From ddf2174cae752395b30669c8f17f1b1e77c8bb54 Mon Sep 17 00:00:00 2001 From: Skylot Date: Wed, 24 Jul 2013 17:30:57 +0400 Subject: [PATCH] core: fix duplicated imports --- jadx-core/src/main/java/jadx/core/codegen/ClassGen.java | 8 +++++--- jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java b/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java index 7951eff05..75b0e1922 100644 --- a/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java +++ b/jadx-core/src/main/java/jadx/core/codegen/ClassGen.java @@ -62,10 +62,12 @@ public class ClassGen { clsCode.newLine(); } - if (imports.size() != 0) { - List sortImports = new ArrayList(); - for (ClassInfo ic : imports) + int importsCount = imports.size(); + if (importsCount != 0) { + List sortImports = new ArrayList(importsCount); + for (ClassInfo ic : imports) { sortImports.add(ic.getFullName()); + } Collections.sort(sortImports); for (String imp : sortImports) { diff --git a/jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java b/jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java index 3ae67143f..bfcea7b95 100644 --- a/jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java +++ b/jadx-core/src/main/java/jadx/core/dex/info/ClassInfo.java @@ -135,12 +135,12 @@ public final class ClassInfo { @Override public String toString() { - return getFullName(); + return fullName; } @Override public int hashCode() { - return type.hashCode(); + return fullName.hashCode(); } @Override