From 0f47403d0220757fed189b76e2071e25b1025cb8 Mon Sep 17 00:00:00 2001 From: Runemoro Date: Wed, 3 Jun 2020 13:39:42 -0400 Subject: Split GUI code to separate module (#242) * Split into modules * Post merge compile fixes Co-authored-by: modmuss50 --- src/test/java/cuchaz/enigma/inputs/Keep.java | 18 ------- .../enigma/inputs/constructors/BaseClass.java | 26 ---------- .../cuchaz/enigma/inputs/constructors/Caller.java | 58 ---------------------- .../inputs/constructors/DefaultConstructable.java | 16 ------ .../enigma/inputs/constructors/SubClass.java | 39 --------------- .../enigma/inputs/constructors/SubSubClass.java | 22 -------- .../enigma/inputs/inheritanceTree/BaseClass.java | 32 ------------ .../enigma/inputs/inheritanceTree/SubclassA.java | 22 -------- .../enigma/inputs/inheritanceTree/SubclassB.java | 41 --------------- .../inputs/inheritanceTree/SubsubclassAA.java | 35 ------------- .../enigma/inputs/innerClasses/A_Anonymous.java | 25 ---------- .../innerClasses/B_AnonymousWithScopeArgs.java | 24 --------- .../inputs/innerClasses/C_ConstructorArgs.java | 31 ------------ .../enigma/inputs/innerClasses/D_Simple.java | 19 ------- .../innerClasses/E_AnonymousWithOuterAccess.java | 32 ------------ .../enigma/inputs/innerClasses/F_ClassTree.java | 30 ----------- .../cuchaz/enigma/inputs/loneClass/LoneClass.java | 25 ---------- .../cuchaz/enigma/inputs/packageAccess/Base.java | 7 --- .../inputs/packageAccess/SamePackageChild.java | 12 ----- .../packageAccess/sub/OtherPackageChild.java | 14 ------ .../cuchaz/enigma/inputs/translation/A_Basic.java | 33 ------------ .../enigma/inputs/translation/B_BaseClass.java | 26 ---------- .../enigma/inputs/translation/C_SubClass.java | 28 ----------- .../inputs/translation/D_AnonymousTesting.java | 29 ----------- .../enigma/inputs/translation/E_Bridges.java | 32 ------------ .../enigma/inputs/translation/F_ObjectMethods.java | 31 ------------ .../enigma/inputs/translation/G_OuterClass.java | 36 -------------- .../enigma/inputs/translation/H_NamelessClass.java | 40 --------------- .../enigma/inputs/translation/I_Generics.java | 35 ------------- 29 files changed, 818 deletions(-) delete mode 100644 src/test/java/cuchaz/enigma/inputs/Keep.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/constructors/Caller.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java delete mode 100644 src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java (limited to 'src/test/java/cuchaz/enigma/inputs') diff --git a/src/test/java/cuchaz/enigma/inputs/Keep.java b/src/test/java/cuchaz/enigma/inputs/Keep.java deleted file mode 100644 index 4dbe8e2..0000000 --- a/src/test/java/cuchaz/enigma/inputs/Keep.java +++ /dev/null @@ -1,18 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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; - -public class Keep { - public static void main(String[] args) { - System.out.println("Keep me!"); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java b/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java deleted file mode 100644 index f07e1f8..0000000 --- a/src/test/java/cuchaz/enigma/inputs/constructors/BaseClass.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.constructors; - -// a -public class BaseClass { - - // ()V - public BaseClass() { - System.out.println("Default constructor"); - } - - // (I)V - public BaseClass(int i) { - System.out.println("Int constructor " + i); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java b/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java deleted file mode 100644 index 71439fd..0000000 --- a/src/test/java/cuchaz/enigma/inputs/constructors/Caller.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.constructors; - -// b -public class Caller { - - // a()V - public void callBaseDefault() { - // a.()V - System.out.println(new BaseClass()); - } - - // b()V - public void callBaseInt() { - // a.(I)V - System.out.println(new BaseClass(5)); - } - - // c()V - public void callSubDefault() { - // d.()V - System.out.println(new SubClass()); - } - - // d()V - public void callSubInt() { - // d.(I)V - System.out.println(new SubClass(6)); - } - - // e()V - public void callSubIntInt() { - // d.(II)V - System.out.println(new SubClass(4, 2)); - } - - // f()V - public void callSubSubInt() { - // e.(I)V - System.out.println(new SubSubClass(3)); - } - - // g()V - public void callDefaultConstructable() { - // c.()V - System.out.println(new DefaultConstructable()); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java b/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java deleted file mode 100644 index c3d4170..0000000 --- a/src/test/java/cuchaz/enigma/inputs/constructors/DefaultConstructable.java +++ /dev/null @@ -1,16 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.constructors; - -public class DefaultConstructable { - // only default constructor -} diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java b/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java deleted file mode 100644 index bc56b3b..0000000 --- a/src/test/java/cuchaz/enigma/inputs/constructors/SubClass.java +++ /dev/null @@ -1,39 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.constructors; - -// d extends a -public class SubClass extends BaseClass { - - // ()V - public SubClass() { - // a.()V - } - - // (I)V - public SubClass(int num) { - // ()V - this(); - System.out.println("SubClass " + num); - } - - // (II)V - public SubClass(int a, int b) { - // (I)V - this(a + b); - } - - // (III)V - public SubClass(int a, int b, int c) { - // a.()V - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java b/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java deleted file mode 100644 index 87b69d3..0000000 --- a/src/test/java/cuchaz/enigma/inputs/constructors/SubSubClass.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.constructors; - -// e extends d -public class SubSubClass extends SubClass { - - // (I)V - public SubSubClass(int i) { - // c.(I)V - super(i); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java deleted file mode 100644 index b9c4929..0000000 --- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/BaseClass.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.inheritanceTree; - -// a -public abstract class BaseClass { - - // a - private String name; - - // (Ljava/lang/String;)V - protected BaseClass(String name) { - this.name = name; - } - - // a()Ljava/lang/String; - public String getName() { - return name; - } - - // a()V - public abstract void doBaseThings(); -} diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java deleted file mode 100644 index 50e963c..0000000 --- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassA.java +++ /dev/null @@ -1,22 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.inheritanceTree; - -// b extends a -public abstract class SubclassA extends BaseClass { - - // (Ljava/lang/String;)V - protected SubclassA(String name) { - // call to a.(Ljava/lang/String)V - super(name); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java deleted file mode 100644 index d0dd664..0000000 --- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubclassB.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.inheritanceTree; - -// c extends a -public class SubclassB extends BaseClass { - - // a - private int numThings; - - // ()V - protected SubclassB() { - // a.(Ljava/lang/String;)V - super("B"); - - // access to a - numThings = 4; - } - - @Override - // a()V - public void doBaseThings() { - // call to a.a()Ljava/lang/String; - System.out.println("Base things by B! " + getName()); - } - - // b()V - public void doBThings() { - // access to a - System.out.println("" + numThings + " B things!"); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java b/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java deleted file mode 100644 index c584570..0000000 --- a/src/test/java/cuchaz/enigma/inputs/inheritanceTree/SubsubclassAA.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.inheritanceTree; - -// d extends b -public class SubsubclassAA extends SubclassA { - - protected SubsubclassAA() { - // call to b.(Ljava/lang/String;)V - super("AA"); - } - - @Override - // a()Ljava/lang/String; - public String getName() { - // call to b.a()Ljava/lang/String; - return "subsub" + super.getName(); - } - - @Override - // a()V - public void doBaseThings() { - // call to d.a()Ljava/lang/String; - System.out.println("Base things by " + getName()); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java deleted file mode 100644 index f652d87..0000000 --- a/src/test/java/cuchaz/enigma/inputs/innerClasses/A_Anonymous.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.innerClasses; - -public class A_Anonymous { - - public void foo() { - Runnable runnable = new Runnable() { - @Override - public void run() { - // don't care - } - }; - runnable.run(); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java deleted file mode 100644 index d1b7601..0000000 --- a/src/test/java/cuchaz/enigma/inputs/innerClasses/B_AnonymousWithScopeArgs.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.innerClasses; - -public class B_AnonymousWithScopeArgs { - - public static void foo(final D_Simple arg) { - System.out.println(new Object() { - @Override - public String toString() { - return arg.toString(); - } - }); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java deleted file mode 100644 index 94061fa..0000000 --- a/src/test/java/cuchaz/enigma/inputs/innerClasses/C_ConstructorArgs.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.innerClasses; - -@SuppressWarnings("unused") -public class C_ConstructorArgs { - - Inner i; - - public void foo() { - i = new Inner(5); - } - - class Inner { - - private int a; - - public Inner(int a) { - this.a = a; - } - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java deleted file mode 100644 index 71b3a6d..0000000 --- a/src/test/java/cuchaz/enigma/inputs/innerClasses/D_Simple.java +++ /dev/null @@ -1,19 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.innerClasses; - -public class D_Simple { - - class Inner { - // nothing to do - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java deleted file mode 100644 index 976ec42..0000000 --- a/src/test/java/cuchaz/enigma/inputs/innerClasses/E_AnonymousWithOuterAccess.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.innerClasses; - -public class E_AnonymousWithOuterAccess { - - // reproduction of error case documented at: - // https://bitbucket.org/cuchaz/enigma/issue/61/stackoverflowerror-when-deobfuscating - - public Object makeInner() { - outerMethod(); - return new Object() { - @Override - public String toString() { - return outerMethod(); - } - }; - } - - private String outerMethod() { - return "foo"; - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java b/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java deleted file mode 100644 index b1de3c9..0000000 --- a/src/test/java/cuchaz/enigma/inputs/innerClasses/F_ClassTree.java +++ /dev/null @@ -1,30 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.innerClasses; - -public class F_ClassTree { - - public class Level1 { - - public int f1; - - public class Level2 { - - public int f2; - - public class Level3 { - - public int f3; - } - } - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java b/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java deleted file mode 100644 index ddc4e31..0000000 --- a/src/test/java/cuchaz/enigma/inputs/loneClass/LoneClass.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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.loneClass; - -public class LoneClass { - - private String name; - - public LoneClass(String name) { - this.name = name; - } - - public String getName() { - return name; - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java b/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java deleted file mode 100644 index 6f5fe30..0000000 --- a/src/test/java/cuchaz/enigma/inputs/packageAccess/Base.java +++ /dev/null @@ -1,7 +0,0 @@ -package cuchaz.enigma.inputs.packageAccess; - -public class Base { - protected int make() { - return 42; - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java b/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java deleted file mode 100644 index cf0f657..0000000 --- a/src/test/java/cuchaz/enigma/inputs/packageAccess/SamePackageChild.java +++ /dev/null @@ -1,12 +0,0 @@ -package cuchaz.enigma.inputs.packageAccess; - -public class SamePackageChild extends Base { - - class Inner { - final int value; - - Inner() { - value = SamePackageChild.this.make(); // no synthetic method - } - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java b/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java deleted file mode 100644 index 19fb19c..0000000 --- a/src/test/java/cuchaz/enigma/inputs/packageAccess/sub/OtherPackageChild.java +++ /dev/null @@ -1,14 +0,0 @@ -package cuchaz.enigma.inputs.packageAccess.sub; - -import cuchaz.enigma.inputs.packageAccess.Base; - -public class OtherPackageChild extends Base { - - class Inner { - final int value; - - Inner() { - value = OtherPackageChild.this.make(); // synthetic method call - } - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java b/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java deleted file mode 100644 index 26f3718..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/A_Basic.java +++ /dev/null @@ -1,33 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 deleted file mode 100644 index fd7f6e7..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/B_BaseClass.java +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 deleted file mode 100644 index 9d74e44..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/C_SubClass.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 deleted file mode 100644 index 99c83bb..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/D_AnonymousTesting.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 getObjs() { - List objs = new ArrayList(); - objs.add(new Object() { - @Override - public String toString() { - return "Object!"; - } - }); - return objs; - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java b/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java deleted file mode 100644 index 0b8cf2a..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/E_Bridges.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 { - - @Override - public boolean hasNext() { - return false; - } - - @Override - public String next() { - // the compiler will generate a bridge for this method - return "foo"; - } - - @Override - public void remove() { - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java b/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java deleted file mode 100644 index 8a92792..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/F_ObjectMethods.java +++ /dev/null @@ -1,31 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 { - clone(); - equals(this); - finalize(); - getClass(); - hashCode(); - notify(); - notifyAll(); - toString(); - wait(); - wait(0); - wait(0, 0); - } -} diff --git a/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java b/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java deleted file mode 100644 index a1e6a85..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/G_OuterClass.java +++ /dev/null @@ -1,36 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 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 deleted file mode 100644 index 013c55a..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/H_NamelessClass.java +++ /dev/null @@ -1,40 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 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 deleted file mode 100644 index fd2ebdd..0000000 --- a/src/test/java/cuchaz/enigma/inputs/translation/I_Generics.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2015 Jeff Martin. - * All rights reserved. This program and the accompanying materials - * 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 List f1; - public List f2; - public Map f3; - public B_Generic f5; - public B_Generic f6; - - public class A_Type { - } - - public class B_Generic { - public T f4; - - public T m1() { - return null; - } - } -} -- cgit v1.2.3