You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2014/06/05 14:32:52 UTC
svn commit: r1600634 -
/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/
Author: ebourg
Date: Thu Jun 5 12:32:51 2014
New Revision: 1600634
URL: http://svn.apache.org/r1600634
Log:
Merged VisitorSupportsInvokeDynamic into Visitor
Removed:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/VisitorSupportsInvokeDynamic.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/EmptyVisitor.java Thu Jun 5 12:32:51 2014
@@ -23,7 +23,7 @@ package org.apache.bcel.generic;
* @version $Id$
* @author <A HREF="mailto:m.dahm@gmx.de">M. Dahm</A>
*/
-public abstract class EmptyVisitor implements VisitorSupportsInvokeDynamic {
+public abstract class EmptyVisitor implements Visitor {
public void visitStackInstruction( StackInstruction obj ) {
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETFIELD.java Thu Jun 5 12:32:51 2014
@@ -80,9 +80,7 @@ public class GETFIELD extends FieldInstr
v.visitTypedInstruction(this);
v.visitLoadClass(this);
v.visitCPInstruction(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- }
+ v.visitNameSignatureInstruction(this);
v.visitFieldOrMethod(this);
v.visitFieldInstruction(this);
v.visitGETFIELD(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/GETSTATIC.java Thu Jun 5 12:32:51 2014
@@ -78,9 +78,7 @@ public class GETSTATIC extends FieldInst
v.visitTypedInstruction(this);
v.visitLoadClass(this);
v.visitCPInstruction(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- }
+ v.visitNameSignatureInstruction(this);
v.visitFieldOrMethod(this);
v.visitFieldInstruction(this);
v.visitGETSTATIC(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEDYNAMIC.java Thu Jun 5 12:32:51 2014
@@ -174,9 +174,7 @@ public class INVOKEDYNAMIC extends NameS
v.visitStackConsumer(this);
v.visitStackProducer(this);
v.visitCPInstruction(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- ((VisitorSupportsInvokeDynamic)v).visitINVOKEDYNAMIC(this);
- }
+ v.visitNameSignatureInstruction(this);
+ v.visitINVOKEDYNAMIC(this);
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEINTERFACE.java Thu Jun 5 12:32:51 2014
@@ -133,9 +133,7 @@ public final class INVOKEINTERFACE exten
v.visitStackProducer(this);
v.visitLoadClass(this);
v.visitCPInstruction(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- }
+ v.visitNameSignatureInstruction(this);
v.visitFieldOrMethod(this);
v.visitInvokeInstruction(this);
v.visitINVOKEINTERFACE(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESPECIAL.java Thu Jun 5 12:32:51 2014
@@ -75,9 +75,7 @@ public class INVOKESPECIAL extends Invok
v.visitStackProducer(this);
v.visitLoadClass(this);
v.visitCPInstruction(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- }
+ v.visitNameSignatureInstruction(this);
v.visitFieldOrMethod(this);
v.visitInvokeInstruction(this);
v.visitINVOKESPECIAL(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKESTATIC.java Thu Jun 5 12:32:51 2014
@@ -72,9 +72,7 @@ public class INVOKESTATIC extends Invoke
v.visitStackProducer(this);
v.visitLoadClass(this);
v.visitCPInstruction(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- }
+ v.visitNameSignatureInstruction(this);
v.visitFieldOrMethod(this);
v.visitInvokeInstruction(this);
v.visitINVOKESTATIC(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/INVOKEVIRTUAL.java Thu Jun 5 12:32:51 2014
@@ -75,9 +75,7 @@ public class INVOKEVIRTUAL extends Invok
v.visitLoadClass(this);
v.visitCPInstruction(this);
v.visitFieldOrMethod(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- }
+ v.visitNameSignatureInstruction(this);
v.visitInvokeInstruction(this);
v.visitINVOKEVIRTUAL(this);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTFIELD.java Thu Jun 5 12:32:51 2014
@@ -79,9 +79,7 @@ public class PUTFIELD extends FieldInstr
v.visitTypedInstruction(this);
v.visitLoadClass(this);
v.visitCPInstruction(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- }
+ v.visitNameSignatureInstruction(this);
v.visitFieldOrMethod(this);
v.visitFieldInstruction(this);
v.visitPUTFIELD(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/PUTSTATIC.java Thu Jun 5 12:32:51 2014
@@ -78,9 +78,7 @@ public class PUTSTATIC extends FieldInst
v.visitTypedInstruction(this);
v.visitLoadClass(this);
v.visitCPInstruction(this);
- if (v instanceof VisitorSupportsInvokeDynamic) {
- ((VisitorSupportsInvokeDynamic)v).visitNameSignatureInstruction(this);
- }
+ v.visitNameSignatureInstruction(this);
v.visitFieldOrMethod(this);
v.visitFieldInstruction(this);
v.visitPUTSTATIC(this);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java?rev=1600634&r1=1600633&r2=1600634&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Visitor.java Thu Jun 5 12:32:51 2014
@@ -566,4 +566,10 @@ public interface Visitor {
void visitBREAKPOINT( BREAKPOINT obj );
+
+
+ void visitNameSignatureInstruction( NameSignatureInstruction obj );
+
+
+ void visitINVOKEDYNAMIC( INVOKEDYNAMIC obj );
}