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

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-11-12 17:09:31 -0500 (Wed, 12 Nov 2008)
New Revision: 2897

Modified:
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java
Log:
Fine tune token editor

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java	2008-11-12 21:42:38 UTC (rev 2896)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceListEditor.java	2008-11-12 22:09:31 UTC (rev 2897)
@@ -80,7 +80,7 @@
       Panel leftHand = new Panel();
       leftHand.setFrame(false);
       leftHand.setHeader(false);
-      leftHand.setBorder(false);
+      leftHand.setBorder(false);      
 
       instanceList = new ProcessInstanceList(
             proc, "Process Instances", view
@@ -99,7 +99,7 @@
       // ----------------------------------------
 
       Panel detailsForm = assembleDetailsForm();
-      tokenEditorPanel = new Panel("Tokens");      
+      tokenEditorPanel = new Panel("Tokens");         
 
       tabPanel.add( detailsForm );
       tabPanel.add(tokenEditorPanel);

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java	2008-11-12 21:42:38 UTC (rev 2896)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java	2008-11-12 22:09:31 UTC (rev 2897)
@@ -25,6 +25,8 @@
 import com.gwtext.client.data.Node;
 import com.gwtext.client.widgets.Panel;
 import com.gwtext.client.widgets.layout.HorizontalLayout;
+import com.gwtext.client.widgets.layout.ColumnLayout;
+import com.gwtext.client.widgets.layout.ColumnLayoutData;
 import com.gwtext.client.widgets.tree.TreeNode;
 import com.gwtext.client.widgets.tree.TreePanel;
 import com.gwtext.client.widgets.tree.event.TreeNodeListenerAdapter;
@@ -36,8 +38,9 @@
  */
 public class TokenEditor extends Panel
 {
-   
+
    private TokenForm tokenForm;
+   private TokenTree tokenTree;
 
    public TokenEditor(final ProcessInstance instance, final SignalCallback callback)
    {
@@ -47,22 +50,32 @@
       this.setBorder(false);
       this.setFrame(false);
 
-      this.setLayout(new HorizontalLayout(10));
+      this.setLayout(new ColumnLayout());
 
-      this.add( new TokenTree(instance.getRootToken(),
+      // ----------------
+
+      tokenTree = new TokenTree(instance.getRootToken(),
             new TokenSelectionCallback()
             {
                public void onSelectedToken(TokenReference tok)
-               {                  
+               {
                   // update form
                   tokenForm.display(instance, tok);
                }
             }
-      ) );
+      );
 
+      tokenTree.expandAll();
+
+      // ----------------
+
       tokenForm = new TokenForm(callback);
       tokenForm.display(instance); // shows the root token
-      this.add(tokenForm);
+
+      // ----------------
+
+      this.add(tokenTree, new ColumnLayoutData(0.3));
+      this.add(tokenForm, new ColumnLayoutData(0.7));
    }
 
    class TokenTree extends TreePanel
@@ -74,6 +87,8 @@
       {
          this.callback = callback;
 
+         this.setBorder(false);
+
          TreeNode outermost = new TreeNode("Tokens");
          TreeNode rootNode = buildTreeNode(rootToken);
          outermost.appendChild(rootNode);

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java	2008-11-12 21:42:38 UTC (rev 2896)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java	2008-11-12 22:09:31 UTC (rev 2897)
@@ -32,6 +32,7 @@
 import com.gwtext.client.widgets.form.Form;
 import com.gwtext.client.widgets.form.FormPanel;
 import com.gwtext.client.widgets.form.TextField;
+import com.allen_sauer.gwt.log.client.Log;
 import org.jboss.bpm.console.client.UIConstants;
 import org.jboss.bpm.console.client.model.ProcessInstance;
 import org.jboss.bpm.console.client.model.jbpm3.TokenReference;
@@ -69,7 +70,7 @@
       tokenForm.setFrame(false);
       tokenForm.setBorder(false);
       tokenForm.setPaddings(5, 5, 5, 0);
-      tokenForm.setLabelWidth(120);
+      tokenForm.setLabelWidth(50);
 
       // ----------
 
@@ -78,7 +79,7 @@
       tokenForm.add(idField);
 
       //tokenForm.add(new TextField("Token Name", "name", 230));
-      TextField nameField = new TextField("Current Node Name", "nodeName", 230);
+      TextField nameField = new TextField("Node Name", "nodeName", 230);
       nameField.setReadOnly(true);
       tokenForm.add(nameField);
 
@@ -106,12 +107,15 @@
             {
                public void onClick(Button button, EventObject eventObject)
                {
-                  ComboBox cb = (ComboBox)tokenForm.getForm().findField("signal");
+                  System.out.println("signal signal");
+                  
+                  /*ComboBox cb = (ComboBox)tokenForm.getForm().findField("signal");
                   String signalValue = cb.getValueAsString();
                   if(signalValue.equals(""))
                      MessageBox.alert("Please select a signal");
                   else
                      callback.onSignalToken(lastSelectedToken, signalValue);
+                     */
                }
             }
       );
@@ -159,7 +163,7 @@
          else
             signalButton.enable();
 
-      }
+      }      
 
       // -----------