[jbpm-commits] JBoss JBPM SVN: r3094 - in projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client: process and 1 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-11-26 03:54:46 -0500 (Wed, 26 Nov 2008)
New Revision: 3094

Modified:
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/UIConstants.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/ProcessInstanceList.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java
Log:
Fix JBPM-1848: Grid sort order doesn't respect selected items in RemoteListView

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/UIConstants.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/UIConstants.java	2008-11-26 08:53:53 UTC (rev 3093)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/UIConstants.java	2008-11-26 08:54:46 UTC (rev 3094)
@@ -35,4 +35,5 @@
    public static final int EDITOR_PANEL_WIDTH = 450;
 
    public static final String DEFAULT_TRANSITION = "(Default transition)";
+   public static final String DATE_FORMAT = "yyyy-m-j H:i:s";  //08-10-02 13:51:27
 }

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	2008-11-26 08:53:53 UTC (rev 3093)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java	2008-11-26 08:54:46 UTC (rev 3094)
@@ -27,6 +27,7 @@
 import com.gwtext.client.widgets.MessageBoxConfig;
 import com.gwtext.client.widgets.grid.ColumnConfig;
 import com.gwtext.client.widgets.grid.ColumnModel;
+import com.gwtext.client.widgets.grid.RowSelectionModel;
 import org.jboss.bpm.console.client.util.ConsoleLog;
 import org.jboss.bpm.console.client.MainView;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
@@ -45,6 +46,8 @@
    {
       super(titleName, view, getResourceUrl(view));
       enableAddBtn(false);
+      final RowSelectionModel sm = new RowSelectionModel(true);
+      setRowSelectionModel(sm);      
    }
 
    private static String getResourceUrl(MainView view)

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java	2008-11-26 08:53:53 UTC (rev 3093)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java	2008-11-26 08:54:46 UTC (rev 3094)
@@ -31,6 +31,7 @@
 import com.gwtext.client.widgets.grid.ColumnModel;
 import org.jboss.bpm.console.client.util.ConsoleLog;
 import org.jboss.bpm.console.client.MainView;
+import org.jboss.bpm.console.client.UIConstants;
 import org.jboss.bpm.console.client.util.DateRenderer;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
 import org.jboss.bpm.console.client.model.ProcessInstanceRef;
@@ -48,8 +49,7 @@
 
    private Map<Integer, ProcessInstanceRef> row2InstanceMap = new HashMap<Integer, ProcessInstanceRef>();
    private ProcessDefinitionRef parent;
-   private static final String DATE_FORMAT = "yyyy-m-j H:i:s";  //08-10-02 13:51:27
-
+   
    public ProcessInstanceList(ProcessDefinitionRef procDef, String titleName, MainView view)
    {
       super(titleName, view, getResourceUrl(view, procDef.getProcessId()));
@@ -171,7 +171,7 @@
          i++;
       }
 
-      ConsoleLog.debug("Loaded " + row2InstanceMap.size() + " records");
+      ConsoleLog.debug("Loaded " + row2InstanceMap.size() + " process instances");
    }
 
    public static ProcessInstanceRef transform(Record r)
@@ -216,8 +216,8 @@
           new IntegerFieldDef("parentId"),
           new StringFieldDef("key"),
           new StringFieldDef("state"),
-          new DateFieldDef("startDate", DATE_FORMAT),
-          new DateFieldDef("endDate", DATE_FORMAT),
+          new DateFieldDef("startDate", UIConstants.DATE_FORMAT),
+          new DateFieldDef("endDate", UIConstants.DATE_FORMAT),
           new BooleanFieldDef("suspended")
         }
       );

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java	2008-11-26 08:53:53 UTC (rev 3093)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java	2008-11-26 08:54:46 UTC (rev 3094)
@@ -131,9 +131,14 @@
          grid.doOnRender(new Function() {
             public void execute() {
                if(-1==selectedRowIndex)
+               {
                   rowSelectionModel.selectFirstRow();
+                  selectedRowIndex = 0;
+               }
                else
+               {
                   rowSelectionModel.selectRow(selectedRowIndex);
+               }
             }
          }, 10);
       }