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/main/java/cuchaz/enigma/api/EnigmaPlugin.java | 5 ---- .../cuchaz/enigma/api/EnigmaPluginContext.java | 9 ------- .../cuchaz/enigma/api/service/EnigmaService.java | 4 --- .../enigma/api/service/EnigmaServiceContext.java | 11 -------- .../enigma/api/service/EnigmaServiceFactory.java | 5 ---- .../enigma/api/service/EnigmaServiceType.java | 29 ---------------------- .../enigma/api/service/JarIndexerService.java | 10 -------- .../enigma/api/service/NameProposalService.java | 12 --------- .../enigma/api/service/ObfuscationTestService.java | 9 ------- 9 files changed, 94 deletions(-) delete mode 100644 src/main/java/cuchaz/enigma/api/EnigmaPlugin.java delete mode 100644 src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java delete mode 100644 src/main/java/cuchaz/enigma/api/service/EnigmaService.java delete mode 100644 src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java delete mode 100644 src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java delete mode 100644 src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java delete mode 100644 src/main/java/cuchaz/enigma/api/service/JarIndexerService.java delete mode 100644 src/main/java/cuchaz/enigma/api/service/NameProposalService.java delete mode 100644 src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java (limited to 'src/main/java/cuchaz/enigma/api') diff --git a/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java b/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java deleted file mode 100644 index bdd6015..0000000 --- a/src/main/java/cuchaz/enigma/api/EnigmaPlugin.java +++ /dev/null @@ -1,5 +0,0 @@ -package cuchaz.enigma.api; - -public interface EnigmaPlugin { - void init(EnigmaPluginContext ctx); -} diff --git a/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java b/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java deleted file mode 100644 index a59051a..0000000 --- a/src/main/java/cuchaz/enigma/api/EnigmaPluginContext.java +++ /dev/null @@ -1,9 +0,0 @@ -package cuchaz.enigma.api; - -import cuchaz.enigma.api.service.EnigmaService; -import cuchaz.enigma.api.service.EnigmaServiceFactory; -import cuchaz.enigma.api.service.EnigmaServiceType; - -public interface EnigmaPluginContext { - void registerService(String id, EnigmaServiceType serviceType, EnigmaServiceFactory factory); -} diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaService.java b/src/main/java/cuchaz/enigma/api/service/EnigmaService.java deleted file mode 100644 index 526dda7..0000000 --- a/src/main/java/cuchaz/enigma/api/service/EnigmaService.java +++ /dev/null @@ -1,4 +0,0 @@ -package cuchaz.enigma.api.service; - -public interface EnigmaService { -} diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java deleted file mode 100644 index 9e433fb..0000000 --- a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceContext.java +++ /dev/null @@ -1,11 +0,0 @@ -package cuchaz.enigma.api.service; - -import java.util.Optional; - -public interface EnigmaServiceContext { - static EnigmaServiceContext empty() { - return key -> Optional.empty(); - } - - Optional getArgument(String key); -} diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java deleted file mode 100644 index 7c10ac2..0000000 --- a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceFactory.java +++ /dev/null @@ -1,5 +0,0 @@ -package cuchaz.enigma.api.service; - -public interface EnigmaServiceFactory { - T create(EnigmaServiceContext ctx); -} diff --git a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java b/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java deleted file mode 100644 index 358828f..0000000 --- a/src/main/java/cuchaz/enigma/api/service/EnigmaServiceType.java +++ /dev/null @@ -1,29 +0,0 @@ -package cuchaz.enigma.api.service; - -public final class EnigmaServiceType { - public final String key; - - private EnigmaServiceType(String key) { - this.key = key; - } - - public static EnigmaServiceType create(String key) { - return new EnigmaServiceType<>(key); - } - - @Override - public int hashCode() { - return key.hashCode(); - } - - @Override - public boolean equals(Object obj) { - if (obj == this) return true; - - if (obj instanceof EnigmaServiceType) { - return ((EnigmaServiceType) obj).key.equals(key); - } - - return false; - } -} diff --git a/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java b/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java deleted file mode 100644 index 0cda199..0000000 --- a/src/main/java/cuchaz/enigma/api/service/JarIndexerService.java +++ /dev/null @@ -1,10 +0,0 @@ -package cuchaz.enigma.api.service; - -import cuchaz.enigma.analysis.ClassCache; -import cuchaz.enigma.analysis.index.JarIndex; - -public interface JarIndexerService extends EnigmaService { - EnigmaServiceType TYPE = EnigmaServiceType.create("jar_indexer"); - - void acceptJar(ClassCache classCache, JarIndex jarIndex); -} diff --git a/src/main/java/cuchaz/enigma/api/service/NameProposalService.java b/src/main/java/cuchaz/enigma/api/service/NameProposalService.java deleted file mode 100644 index 4c357db..0000000 --- a/src/main/java/cuchaz/enigma/api/service/NameProposalService.java +++ /dev/null @@ -1,12 +0,0 @@ -package cuchaz.enigma.api.service; - -import cuchaz.enigma.translation.mapping.EntryRemapper; -import cuchaz.enigma.translation.representation.entry.Entry; - -import java.util.Optional; - -public interface NameProposalService extends EnigmaService { - EnigmaServiceType TYPE = EnigmaServiceType.create("name_proposal"); - - Optional proposeName(Entry obfEntry, EntryRemapper remapper); -} diff --git a/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java b/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java deleted file mode 100644 index af0cf30..0000000 --- a/src/main/java/cuchaz/enigma/api/service/ObfuscationTestService.java +++ /dev/null @@ -1,9 +0,0 @@ -package cuchaz.enigma.api.service; - -import cuchaz.enigma.translation.representation.entry.Entry; - -public interface ObfuscationTestService extends EnigmaService { - EnigmaServiceType TYPE = EnigmaServiceType.create("obfuscation_test"); - - boolean testDeobfuscated(Entry entry); -} -- cgit v1.2.3