From f5431c3bb14854025dc1f0ec470b77497f79494c Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 29 Aug 2014 21:58:12 +0400 Subject: java-decompiler: post-import cleanup (common fixes and optimizations) --- .../java/decompiler/modules/renamer/IdentifierConverter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/org/jetbrains/java/decompiler/modules/renamer') diff --git a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java index c8ec379..546ece3 100644 --- a/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java +++ b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java @@ -193,11 +193,12 @@ public class IdentifierConverter { } String classOldFullName = cl.qualifiedName; - String classNewFullName = classOldFullName; // TODO: rename packages String clsimplename = ConverterHelper.getSimpleClassName(classOldFullName); if (helper.toBeRenamed(IIdentifierRenamer.ELEMENT_CLASS, clsimplename, null, null)) { + String classNewFullName; + do { classNewFullName = ConverterHelper.replaceSimpleClassName(classOldFullName, helper.getNextClassname(classOldFullName, ConverterHelper @@ -339,7 +340,7 @@ public class IdentifierConverter { return descriptor; } - private List getReversePostOrderListIterative(List roots) { + private static List getReversePostOrderListIterative(List roots) { List res = new ArrayList(); -- cgit v1.2.3