[jbpm-commits] JBoss JBPM SVN: r5155 - in jbpm4/trunk/modules/integration: form-plugin/src/main/java/org/jbpm/integration/console/forms and 1 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-06-29 09:47:09 -0400 (Mon, 29 Jun 2009)
New Revision: 5155

Modified:
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
   jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java
   jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java
Log:
Fix JBPM-2295: Highlight multiple activities in GraphViewer

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-06-29 13:28:24 UTC (rev 5154)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/TaskManagementImpl.java	2009-06-29 13:47:09 UTC (rev 5155)
@@ -109,7 +109,7 @@
     }
   }
 
-  public void assignTask(long taskId, String idRef)
+  public void assignTask(long taskId, String idRef, String performingUser)
   {
     Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
 
@@ -123,7 +123,7 @@
     }
   }
 
-  public void releaseTask(long taskId)
+  public void releaseTask(long taskId, String performingUser)
   {
     Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
 
@@ -137,7 +137,7 @@
     }
   }
 
-  public void completeTask(long taskId, Map data)
+  public void completeTask(long taskId, Map data, String performingUser)
   {
     Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
 
@@ -154,7 +154,7 @@
     }
   }
 
-  public void completeTask(long taskId, String outcome, Map data)
+  public void completeTask(long taskId, String outcome, Map data, String performingUser)
   {
     Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
 

Modified: jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java	2009-06-29 13:28:24 UTC (rev 5154)
+++ jbpm4/trunk/modules/integration/form-plugin/src/main/java/org/jbpm/integration/console/forms/TaskDispatcherPluginImpl.java	2009-06-29 13:47:09 UTC (rev 5155)
@@ -223,7 +223,7 @@
 
             public String getContentType()
             {
-              return "*/*";
+              return "application/octet-stream";
             }
 
             public String getName()

Modified: jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java
===================================================================
--- jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java	2009-06-29 13:28:24 UTC (rev 5154)
+++ jbpm4/trunk/modules/integration/graphView-plugin/src/main/java/org/jbpm/integration/console/graphView/GraphViewerPluginImpl.java	2009-06-29 13:47:09 UTC (rev 5155)
@@ -24,6 +24,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
+import java.util.ArrayList;
 
 import javax.naming.InitialContext;
 
@@ -106,8 +108,11 @@
     throw new RuntimeException("Not implemented");
   }
 
-  public ActiveNodeInfo getActiveNodeInfo(String instanceId)
+  public List<ActiveNodeInfo> getActiveNodeInfo(String instanceId)
   {
+
+    List<ActiveNodeInfo> results = new ArrayList<ActiveNodeInfo>();
+
     Environment env = ((EnvironmentFactory)processEngine).openEnvironment();
 
     try
@@ -125,13 +130,15 @@
           processInstance.getProcessDefinitionId(), currentActivity
       );
 
-      return new ActiveNodeInfo(
+
+      results.add(new ActiveNodeInfo(
           coords.getWidth(), coords.getHeight(),
           new DiagramNodeInfo(
               currentActivity,
               coords.getX(), coords.getY(),
               coords.getWidth(), coords.getHeight()
           )
+      )
       );
 
     }
@@ -139,6 +146,8 @@
     {
       env.close();
     }
+
+    return results;
   }
 
   protected void initializeProcessEngine()