[jbpm-commits] JBoss JBPM SVN: r1586 - in api/trunk/modules/api/src: test/java/org/jboss/bpm/model and 1 other directory.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-07-11 09:34:33 -0400 (Fri, 11 Jul 2008)
New Revision: 1586

Modified:
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractEndEvent.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
   api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
   api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessMarshallerTest.java
Log:
Add name validation

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractEndEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractEndEvent.java	2008-07-11 13:14:17 UTC (rev 1585)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/AbstractEndEvent.java	2008-07-11 13:34:33 UTC (rev 1586)
@@ -36,7 +36,7 @@
  * @since 08-Jul-2008
  */
 @XmlType(name = "AbstractEndEvent")
-abstract class AbstractEndEvent extends Event
+abstract class AbstractEndEvent extends Event implements NamedFlowObject
 {
   private String name;
 

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java	2008-07-11 13:14:17 UTC (rev 1585)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/EndEvent.java	2008-07-11 13:34:33 UTC (rev 1586)
@@ -40,7 +40,7 @@
  * @since 08-Jul-2008
  */
 @XmlType(name="EndEvent")
-public class EndEvent extends AbstractEndEvent implements NamedFlowObject, SingleInFlowSupport
+public class EndEvent extends AbstractEndEvent implements SingleInFlowSupport
 {
   private Result result;
   private Flow inFlow;

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java	2008-07-11 13:14:17 UTC (rev 1585)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/FlowObject.java	2008-07-11 13:34:33 UTC (rev 1586)
@@ -56,7 +56,15 @@
   protected void initialize(Process proc)
   {
     setProcess(proc);
-    
+
+    if (this instanceof NamedFlowObject)
+    {
+      NamedFlowObject nfo = (NamedFlowObject)this;
+      if (nfo.getName() == null)
+        throw new InvalidProcessException("Name is required for: " + this);
+    }
+      
+    // Initialize in/out flows
     Flow outFlow = null;
     if (this instanceof SingleOutFlowSupport)
     {

Modified: api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java
===================================================================
--- api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java	2008-07-11 13:14:17 UTC (rev 1585)
+++ api/trunk/modules/api/src/main/java/org/jboss/bpm/model/Process.java	2008-07-11 13:34:33 UTC (rev 1586)
@@ -97,7 +97,7 @@
     if (flowObject instanceof NamedFlowObject)
     {
       NamedFlowObject nfo = (NamedFlowObject)flowObject;
-      if (findFlowObject(nfo.getName()) != null)
+      if (nfo.getName() != null && findFlowObject(nfo.getName()) != null)
         throw new NameNotUniqueException("NamedFlowObject: " + nfo.getName());
     }
 
@@ -181,7 +181,7 @@
       if (aux instanceof NamedFlowObject)
       {
         NamedFlowObject auxnfo = (NamedFlowObject)aux;
-        if (auxnfo.getName().equals(name))
+        if (name.equals(auxnfo.getName()))
         {
           nfo = aux;
           break;

Modified: api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessMarshallerTest.java
===================================================================
--- api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessMarshallerTest.java	2008-07-11 13:14:17 UTC (rev 1585)
+++ api/trunk/modules/api/src/test/java/org/jboss/bpm/model/ProcessMarshallerTest.java	2008-07-11 13:34:33 UTC (rev 1586)
@@ -51,7 +51,7 @@
     marshaller.marshallProcess(inProc, strwr);
     String xml = strwr.toString();
 
-    System.out.println(xml);
+    //System.out.println(xml);
 
     ProcessUnmarshaller unmarshaller = new ProcessUnmarshaller();
     Process outProc = unmarshaller.unmarshallProcess(new StringReader(xml));