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/inheritanceTree | |
| 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/inheritanceTree')
4 files changed, 24 insertions, 33 deletions
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 | } |