[overlord-commits] Overlord SVN: r74 - in trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model: actions and 1 other directory.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Thu Jun 26 13:39:18 EDT 2008
Author: objectiser
Date: 2008-06-26 13:39:18 -0400 (Thu, 26 Jun 2008)
New Revision: 74
Modified:
trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java
trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java
trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java
trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java
Log:
Modified: trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java
===================================================================
--- trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java 2008-06-26 13:02:35 UTC (rev 73)
+++ trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/ESBLanguageModel.java 2008-06-26 17:39:18 UTC (rev 74)
@@ -202,7 +202,7 @@
String str=new String(os.toByteArray());
- System.out.println("EXPORTED TEXT:");
+ System.out.println("EXPORTED JBOSS-ESB TEXT:");
System.out.println(str);
}
} catch(Exception e) {
Modified: trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java
===================================================================
--- trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-06-26 13:02:35 UTC (rev 73)
+++ trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/ParallelAction.java 2008-06-26 17:39:18 UTC (rev 74)
@@ -51,18 +51,32 @@
org.w3c.dom.Node n=nl.item(i);
- if (n instanceof org.w3c.dom.Element &&
- (n.getNodeName().equals(PATH) ||
- n.getNodeName().equals(JOIN))) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- // Lookup service associated with category and name
- ESBService service=getService().getModel().getService(category, name);
-
- // Initialize link, even if service is null - this will be
- // reported as a validation error later
- getLinks().add(new ESBLink(category, name, service, true));
+ if (n instanceof org.w3c.dom.Element) {
+ if (n.getNodeName().equals(PATH)) {
+ String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
+ String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
+
+ // Lookup service associated with category and name
+ ESBService service=getService().getModel().getService(category, name);
+
+ // Initialize link, even if service is null - this will be
+ // reported as a validation error later
+ getLinks().add(new ESBLink(category, name, service, true));
+
+ if (service != null) {
+ m_services.add(service);
+ }
+ } else if (n.getNodeName().equals(JOIN)) {
+ m_joinCategory=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
+ m_joinName=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
+
+ // Lookup service associated with category and name
+ m_joinService=getService().getModel().getService(m_joinCategory, m_joinName);
+
+ // Initialize link, even if service is null - this will be
+ // reported as a validation error later
+ getLinks().add(new ESBLink(m_joinCategory, m_joinName, m_joinService, true));
+ }
}
}
}
@@ -78,51 +92,45 @@
@Override
public void convert(java.util.List<Activity> activities,
ConversionContext context) {
-
- org.w3c.dom.NodeList nl=getPropertyChildNodes(PATHS);
-
+
Parallel parallel=new Parallel();
activities.add(parallel);
- for (int i=0; i < nl.getLength(); i++) {
+ parallel.derivedFrom(this);
+
+ if (m_joinService != null) {
+ context.markJoin(m_joinService);
+ }
+
+ for (int i=0; i < m_services.size(); i++) {
+ Block block=new Block();
- org.w3c.dom.Node n=nl.item(i);
+ ESBService service=m_services.get(i);
- if (n instanceof org.w3c.dom.Element) {
- if (n.getNodeName().equals(PATH)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- Block block=new Block();
-
- ESBService service=getService().getModel().getService(category, name);
-
- if (service != null) {
- service.convert(block.getContents(), context);
- }
-
- if (block.getContents().size() > 0) {
- parallel.getBlocks().add(block);
- }
- } else if (n.getNodeName().equals(JOIN)) {
- String category=((org.w3c.dom.Element)n).getAttribute(SERVICE_CATEGORY);
- String name=((org.w3c.dom.Element)n).getAttribute(SERVICE_NAME);
-
- ESBService service=getService().getModel().getService(category, name);
-
- if (service != null) {
- // Join activities should be added after the
- // parallel construct
- service.convert(activities, context);
- }
- }
+ if (service != null) {
+ service.convert(block.getContents(), context);
}
+
+ // TODO: Only temporary check while conformance
+ // check does not handle
+ if (block.getContents().size() > 0) {
+ parallel.getBlocks().add(block);
+ }
}
-
- // Only add parallel activity if it has paths
+
+ // TODO: Only temporary check while conformance
+ // check does not handle
if (parallel.getBlocks().size() == 0) {
activities.remove(parallel);
}
+
+ if (m_joinService != null) {
+ m_joinService.convert(activities, context);
+ }
}
+ private java.util.List<ESBService> m_services=new java.util.Vector<ESBService>();
+ private String m_joinCategory=null;
+ private String m_joinName=null;
+ private ESBService m_joinService=null;
}
Modified: trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java
===================================================================
--- trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-06-26 13:02:35 UTC (rev 73)
+++ trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhenAction.java 2008-06-26 17:39:18 UTC (rev 74)
@@ -129,10 +129,6 @@
}
}
- if (elem.getConditionalBlocks().size() == 0) {
- activities.remove(elem);
- }
-
if (m_joinService != null) {
m_joinService.convert(activities, context);
}
Modified: trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java
===================================================================
--- trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-06-26 13:02:35 UTC (rev 73)
+++ trunk/cdl/tools/plugins/org.jboss.tools.overlord.jbossesb/src/java/org/jboss/tools/overlord/jbossesb/model/actions/WhileAction.java 2008-06-26 17:39:18 UTC (rev 74)
@@ -155,10 +155,6 @@
context.pop(getService());
}
- if (elem.getBlock().getContents().size() == 0) {
- activities.remove(elem);
- }
-
if (m_exitService != null) {
m_exitService.convert(activities, context);
}
More information about the overlord-commits
mailing list