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 --- .../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 -------------------- 6 files changed, 161 deletions(-) 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 (limited to 'src/test/java/cuchaz/enigma/inputs/innerClasses') 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; - } - } - } -} -- cgit v1.2.3