You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/09/10 19:23:26 UTC
cvs commit: avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/factory AbstractObjectFactory.java BCELCodeGenerator.java
bloritsch 2003/09/10 10:23:26
Modified: fortress/container/src/impl/org/apache/avalon/fortress/impl/factory
AbstractObjectFactory.java BCELCodeGenerator.java
Log:
Update the BCEL code again to avoid the erronious INVOKENONVIRTUAL bug introduced earlier. ALso clean up my micro testing code.
Revision Changes Path
1.7 +4 -27 avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/factory/AbstractObjectFactory.java
Index: AbstractObjectFactory.java
===================================================================
RCS file: /home/cvs/avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/factory/AbstractObjectFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractObjectFactory.java 10 Sep 2003 16:57:06 -0000 1.6
+++ AbstractObjectFactory.java 10 Sep 2003 17:23:26 -0000 1.7
@@ -49,7 +49,10 @@
*/
package org.apache.avalon.fortress.impl.factory;
-import org.apache.avalon.framework.activity.*;
+import org.apache.avalon.framework.activity.Disposable;
+import org.apache.avalon.framework.activity.Initializable;
+import org.apache.avalon.framework.activity.Startable;
+import org.apache.avalon.framework.activity.Suspendable;
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.Composable;
import org.apache.avalon.framework.component.Recomposable;
@@ -61,7 +64,6 @@
import org.apache.avalon.framework.logger.Loggable;
import org.apache.avalon.framework.parameters.Parameterizable;
import org.apache.avalon.framework.parameters.Reparameterizable;
-import org.apache.avalon.framework.service.ServiceManager;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.excalibur.instrument.Instrument;
import org.apache.excalibur.instrument.Instrumentable;
@@ -246,30 +248,5 @@
workInterfaces.add( interfaces[i] );
addInterfaces(interfaces[i].getInterfaces(), workInterfaces);
}
- }
-
- public static void main(String[] args) throws Exception
- {
- BCELWrapperGenerator generator = new BCELWrapperGenerator();
- Class klass = generator.createWrapper(Test.class);
- Class[] ifaces = klass.getInterfaces();
- for(int i =0; i < ifaces.length; i++)
- {
- System.out.println(ifaces[i].getName());
- }
- }
-
- public static interface Base extends Executable,Serviceable{};
- public static interface Extended extends Base{void extend();};
- public static interface Complicate extends Extended{void complicate();};
- public static abstract class SuperTest implements Complicate
- {
- public final void execute(){}
- }
- public static class Test extends SuperTest
- {
- public void extend(){}
- public void complicate(){}
- public void service(ServiceManager manager){}
}
}
1.6 +1 -1 avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/factory/BCELCodeGenerator.java
Index: BCELCodeGenerator.java
===================================================================
RCS file: /home/cvs/avalon/fortress/container/src/impl/org/apache/avalon/fortress/impl/factory/BCELCodeGenerator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BCELCodeGenerator.java 10 Sep 2003 16:57:06 -0000 1.5
+++ BCELCodeGenerator.java 10 Sep 2003 17:23:26 -0000 1.6
@@ -414,7 +414,7 @@
meth.name,
meth.returnType,
meth.parameterTypes,
- (meth.isFinal) ? Constants.INVOKENONVIRTUAL : Constants.INVOKEVIRTUAL ) );
+ Constants.INVOKEVIRTUAL ) );
// Creating return statement ...
m_instructionList.append( InstructionFactory.createReturn( meth.returnType ) );
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org