diff options
| author | 2015-01-13 23:25:04 -0500 | |
|---|---|---|
| committer | 2015-01-13 23:25:04 -0500 | |
| commit | 959cb5fd4f9586ec3bd265b452fe25fe1db82e3f (patch) | |
| tree | bdd8a2c52c2fe053ba3460614bde8542e5378dbe /test/cuchaz/enigma/inputs | |
| parent | got rid of gradle in favor of ivy+ssjb (diff) | |
| download | enigma-fork-959cb5fd4f9586ec3bd265b452fe25fe1db82e3f.tar.gz enigma-fork-959cb5fd4f9586ec3bd265b452fe25fe1db82e3f.tar.xz enigma-fork-959cb5fd4f9586ec3bd265b452fe25fe1db82e3f.zip | |
source format change
don't hate me too much if you were planning a big merge. =P
Diffstat (limited to 'test/cuchaz/enigma/inputs')
15 files changed, 94 insertions, 131 deletions
diff --git a/test/cuchaz/enigma/inputs/Keep.java b/test/cuchaz/enigma/inputs/Keep.java index 3c12bae..390e82f 100644 --- a/test/cuchaz/enigma/inputs/Keep.java +++ b/test/cuchaz/enigma/inputs/Keep.java | |||
| @@ -1,9 +1,7 @@ | |||
| 1 | package cuchaz.enigma.inputs; | 1 | package cuchaz.enigma.inputs; |
| 2 | 2 | ||
| 3 | public class Keep | 3 | public class Keep { |
| 4 | { | 4 | public static void main(String[] args) { |
| 5 | public static void main( String[] args ) | 5 | System.out.println("Keep me!"); |
| 6 | { | ||
| 7 | System.out.println( "Keep me!" ); | ||
| 8 | } | 6 | } |
| 9 | } | 7 | } |
diff --git a/test/cuchaz/enigma/inputs/constructors/BaseClass.java b/test/cuchaz/enigma/inputs/constructors/BaseClass.java index e6d8768..9345308 100644 --- a/test/cuchaz/enigma/inputs/constructors/BaseClass.java +++ b/test/cuchaz/enigma/inputs/constructors/BaseClass.java | |||
| @@ -1,17 +1,15 @@ | |||
| 1 | package cuchaz.enigma.inputs.constructors; | 1 | package cuchaz.enigma.inputs.constructors; |
| 2 | 2 | ||
| 3 | // none/a | 3 | // none/a |
| 4 | public class BaseClass | 4 | public class BaseClass { |
| 5 | { | 5 | |
| 6 | // <init>()V | 6 | // <init>()V |
| 7 | public BaseClass( ) | 7 | public BaseClass() { |
| 8 | { | 8 | System.out.println("Default constructor"); |
| 9 | System.out.println( "Default constructor" ); | ||
| 10 | } | 9 | } |
| 11 | 10 | ||
| 12 | // <init>(I)V | 11 | // <init>(I)V |
| 13 | public BaseClass( int i ) | 12 | public BaseClass(int i) { |
| 14 | { | 13 | System.out.println("Int constructor " + i); |
| 15 | System.out.println( "Int constructor " + i ); | ||
| 16 | } | 14 | } |
| 17 | } | 15 | } |
diff --git a/test/cuchaz/enigma/inputs/constructors/Caller.java b/test/cuchaz/enigma/inputs/constructors/Caller.java index b218619..5727875 100644 --- a/test/cuchaz/enigma/inputs/constructors/Caller.java +++ b/test/cuchaz/enigma/inputs/constructors/Caller.java | |||
| @@ -1,54 +1,47 @@ | |||
| 1 | package cuchaz.enigma.inputs.constructors; | 1 | package cuchaz.enigma.inputs.constructors; |
| 2 | 2 | ||
| 3 | // none/b | 3 | // none/b |
| 4 | public class Caller | 4 | public class Caller { |
| 5 | { | 5 | |
| 6 | // a()V | 6 | // a()V |
| 7 | public void callBaseDefault( ) | 7 | public void callBaseDefault() { |
| 8 | { | ||
| 9 | // none/a.<init>()V | 8 | // none/a.<init>()V |
| 10 | System.out.println( new BaseClass() ); | 9 | System.out.println(new BaseClass()); |
| 11 | } | 10 | } |
| 12 | 11 | ||
| 13 | // b()V | 12 | // b()V |
| 14 | public void callBaseInt( ) | 13 | public void callBaseInt() { |
| 15 | { | ||
| 16 | // none/a.<init>(I)V | 14 | // none/a.<init>(I)V |
| 17 | System.out.println( new BaseClass( 5 ) ); | 15 | System.out.println(new BaseClass(5)); |
| 18 | } | 16 | } |
| 19 | 17 | ||
| 20 | // c()V | 18 | // c()V |
| 21 | public void callSubDefault( ) | 19 | public void callSubDefault() { |
| 22 | { | ||
| 23 | // none/d.<init>()V | 20 | // none/d.<init>()V |
| 24 | System.out.println( new SubClass() ); | 21 | System.out.println(new SubClass()); |
| 25 | } | 22 | } |
| 26 | 23 | ||
| 27 | // d()V | 24 | // d()V |
| 28 | public void callSubInt( ) | 25 | public void callSubInt() { |
| 29 | { | ||
| 30 | // none/d.<init>(I)V | 26 | // none/d.<init>(I)V |
| 31 | System.out.println( new SubClass( 6 ) ); | 27 | System.out.println(new SubClass(6)); |
| 32 | } | 28 | } |
| 33 | 29 | ||
| 34 | // e()V | 30 | // e()V |
| 35 | public void callSubIntInt( ) | 31 | public void callSubIntInt() { |
| 36 | { | ||
| 37 | // none/d.<init>(II)V | 32 | // none/d.<init>(II)V |
| 38 | System.out.println( new SubClass( 4, 2 ) ); | 33 | System.out.println(new SubClass(4, 2)); |
| 39 | } | 34 | } |
| 40 | 35 | ||
| 41 | // f()V | 36 | // f()V |
| 42 | public void callSubSubInt( ) | 37 | public void callSubSubInt() { |
| 43 | { | ||
| 44 | // none/e.<init>(I)V | 38 | // none/e.<init>(I)V |
| 45 | System.out.println( new SubSubClass( 3 ) ); | 39 | System.out.println(new SubSubClass(3)); |
| 46 | } | 40 | } |
| 47 | 41 | ||
| 48 | // g()V | 42 | // g()V |
| 49 | public void callDefaultConstructable() | 43 | public void callDefaultConstructable() { |
| 50 | { | ||
| 51 | // none/c.<init>()V | 44 | // none/c.<init>()V |
| 52 | System.out.println( new DefaultConstructable() ); | 45 | System.out.println(new DefaultConstructable()); |
| 53 | } | 46 | } |
| 54 | } | 47 | } |
diff --git a/test/cuchaz/enigma/inputs/constructors/DefaultConstructable.java b/test/cuchaz/enigma/inputs/constructors/DefaultConstructable.java index 6cfd35e..26a3ddb 100644 --- a/test/cuchaz/enigma/inputs/constructors/DefaultConstructable.java +++ b/test/cuchaz/enigma/inputs/constructors/DefaultConstructable.java | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | package cuchaz.enigma.inputs.constructors; | 1 | package cuchaz.enigma.inputs.constructors; |
| 2 | 2 | ||
| 3 | public class DefaultConstructable | 3 | public class DefaultConstructable { |
| 4 | { | ||
| 5 | // only default constructor | 4 | // only default constructor |
| 6 | } | 5 | } |
diff --git a/test/cuchaz/enigma/inputs/constructors/SubClass.java b/test/cuchaz/enigma/inputs/constructors/SubClass.java index 6ef7732..fecfa2b 100644 --- a/test/cuchaz/enigma/inputs/constructors/SubClass.java +++ b/test/cuchaz/enigma/inputs/constructors/SubClass.java | |||
| @@ -1,32 +1,28 @@ | |||
| 1 | package cuchaz.enigma.inputs.constructors; | 1 | package cuchaz.enigma.inputs.constructors; |
| 2 | 2 | ||
| 3 | // none/d extends none/a | 3 | // none/d extends none/a |
| 4 | public class SubClass extends BaseClass | 4 | public class SubClass extends BaseClass { |
| 5 | { | 5 | |
| 6 | // <init>()V | 6 | // <init>()V |
| 7 | public SubClass( ) | 7 | public SubClass() { |
| 8 | { | ||
| 9 | // none/a.<init>()V | 8 | // none/a.<init>()V |
| 10 | } | 9 | } |
| 11 | 10 | ||
| 12 | // <init>(I)V | 11 | // <init>(I)V |
| 13 | public SubClass( int num ) | 12 | public SubClass(int num) { |
| 14 | { | ||
| 15 | // <init>()V | 13 | // <init>()V |
| 16 | this(); | 14 | this(); |
| 17 | System.out.println( "SubClass " + num ); | 15 | System.out.println("SubClass " + num); |
| 18 | } | 16 | } |
| 19 | 17 | ||
| 20 | // <init>(II)V | 18 | // <init>(II)V |
| 21 | public SubClass( int a, int b ) | 19 | public SubClass(int a, int b) { |
| 22 | { | ||
| 23 | // <init>(I)V | 20 | // <init>(I)V |
| 24 | this( a + b ); | 21 | this(a + b); |
| 25 | } | 22 | } |
| 26 | 23 | ||
| 27 | // <init>(III)V | 24 | // <init>(III)V |
| 28 | public SubClass( int a, int b, int c ) | 25 | public SubClass(int a, int b, int c) { |
| 29 | { | ||
| 30 | // none/a.<init>()V | 26 | // none/a.<init>()V |
| 31 | } | 27 | } |
| 32 | } | 28 | } |
diff --git a/test/cuchaz/enigma/inputs/constructors/SubSubClass.java b/test/cuchaz/enigma/inputs/constructors/SubSubClass.java index 76a0f1f..ab84161 100644 --- a/test/cuchaz/enigma/inputs/constructors/SubSubClass.java +++ b/test/cuchaz/enigma/inputs/constructors/SubSubClass.java | |||
| @@ -1,12 +1,11 @@ | |||
| 1 | package cuchaz.enigma.inputs.constructors; | 1 | package cuchaz.enigma.inputs.constructors; |
| 2 | 2 | ||
| 3 | // none/e extends none/d | 3 | // none/e extends none/d |
| 4 | public class SubSubClass extends SubClass | 4 | public class SubSubClass extends SubClass { |
| 5 | { | 5 | |
| 6 | // <init>(I)V | 6 | // <init>(I)V |
| 7 | public SubSubClass( int i ) | 7 | public SubSubClass(int i) { |
| 8 | { | ||
| 9 | // none/c.<init>(I)V | 8 | // none/c.<init>(I)V |
| 10 | super( i ); | 9 | super(i); |
| 11 | } | 10 | } |
| 12 | } | 11 | } |
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java b/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java index 8402dde..5b416c4 100644 --- a/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java +++ b/test/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java | |||
| @@ -1,23 +1,21 @@ | |||
| 1 | package cuchaz.enigma.inputs.inheritanceTree; | 1 | package cuchaz.enigma.inputs.inheritanceTree; |
| 2 | 2 | ||
| 3 | // none/a | 3 | // none/a |
| 4 | public abstract class BaseClass | 4 | public abstract class BaseClass { |
| 5 | { | 5 | |
| 6 | // a | 6 | // a |
| 7 | private String m_name; | 7 | private String m_name; |
| 8 | 8 | ||
| 9 | // <init>(Ljava/lang/String;)V | 9 | // <init>(Ljava/lang/String;)V |
| 10 | protected BaseClass( String name ) | 10 | protected BaseClass(String name) { |
| 11 | { | ||
| 12 | m_name = name; | 11 | m_name = name; |
| 13 | } | 12 | } |
| 14 | 13 | ||
| 15 | // a()Ljava/lang/String; | 14 | // a()Ljava/lang/String; |
| 16 | public String getName( ) | 15 | public String getName() { |
| 17 | { | ||
| 18 | return m_name; | 16 | return m_name; |
| 19 | } | 17 | } |
| 20 | 18 | ||
| 21 | // a()V | 19 | // a()V |
| 22 | public abstract void doBaseThings( ); | 20 | public abstract void doBaseThings(); |
| 23 | } | 21 | } |
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java index ed50709..7a99d51 100644 --- a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java +++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java | |||
| @@ -1,12 +1,11 @@ | |||
| 1 | package cuchaz.enigma.inputs.inheritanceTree; | 1 | package cuchaz.enigma.inputs.inheritanceTree; |
| 2 | 2 | ||
| 3 | // none/b extends none/a | 3 | // none/b extends none/a |
| 4 | public abstract class SubclassA extends BaseClass | 4 | public abstract class SubclassA extends BaseClass { |
| 5 | { | 5 | |
| 6 | // <init>(Ljava/lang/String;)V | 6 | // <init>(Ljava/lang/String;)V |
| 7 | protected SubclassA( String name ) | 7 | protected SubclassA(String name) { |
| 8 | { | ||
| 9 | // call to none/a.<init>(Ljava/lang/String)V | 8 | // call to none/a.<init>(Ljava/lang/String)V |
| 10 | super( name ); | 9 | super(name); |
| 11 | } | 10 | } |
| 12 | } | 11 | } |
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java index fc4c8ee..c9485d3 100644 --- a/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java +++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java | |||
| @@ -1,16 +1,15 @@ | |||
| 1 | package cuchaz.enigma.inputs.inheritanceTree; | 1 | package cuchaz.enigma.inputs.inheritanceTree; |
| 2 | 2 | ||
| 3 | // none/c extends none/a | 3 | // none/c extends none/a |
| 4 | public class SubclassB extends BaseClass | 4 | public class SubclassB extends BaseClass { |
| 5 | { | 5 | |
| 6 | // a | 6 | // a |
| 7 | private int m_numThings; | 7 | private int m_numThings; |
| 8 | 8 | ||
| 9 | // <init>()V | 9 | // <init>()V |
| 10 | protected SubclassB( ) | 10 | protected SubclassB() { |
| 11 | { | ||
| 12 | // none/a.<init>(Ljava/lang/String;)V | 11 | // none/a.<init>(Ljava/lang/String;)V |
| 13 | super( "B" ); | 12 | super("B"); |
| 14 | 13 | ||
| 15 | // access to a | 14 | // access to a |
| 16 | m_numThings = 4; | 15 | m_numThings = 4; |
| @@ -18,16 +17,14 @@ public class SubclassB extends BaseClass | |||
| 18 | 17 | ||
| 19 | @Override | 18 | @Override |
| 20 | // a()V | 19 | // a()V |
| 21 | public void doBaseThings( ) | 20 | public void doBaseThings() { |
| 22 | { | ||
| 23 | // call to none/a.a()Ljava/lang/String; | 21 | // call to none/a.a()Ljava/lang/String; |
| 24 | System.out.println( "Base things by B! " + getName() ); | 22 | System.out.println("Base things by B! " + getName()); |
| 25 | } | 23 | } |
| 26 | 24 | ||
| 27 | // b()V | 25 | // b()V |
| 28 | public void doBThings( ) | 26 | public void doBThings() { |
| 29 | { | ||
| 30 | // access to a | 27 | // access to a |
| 31 | System.out.println( "" + m_numThings + " B things!" ); | 28 | System.out.println("" + m_numThings + " B things!"); |
| 32 | } | 29 | } |
| 33 | } | 30 | } |
diff --git a/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java b/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java index b3b8342..afd03ac 100644 --- a/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java +++ b/test/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java | |||
| @@ -1,27 +1,24 @@ | |||
| 1 | package cuchaz.enigma.inputs.inheritanceTree; | 1 | package cuchaz.enigma.inputs.inheritanceTree; |
| 2 | 2 | ||
| 3 | // none/d extends none/b | 3 | // none/d extends none/b |
| 4 | public class SubsubclassAA extends SubclassA | 4 | public class SubsubclassAA extends SubclassA { |
| 5 | { | 5 | |
| 6 | protected SubsubclassAA( ) | 6 | protected SubsubclassAA() { |
| 7 | { | ||
| 8 | // call to none/b.<init>(Ljava/lang/String;)V | 7 | // call to none/b.<init>(Ljava/lang/String;)V |
| 9 | super( "AA" ); | 8 | super("AA"); |
| 10 | } | 9 | } |
| 11 | 10 | ||
| 12 | @Override | 11 | @Override |
| 13 | // a()Ljava/lang/String; | 12 | // a()Ljava/lang/String; |
| 14 | public String getName( ) | 13 | public String getName() { |
| 15 | { | ||
| 16 | // call to none/b.a()Ljava/lang/String; | 14 | // call to none/b.a()Ljava/lang/String; |
| 17 | return "subsub" + super.getName(); | 15 | return "subsub" + super.getName(); |
| 18 | } | 16 | } |
| 19 | 17 | ||
| 20 | @Override | 18 | @Override |
| 21 | // a()V | 19 | // a()V |
| 22 | public void doBaseThings( ) | 20 | public void doBaseThings() { |
| 23 | { | ||
| 24 | // call to none/d.a()Ljava/lang/String; | 21 | // call to none/d.a()Ljava/lang/String; |
| 25 | System.out.println( "Base things by " + getName() ); | 22 | System.out.println("Base things by " + getName()); |
| 26 | } | 23 | } |
| 27 | } | 24 | } |
diff --git a/test/cuchaz/enigma/inputs/innerClasses/Anonymous.java b/test/cuchaz/enigma/inputs/innerClasses/Anonymous.java index d36a514..f5d9d1c 100644 --- a/test/cuchaz/enigma/inputs/innerClasses/Anonymous.java +++ b/test/cuchaz/enigma/inputs/innerClasses/Anonymous.java | |||
| @@ -1,14 +1,11 @@ | |||
| 1 | package cuchaz.enigma.inputs.innerClasses; | 1 | package cuchaz.enigma.inputs.innerClasses; |
| 2 | 2 | ||
| 3 | public class Anonymous | 3 | public class Anonymous { |
| 4 | { | 4 | |
| 5 | public void foo( ) | 5 | public void foo() { |
| 6 | { | 6 | Runnable runnable = new Runnable() { |
| 7 | Runnable runnable = new Runnable( ) | ||
| 8 | { | ||
| 9 | @Override | 7 | @Override |
| 10 | public void run( ) | 8 | public void run() { |
| 11 | { | ||
| 12 | // don't care | 9 | // don't care |
| 13 | } | 10 | } |
| 14 | }; | 11 | }; |
diff --git a/test/cuchaz/enigma/inputs/innerClasses/AnonymousWithScopeArgs.java b/test/cuchaz/enigma/inputs/innerClasses/AnonymousWithScopeArgs.java index e0a65e2..b3ba1af 100644 --- a/test/cuchaz/enigma/inputs/innerClasses/AnonymousWithScopeArgs.java +++ b/test/cuchaz/enigma/inputs/innerClasses/AnonymousWithScopeArgs.java | |||
| @@ -1,16 +1,13 @@ | |||
| 1 | package cuchaz.enigma.inputs.innerClasses; | 1 | package cuchaz.enigma.inputs.innerClasses; |
| 2 | 2 | ||
| 3 | public class AnonymousWithScopeArgs | 3 | public class AnonymousWithScopeArgs { |
| 4 | { | 4 | |
| 5 | public static void foo( final Simple arg ) | 5 | public static void foo(final Simple arg) { |
| 6 | { | 6 | System.out.println(new Object() { |
| 7 | System.out.println( new Object( ) | ||
| 8 | { | ||
| 9 | @Override | 7 | @Override |
| 10 | public String toString( ) | 8 | public String toString() { |
| 11 | { | ||
| 12 | return arg.toString(); | 9 | return arg.toString(); |
| 13 | } | 10 | } |
| 14 | } ); | 11 | }); |
| 15 | } | 12 | } |
| 16 | } | 13 | } |
diff --git a/test/cuchaz/enigma/inputs/innerClasses/ConstructorArgs.java b/test/cuchaz/enigma/inputs/innerClasses/ConstructorArgs.java index e24395c..08135fe 100644 --- a/test/cuchaz/enigma/inputs/innerClasses/ConstructorArgs.java +++ b/test/cuchaz/enigma/inputs/innerClasses/ConstructorArgs.java | |||
| @@ -1,22 +1,20 @@ | |||
| 1 | package cuchaz.enigma.inputs.innerClasses; | 1 | package cuchaz.enigma.inputs.innerClasses; |
| 2 | 2 | ||
| 3 | @SuppressWarnings( "unused" ) | 3 | @SuppressWarnings("unused") |
| 4 | public class ConstructorArgs | 4 | public class ConstructorArgs { |
| 5 | { | 5 | |
| 6 | class Inner | 6 | class Inner { |
| 7 | { | 7 | |
| 8 | private int a; | 8 | private int a; |
| 9 | 9 | ||
| 10 | public Inner( int a ) | 10 | public Inner(int a) { |
| 11 | { | ||
| 12 | this.a = a; | 11 | this.a = a; |
| 13 | } | 12 | } |
| 14 | } | 13 | } |
| 15 | 14 | ||
| 16 | Inner i; | 15 | Inner i; |
| 17 | 16 | ||
| 18 | public void foo( ) | 17 | public void foo() { |
| 19 | { | 18 | i = new Inner(5); |
| 20 | i = new Inner( 5 ); | ||
| 21 | } | 19 | } |
| 22 | } | 20 | } |
diff --git a/test/cuchaz/enigma/inputs/innerClasses/Simple.java b/test/cuchaz/enigma/inputs/innerClasses/Simple.java index 405c639..cb536fa 100644 --- a/test/cuchaz/enigma/inputs/innerClasses/Simple.java +++ b/test/cuchaz/enigma/inputs/innerClasses/Simple.java | |||
| @@ -1,9 +1,8 @@ | |||
| 1 | package cuchaz.enigma.inputs.innerClasses; | 1 | package cuchaz.enigma.inputs.innerClasses; |
| 2 | 2 | ||
| 3 | public class Simple | 3 | public class Simple { |
| 4 | { | 4 | |
| 5 | class Inner | 5 | class Inner { |
| 6 | { | ||
| 7 | // nothing to do | 6 | // nothing to do |
| 8 | } | 7 | } |
| 9 | } | 8 | } |
diff --git a/test/cuchaz/enigma/inputs/loneClass/LoneClass.java b/test/cuchaz/enigma/inputs/loneClass/LoneClass.java index 961b012..18c716e 100644 --- a/test/cuchaz/enigma/inputs/loneClass/LoneClass.java +++ b/test/cuchaz/enigma/inputs/loneClass/LoneClass.java | |||
| @@ -1,16 +1,14 @@ | |||
| 1 | package cuchaz.enigma.inputs.loneClass; | 1 | package cuchaz.enigma.inputs.loneClass; |
| 2 | 2 | ||
| 3 | public class LoneClass | 3 | public class LoneClass { |
| 4 | { | 4 | |
| 5 | private String m_name; | 5 | private String m_name; |
| 6 | 6 | ||
| 7 | public LoneClass( String name ) | 7 | public LoneClass(String name) { |
| 8 | { | ||
| 9 | m_name = name; | 8 | m_name = name; |
| 10 | } | 9 | } |
| 11 | 10 | ||
| 12 | public String getName( ) | 11 | public String getName() { |
| 13 | { | ||
| 14 | return m_name; | 12 | return m_name; |
| 15 | } | 13 | } |
| 16 | } | 14 | } |