From 959cb5fd4f9586ec3bd265b452fe25fe1db82e3f Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 13 Jan 2015 23:25:04 -0500 Subject: source format change don't hate me too much if you were planning a big merge. =P --- test/cuchaz/enigma/inputs/Keep.java | 8 ++-- .../enigma/inputs/constructors/BaseClass.java | 16 ++++--- test/cuchaz/enigma/inputs/constructors/Caller.java | 49 ++++++++++------------ .../inputs/constructors/DefaultConstructable.java | 3 +- .../enigma/inputs/constructors/SubClass.java | 20 ++++----- .../enigma/inputs/constructors/SubSubClass.java | 9 ++-- .../enigma/inputs/inheritanceTree/BaseClass.java | 12 +++--- .../enigma/inputs/inheritanceTree/SubclassA.java | 9 ++-- .../enigma/inputs/inheritanceTree/SubclassB.java | 19 ++++----- .../inputs/inheritanceTree/SubsubclassAA.java | 17 ++++---- .../enigma/inputs/innerClasses/Anonymous.java | 13 +++--- .../innerClasses/AnonymousWithScopeArgs.java | 15 +++---- .../inputs/innerClasses/ConstructorArgs.java | 18 ++++---- test/cuchaz/enigma/inputs/innerClasses/Simple.java | 7 ++-- test/cuchaz/enigma/inputs/loneClass/LoneClass.java | 10 ++--- 15 files changed, 94 insertions(+), 131 deletions(-) (limited to 'test/cuchaz/enigma/inputs') 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 @@ package cuchaz.enigma.inputs; -public class Keep -{ - public static void main( String[] args ) - { - System.out.println( "Keep me!" ); +public class Keep { + public static void main(String[] args) { + System.out.println("Keep me!"); } } 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 @@ package cuchaz.enigma.inputs.constructors; // none/a -public class BaseClass -{ +public class BaseClass { + // ()V - public BaseClass( ) - { - System.out.println( "Default constructor" ); + public BaseClass() { + System.out.println("Default constructor"); } - + // (I)V - public BaseClass( int i ) - { - System.out.println( "Int constructor " + i ); + public BaseClass(int i) { + System.out.println("Int constructor " + i); } } 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 @@ package cuchaz.enigma.inputs.constructors; // none/b -public class Caller -{ +public class Caller { + // a()V - public void callBaseDefault( ) - { + public void callBaseDefault() { // none/a.()V - System.out.println( new BaseClass() ); + System.out.println(new BaseClass()); } - + // b()V - public void callBaseInt( ) - { + public void callBaseInt() { // none/a.(I)V - System.out.println( new BaseClass( 5 ) ); + System.out.println(new BaseClass(5)); } - + // c()V - public void callSubDefault( ) - { + public void callSubDefault() { // none/d.()V - System.out.println( new SubClass() ); + System.out.println(new SubClass()); } - + // d()V - public void callSubInt( ) - { + public void callSubInt() { // none/d.(I)V - System.out.println( new SubClass( 6 ) ); + System.out.println(new SubClass(6)); } - + // e()V - public void callSubIntInt( ) - { + public void callSubIntInt() { // none/d.(II)V - System.out.println( new SubClass( 4, 2 ) ); + System.out.println(new SubClass(4, 2)); } - + // f()V - public void callSubSubInt( ) - { + public void callSubSubInt() { // none/e.(I)V - System.out.println( new SubSubClass( 3 ) ); + System.out.println(new SubSubClass(3)); } // g()V - public void callDefaultConstructable() - { + public void callDefaultConstructable() { // none/c.()V - System.out.println( new DefaultConstructable() ); + System.out.println(new DefaultConstructable()); } } 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 @@ package cuchaz.enigma.inputs.constructors; -public class DefaultConstructable -{ +public class DefaultConstructable { // only default constructor } 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 @@ package cuchaz.enigma.inputs.constructors; // none/d extends none/a -public class SubClass extends BaseClass -{ +public class SubClass extends BaseClass { + // ()V - public SubClass( ) - { + public SubClass() { // none/a.()V } // (I)V - public SubClass( int num ) - { + public SubClass(int num) { // ()V this(); - System.out.println( "SubClass " + num ); + System.out.println("SubClass " + num); } // (II)V - public SubClass( int a, int b ) - { + public SubClass(int a, int b) { // (I)V - this( a + b ); + this(a + b); } // (III)V - public SubClass( int a, int b, int c ) - { + public SubClass(int a, int b, int c) { // none/a.()V } } 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 @@ package cuchaz.enigma.inputs.constructors; // none/e extends none/d -public class SubSubClass extends SubClass -{ +public class SubSubClass extends SubClass { + // (I)V - public SubSubClass( int i ) - { + public SubSubClass(int i) { // none/c.(I)V - super( i ); + super(i); } } 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 @@ package cuchaz.enigma.inputs.inheritanceTree; // none/a -public abstract class BaseClass -{ +public abstract class BaseClass { + // a private String m_name; // (Ljava/lang/String;)V - protected BaseClass( String name ) - { + protected BaseClass(String name) { m_name = name; } // a()Ljava/lang/String; - public String getName( ) - { + public String getName() { return m_name; } // a()V - public abstract void doBaseThings( ); + public abstract void doBaseThings(); } 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 @@ package cuchaz.enigma.inputs.inheritanceTree; // none/b extends none/a -public abstract class SubclassA extends BaseClass -{ +public abstract class SubclassA extends BaseClass { + // (Ljava/lang/String;)V - protected SubclassA( String name ) - { + protected SubclassA(String name) { // call to none/a.(Ljava/lang/String)V - super( name ); + super(name); } } 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 @@ package cuchaz.enigma.inputs.inheritanceTree; // none/c extends none/a -public class SubclassB extends BaseClass -{ +public class SubclassB extends BaseClass { + // a private int m_numThings; // ()V - protected SubclassB( ) - { + protected SubclassB() { // none/a.(Ljava/lang/String;)V - super( "B" ); + super("B"); // access to a m_numThings = 4; @@ -18,16 +17,14 @@ public class SubclassB extends BaseClass @Override // a()V - public void doBaseThings( ) - { + public void doBaseThings() { // call to none/a.a()Ljava/lang/String; - System.out.println( "Base things by B! " + getName() ); + System.out.println("Base things by B! " + getName()); } // b()V - public void doBThings( ) - { + public void doBThings() { // access to a - System.out.println( "" + m_numThings + " B things!" ); + System.out.println("" + m_numThings + " B things!"); } } 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 @@ package cuchaz.enigma.inputs.inheritanceTree; // none/d extends none/b -public class SubsubclassAA extends SubclassA -{ - protected SubsubclassAA( ) - { +public class SubsubclassAA extends SubclassA { + + protected SubsubclassAA() { // call to none/b.(Ljava/lang/String;)V - super( "AA" ); + super("AA"); } @Override // a()Ljava/lang/String; - public String getName( ) - { + public String getName() { // call to none/b.a()Ljava/lang/String; return "subsub" + super.getName(); } @Override // a()V - public void doBaseThings( ) - { + public void doBaseThings() { // call to none/d.a()Ljava/lang/String; - System.out.println( "Base things by " + getName() ); + System.out.println("Base things by " + getName()); } } 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 @@ package cuchaz.enigma.inputs.innerClasses; -public class Anonymous -{ - public void foo( ) - { - Runnable runnable = new Runnable( ) - { +public class Anonymous { + + public void foo() { + Runnable runnable = new Runnable() { @Override - public void run( ) - { + public void run() { // don't care } }; 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 @@ package cuchaz.enigma.inputs.innerClasses; -public class AnonymousWithScopeArgs -{ - public static void foo( final Simple arg ) - { - System.out.println( new Object( ) - { +public class AnonymousWithScopeArgs { + + public static void foo(final Simple arg) { + System.out.println(new Object() { @Override - public String toString( ) - { + public String toString() { return arg.toString(); } - } ); + }); } } 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 @@ package cuchaz.enigma.inputs.innerClasses; -@SuppressWarnings( "unused" ) -public class ConstructorArgs -{ - class Inner - { +@SuppressWarnings("unused") +public class ConstructorArgs { + + class Inner { + private int a; - public Inner( int a ) - { + public Inner(int a) { this.a = a; } } Inner i; - public void foo( ) - { - i = new Inner( 5 ); + public void foo() { + i = new Inner(5); } } 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 @@ package cuchaz.enigma.inputs.innerClasses; -public class Simple -{ - class Inner - { +public class Simple { + + class Inner { // nothing to do } } 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 @@ package cuchaz.enigma.inputs.loneClass; -public class LoneClass -{ +public class LoneClass { + private String m_name; - public LoneClass( String name ) - { + public LoneClass(String name) { m_name = name; } - public String getName( ) - { + public String getName() { return m_name; } } -- cgit v1.2.3