[jbpm-commits] JBoss JBPM SVN: r2541 - in jbpm3/trunk/modules/gwt-console/war: src/main/java/org/jboss/bpm/console/client/model/internal and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-10-15 03:58:33 -0400 (Wed, 15 Oct 2008) New Revision: 2541 Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/internal/MockMetricsDAO.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java Log: Update to mvn GWT plugin 2.0-beta24 Modified: jbpm3/trunk/modules/gwt-console/war/pom.xml =================================================================== --- jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-10-14 23:45:01 UTC (rev 2540) +++ jbpm3/trunk/modules/gwt-console/war/pom.xml 2008-10-15 07:58:33 UTC (rev 2541) @@ -77,7 +77,7 @@ <plugin> <groupId>com.totsp.gwt</groupId> <artifactId>maven-googlewebtoolkit2-plugin</artifactId> - <version>2.0-beta23</version> + <version>2.0-beta24</version> <configuration> <logLevel>INFO</logLevel> <compileTargets><value>org.jboss.bpm.console.Application</value></compileTargets> Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/internal/MockMetricsDAO.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/internal/MockMetricsDAO.java 2008-10-14 23:45:01 UTC (rev 2540) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/model/internal/MockMetricsDAO.java 2008-10-15 07:58:33 UTC (rev 2541) @@ -54,7 +54,7 @@ for(int i=0; i<instances.size(); i++) { ProcessInstance pi = (ProcessInstance)instances.get(i); - metrics.put( new Long(pi.getId()) , new Double(Math.random()* MAX_EXEC_TIME) ); + metrics.put( new Long(pi.getInstanceId()) , new Double(Math.random()* MAX_EXEC_TIME) ); } return metrics; Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-10-14 23:45:01 UTC (rev 2540) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-10-15 07:58:33 UTC (rev 2541) @@ -23,7 +23,6 @@ import com.google.gwt.core.client.JavaScriptObject; import com.google.gwt.json.client.JSONObject; -import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.HTML; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; @@ -92,7 +91,7 @@ private void loadActiveNodeInfo() { - String url = view.getRestURL().getActiveNodeInfoURL(this.instance.getId()); + String url = view.getRestURL().getActiveNodeInfoURL(this.instance.getInstanceId()); System.out.println("Loading activeNodeInfo: " + url); JSONRequest.get(url, Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-10-14 23:45:01 UTC (rev 2540) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-10-15 07:58:33 UTC (rev 2541) @@ -54,7 +54,7 @@ public ProcessInstanceEditor(final ProcessDefinition proc, final ProcessInstance instance, final ConsoleView view) { super(); - this.setId(ProcessInstanceEditor.ID+"."+instance.getId()); + this.setId(ProcessInstanceEditor.ID+"."+instance.getInstanceId()); this.processDefinition = proc; this.processInstance = instance; @@ -161,7 +161,7 @@ public String getTitle() { - return "#"+processInstance.getId()+" ("+processDefinition.getName()+")"; + return "#"+processInstance.getInstanceId()+" ("+processDefinition.getName()+")"; } Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-10-14 23:45:01 UTC (rev 2540) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-10-15 07:58:33 UTC (rev 2541) @@ -59,7 +59,7 @@ protected void onExamine(final int row) { ProcessInstance instance = row2InstanceMap.get(row); - String id = ProcessInstanceEditor.ID+"."+instance.getId(); + String id = ProcessInstanceEditor.ID+"."+instance.getInstanceId(); if(view.hasEditorView(id)) view.showEditor(id); else @@ -79,7 +79,7 @@ if("yes".equals( btnID) ) { ProcessInstance instance = row2InstanceMap.get(row); - String url = view.getRestURL().getRemoveInstanceURL(instance.getId()); + String url = view.getRestURL().getRemoveInstanceURL(instance.getInstanceId()); RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url); try @@ -122,8 +122,8 @@ id, Long.valueOf( r.getAsString("parentId")), r.getAsString("status"), - r.getAsDate("start"), - r.getAsDate("end") + r.getAsDate("startDate"), + r.getAsDate("endDate") ); row2InstanceMap.put(i, pd); @@ -142,8 +142,8 @@ //new ColumnConfig("Process ID", "parentId", 25, true), //new ColumnConfig("Key", "key", 50, true), new ColumnConfig("Status", "status", 100, true, null, "expand"), - new ColumnConfig("Start Date", "start", 125, true), - new ColumnConfig("End Date", "end", 125, true) + new ColumnConfig("Start Date", "startDate", 125, true), + new ColumnConfig("End Date", "endDate", 125, true) } ); @@ -158,8 +158,8 @@ new IntegerFieldDef("parentId"), new StringFieldDef("key"), new StringFieldDef("status"), - new DateFieldDef("start", DATE_FORMAT), - new DateFieldDef("end", DATE_FORMAT) + new DateFieldDef("startDate", DATE_FORMAT), + new DateFieldDef("endDate", DATE_FORMAT) } ); Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java =================================================================== --- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-10-14 23:45:01 UTC (rev 2540) +++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java 2008-10-15 07:58:33 UTC (rev 2541) @@ -92,8 +92,8 @@ fieldSet.add(new TextField("Id", "instanceId", 230)); fieldSet.add(new TextField("Key", "key", 230)); fieldSet.add(new TextField("Status", "status", 230)); - fieldSet.add(new DateField("Start Date", "start", 230)); - fieldSet.add(new DateField("End Date", "end", 230)); + fieldSet.add(new DateField("Start Date", "startDate", 230)); + fieldSet.add(new DateField("End Date", "endDate", 230)); Panel inner = new PaddedPanel(fieldSet, 0, 10, 0, 0); formPanel.add(inner);