printType,

call type.guessName for abstract methods


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

jode/jode/decompiler/MethodAnalyzer.java

@@ -196,25 +196,39 @@ public class MethodAnalyzer implements Analyzer {
         else { 
             if (isConstructor)
                 writer.print(imports.getClassString(classAnalyzer.getClazz()));
-            else
-                writer.print(getReturnType().toString()
-			     + " " + methodName);
+            else {
+                writer.printType(getReturnType());
+		writer.print(" " + methodName);
+	    }
             writer.print("(");
             Type[] paramTypes = methodType.getParameterTypes();
             int offset = isStatic()?0:1;
+
+	    LocalInfo[] param = new LocalInfo[paramTypes.length];
             for (int i=0; i<paramTypes.length; i++) {
-                if (i>0)
-                    writer.print(", ");
-                LocalInfo li;
                 if (code == null) {
-                    li = new LocalInfo(offset);
-                    li.setType(paramTypes[i]);
-                    li.makeNameUnique();
-                } else
-                    li = code.getParamInfo(offset);
-                writer.print(li.getType().toString()+" "+li.getName());
+                    param[i] = new LocalInfo(offset);
+                    param[i].setType(paramTypes[i]);
+		    param[i].guessName();
+		    for (int j=0; j < i; j++) {
+			if (param[j].getName().equals(param[i].getName())) {
+			    /* A name conflict happened. */
+			    param[i].makeNameUnique();
+			    break; /* j */
+			}
+		    }
+                } else {
+                    param[i] = code.getParamInfo(offset);
 		    offset++;
 		}
+            }
+
+            for (int i=0; i<paramTypes.length; i++) {
+                if (i>0)
+                    writer.print(", ");
+                writer.printType(param[i].getType());
+		writer.print(" "+param[i].getName());
+            }
             writer.print(")");
         }
         if (exceptions.length > 0) {
@@ -223,7 +237,7 @@ public class MethodAnalyzer implements Analyzer {
             for (int i= 0; i< exceptions.length; i++) {
                 if (i > 0)
                     writer.print(", ");
-                writer.print(exceptions[i].toString());
+                writer.printType(exceptions[i]);
             }
         }
         if (code != null) {