preserveSerial added

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

jode/jode/obfuscator/ClassIdentifier.java

@@ -106,8 +106,18 @@ public class ClassIdentifier extends Identifier {
      * a compatible class.
      */
     public void preserveSerializable() {
-	/*XXX*/
+	preserveIdentifier("writeObject", "(Ljava.io.ObjectOutputStream)V");
-	/* add a field serializableVersionUID if not existent */
+	preserveIdentifier("readObject", "(Ljava.io.ObjectOutputStream)V");
+	if (Obfuscator.preserveSerial) {
+	    /* XXX - add a field serializableVersionUID if not existent */
+	    preserveIdentifier("serializableVersionUID", "I");
+	    for (int i=0; i < fieldCount; i++) {
+		FieldIdentifier ident = (FieldIdentifier) identifiers[i];
+		if ((ident.info.getModifiers() 
+		     & (Modifier.TRANSIENT | Modifier.STATIC)) == 0)
+		    identifiers[i].setPreserved();
+	    }
+	}
     }
 
     public void initSuperClasses(ClassInfo superclass) {
@@ -174,9 +184,11 @@ public class ClassIdentifier extends Identifier {
 	MethodInfo[] minfos  = info.getMethods();
 	if (Obfuscator.swapOrder) {
 	    Random rand = new Random();
+	    // XXX replace the following for JDK12 with:
+	    // Collections.shuffle(Arrays.asList(finfos), rand);
+	    // Collections.shuffle(Arrays.asList(minfos), rand);
 	    for (int i=1; i < finfos.length; i++) {
 		int j = (Math.abs(rand.nextInt()) % (i+1)); 
-		// XXX replace with nextInt(i+1) for JDK12.
 		if (j != i) {
 		    FieldInfo tmp = finfos[i];
 		    finfos[i] = finfos[j];
@@ -185,7 +197,6 @@ public class ClassIdentifier extends Identifier {
 	    }
 	    for (int i=1; i < minfos.length; i++) {
 		int j = (Math.abs(rand.nextInt()) % (i+1)); 
-		// XXX replace with nextInt(i+1) for JDK12.
 		if (j != i) {
 		    MethodInfo tmp = minfos[i];
 		    minfos[i] = minfos[j];

jode/jode/obfuscator/Main.java

@@ -29,6 +29,7 @@ public class Obfuscator {
 
     public static boolean shouldStrip = true;
     public static boolean swapOrder   = false;
+    public static boolean preserveSerial = true;
 
     public static PrintStream err = System.err;
     public static final int PRESERVE_NONE = 0;
@@ -64,6 +65,8 @@ public class Obfuscator {
 		    "Preserve all public members");
         err.println("\t[-preserve <name>] "+
 		    "Preserve only the given name (allowed multiple times)");
+	err.println("\t[-breakserial]     "+
+		    "Allow the serialized form to change");
         err.println("Obfuscating options: ");
         err.println("\t[-strong]          "+
 		    "Rename identifiers to random unicode identifier");
@@ -119,6 +122,8 @@ public class Obfuscator {
                 String ident = params[++i];
                 preservedIdents.addElement(ident);
             }
+            else if (params[i].equals("-breakserial"))
+		preserveSerial = false;
 
             /* Obfuscate options */
             else if (params[i].equals("-strong"))