svn commit: r558002 - in /incubator/tuscany/java/sca/modules/implementation-java-xml/src: main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/

[antelder]

Author: antelder
Date: Fri Jul 20 07:18:46 2007
New Revision: 558002

URL: http://svn.apache.org/viewvc?view=rev&rev=558002
Log:
Change java impl to support multiple use of @ConversationId

Modified:
    
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
    
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java

Modified: 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java?view=diff&rev=558002&r1=558001&r2=558002
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/main/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessor.java
 Fri Jul 20 07:18:46 2007
@@ -87,7 +87,7 @@
         if (conversationID == null) {
             return;
         }
-        type.setConversationIDMember(method);
+        type.addConversationIDMember(method);
     }
 
     public void visitField(Field field,
@@ -96,7 +96,7 @@
         if (conversationID == null) {
             return;
         }
-        type.setConversationIDMember(field);
+        type.addConversationIDMember(field);
     }
 
     protected long convertTimeMillis(String expr) throws NumberFormatException 
{

Modified: 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java?view=diff&rev=558002&r1=558001&r2=558002
==============================================================================
--- 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/implementation-java-xml/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ConversationProcessorTestCase.java
 Fri Jul 20 07:18:46 2007
@@ -81,16 +81,16 @@
         JavaImplementation type = 
javaImplementationFactory.createJavaImplementation();
         Field field = 
FooWithConversationIDField.class.getDeclaredField("conversationID");
         processor.visitField(field, type);
-        assertNotNull(type.getConversationIDMember());
-        assertEquals(field, type.getConversationIDMember());
+        assertNotNull(type.getConversationIDMembers());
+        assertEquals(field, type.getConversationIDMembers().get(0));
     }
 
     public void testSetConversationIDMethod() throws Exception {
         JavaImplementation type = 
javaImplementationFactory.createJavaImplementation();
         Method method = 
FooWithConversationIDMethod.class.getDeclaredMethods()[0];
         processor.visitMethod(method, type);
-        assertNotNull(type.getConversationIDMember());
-        assertEquals(method, type.getConversationIDMember());
+        assertNotNull(type.getConversationIDMembers());
+        assertEquals(method, type.getConversationIDMembers().get(0));
     }
 
     @Scope("CONVERSATION")



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]