bug fixes

read table
not refusing to overwrite.


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

jode/jode/obfuscator/PackageIdentifier.java

@@ -73,7 +73,7 @@ public class PackageIdentifier extends Identifier {
 		    loadedClasses.put(name, ident);
 		} else if (!ClassInfo.exists(fullname)) {
 		    throw new IllegalArgumentException
-			("Can't find class"+fullname);
+			("Can't find class "+fullname);
 		} else {
 		    ident = new ClassIdentifier(bundle, this, name, 
 						ClassInfo.forName(fullname));
@@ -222,15 +222,25 @@ public class PackageIdentifier extends Identifier {
 	}
     }
 
-    public void writeTable(PrintWriter out) throws IOException {
+    public void readTable(Hashtable table) {
-	if (parent != null && getName() != getAlias())
+	if (parent != null)
-	    out.println("" + parent.getFullAlias() + getAlias()
+	    setAlias((String) table.get(parent.getFullName() + getName()));
-			+ " = " + getName());
+	Enumeration enum = loadedClasses.elements();
+	while (enum.hasMoreElements()) {
+	    Identifier ident = (Identifier) enum.nextElement();
+	    if (!Obfuscator.shouldStrip || ident.isReachable())
+		ident.readTable(table);
+	}
+    }
+
+    public void writeTable(Hashtable table) {
+	if (parent != null)
+	    table.put(parent.getFullAlias() + getAlias(), getName());
 	Enumeration enum = loadedClasses.elements();
 	while (enum.hasMoreElements()) {
 	    Identifier ident = (Identifier) enum.nextElement();
 	    if (!Obfuscator.shouldStrip || ident.isReachable())
-		ident.writeTable(out);
+		ident.writeTable(table);
 	}
     }
 
@@ -269,11 +279,12 @@ public class PackageIdentifier extends Identifier {
 	    else {
 		try {
 		    File file = new File(newDest, ident.getAlias()+".class");
-		    if (file.exists()) {
+// 		    if (file.exists()) {
-			Obfuscator.err.println
+// 			Obfuscator.err.println
-			    ("Refuse to overwrite existing class file "
+// 			    ("Refuse to overwrite existing class file "
-			     +file.getPath()+".  Remove it first.");
+// 			     +file.getPath()+".  Remove it first.");
-		    }
+// 			return;
+// 		    }
 		    DataOutputStream out = new DataOutputStream
 			(new FileOutputStream(file));
 		    ((ClassIdentifier) ident).storeClass(out);