[jbpm-commits] JBoss JBPM SVN: r1806 - jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-08-02 12:46:28 -0400 (Sat, 02 Aug 2008)
New Revision: 1806

Modified:
   jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java
   jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java
Log:
Optional proc init

Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java	2008-08-02 16:46:05 UTC (rev 1805)
+++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java	2008-08-02 16:46:28 UTC (rev 1806)
@@ -55,7 +55,7 @@
     try
     {
       ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
-      Process proc = unmarschaller.unmarshallProcess(new ByteArrayInputStream(pXML.getBytes()));
+      Process proc = unmarschaller.unmarshallProcess(new ByteArrayInputStream(pXML.getBytes()), isInclude);
       return proc;
     }
     catch (JAXBException ex)
@@ -69,7 +69,7 @@
     try
     {
       ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
-      Process proc = unmarschaller.unmarshallProcess(pURL.openStream());
+      Process proc = unmarschaller.unmarshallProcess(pURL.openStream(), isInclude);
       return proc;
     }
     catch (JAXBException ex)

Modified: jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java
===================================================================
--- jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java	2008-08-02 16:46:05 UTC (rev 1805)
+++ jbossbpm/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java	2008-08-02 16:46:28 UTC (rev 1806)
@@ -66,7 +66,7 @@
   private List<Activity> activities = new ArrayList<Activity>();
 
   @SuppressWarnings("unchecked")
-  public Process unmarshallProcess(InputStream xml) throws JAXBException
+  public Process unmarshallProcess(InputStream xml, boolean isInclude) throws JAXBException
   {
     JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
     Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
@@ -133,7 +133,8 @@
       adaptActivity(builder, stpActivity);
     }
 
-    return builder.getProcess(true);
+    Process proc = builder.getProcess(!isInclude);
+    return proc;
   }
 
   private ProcessBuilder adaptDiagram(BpmnDiagram bpmnDiagram)