From e43fac9f55cfeebacd869352bfb090b7d8d063c1 Mon Sep 17 00:00:00 2001 From: jeff Date: Sat, 30 Aug 2014 11:41:17 -0400 Subject: got a decent class matcher working --- src/cuchaz/enigma/bytecode/ClassRenamer.java | 35 ++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) (limited to 'src/cuchaz/enigma/bytecode/ClassRenamer.java') diff --git a/src/cuchaz/enigma/bytecode/ClassRenamer.java b/src/cuchaz/enigma/bytecode/ClassRenamer.java index f3a8c0e..efe22a1 100644 --- a/src/cuchaz/enigma/bytecode/ClassRenamer.java +++ b/src/cuchaz/enigma/bytecode/ClassRenamer.java @@ -14,6 +14,7 @@ import java.util.Map; import java.util.Set; import javassist.ClassMap; +import javassist.CtBehavior; import javassist.CtClass; import javassist.bytecode.ConstPool; import javassist.bytecode.Descriptor; @@ -23,6 +24,8 @@ import com.beust.jcommander.internal.Sets; import com.google.common.collect.Maps; import cuchaz.enigma.mapping.ClassEntry; +import cuchaz.enigma.mapping.SignatureUpdater; +import cuchaz.enigma.mapping.SignatureUpdater.ClassNameUpdater; public class ClassRenamer { @@ -115,5 +118,37 @@ public class ClassRenamer } } ClassRenamer.renameClasses( c, map ); + + // TEMP + for( ClassEntry classEntry : ClassRenamer.getAllClassEntries( c ) ) + { + if( classEntry.isInDefaultPackage() ) + { + throw new Error( "!!! " + classEntry ); + } + } + + // TEMP + for( CtBehavior behavior : c.getDeclaredBehaviors() ) + { + if( behavior.getSignature() == null ) + { + continue; + } + + SignatureUpdater.update( behavior.getSignature(), new ClassNameUpdater( ) + { + @Override + public String update( String className ) + { + ClassEntry classEntry = new ClassEntry( className ); + if( classEntry.isInDefaultPackage() ) + { + throw new Error( "!!! " + className ); + } + return className; + } + } ); + } } } -- cgit v1.2.3