Merge pull request #931 from randombyte-developer/develop

Fixed #930

Author: StevenArzt

src/main/java/soot/jbco/Main.java

@@ -172,7 +172,7 @@ else if (arg.startsWith("-t:")) {
         Object o = null;
         arg = arg.substring(4);
 
-        int tweight = 0;
+        int tweight = 9;
         char cweight = arg.charAt(0);
         if (cweight >= '0' && cweight <= '9') {
           try {
@@ -209,6 +209,7 @@ else if (arg.startsWith("-t:")) {
           o = arg;
         }
 
+        transformsToAdd.add(trans);
         Map<Object, Integer> htmp = transformsToMethodsToWeights.get(trans);
         if (htmp == null) {
           htmp = new HashMap<Object, Integer>();
@@ -470,6 +471,8 @@ public static int getWeight(String phasename, String method) {
         if (o instanceof java.util.regex.Pattern) {
           if (((java.util.regex.Pattern) o).matcher(method).matches()) {
             intg = (Integer) htmp.get(o);
+          } else {
+            intg = 0;
           }
         } else if (o instanceof String && method.equals(o)) {
           intg = (Integer) htmp.get(o);

src/main/java/soot/jbco/jimpleTransformations/FieldRenamer.java

@@ -118,7 +118,7 @@ protected void internalTransform(String phaseName, Map<String, String> options)
         }
         // rename all the fields in the class
         for (SootField f : sc.getFields()) {
-          int weight = soot.jbco.Main.getWeight(phaseName, f.getName());
+          int weight = soot.jbco.Main.getWeight(phaseName, f.getSignature());
           if (weight > 0) {
             renameField(className, f);
           }

src/main/java/soot/jbco/jimpleTransformations/MethodRenamer.java

@@ -379,7 +379,7 @@ public String getNewName() {
   }
 
   private boolean isRenamingAllowed(SootMethod method) {
-    if (soot.jbco.Main.getWeight(MethodRenamer.name, method.getName()) == 0) {
+    if (soot.jbco.Main.getWeight(MethodRenamer.name, method.getSignature()) == 0) {
       return false;
     }