9:06 a.m.
Author: heiko.braun(a)jboss.com
Date: 2009-02-11 10:06:23 -0500 (Wed, 11 Feb 2009)
New Revision: 3835
Modified:
projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
projects/gwt-console/trunk/plugin-example/pom.xml
projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageComponent.java
projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg
Log:
RPC model changes. Strip down to just process management plugin
Modified:
projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
---
projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-02-11
14:57:04 UTC (rev 3834)
+++
projects/gwt-console/trunk/plugin-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-02-11
15:06:23 UTC (rev 3835)
@@ -44,7 +44,7 @@
{
JSONValue root = JSONParser.parse(json);
long id = JSONWalk.on(root).next("processId").asLong();
- String version = JSONWalk.on(root).next("version").asString();
+ Long version = JSONWalk.on(root).next("version").asLong();
String name = JSONWalk.on(root).next("name").asString();
return new ProcessDefinitionRef(id, name, version);
Modified: projects/gwt-console/trunk/plugin-example/pom.xml
===================================================================
--- projects/gwt-console/trunk/plugin-example/pom.xml 2009-02-11 14:57:04 UTC (rev 3834)
+++ projects/gwt-console/trunk/plugin-example/pom.xml 2009-02-11 15:06:23 UTC (rev 3835)
@@ -7,6 +7,14 @@
<version>1.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.bpm</groupId>
+ <artifactId>gwt-console-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<properties>
<gwt-console.version>1.0.0-SNAPSHOT</gwt-console.version>
<gwt-ext.version>2.0.5</gwt-ext.version>
@@ -23,6 +31,12 @@
</dependency>
<dependency>
+ <groupId>com.google.gwt</groupId>
+ <artifactId>gwt-user</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
<groupId>com.gwtext</groupId>
<artifactId>gwtext</artifactId>
<version>${gwt-ext.version}</version>
@@ -38,7 +52,7 @@
</dependencies>
<!-- Plugins -->
- <build>
+ <build>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -73,5 +87,5 @@
</plugin>
</plugins>
</build>
-
+
</project>
Modified:
projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java
===================================================================
---
projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java 2009-02-11
14:57:04 UTC (rev 3834)
+++
projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java 2009-02-11
15:06:23 UTC (rev 3835)
@@ -35,7 +35,7 @@
public class ProcessInstanceRef
{
private long instanceId;
- private long parentId;
+ private long definitionId;
private String key;
public enum STATE {RUNNING, SUSPENDED, ENDED};
@@ -64,7 +64,7 @@
throw new IllegalArgumentException("An instance cannot be ended and
suspended at the same time");
this.instanceId = id;
- this.parentId = parentId;
+ this.definitionId = parentId;
this.startDate = startDate;
this.endDate = endDate;
this.suspended = suspended;
@@ -96,14 +96,14 @@
}
@XmlElement(name = "parentId")
- public long getParentId()
+ public long getDefinitionId()
{
- return parentId;
+ return definitionId;
}
- public void setParentId(long parentId)
+ public void setDefinitionId(long definitionId)
{
- this.parentId = parentId;
+ this.definitionId = definitionId;
}
@XmlElement(name = "key")
@@ -289,7 +289,7 @@
ProcessInstanceRef that = (ProcessInstanceRef) o;
if (instanceId != that.instanceId) return false;
- if (parentId != that.parentId) return false;
+ if (definitionId != that.definitionId) return false;
if (suspended != that.suspended) return false;
if (endDate != null ? !endDate.equals(that.endDate) : that.endDate != null) return
false;
if (key != null ? !key.equals(that.key) : that.key != null) return false;
@@ -304,7 +304,7 @@
{
int result;
result = (int) (instanceId ^ (instanceId >>> 32));
- result = 31 * result + (int) (parentId ^ (parentId >>> 32));
+ result = 31 * result + (int) (definitionId ^ (definitionId >>> 32));
result = 31 * result + (key != null ? key.hashCode() : 0);
result = 31 * result + (startDate != null ? startDate.hashCode() : 0);
result = 31 * result + (endDate != null ? endDate.hashCode() : 0);
Modified:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
===================================================================
---
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2009-02-11
14:57:04 UTC (rev 3834)
+++
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2009-02-11
15:06:23 UTC (rev 3835)
@@ -170,7 +170,7 @@
ProcessDefinitionRef pd = new ProcessDefinitionRef(
id,
r.getAsString("name"),
- r.getAsString("version")
+ Long.valueOf( r.getAsString("version"))
);
row2ProcessMap.put(i, pd);
Modified:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageComponent.java
===================================================================
---
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageComponent.java 2009-02-11
14:57:04 UTC (rev 3834)
+++
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageComponent.java 2009-02-11
15:06:23 UTC (rev 3835)
@@ -133,7 +133,7 @@
this.activeNodeInfo = activeNodeInfo;
DiagramNodeInfo activeNode = activeNodeInfo.getActiveNode();
- String imageUrl = view.getUrlBuilder().getProcessImageURL(instance.getParentId());
+ String imageUrl =
view.getUrlBuilder().getProcessImageURL(instance.getDefinitionId());
HTML html = new HTML(
"<div id=\"imageContainer\"
style=\"position:relative;top:-1;left:-1;height:" + activeNodeInfo.getHeight() +
"px;width:" + activeNodeInfo.getWidth() + "px\">" +
Modified:
projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg
===================================================================
---
projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-02-11
14:57:04 UTC (rev 3834)
+++
projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/workspace-default.cfg 2009-02-11
15:06:23 UTC (rev 3835)
@@ -1,3 +1,5 @@
org.jboss.bpm.console.client.process.ProcessEditor
-org.jboss.bpm.console.client.task.TaskEditor
-org.jboss.bpm.console.client.report.ReportEditor
\ No newline at end of file
+
+# not yet implemented in jBPM4
+#org.jboss.bpm.console.client.task.TaskEditor
+#org.jboss.bpm.console.client.report.ReportEditor
\ No newline at end of file