From b7c91d19660ef4a36b0ad3edae81575fb57c39fe Mon Sep 17 00:00:00 2001 From: jeff Date: Fri, 20 Mar 2015 12:40:07 -0400 Subject: get rid of stupid fucking com.beust.jcommander imports crashing all my downstream apps Eclipse loves to import that particular collections implementation for some reason and I don't want to use it!! --- src/cuchaz/enigma/TranslatingTypeLoader.java | 2 +- src/cuchaz/enigma/analysis/RelatedMethodChecker.java | 2 +- src/cuchaz/enigma/bytecode/InnerClassWriter.java | 5 ++--- src/cuchaz/enigma/convert/ClassIdentifier.java | 5 ++--- src/cuchaz/enigma/convert/MappingsConverter.java | 2 +- src/cuchaz/enigma/convert/MatchesReader.java | 2 +- src/cuchaz/enigma/gui/ClassMatchingGui.java | 4 ++-- src/cuchaz/enigma/gui/MemberMatchingGui.java | 4 ++-- src/cuchaz/enigma/mapping/ClassEntry.java | 2 +- src/cuchaz/enigma/mapping/Mappings.java | 2 +- src/cuchaz/enigma/mapping/MappingsChecker.java | 2 +- src/cuchaz/enigma/mapping/Signature.java | 2 +- src/cuchaz/enigma/mapping/Translator.java | 2 +- 13 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/cuchaz/enigma/TranslatingTypeLoader.java b/src/cuchaz/enigma/TranslatingTypeLoader.java index dce4b859..184ba263 100644 --- a/src/cuchaz/enigma/TranslatingTypeLoader.java +++ b/src/cuchaz/enigma/TranslatingTypeLoader.java @@ -25,7 +25,7 @@ import javassist.CtClass; import javassist.NotFoundException; import javassist.bytecode.Descriptor; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.strobel.assembler.metadata.Buffer; import com.strobel.assembler.metadata.ClasspathTypeLoader; diff --git a/src/cuchaz/enigma/analysis/RelatedMethodChecker.java b/src/cuchaz/enigma/analysis/RelatedMethodChecker.java index 5bd67a0a..e231b807 100644 --- a/src/cuchaz/enigma/analysis/RelatedMethodChecker.java +++ b/src/cuchaz/enigma/analysis/RelatedMethodChecker.java @@ -3,7 +3,7 @@ package cuchaz.enigma.analysis; import java.util.Map; import java.util.Set; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Maps; import com.google.common.collect.Sets; import cuchaz.enigma.mapping.BehaviorEntry; diff --git a/src/cuchaz/enigma/bytecode/InnerClassWriter.java b/src/cuchaz/enigma/bytecode/InnerClassWriter.java index bb643158..0c11b71b 100644 --- a/src/cuchaz/enigma/bytecode/InnerClassWriter.java +++ b/src/cuchaz/enigma/bytecode/InnerClassWriter.java @@ -13,13 +13,12 @@ package cuchaz.enigma.bytecode; import java.util.Collection; import java.util.List; +import com.google.common.collect.Lists; + import javassist.CtClass; import javassist.bytecode.ConstPool; import javassist.bytecode.EnclosingMethodAttribute; import javassist.bytecode.InnerClassesAttribute; - -import com.beust.jcommander.internal.Lists; - import cuchaz.enigma.analysis.JarIndex; import cuchaz.enigma.mapping.BehaviorEntry; import cuchaz.enigma.mapping.ClassEntry; diff --git a/src/cuchaz/enigma/convert/ClassIdentifier.java b/src/cuchaz/enigma/convert/ClassIdentifier.java index da799cd0..2e6217b3 100644 --- a/src/cuchaz/enigma/convert/ClassIdentifier.java +++ b/src/cuchaz/enigma/convert/ClassIdentifier.java @@ -3,10 +3,9 @@ package cuchaz.enigma.convert; import java.util.Map; import java.util.jar.JarFile; -import javassist.CtClass; - -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Maps; +import javassist.CtClass; import cuchaz.enigma.TranslatingTypeLoader; import cuchaz.enigma.analysis.JarIndex; import cuchaz.enigma.convert.ClassNamer.SidedClassNamer; diff --git a/src/cuchaz/enigma/convert/MappingsConverter.java b/src/cuchaz/enigma/convert/MappingsConverter.java index 2afa1208..b3ac1cf4 100644 --- a/src/cuchaz/enigma/convert/MappingsConverter.java +++ b/src/cuchaz/enigma/convert/MappingsConverter.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.Set; import java.util.jar.JarFile; -import com.beust.jcommander.internal.Lists; import com.google.common.collect.BiMap; import com.google.common.collect.HashMultimap; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; diff --git a/src/cuchaz/enigma/convert/MatchesReader.java b/src/cuchaz/enigma/convert/MatchesReader.java index dac2f057..7c823054 100644 --- a/src/cuchaz/enigma/convert/MatchesReader.java +++ b/src/cuchaz/enigma/convert/MatchesReader.java @@ -7,7 +7,7 @@ import java.io.IOException; import java.util.Collection; import java.util.List; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import cuchaz.enigma.mapping.ClassEntry; import cuchaz.enigma.mapping.Entry; diff --git a/src/cuchaz/enigma/gui/ClassMatchingGui.java b/src/cuchaz/enigma/gui/ClassMatchingGui.java index 9e210ec4..6f8feac3 100644 --- a/src/cuchaz/enigma/gui/ClassMatchingGui.java +++ b/src/cuchaz/enigma/gui/ClassMatchingGui.java @@ -23,9 +23,9 @@ import javax.swing.JSplitPane; import javax.swing.SwingConstants; import javax.swing.WindowConstants; -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; import com.google.common.collect.BiMap; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import cuchaz.enigma.Constants; import cuchaz.enigma.Deobfuscator; diff --git a/src/cuchaz/enigma/gui/MemberMatchingGui.java b/src/cuchaz/enigma/gui/MemberMatchingGui.java index 181fb548..65e6dd9e 100644 --- a/src/cuchaz/enigma/gui/MemberMatchingGui.java +++ b/src/cuchaz/enigma/gui/MemberMatchingGui.java @@ -24,8 +24,8 @@ import javax.swing.JSplitPane; import javax.swing.WindowConstants; import javax.swing.text.Highlighter.HighlightPainter; -import com.beust.jcommander.internal.Lists; -import com.beust.jcommander.internal.Maps; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import cuchaz.enigma.Constants; import cuchaz.enigma.Deobfuscator; diff --git a/src/cuchaz/enigma/mapping/ClassEntry.java b/src/cuchaz/enigma/mapping/ClassEntry.java index e6400b8c..4d977b1b 100644 --- a/src/cuchaz/enigma/mapping/ClassEntry.java +++ b/src/cuchaz/enigma/mapping/ClassEntry.java @@ -13,7 +13,7 @@ package cuchaz.enigma.mapping; import java.io.Serializable; import java.util.List; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; public class ClassEntry implements Entry, Serializable { diff --git a/src/cuchaz/enigma/mapping/Mappings.java b/src/cuchaz/enigma/mapping/Mappings.java index 659d23ac..d802139d 100644 --- a/src/cuchaz/enigma/mapping/Mappings.java +++ b/src/cuchaz/enigma/mapping/Mappings.java @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; diff --git a/src/cuchaz/enigma/mapping/MappingsChecker.java b/src/cuchaz/enigma/mapping/MappingsChecker.java index 57ea90ce..b9feee4e 100644 --- a/src/cuchaz/enigma/mapping/MappingsChecker.java +++ b/src/cuchaz/enigma/mapping/MappingsChecker.java @@ -2,8 +2,8 @@ package cuchaz.enigma.mapping; import java.util.Map; -import com.beust.jcommander.internal.Maps; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import cuchaz.enigma.analysis.JarIndex; import cuchaz.enigma.analysis.RelatedMethodChecker; diff --git a/src/cuchaz/enigma/mapping/Signature.java b/src/cuchaz/enigma/mapping/Signature.java index f4850ac3..d1e89b20 100644 --- a/src/cuchaz/enigma/mapping/Signature.java +++ b/src/cuchaz/enigma/mapping/Signature.java @@ -3,7 +3,7 @@ package cuchaz.enigma.mapping; import java.io.Serializable; import java.util.List; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import cuchaz.enigma.Util; diff --git a/src/cuchaz/enigma/mapping/Translator.java b/src/cuchaz/enigma/mapping/Translator.java index fb187b90..3ceeea11 100644 --- a/src/cuchaz/enigma/mapping/Translator.java +++ b/src/cuchaz/enigma/mapping/Translator.java @@ -13,7 +13,7 @@ package cuchaz.enigma.mapping; import java.util.List; import java.util.Map; -import com.beust.jcommander.internal.Lists; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import cuchaz.enigma.analysis.TranslationIndex; -- cgit v1.2.3