You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/08/06 05:44:06 UTC

svn commit: r563019 [2/2] - in /incubator/tuscany/java/sca/modules: core-spring/src/main/java/org/apache/tuscany/sca/core/spring/context/ core-spring/src/main/java/org/apache/tuscany/sca/core/spring/implementation/java/impl/ databinding-sdo/src/test/ja...

Modified: incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java?view=diff&rev=563019&r1=563018&r2=563019
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceFactoryImpl.java Sun Aug  5 20:43:59 2007
@@ -32,7 +32,7 @@
     private JavaInterfaceIntrospectorImpl introspector;
     
     public JavaInterfaceFactoryImpl(JavaInterfaceIntrospectorExtensionPoint visitors) {
-        introspector = new JavaInterfaceIntrospectorImpl(this, visitors);
+        introspector = new JavaInterfaceIntrospectorImpl(visitors);
     }
 
     public JavaInterface createJavaInterface() {
@@ -40,7 +40,13 @@
     }
     
     public JavaInterface createJavaInterface(Class<?> interfaceClass) throws InvalidInterfaceException {
-        return introspector.introspect(interfaceClass);
+        JavaInterface javaInterface = createJavaInterface();
+        introspector.introspectInterface(javaInterface, interfaceClass);
+        return javaInterface;
+    }
+    
+    public void createJavaInterface(JavaInterface javaInterface, Class<?> interfaceClass) throws InvalidInterfaceException {
+        introspector.introspectInterface(javaInterface, interfaceClass);
     }
     
     public JavaInterfaceContract createJavaInterfaceContract() {

Modified: incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java?view=diff&rev=563019&r1=563018&r2=563019
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceIntrospectorImpl.java Sun Aug  5 20:43:59 2007
@@ -34,7 +34,6 @@
 import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
 import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceIntrospectorExtensionPoint;
 import org.apache.tuscany.sca.interfacedef.java.introspect.JavaInterfaceVisitor;
 import org.osoa.sca.annotations.Conversational;
@@ -52,16 +51,13 @@
 
     private static final String UNKNOWN_DATABINDING = null;
 
-    private JavaInterfaceFactory javaFactory;
     private List<JavaInterfaceVisitor> visitors = new ArrayList<JavaInterfaceVisitor>();
 
-    public JavaInterfaceIntrospectorImpl(JavaInterfaceFactory javaFactory, JavaInterfaceIntrospectorExtensionPoint visitors) {
-        this.javaFactory = javaFactory;
+    public JavaInterfaceIntrospectorImpl(JavaInterfaceIntrospectorExtensionPoint visitors) {
         this.visitors = visitors.getInterfaceVisitors();
     }
 
-    public JavaInterface introspect(Class<?> type) throws InvalidInterfaceException {
-        JavaInterface javaInterface = javaFactory.createJavaInterface();
+    public void introspectInterface(JavaInterface javaInterface, Class<?> type) throws InvalidInterfaceException {
         javaInterface.setJavaClass(type);
 
         boolean remotable = type.isAnnotationPresent(Remotable.class);
@@ -84,7 +80,6 @@
         for (JavaInterfaceVisitor extension : visitors) {
             extension.visitInterface(javaInterface);
         }
-        return javaInterface;
     }
 
     private <T> List<Operation> getOperations(Class<T> type, boolean remotable, boolean conversational)

Modified: incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java?view=diff&rev=563019&r1=563018&r2=563019
==============================================================================
--- incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java (original)
+++ incubator/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/introspect/ExtensibleJavaInterfaceIntrospector.java Sun Aug  5 20:43:59 2007
@@ -18,6 +18,8 @@
  */
 package org.apache.tuscany.sca.interfacedef.java.introspect;
 
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
+import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
 import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory;
 import org.apache.tuscany.sca.interfacedef.java.impl.JavaInterfaceIntrospectorImpl;
 
@@ -28,9 +30,18 @@
  * @version $Rev$ $Date$
  */
 public class ExtensibleJavaInterfaceIntrospector extends JavaInterfaceIntrospectorImpl implements JavaInterfaceIntrospector {
+    
+    private JavaInterfaceFactory javaFactory;
 
     public ExtensibleJavaInterfaceIntrospector(JavaInterfaceFactory javaFactory, JavaInterfaceIntrospectorExtensionPoint visitors) {
-        super(javaFactory, visitors);
+        super(visitors);
+        this.javaFactory = javaFactory;
+    }
+    
+    public JavaInterface introspect(Class<?> type) throws InvalidInterfaceException {
+        JavaInterface javaInterface = javaFactory.createJavaInterface();
+        super.introspectInterface(javaInterface, type);
+        return javaInterface;
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org