diff --git a/jode/jode/bytecode/MethodInfo.java b/jode/jode/bytecode/MethodInfo.java index f38f078..520049e 100644 --- a/jode/jode/bytecode/MethodInfo.java +++ b/jode/jode/bytecode/MethodInfo.java @@ -54,7 +54,7 @@ public final class MethodInfo extends BinaryInfo implements Comparable { && name.equals("Exceptions")) { int count = input.readUnsignedShort(); exceptions = new String[count]; - for (int i=0; i< count; i++) + for (int i = 0; i < count; i++) exceptions[i] = cp.getClassName(input.readUnsignedShort()); if (length != 2 * (count + 1)) throw new ClassFormatException @@ -95,7 +95,7 @@ public final class MethodInfo extends BinaryInfo implements Comparable { } if (exceptions != null) { gcp.putUTF8("Exceptions"); - for (int i=0; i< exceptions.length; i++) + for (int i = 0; i < exceptions.length; i++) gcp.putClassName(exceptions[i]); } if (syntheticFlag) @@ -130,7 +130,7 @@ public final class MethodInfo extends BinaryInfo implements Comparable { output.writeShort(gcp.putUTF8("Exceptions")); output.writeInt(2 + count * 2); output.writeShort(count); - for (int i=0; i< count; i++) + for (int i = 0; i < count; i++) output.writeShort(gcp.putClassName(exceptions[i])); } if (syntheticFlag) { diff --git a/jode/jode/decompiler/ClassAnalyzer.java b/jode/jode/decompiler/ClassAnalyzer.java index d1c7c19..ce27334 100644 --- a/jode/jode/decompiler/ClassAnalyzer.java +++ b/jode/jode/decompiler/ClassAnalyzer.java @@ -308,21 +308,20 @@ public class ClassAnalyzer // First analyze constructors and synthetic fields: constrAna = null; if (constructors.length > 0) { - for (int j=0; j< constructors.length; j++) - { - if (pl != null) { - double constrCompl = constructors[j].getComplexity() - * subScale; - if (constrCompl > STEP_COMPLEXITY) - constructors[j].analyze(pl, done, constrCompl); - else { - pl.updateProgress(done, name); - constructors[j].analyze(null, 0.0, 0.0); - } - done += constrCompl; - } else + for (int j=0; j< constructors.length; j++) { + if (pl != null) { + double constrCompl = constructors[j].getComplexity() + * subScale; + if (constrCompl > STEP_COMPLEXITY) + constructors[j].analyze(pl, done, constrCompl); + else { + pl.updateProgress(done, name); constructors[j].analyze(null, 0.0, 0.0); - } + } + done += constrCompl; + } else + constructors[j].analyze(null, 0.0, 0.0); + } constrAna = new TransformConstructors(this, false, constructors); constrAna.removeSynthInitializers(); } @@ -408,6 +407,7 @@ public class ClassAnalyzer } public void makeDeclaration(Set done) { + // First prepare constructors: if (constrAna != null) constrAna.transform(); if (staticConstructor != null) { diff --git a/jode/jode/decompiler/MethodAnalyzer.java b/jode/jode/decompiler/MethodAnalyzer.java index 49226d3..6f2050b 100644 --- a/jode/jode/decompiler/MethodAnalyzer.java +++ b/jode/jode/decompiler/MethodAnalyzer.java @@ -635,6 +635,7 @@ public class MethodAnalyzer implements Scope, ClassDeclarer { if (!li.isShadow()) imports.useType(li.getType()); } + for (int i=0; i < param.length; i++) { param[i].guessName(); Iterator doneIter = done.iterator(); diff --git a/jode/jode/obfuscator/ClassIdentifier.java b/jode/jode/obfuscator/ClassIdentifier.java index f03bcf3..dcb133f 100644 --- a/jode/jode/obfuscator/ClassIdentifier.java +++ b/jode/jode/obfuscator/ClassIdentifier.java @@ -232,7 +232,7 @@ public class ClassIdentifier extends Identifier { for (Iterator i = methods.iterator(); i.hasNext(); ) { MethodIdentifier method = (MethodIdentifier) i.next(); modifiers = method.info.getModifiers(); - if( Modifier.isPrivate(modifiers)) + if (Modifier.isPrivate(modifiers)) continue; out.writeUTF(method.getName());