ra/fernflower
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor cleanup and formatting

Browse Source
This commit is contained in:
Egor.Ushakov
2017-04-24 15:11:07 +03:00
parent 2a213aa4a0
commit d149b53799
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
View File

@@ -15,7 +15,6 @@
*/
package org.jetbrains.java.decompiler.main.collectors;
import org.jetbrains.java.decompiler.main.ClassesProcessor;
import org.jetbrains.java.decompiler.main.ClassesProcessor.ClassNode;
import org.jetbrains.java.decompiler.main.DecompilerContext;
import org.jetbrains.java.decompiler.main.TextBuffer;
@@ -49,20 +48,16 @@ public class ImportCollector {
currentPackagePoint = "";
}
Map<String, ClassNode> mapRootCases = DecompilerContext.getClassProcessor().getMapRootClasses();
for(StructClass sClass = root.classStruct;
sClass!=null;
){
// all field names for current class ..
for(StructField f: sClass.getFields()) {
Map<String, StructClass> classes = DecompilerContext.getStructContext().getClasses();
StructClass currentClass = root.classStruct;
while (currentClass != null) {
// all field names for the current class ..
for (StructField f : currentClass.getFields()) {
setFieldNames.add(f.getName());
}
// .. and traverse through parent.
ClassNode classNode;
if(sClass.superClass==null || (classNode = (mapRootCases.get(sClass.superClass.getString())))==null)
break;
sClass = classNode.classStruct;
currentClass = currentClass.superClass != null ? classes.get(currentClass.superClass.getString()) : null;
}
}
@@ -76,7 +71,8 @@ public class ImportCollector {
String shortName = getShortName(classToName);
if (setFieldNames.contains(shortName)) {
return classToName;
} else {
}
else {
return shortName;
}
}