svn commit: r709192 - in /tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml: CompositeProcessor.java Constants.java

[edwardsmj]

Author: edwardsmj
Date: Thu Oct 30 09:19:33 2008
New Revision: 709192

URL: http://svn.apache.org/viewvc?rev=709192&view=rev
Log:
Added in processing for reading EventTypes for CompositeConsumers and Composite 
Producers

Modified:
    
tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
    
tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java

Modified: 
tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
URL: 
http://svn.apache.org/viewvc/tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java?rev=709192&r1=709191&r2=709192&view=diff
==============================================================================
--- 
tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
 (original)
+++ 
tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
 Thu Oct 30 09:19:33 2008
@@ -313,6 +313,14 @@
                             contract = componentConsumer;
                             componentConsumer.setName(getString(reader, NAME));
                             
+                            // Read the EventTypes attribute
+                            String eventTypes = reader.getAttributeValue(null, 
Constants.EVENTTYPES);
+                            if (eventTypes != null) {
+                                for (StringTokenizer tokens = new 
StringTokenizer(eventTypes); tokens.hasMoreTokens();) {
+                                    
componentConsumer.getEventTypes().addEventType(tokens.nextToken());
+                                } // end for
+                            } // end if
+                            
                             //handle extension attributes
                             this.readExtendedAttributes(reader, name, 
componentConsumer, extensionAttributeProcessor);
 
@@ -325,6 +333,14 @@
                             compositeConsumer = 
assemblyFactory.createCompositeConsumer();
                             contract = componentConsumer;
                             compositeConsumer.setName(getString(reader, NAME));
+                            
+                            // Read the EventTypes attribute
+                            String eventTypes = reader.getAttributeValue(null, 
Constants.EVENTTYPES);
+                            if (eventTypes != null) {
+                                for (StringTokenizer tokens = new 
StringTokenizer(eventTypes); tokens.hasMoreTokens();) {
+                                    
compositeConsumer.getEventTypes().addEventType(tokens.nextToken());
+                                } // end for
+                            } // end if
 
                             String promoted = getString(reader, PROMOTE);
                             if (promoted != null) {
@@ -364,6 +380,14 @@
                             contract = componentProducer;
                             componentProducer.setName(getString(reader, NAME));
                             
+                            // Read the EventTypes attribute
+                            String eventTypes = reader.getAttributeValue(null, 
Constants.EVENTTYPES);
+                            if (eventTypes != null) {
+                                for (StringTokenizer tokens = new 
StringTokenizer(eventTypes); tokens.hasMoreTokens();) {
+                                    
componentProducer.getEventTypes().addEventType(tokens.nextToken());
+                                } // end for
+                            } // end if
+                            
                             //handle extension attributes
                             this.readExtendedAttributes(reader, name, 
componentProducer, extensionAttributeProcessor);
 
@@ -375,6 +399,15 @@
                             compositeProducer = 
assemblyFactory.createCompositeProducer();
                             contract = componentProducer;
                             compositeProducer.setName(getString(reader, NAME));
+                            
+                            // Read the EventTypes attribute
+                            String eventTypes = reader.getAttributeValue(null, 
Constants.EVENTTYPES);
+                            if (eventTypes != null) {
+                                for (StringTokenizer tokens = new 
StringTokenizer(eventTypes); tokens.hasMoreTokens();) {
+                                    
compositeProducer.getEventTypes().addEventType(tokens.nextToken());
+                                } // end for
+                            } // end if
+                            
                             String promoted = getString(reader, PROMOTE);
                             if (promoted != null) {
                                 String promotedComponentName;

Modified: 
tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
URL: 
http://svn.apache.org/viewvc/tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java?rev=709192&r1=709191&r2=709192&view=diff
==============================================================================
--- 
tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
 (original)
+++ 
tuscany/sandbox/event/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
 Thu Oct 30 09:19:33 2008
@@ -88,6 +88,7 @@
     String PROMOTE = "promote";
     String TARGET = "target";
     String WIRED_BY_IMPL = "wiredByImpl";
+    String EVENTTYPES = "eventTypes";
     String MULTIPLICITY = "multiplicity";
     String TYPE = "type";
     String ELEMENT = "element";