[jbpm-commits] JBoss JBPM SVN: r3024 - projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Nov 21 06:04:59 EST 2008
Author: heiko.braun at jboss.com
Date: 2008-11-21 06:04:59 -0500 (Fri, 21 Nov 2008)
New Revision: 3024
Modified:
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ManagementExtension.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java
projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3TaskManagement.java
Log:
Use qualified import since the models names don't conflict anymore
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ManagementExtension.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ManagementExtension.java 2008-11-21 11:01:30 UTC (rev 3023)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ManagementExtension.java 2008-11-21 11:04:59 UTC (rev 3024)
@@ -28,7 +28,9 @@
import org.jboss.bpm.console.server.integration.JBPM3Extension;
import org.jbpm.file.def.FileDefinition;
import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
import org.jbpm.util.XmlUtil;
+import org.jbpm.taskmgmt.exe.TaskInstance;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
@@ -55,20 +57,20 @@
public byte[] getProcessImage(long processId)
{
- org.jbpm.graph.def.ProcessDefinition p0 = delegate.getActualDefinition(processId);
+ ProcessDefinition p0 = delegate.getActualDefinition(processId);
return p0.getFileDefinition().getBytes(PROCESSIMAGE_FILENAME);
}
public DiagramInfo getDiagramInfo(long processId)
{
- org.jbpm.graph.def.ProcessDefinition p0 = delegate.getActualDefinition(processId);
+ ProcessDefinition p0 = delegate.getActualDefinition(processId);
InputStream in = p0.getFileDefinition().getInputStream(GPD_XML_FILENAME);
return DiagramInfoParser.parse(in);
}
public ActiveNodeInfo getActivNodeInfo(long instanceId)
{
- org.jbpm.graph.exe.ProcessInstance instance = delegate.getActualInstance(instanceId);
+ ProcessInstance instance = delegate.getActualInstance(instanceId);
String currentNodeName = instance.getRootToken().getNode().getName();
DiagramInfo diagram = getDiagramInfo(instance.getProcessDefinition().getId());
@@ -93,8 +95,7 @@
public Map<String, String> getAvailableTaskForms(long processId)
{
- org.jbpm.graph.def.ProcessDefinition processDefinition =
- delegate.getActualDefinition(processId);
+ ProcessDefinition processDefinition = delegate.getActualDefinition(processId);
return getTask2FileMapping(processDefinition);
}
@@ -136,9 +137,8 @@
public byte[] getTaskFormByTaskName(long processId, long taskId)
{
- org.jbpm.graph.def.ProcessDefinition processDefinition =
- delegate.getActualDefinition(processId);
- org.jbpm.taskmgmt.exe.TaskInstance t0 = delegate.getTaskById(taskId);
+ ProcessDefinition processDefinition = delegate.getActualDefinition(processId);
+ TaskInstance t0 = delegate.getTaskById(taskId);
Map<String,String> fileMapping = getTask2FileMapping(processDefinition);
String fileName = fileMapping.get(t0.getName());
@@ -151,7 +151,7 @@
public void changeInstanceState(long instanceId, ProcessInstanceRef.STATE nextState)
{
- org.jbpm.graph.exe.ProcessInstance p0 = delegate.getActualInstance(instanceId);
+ ProcessInstance p0 = delegate.getActualInstance(instanceId);
Transform.doTransition(p0, nextState); // modifies the actual PI
// TX commit will persist changes to the actual PI
@@ -159,7 +159,7 @@
public org.jboss.bpm.console.client.model.ProcessDefinitionRef deployNewDefinition(byte[] data)
{
- org.jbpm.graph.def.ProcessDefinition p0 = delegate.deploy(data);
+ ProcessDefinition p0 = delegate.deploy(data);
return Transform.processDefinition(p0);
}
}
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java 2008-11-21 11:01:30 UTC (rev 3023)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java 2008-11-21 11:04:59 UTC (rev 3024)
@@ -24,6 +24,8 @@
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.server.integration.ProcessManagement;
+import org.jbpm.graph.def.ProcessDefinition;
+import org.jbpm.graph.exe.ProcessInstance;
import java.util.ArrayList;
import java.util.List;
@@ -42,10 +44,10 @@
public List<ProcessDefinitionRef> getAllDefinitions()
{
- List<org.jbpm.graph.def.ProcessDefinition> defs = delegate.getActualDefinitions();
+ List<ProcessDefinition> defs = delegate.getActualDefinitions();
List<ProcessDefinitionRef> results = new ArrayList<ProcessDefinitionRef>(defs.size());
- for(org.jbpm.graph.def.ProcessDefinition p0 : defs)
+ for(ProcessDefinition p0 : defs)
{
results.add( Transform.processDefinition(p0) );
}
@@ -54,7 +56,7 @@
public ProcessDefinitionRef getDefinitionById(long processId)
{
- org.jbpm.graph.def.ProcessDefinition p0 = delegate.getActualDefinition(processId);
+ ProcessDefinition p0 = delegate.getActualDefinition(processId);
return Transform.processDefinition(p0);
}
@@ -67,13 +69,13 @@
public ProcessInstanceRef newInstance(long processId)
{
- org.jbpm.graph.exe.ProcessInstance instance = delegate.startNewInstance(processId);
+ ProcessInstance instance = delegate.startNewInstance(processId);
return Transform.processInstance(instance);
}
public List<ProcessInstanceRef> getInstancesByDefinitionId(long processId)
{
- List<org.jbpm.graph.exe.ProcessInstance> instances = delegate.getActualInstances(processId);
+ List<ProcessInstance> instances = delegate.getActualInstances(processId);
List<ProcessInstanceRef> results = new ArrayList<ProcessInstanceRef>(instances.size());
for(org.jbpm.graph.exe.ProcessInstance i0 : instances)
{
@@ -84,7 +86,7 @@
public ProcessInstanceRef getInstanceById(long instanceId)
{
- org.jbpm.graph.exe.ProcessInstance instance = delegate.getActualInstance(instanceId);
+ ProcessInstance instance = delegate.getActualInstance(instanceId);
return Transform.processInstance(instance);
}
Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3TaskManagement.java
===================================================================
--- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3TaskManagement.java 2008-11-21 11:01:30 UTC (rev 3023)
+++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3TaskManagement.java 2008-11-21 11:04:59 UTC (rev 3024)
@@ -23,6 +23,7 @@
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.server.integration.TaskManagement;
+import org.jbpm.taskmgmt.exe.TaskInstance;
import java.util.ArrayList;
import java.util.List;
@@ -43,11 +44,11 @@
public List<TaskRef> getTasksByActor(String actorName)
{
- List<org.jbpm.taskmgmt.exe.TaskInstance> actualTasks =
+ List<TaskInstance> actualTasks =
delegate.getActualTasksForActor(actorName);
List<TaskRef> taskRefs = new ArrayList<TaskRef>();
- for(org.jbpm.taskmgmt.exe.TaskInstance t0 : actualTasks)
+ for(TaskInstance t0 : actualTasks)
{
taskRefs.add( Transform.taskInstance(t0));
}
@@ -57,7 +58,7 @@
public TaskRef getTaskById(long taskId)
{
- org.jbpm.taskmgmt.exe.TaskInstance t0 = delegate.getTaskById(taskId);
+ TaskInstance t0 = delegate.getTaskById(taskId);
TaskRef taskRef = Transform.taskInstance(t0);
return taskRef;
}
More information about the jbpm-commits
mailing list