java-decompiler: renamer interface cleaned

- enum instead of magic constants
- typos
This commit is contained in:
Roman Shevchenko
2014-11-05 13:57:07 +01:00
parent 1fde78b6f1
commit 0b9402bd45
4 changed files with 50 additions and 106 deletions

View File

@@ -83,8 +83,8 @@ public class ClassesProcessor {
}
else if (simpleName != null && DecompilerContext.getOption(IFernflowerPreferences.RENAME_ENTITIES)) {
IIdentifierRenamer renamer = DecompilerContext.getPoolInterceptor().getHelper();
if (renamer.toBeRenamed(IIdentifierRenamer.ELEMENT_CLASS, simpleName, null, null)) {
simpleName = renamer.getNextClassname(innername, simpleName);
if (renamer.toBeRenamed(IIdentifierRenamer.Type.ELEMENT_CLASS, simpleName, null, null)) {
simpleName = renamer.getNextClassName(innername, simpleName);
mapNewSimpleNames.put(innername, simpleName);
}
}

View File

@@ -15,21 +15,15 @@
*/
package org.jetbrains.java.decompiler.main.extern;
public interface IIdentifierRenamer {
int ELEMENT_CLASS = 1;
enum Type {ELEMENT_CLASS, ELEMENT_FIELD, ELEMENT_METHOD};
int ELEMENT_FIELD = 2;
boolean toBeRenamed(Type elementType, String className, String element, String descriptor);
int ELEMENT_METHOD = 3;
String getNextClassName(String fullName, String shortName);
String getNextFieldName(String className, String field, String descriptor);
boolean toBeRenamed(int element_type, String classname, String element, String descriptor);
String getNextClassname(String fullname, String shortname);
String getNextFieldname(String classname, String field, String descriptor);
String getNextMethodname(String classname, String method, String descriptor);
String getNextMethodName(String className, String method, String descriptor);
}