diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/CallBackInterfaceClassGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/CallBackInterfaceClassGenerator.java index a39c7550598bd27e7c1ec8e071c9117f51f804d4..fc9da0a3ee1f64e8eb235fd435b9b95265168d0b 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/CallBackInterfaceClassGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/CallBackInterfaceClassGenerator.java @@ -93,9 +93,9 @@ extends AbstractProxyClassGenerator { } @Override - public void generateConstructors( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateConstructors( ClassSourceCodeVisitor cv ) { - super.generateConstructors(cv, proxycl); + super.generateConstructors(cv); // public constructor() BlockSourceCodeVisitor mv = @@ -118,7 +118,7 @@ extends AbstractProxyClassGenerator { @Override public void generateProxyMethodBodyBeforeCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { /* * Regiqter the request context and get the content instance which @@ -136,7 +136,7 @@ extends AbstractProxyClassGenerator { @Override public void generateProxyMethodBodyAfterCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { // End of the try block mv.visitln(" }"); @@ -156,7 +156,7 @@ extends AbstractProxyClassGenerator { mv.visitln(" }"); } - public String getDelegatingInstance( Class proxycl, Method proxym ) { + public String getDelegatingInstance( Method proxym ) { return "impl"; } } diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ClientInterfaceClassGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ClientInterfaceClassGenerator.java index a256b4bc0dd9c995c17e468630f3a41273c88579..07645024a5bd82959c31842ec82b3df97ab9741b 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ClientInterfaceClassGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ClientInterfaceClassGenerator.java @@ -103,9 +103,9 @@ extends ServerInterfaceClassGenerator { } @Override - public void generateMethods( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateMethods( ClassSourceCodeVisitor cv ) { - super.generateMethods(cv, proxycl); + super.generateMethods(cv); BlockSourceCodeVisitor mv = cv.visitMethod( @@ -126,7 +126,7 @@ extends ServerInterfaceClassGenerator { @Override public void generateProxyMethod( - ClassSourceCodeVisitor cv, Class proxycl, Method proxym ) { + ClassSourceCodeVisitor cv, Method proxym ) { /* * Indeed nothing. * Proxy methods are inherited from the component server interface diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/InterceptorClassGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/InterceptorClassGenerator.java index 0438625e113a619439255e7daafdb90ec4298385..bb91b1e49ce6c15f3120067e4ec2341f372fafbe 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/InterceptorClassGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/InterceptorClassGenerator.java @@ -47,13 +47,13 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator { } @Override - public String getDelegatingInstance( Class proxycl, Method proxym ) { + public String getDelegatingInstance( Method proxym ) { return "impl"; } @Override public void generateProxyMethodBodyDelegatingCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { String rtypename = UClass.getGenericReturnType(proxym,proxycl); @@ -93,7 +93,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator { * @since 1.1.1 */ @Override - public void generateFieldImpl( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateFieldImpl( ClassSourceCodeVisitor cv ) { /* * The implementation of the impl field is inherited from * TinfiComponentInterceptor. @@ -104,7 +104,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator { * @since 1.1.1 */ @Override - public void generateMethodGetFcItfDelegate( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateMethodGetFcItfDelegate( ClassSourceCodeVisitor cv ) { /* * The implementation of the getFcItfDelegate method is inherited from * TinfiComponentInterceptor. @@ -115,7 +115,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator { * @since 1.1.1 */ @Override - public void generateMethodSetFcItfDelegate( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateMethodSetFcItfDelegate( ClassSourceCodeVisitor cv ) { /* * The implementation of the setFcItfDelegate method is inherited from * TinfiComponentInterceptor. diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCAContentInterceptorSourceCodeGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCAContentInterceptorSourceCodeGenerator.java index 09447ae2523399f0395cdc7a779aba81c962d2d8..0fa50f0f2e4fffef1156d7e798a155e591d4a20d 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCAContentInterceptorSourceCodeGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCAContentInterceptorSourceCodeGenerator.java @@ -93,7 +93,7 @@ extends AbstractInterceptorSourceCodeGenerator { @Override public void generateProxyMethodBodyBeforeCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { /* * Regiqter the request context and get the content instance which @@ -118,7 +118,7 @@ extends AbstractInterceptorSourceCodeGenerator { @Override public void generateProxyMethodBodyFinallyCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { // End of the try block mv.visitln(" }"); diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCAIntentInterceptorSourceCodeGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCAIntentInterceptorSourceCodeGenerator.java index cc78cc0ea3e673a005f2dff40bb35cff2cff57c4..3f26b07fff858705dc86865daaf46e739b6026af 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCAIntentInterceptorSourceCodeGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCAIntentInterceptorSourceCodeGenerator.java @@ -88,7 +88,7 @@ extends AbstractInterceptorSourceCodeGenerator { } @Override - public void generateStaticParts( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateStaticParts( ClassSourceCodeVisitor cv ) { /* * Initialize the METHODS field (declared below in method @@ -137,7 +137,7 @@ extends AbstractInterceptorSourceCodeGenerator { } @Override - public void generateFields( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateFields( ClassSourceCodeVisitor cv ) { /* * Generate a METHODS field to store the array of component methods @@ -254,18 +254,18 @@ extends AbstractInterceptorSourceCodeGenerator { } @Override - public void generateMethodInitFcController( BlockSourceCodeVisitor mv, Class proxycl ) { + public void generateMethodInitFcController( BlockSourceCodeVisitor mv ) { mv.visitln(" initIntentHandlersMap(METHODS);"); } @Override - public void generateMethodClone( BlockSourceCodeVisitor mv, Class proxycl ) { + public void generateMethodClone( BlockSourceCodeVisitor mv ) { mv.visitln(" clone.initIntentHandlersMap(METHODS);"); } @Override public void generateProxyMethodBodyBeforeCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { /* * Retrieve the index of proxym in the array of methods for proxycl. @@ -382,7 +382,7 @@ extends AbstractInterceptorSourceCodeGenerator { @Override public void generateProxyMethodBodyFinallyCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { // End of else block mv.visitln(" }"); diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCATinfiInterceptorSourceCodeGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCATinfiInterceptorSourceCodeGenerator.java index 4945a4f189fe7eebbce2a7f626f07640bc4857dd..d4d50165d5ed8c60bf64ed44fd7c212ccbd66cef 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCATinfiInterceptorSourceCodeGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/SCATinfiInterceptorSourceCodeGenerator.java @@ -99,12 +99,12 @@ extends AbstractInterceptorSourceCodeGenerator { } @Override - public void generateMethodInitFcController( BlockSourceCodeVisitor mv, Class proxycl ) { + public void generateMethodInitFcController( BlockSourceCodeVisitor mv ) { mv.visitIns("super.initFcController(ic)"); } @Override - public void generateMethodClone( BlockSourceCodeVisitor mv, Class proxycl ) { + public void generateMethodClone( BlockSourceCodeVisitor mv ) { mv.visitIns("initFcClone(clone)"); } } diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServerInterfaceClassGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServerInterfaceClassGenerator.java index 8cedb4ffcc5da5257cfac3a800807be32f2f694a..b92cfa3c5c1a3ac8330ba987fdc6f85a30209db8 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServerInterfaceClassGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServerInterfaceClassGenerator.java @@ -80,7 +80,7 @@ extends InterfaceImplementationClassGenerator { } @Override - public void generateFieldImpl( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateFieldImpl( ClassSourceCodeVisitor cv ) { /* * Indeed nothing. * The field is managed by TinfiComponentInterface. @@ -88,7 +88,7 @@ extends InterfaceImplementationClassGenerator { } @Override - public void generateMethodGetFcItfImpl( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateMethodGetFcItfImpl( ClassSourceCodeVisitor cv ) { /* * Indeed nothing. * The method is inherited from TinfiComponentInterface. @@ -96,7 +96,7 @@ extends InterfaceImplementationClassGenerator { } @Override - public void generateMethodSetFcItfImpl( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateMethodSetFcItfImpl( ClassSourceCodeVisitor cv ) { /* * Indeed nothing. * The method is inherited from TinfiComponentInterface. diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServiceReferenceClassGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServiceReferenceClassGenerator.java index 798e1b49c6f6180205e45d67557375db560d8e8b..7568eba617ca3b4b382b26075d4cf0a4688cfeb0 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServiceReferenceClassGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/ServiceReferenceClassGenerator.java @@ -130,10 +130,9 @@ extends AbstractProxyClassGenerator { } @Override - public void generateConstructors( - ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateConstructors( ClassSourceCodeVisitor cv ) { - super.generateConstructors(cv,proxycl); + super.generateConstructors(cv); /* * Create the signature of the proxy interface with generic parameters @@ -161,7 +160,7 @@ extends AbstractProxyClassGenerator { * @since 1.4.1 */ @Override - public void generateMethods( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateMethods( ClassSourceCodeVisitor cv ) { /* * Override the getService method inherited from ServiceReferenceImpl. * The idea is that in generated subclasses of ServiceReferenceImpl we @@ -181,9 +180,9 @@ extends AbstractProxyClassGenerator { @Override public void generateProxyMethodBodyBeforeCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { - super.generateProxyMethodBodyBeforeCode(mv,proxycl,proxym); + super.generateProxyMethodBodyBeforeCode(mv,proxym); conversationalItf = proxycl.getAnnotation(Conversational.class); oneWayMeth = @@ -259,9 +258,9 @@ extends AbstractProxyClassGenerator { @Override public void generateProxyMethodBodyAfterCode( - BlockSourceCodeVisitor mv, Class proxycl, Method proxym ) { + BlockSourceCodeVisitor mv, Method proxym ) { - super.generateProxyMethodBodyAfterCode(mv,proxycl,proxym); + super.generateProxyMethodBodyAfterCode(mv,proxym); EndsConversation end = proxym.getAnnotation(EndsConversation.class); if( end != null ) { @@ -289,7 +288,7 @@ extends AbstractProxyClassGenerator { } } - public String getDelegatingInstance( Class proxycl, Method proxym ) { + public String getDelegatingInstance( Method proxym ) { return "service"; } } diff --git a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/light/InterceptorNoIntentClassGenerator.java b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/light/InterceptorNoIntentClassGenerator.java index aeff451692f5596830a6a6bc27fd408bcd58655a..350c32b65bd829ae198ac070d40a588d988f1345 100644 --- a/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/light/InterceptorNoIntentClassGenerator.java +++ b/tinfi/module/opt-oo/core/src/main/java/org/ow2/frascati/tinfi/opt/oo/light/InterceptorNoIntentClassGenerator.java @@ -41,7 +41,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator { public InterceptorNoIntentClassGenerator() {} @Override - public void generateFieldImpl( ClassSourceCodeVisitor cv, Class proxycl ) { + public void generateFieldImpl( ClassSourceCodeVisitor cv ) { /* * The implementation of the impl field is inherited from * TinfiComponentInterceptor. @@ -49,7 +49,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator { } @Override - public void generateMethodGetFcItfDelegate(ClassSourceCodeVisitor cv, Class proxycl) { + public void generateMethodGetFcItfDelegate( ClassSourceCodeVisitor cv ) { /* * The implementation of the getFcItfDelegate method is inherited from * TinfiComponentInterceptor. @@ -57,7 +57,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator { } @Override - public void generateMethodSetFcItfDelegate(ClassSourceCodeVisitor cv, Class proxycl) { + public void generateMethodSetFcItfDelegate( ClassSourceCodeVisitor cv ) { /* * The implementation of the setFcItfDelegate method is inherited from * TinfiComponentInterceptor. @@ -65,7 +65,7 @@ extends org.objectweb.fractal.juliac.proxy.InterceptorClassGenerator { } @Override - public String getDelegatingInstance( Class proxycl, Method proxym ) { + public String getDelegatingInstance( Method proxym ) { return "impl"; } }