beautification

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@1257 379699f6-c40d-0410-875b-85095c16579e

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) {

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++)
+	    for (int j=0; j< constructors.length; j++) {
-		{
+		if (pl != null) {
-		    if (pl != null) {
+		    double constrCompl = constructors[j].getComplexity()
-			double constrCompl = constructors[j].getComplexity()
+			* subScale;
-			    * subScale;
+		    if (constrCompl > STEP_COMPLEXITY)
-			if (constrCompl > STEP_COMPLEXITY)
+			constructors[j].analyze(pl, done, constrCompl);
-			    constructors[j].analyze(pl, done, constrCompl);
+		    else {
-			else {
+			pl.updateProgress(done, name);
-			    pl.updateProgress(done, name);
-			    constructors[j].analyze(null, 0.0, 0.0);
-			}
-			done += constrCompl;
-		    } else
 			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) {

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();

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());