9 files changed, 57 insertions, 50 deletions

diff --git a/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java b/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
index 26acac8..26f3718 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java
@@ -4,28 +4,29 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 public class A_Basic {
-        
+
         public int one;
         public float two;
         public String three;
-        
+
         public void m1() {
         }
-        
+
         public int m2() {
                 return 42;
         }
-        
+
         public void m3(int a1) {
         }
-        
+
         public int m4(int a1) {
                 return 5; // chosen by fair die roll, guaranteed to be random
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java b/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
index 035e329..fd7f6e7 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java
@@ -4,21 +4,22 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 public class B_BaseClass {
-        
+
         public int f1;
         public char f2;
-        
+
         public int m1() {
                 return 5;
         }
-        
+
         public int m2() {
                 return 42;
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java b/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
index 6026a8d..9d74e44 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java
@@ -4,23 +4,24 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 public class C_SubClass extends B_BaseClass {
-        
+
         public char f2; // shadows B_BaseClass.f2
         public int f3;
         public int f4;
-        
+
         @Override
         public int m1() {
                 return 32;
         }
-        
+
         public int m3() {
                 return 7;
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java b/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
index a1827f9..99c83bb 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java
@@ -4,17 +4,18 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class D_AnonymousTesting {
-        
+
         public List<Object> getObjs() {
                 List<Object> objs = new ArrayList<Object>();
                 objs.add(new Object() {
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java b/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
index 769eb70..0b8cf2a 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java
@@ -4,15 +4,15 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 import java.util.Iterator;
 
-
 public class E_Bridges implements Iterator<Object> {
 
         @Override
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java b/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
index 845d62b..8a92792 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java
@@ -4,17 +4,18 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 @SuppressWarnings("FinalizeCalledExplicitly")
 public class F_ObjectMethods {
-        
+
         public void callEmAll()
-        throws Throwable {
+                throws Throwable {
                 clone();
                 equals(this);
                 finalize();
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java b/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
index a2e0daf..a1e6a85 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java
@@ -4,30 +4,30 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
-package cuchaz.enigma.inputs.translation;
 
+package cuchaz.enigma.inputs.translation;
 
 public class G_OuterClass {
-        
+
         public class A_InnerClass {
-                
+
                 public int f1;
                 public String f2;
-                
+
                 public void m1() {}
-                
+
                 public class A_InnerInnerClass {
-                        
+
                         public int f3;
-                        
+
                         public void m2() {}
                 }
         }
-        
+
         public class B_NamelessClass {
                 public class A_NamedInnerClass {
                         public int f4;
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java b/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
index 1b718a5..013c55a 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java
@@ -4,34 +4,36 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
-package cuchaz.enigma.inputs.translation;
 
+package cuchaz.enigma.inputs.translation;
 
 public class H_NamelessClass {
-        
+
         public class A_InnerClass {
-                
+
                 public int f1;
                 public String f2;
-                
+
                 public void m1() {}
-                
+
                 public class A_InnerInnerClass {
-                        
+
                         public int f3;
-                        
+
                         public void m2() {}
                 }
         }
-        
+
         public class B_NamelessClass {
                 public class A_NamedInnerClass {
                         public int f4;
+
                         public class A_AnotherInnerClass {}
+
                         public class B_YetAnotherInnerClass {}
                 }
         }
diff --git a/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java b/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
index 3490f9d..fd2ebdd 100644
--- a/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
+++ b/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java
@@ -4,32 +4,32 @@
  * are made available under the terms of the GNU Lesser General Public
  * License v3.0 which accompanies this distribution, and is available at
  * http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  * Contributors:
  *     Jeff Martin - initial API and implementation
  ******************************************************************************/
+
 package cuchaz.enigma.inputs.translation;
 
 import java.util.List;
 import java.util.Map;
 
-
 public class I_Generics {
-        
-        public class A_Type {
-        }
-        
+
         public List<Integer> f1;
         public List<A_Type> f2;
-        public Map<A_Type,A_Type> f3;
-        
+        public Map<A_Type, A_Type> f3;
+        public B_Generic<Integer> f5;
+        public B_Generic<A_Type> f6;
+
+        public class A_Type {
+        }
+
         public class B_Generic<T> {
                 public T f4;
+
                 public T m1() {
                         return null;
                 }
         }
-        
-        public B_Generic<Integer> f5;
-        public B_Generic<A_Type> f6;
 }