fix code style issues

This commit is contained in:
Skylot
2014-02-22 16:30:40 +04:00
parent bb4ef4f0a2
commit 3c84975a09
59 changed files with 352 additions and 410 deletions
@@ -45,20 +45,19 @@ public class JClass extends JNode {
if (!loaded) {
cls.decompile();
loaded = true;
updateChilds();
update();
}
}
@Override
public synchronized void updateChilds() {
public synchronized void update() {
removeAllChildren();
if (!loaded) {
add(new TextNode(NLS.str("tree.loading")));
} else {
for (JavaClass javaClass : cls.getInnerClasses()) {
JClass child = new JClass(javaClass, this);
add(child);
child.updateChilds();
JClass innerCls = new JClass(javaClass, this);
add(innerCls);
innerCls.update();
}
for (JavaField f : cls.getFields()) {
add(new JField(f, this));
@@ -27,10 +27,6 @@ public class JField extends JNode {
this.jParent = jClass;
}
@Override
public void updateChilds() {
}
@Override
public JClass getJParent() {
return jParent;
@@ -29,10 +29,6 @@ public class JMethod extends JNode {
this.jParent = jClass;
}
@Override
public void updateChilds() {
}
@Override
public JClass getJParent() {
return jParent;
@@ -16,7 +16,5 @@ public abstract class JNode extends DefaultMutableTreeNode {
public abstract int getLine();
public abstract void updateChilds();
public abstract Icon getIcon();
}
@@ -25,7 +25,7 @@ public class JPackage extends JNode implements Comparable<JPackage> {
for (JavaClass javaClass : javaClasses) {
classes.add(new JClass(javaClass));
}
updateChilds();
update();
}
public JPackage(String name) {
@@ -33,15 +33,14 @@ public class JPackage extends JNode implements Comparable<JPackage> {
this.classes = new ArrayList<JClass>(1);
}
@Override
public void updateChilds() {
public void update() {
removeAllChildren();
for (JPackage pkg : innerPackages) {
pkg.updateChilds();
pkg.update();
add(pkg);
}
for (JClass cls : classes) {
cls.updateChilds();
cls.update();
add(cls);
}
}
@@ -27,11 +27,10 @@ public class JRoot extends JNode {
public JRoot(JadxWrapper wrapper) {
this.wrapper = wrapper;
updateChilds();
update();
}
@Override
public void updateChilds() {
public void update() {
removeAllChildren();
if (flatPackages) {
for (JavaPackage pkg : wrapper.getPackages()) {
@@ -41,7 +40,7 @@ public class JRoot extends JNode {
// build packages hierarchy
List<JPackage> rootPkgs = getHierarchyPackages(wrapper.getPackages());
for (JPackage jPackage : rootPkgs) {
jPackage.updateChilds();
jPackage.update();
add(jPackage);
}
}
@@ -88,7 +87,7 @@ public class JRoot extends JNode {
}
// use identity set for collect inner packages
Set<JPackage> innerPackages = Collections.newSetFromMap(new IdentityHashMap<JPackage,Boolean>());
Set<JPackage> innerPackages = Collections.newSetFromMap(new IdentityHashMap<JPackage, Boolean>());
for (JPackage pkg : pkgMap.values()) {
innerPackages.addAll(pkg.getInnerPackages());
}
@@ -131,7 +130,7 @@ public class JRoot extends JNode {
public void setFlatPackages(boolean flatPackages) {
if (this.flatPackages != flatPackages) {
this.flatPackages = flatPackages;
updateChilds();
update();
}
}
@@ -19,10 +19,6 @@ public class TextNode extends JNode {
return 0;
}
@Override
public void updateChilds() {
}
@Override
public Icon getIcon() {
return null;
@@ -67,10 +67,18 @@ public class Utils {
icon = def;
}
OverlayIcon overIcon = new OverlayIcon(icon);
if (af.isFinal()) overIcon.add(ICON_FINAL);
if (af.isStatic()) overIcon.add(ICON_STATIC);
if (af.isAbstract()) overIcon.add(ICON_ABSTRACT);
if (af.isNative()) overIcon.add(ICON_NATIVE);
if (af.isFinal()) {
overIcon.add(ICON_FINAL);
}
if (af.isStatic()) {
overIcon.add(ICON_STATIC);
}
if (af.isAbstract()) {
overIcon.add(ICON_ABSTRACT);
}
if (af.isNative()) {
overIcon.add(ICON_NATIVE);
}
return overIcon;
}
}