fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AE Optional Transformer should not be fully operational.

Browse Source
This commit is contained in:
AlgorithmX2
2014-04-06 03:20:51 -05:00
parent 14f93f66f6
commit 72219780ef
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
transformer/asm/ASMIntegration.java
+18 -4
View File
@@ -98,12 +98,16 @@ public class ASMIntegration implements IClassTransformer
{ {
if ( hasAnnotation( an, integration.Interface.class ) ) if ( hasAnnotation( an, integration.Interface.class ) )
{ {
changed = changed || stripInterface( classNode, integration.Interface.class, an ); if ( stripInterface( classNode, integration.Interface.class, an ) )
changed = true;
} }
else if ( hasAnnotation( an, integration.InterfaceList.class ) ) else if ( hasAnnotation( an, integration.InterfaceList.class ) )
{ {
for (Object o : ((List) an.values.get( 1 ))) for (Object o : ((List) an.values.get( 1 )))
changed = changed || stripInterface( classNode, integration.InterfaceList.class, (AnnotationNode) o ); {
if ( stripInterface( classNode, integration.InterfaceList.class, (AnnotationNode) o ) )
changed = true;
}
} }
} }
} }
@@ -119,13 +123,17 @@ public class ASMIntegration implements IClassTransformer
{ {
if ( hasAnnotation( an, integration.Method.class ) ) if ( hasAnnotation( an, integration.Method.class ) )
{ {
changed = changed || stripMethod( classNode, mn, i, integration.Method.class, an ); if ( stripMethod( classNode, mn, i, integration.Method.class, an ) )
changed = true;
} }
} }
} }
} }
if ( changed )
log( "Updated " + classNode.name );
return changed; return changed;
} }
@@ -150,7 +158,10 @@ public class ASMIntegration implements IClassTransformer
{ {
log( "Removing Method " + mn.name + " from " + classNode.name + " because " + iName + " integration is disabled." ); log( "Removing Method " + mn.name + " from " + classNode.name + " because " + iName + " integration is disabled." );
i.remove(); i.remove();
return true;
} }
else
log( "Allowing Method " + mn.name + " from " + classNode.name + " because " + iName + " integration is enabled." );
} }
else else
throw new RuntimeException( "Unable to handle Method annotation on " + classNode.name ); throw new RuntimeException( "Unable to handle Method annotation on " + classNode.name );
@@ -181,8 +192,11 @@ public class ASMIntegration implements IClassTransformer
if ( !IntegrationRegistry.instance.isEnabled( iName ) ) if ( !IntegrationRegistry.instance.isEnabled( iName ) )
{ {
log( "Removing Interface " + iFace + " from " + classNode.name + " because " + iName + " integration is disabled." ); log( "Removing Interface " + iFace + " from " + classNode.name + " because " + iName + " integration is disabled." );
classNode.interfaces.remove( iFace ); classNode.interfaces.remove( iFace.replace( '.', '/' ) );
return true;
} }
else
log( "Allowing Interface " + iFace + " from " + classNode.name + " because " + iName + " integration is enabled." );
} }
else else
throw new RuntimeException( "Unable to handle Method annotation on " + classNode.name ); throw new RuntimeException( "Unable to handle Method annotation on " + classNode.name );