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/constructors | |
| 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/constructors')
5 files changed, 41 insertions, 56 deletions
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 | } |