preserveRule

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

jode/jode/obfuscator/FieldIdentifier.java

@@ -17,6 +17,7 @@
  * $Id$
  */
 package jode.obfuscator;
+import java.lang.reflect.Modifier;
 import jode.bytecode.*;
 import java.io.*;
 
@@ -30,6 +31,13 @@ public class FieldIdentifier extends Identifier{
 	this.clazz = clazz;
     }
 
+    public void applyPreserveRule(int preserveRule) {
+	if ((preserveRule & (info.getModifiers() ^ Modifier.PRIVATE)) != 0) {
+	    setReachable();
+	    setPreserved();
+	}
+    }
+
     public void setSingleReachable() {
 	super.setSingleReachable();
 	String type = getType();

jode/jode/obfuscator/Identifier.java

@@ -218,6 +218,7 @@ public abstract class Identifier {
 	    setAlias((String) table.get(getFullName()));
     }
 
+    public abstract void applyPreserveRule(int preserveRule);
     public abstract Identifier getParent();
     public abstract String getName();
     public abstract String getType();

jode/jode/obfuscator/MethodIdentifier.java

@@ -17,6 +17,7 @@
  * $Id$
  */
 package jode.obfuscator;
+import java.lang.reflect.Modifier;
 import jode.Obfuscator;
 import jode.bytecode.*;
 import java.io.*;
@@ -55,6 +56,13 @@ public class MethodIdentifier extends Identifier implements Opcodes {
 	}
     }
 
+    public void applyPreserveRule(int preserveRule) {
+	if ((preserveRule & (info.getModifiers() ^ Modifier.PRIVATE)) != 0) {
+	    setReachable();
+	    setPreserved();
+	}
+    }
+
     /**
      * Reads the opcodes out of the code info and determine its 
      * references

jode/jode/obfuscator/PackageIdentifier.java

@@ -46,8 +46,11 @@ public class PackageIdentifier extends Identifier {
     }
 
     public Identifier getIdentifier(String name) {
-	if (loadOnDemand)
+	if (loadOnDemand) {
-	    return loadClass(name);
+	    Identifier ident = loadClass(name);
+	    if (bundle.preserveRule != -1)
+		ident.applyPreserveRule(bundle.preserveRule);
+	}
 
 	int index = name.indexOf('.');
 	if (index == -1)
@@ -116,6 +119,12 @@ public class PackageIdentifier extends Identifier {
 	}
     }
 
+    public void applyPreserveRule(int preserveRule) {
+	Enumeration enum = loadedClasses.elements();
+	while(enum.hasMoreElements())
+	    ((Identifier) enum.nextElement()).applyPreserveRule(preserveRule);
+    }
+
     public void reachableIdentifier(String fqn, boolean isVirtual) {
 	int index = fqn.indexOf('.');
 	String component = index == -1 ? fqn : fqn.substring(0, index);