[jbpm-commits] JBoss JBPM SVN: r3249 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec.

[do-not-reply at jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-12-06 11:34:04 -0500 (Sat, 06 Dec 2008)
New Revision: 3249

Modified:
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
   projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
Log:
Refactor ConfigurationProvider, ProcessInstanceService

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java	2008-12-06 16:33:38 UTC (rev 3248)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/ProcessManagementImpl.java	2008-12-06 16:34:04 UTC (rev 3249)
@@ -40,7 +40,7 @@
 import org.jboss.bpm.api.runtime.Token.TokenStatus;
 import org.jboss.bpm.api.service.ProcessDefinitionService;
 import org.jboss.bpm.api.service.ProcessEngine;
-import org.jboss.bpm.api.service.ProcessService;
+import org.jboss.bpm.api.service.ProcessInstanceService;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
 import org.jboss.bpm.console.client.model.ProcessInstanceRef;
 import org.jboss.bpm.console.client.model.ProcessInstanceRef.STATE;
@@ -124,12 +124,12 @@
 
     log.info("getProcessInstances: " + procDef);
 
-    ProcessService procService = getProcessService();
-    Iterator<ObjectName> itProc = procService.getProcesses(procDef.getKey(), ProcessStatus.Active).iterator();
+    ProcessInstanceService procService = getProcessService();
+    Iterator<ObjectName> itProc = procService.getInstance(procDef.getKey(), ProcessStatus.Active).iterator();
     while (itProc.hasNext())
     {
       ObjectName procID = itProc.next();
-      ProcessInstance proc = procService.getProcess(procID);
+      ProcessInstance proc = procService.getInstance(procID);
 
       log.info(proc);
 
@@ -173,12 +173,12 @@
   public void signalToken(long tokenId, String name)
   {
     Token token = null;
-    ProcessService procService = getProcessService();
-    Iterator<ObjectName> itProc = procService.getProcesses().iterator();
+    ProcessInstanceService procService = getProcessService();
+    Iterator<ObjectName> itProc = procService.getInstance().iterator();
     while (token == null && itProc.hasNext())
     {
       ObjectName procID = itProc.next();
-      ProcessInstance proc = procService.getProcess(procID);
+      ProcessInstance proc = procService.getInstance(procID);
       for (Token aux : proc.getTokens())
       {
         Long auxId = adaptKey(aux.getKey());
@@ -232,24 +232,24 @@
     return new ProcessDefinitionRef(procDefID, procDef.getName(), procDef.getVersion());
   }
 
-  private ProcessService getProcessService()
+  private ProcessInstanceService getProcessService()
   {
     ProcessEngine engine = ProcessEngineFactory.getProcessEngine();
-    ProcessService pService = engine.getService(ProcessService.class);
+    ProcessInstanceService pService = engine.getService(ProcessInstanceService.class);
     return pService;
   }
 
   private ProcessInstance getProcessById(long procID)
   {
     ProcessInstance proc = null;
-    ProcessService procService = getProcessService();
-    Iterator<ObjectName> it = procService.getProcesses().iterator();
+    ProcessInstanceService procService = getProcessService();
+    Iterator<ObjectName> it = procService.getInstance().iterator();
     while (it.hasNext())
     {
       ObjectName auxKey = it.next();
       if (procID == adaptKey(auxKey))
       {
-        proc = procService.getProcess(auxKey);
+        proc = procService.getInstance(auxKey);
         break;
       }
     }
@@ -277,7 +277,7 @@
     Long tokenId = adaptKey(token.getKey());
     token.getKey();
 
-    Node currNode = token.getCurrentNode();
+    Node currNode = token.getNode();
     TokenReference tokenRef = new TokenReference(tokenId, null, currNode.getName());
 
     TokenStatus tokenStatus = token.getTokenStatus();

Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java	2008-12-06 16:33:38 UTC (rev 3248)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/spec/TaskManagementImpl.java	2008-12-06 16:34:04 UTC (rev 3249)
@@ -117,7 +117,7 @@
       taskRef.addPooledActor(pa);
     }
 
-    Node currentNode = token.getCurrentNode();
+    Node currentNode = token.getNode();
     if (currentNode instanceof SingleOutFlowSupport)
     {
       SingleOutFlowSupport sofs = (SingleOutFlowSupport)currentNode;