[jbpm-commits] JBoss JBPM SVN: r4304 - in jbpm4/trunk/modules/jpdl/src: test/java/org/jbpm/jpdl/parsing and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-03-21 05:33:54 -0400 (Sat, 21 Mar 2009)
New Revision: 4304

Modified:
   jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
   jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
Log:
removed obsolete initial parsing

Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2009-03-20 21:08:31 UTC (rev 4303)
+++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java	2009-03-21 09:33:54 UTC (rev 4304)
@@ -98,6 +98,7 @@
     StartActivities startActivities = new StartActivities();
     parse.pushObject(startActivities);
     try {
+      // process attribues
       String name = XmlUtil.attribute(documentElement, "name", true, parse);
       processDefinition.setName(name);
       
@@ -123,6 +124,10 @@
       UnresolvedTransitions unresolvedTransitions = new UnresolvedTransitions();
       parse.pushObject(unresolvedTransitions);
       
+      // swimlanes
+      
+      
+      // activities
       List<Element> elements = XmlUtil.elements(documentElement);
       for (Element element: elements) {
         JpdlActivityBinding activityBinding = (JpdlActivityBinding) getBinding(element, "activity");
@@ -146,17 +151,6 @@
         unresolvedTransition.resolve(processDefinition, parse);
       }
 
-      // TODO remove the initial attribute parsing
-      String initialActivityName = XmlUtil.attribute(documentElement, "initial", false, parse);
-      if (initialActivityName!=null) {
-        ActivityImpl initial = processDefinition.getActivity(initialActivityName);
-        if (initial==null) {
-          parse.addProblem("initial activity '"+initialActivityName+"' was not found");
-        } else {
-          processDefinition.setInitial(initial);
-        }
-      }
-
     } finally {
       parse.popObject();
     }

Modified: jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java
===================================================================
--- jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2009-03-20 21:08:31 UTC (rev 4303)
+++ jbpm4/trunk/modules/jpdl/src/test/java/org/jbpm/jpdl/parsing/ProcessParsingTest.java	2009-03-21 09:33:54 UTC (rev 4304)
@@ -58,12 +58,4 @@
     assertTextPresent("attribute <process name=\"\" is empty", problems.get(0).getMsg());
     assertTextPresent("no start activity in process", problems.get(1).getMsg());
   }
-
-  public void testProcessWithUnexistingInitial() {
-    List<Problem> problems = parseProblems(
-      "<process name='p' initial='ufo' />"
-    );
-    assertTextPresent("initial activity 'ufo' was not found", problems.get(0).getMsg());
-    assertTextPresent("no start activity in process", problems.get(1).getMsg());
-  }
 }