[overlord-commits] Overlord SVN: r939 - in bpm-console/trunk/gui/war: src/main/java/org/jboss/bpm/console/client and 2 other directories.

overlord-commits at lists.jboss.org overlord-commits at lists.jboss.org
Thu Jan 28 09:44:48 EST 2010


Author: heiko.braun at jboss.com
Date: 2010-01-28 09:44:47 -0500 (Thu, 28 Jan 2010)
New Revision: 939

Added:
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ClearInstancesAction.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java
Modified:
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java
   bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
   bpm-console/trunk/gui/war/war/app.html
   bpm-console/trunk/gui/war/war/console.css
Log:
Fix BPMC-39: Improve navigation process->instances

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml	2010-01-26 16:16:30 UTC (rev 938)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml	2010-01-28 14:44:47 UTC (rev 939)
@@ -24,19 +24,19 @@
 
     <inherits name='org.jboss.bpm.report.BPMReport' />
 
-    <!-- Includes the public resources used by the GWT Mosaic       -->
+   <!-- Includes the public resources used by the GWT Mosaic       -->
     <!-- themes. Those files do not inject a style sheet into the   -->
     <!-- application.                                               -->
-    <!--inherits name="org.gwt.mosaic.theme.standard.StandardResources" />
-    <inherits name="org.gwt.mosaic.theme.chrome.ChromeResources" />
-    <inherits name="org.gwt.mosaic.theme.dark.DarkResources" /-->
+    <!--inherits name='org.gwt.mosaic.theme.standard.StandardResources' /-->
+    <!--inherits name="org.gwt.mosaic.theme.chrome.ChromeResources" /-->
+    <!--inherits name="org.gwt.mosaic.theme.dark.DarkResources" /-->
     <inherits name="org.gwt.mosaic.theme.aegean.AegeanResources" />
-
+    
     <!-- Inherit the default GWT Mosaic style sheet. You can change -->
     <!-- the theme of your GWT Mosaic application by uncommenting   -->
     <!-- any one of the following lines.                            -->
-    <!-- <inherits name='org.gwt.mosaic.theme.standard.Standard' />  -->
-    <!-- <inherits name="org.gwt.mosaic.chrome.Chrome"/>            -->
+    <!-- <inherits name='org.gwt.mosaic.theme.standard.Standard' /> -->
+    <!--inherits name="org.gwt.mosaic.theme.chrome.Chrome" /-->
     <!-- <inherits name="org.gwt.mosaic.dark.Dark"/>                -->
     <inherits name='org.gwt.mosaic.theme.aegean.Aegean' />
 

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java	2010-01-26 16:16:30 UTC (rev 938)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java	2010-01-28 14:44:47 UTC (rev 939)
@@ -28,11 +28,15 @@
 import com.google.gwt.user.client.DeferredCommand;
 import com.mvc4g.client.Controller;
 import com.mvc4g.client.Event;
+import org.gwt.mosaic.ui.client.MessageBox;
 import org.jboss.bpm.console.client.engine.UpdateDeploymentsAction;
 import org.jboss.bpm.console.client.engine.ViewDeploymentAction;
 import org.jboss.bpm.console.client.process.UpdateDefinitionsAction;
 import org.jboss.bpm.console.client.util.ConsoleLog;
+import org.jboss.errai.bus.client.ClientMessageBus;
+import org.jboss.errai.bus.client.ErraiBus;
 import org.jboss.errai.workspaces.client.Registry;
+import org.jboss.errai.workspaces.client.modules.auth.AuthenticationModule;
 
 
 public class ErraiApplication implements EntryPoint
@@ -55,11 +59,22 @@
 
   public void onModuleLoad2()
   {
+    final ClientMessageBus bus = (ClientMessageBus) ErraiBus.get();
+
+    bus.addPostInitTask(
+        new Runnable() {
+          public void run()
+          {
+            Registry.get(AuthenticationModule.class).setDeferredNotification(true);
+          }
+        }
+    );
+
     Controller mainController = new com.mvc4g.client.Controller();
     Registry.set(Controller.class, mainController);
 
     // ------
-    
+
     // setup base urls
     String proxyUrl = null;
     if (!GWT.isScript())
@@ -75,11 +90,14 @@
     // ------
 
     ApplicationContext appContext = new ApplicationContext()
-    {      
+    {
       @Override
       public void displayMessage(String message, boolean isError)
       {
-        throw new RuntimeException("Not implemented!");
+        if(isError)
+          MessageBox.error("Error", message);
+        else
+          MessageBox.alert("Warn", message);
       }
 
       @Override
@@ -97,14 +115,14 @@
       @Override
       public void refreshView()
       {
-        
+
       }
     };
 
     Registry.set(ApplicationContext.class, appContext);
 
     // ------
-    
+
     registerGlobalViewsAndActions(mainController);
 
     mainController.addAction("login", new LoginAction());
@@ -115,13 +133,13 @@
     mainController.handleEvent(
         new com.mvc4g.client.Event(BootstrapAction.ID, Boolean.TRUE)
     );
-        
-    mainController.handleEvent(new Event("login", null));    
+
+    mainController.handleEvent(new Event("login", null));
   }
 
-    /**
-     * Views and actions accessible from any component
-     */
+  /**
+   * Views and actions accessible from any component
+   */
   private void registerGlobalViewsAndActions(Controller controller)
   {
     // register global views and actions, available across editors

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java	2010-01-26 16:16:30 UTC (rev 938)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java	2010-01-28 14:44:47 UTC (rev 939)
@@ -38,6 +38,7 @@
 import org.jboss.errai.bus.client.ErraiBus;
 import org.jboss.errai.bus.client.MessageBuilder;
 import org.jboss.errai.workspaces.client.Registry;
+import org.jboss.errai.workspaces.client.Workspace;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
@@ -139,7 +140,7 @@
                                   //new MainLayout(controller, auth, config);
                                   MessageBuilder.createMessage()
                                       .toSubject("Workspace")
-                                      .command("launch")
+                                      .command("Initialize")
                                       .noErrorHandling()
                                       .sendNowWith(ErraiBus.get()
                                       );

Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ClearInstancesAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ClearInstancesAction.java	                        (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ClearInstancesAction.java	2010-01-28 14:44:47 UTC (rev 939)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.process;
+
+import com.mvc4g.client.ActionInterface;
+import com.mvc4g.client.Controller;
+
+/**
+ * reset the instance list and associated views
+ */
+public class ClearInstancesAction implements ActionInterface
+{
+  public static String ID = ClearInstancesAction.class.getName();
+  
+  public void execute(Controller controller, Object o)
+  {
+    InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
+    view.reset();
+  }
+}

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java	2010-01-26 16:16:30 UTC (rev 938)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java	2010-01-28 14:44:47 UTC (rev 939)
@@ -49,7 +49,7 @@
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
- at LoadTool(name = "Definitions", group = "Processes")
+//@LoadTool(name = "Definitions", group = "Processes")
 public class DefinitionListView implements WSComponent, ViewInterface
 {
   public final static String ID = DefinitionListView.class.getName();
@@ -201,7 +201,7 @@
       ProcessDetailView detailsView = new ProcessDetailView();
       controller.addView(ProcessDetailView.ID, detailsView);
       controller.addAction(UpdateProcessDetailAction.ID, new UpdateProcessDetailAction());
-      layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10,200));
+      //layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10,200));
 
       panel.add(layout);
 
@@ -214,7 +214,7 @@
     final ListBox<ProcessDefinitionRef> listBox =
         new ListBox<ProcessDefinitionRef>(
             new String[] {
-                "Name", "Version", "Suspended"
+                "Process Name"//, "Version", "Suspended"
             }
         );
 
@@ -315,6 +315,9 @@
       controller.handleEvent(
           new Event(UpdateProcessDetailAction.ID, null)
       );
+
+      // clear instance panel
+      controller.handleEvent(new Event(ClearInstancesAction.ID, null));
     }
   }
 

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java	2010-01-26 16:16:30 UTC (rev 938)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java	2010-01-28 14:44:47 UTC (rev 939)
@@ -40,6 +40,7 @@
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
 import org.jboss.bpm.console.client.model.ProcessInstanceRef;
 import org.jboss.bpm.console.client.util.SimpleDateFormat;
+import org.jboss.errai.workspaces.client.Registry;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
@@ -75,10 +76,10 @@
 
   private boolean isRiftsawInstance;
 
-  public InstanceDetailView(final ApplicationContext appContext)
+  public InstanceDetailView()
   {
     super("Instance details");
-    this.appContext = appContext;
+    this.appContext = Registry.get(ApplicationContext.class);
     isRiftsawInstance = appContext.getConfig().getProfileName().equals("BPEL Console");
 
     super.setStyleName("bpm-detail-panel");

Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java	2010-01-26 16:16:30 UTC (rev 938)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java	2010-01-28 14:44:47 UTC (rev 939)
@@ -46,14 +46,14 @@
 import org.jboss.bpm.console.client.util.SimpleDateFormat;
 import org.jboss.errai.common.client.framework.WSComponent;
 import org.jboss.errai.workspaces.client.Registry;
-import org.jboss.errai.workspaces.client.framework.annotations.LoadTool;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
- at LoadTool(name = "Instances", group = "Processes")
+//@LoadTool(name = "Instances", group = "Processes")
 public class InstanceListView implements WSComponent, ViewInterface
 {
   public final static String ID = InstanceListView.class.getName();
@@ -82,6 +82,8 @@
 
   MosaicPanel panel;
 
+  private Button startBtn, terminateBtn, deleteBtn;
+
   public Widget getWidget()
   {
 
@@ -159,14 +161,14 @@
             }
           }
       );
-
+      
       // toolbar
       final MosaicPanel toolBox = new MosaicPanel();
       toolBox.setPadding(0);
       toolBox.setWidgetSpacing(5);
 
       final ToolBar toolBar = new ToolBar();
-      toolBar.add(
+      /*toolBar.add(
           new Button("Refresh", new ClickHandler() {
 
             public void onClick(ClickEvent clickEvent)
@@ -180,150 +182,159 @@
             }
           }
           )
-      );
+      );*/
 
+      startBtn = new Button("Start", new ClickHandler()
+      {
+        public void onClick(ClickEvent clickEvent)
+        {
+          MessageBox.confirm("Start new execution",
+              "Do you want to start a new execution of this process?",
+              new MessageBox.ConfirmationCallback()
+              {
+                public void onResult(boolean doIt)
+                {
+                  if (doIt)
+                  {
+                    String url = getCurrentDefinition().getFormUrl();
+                    boolean hasForm = (url != null && !url.equals(""));
+                    if (hasForm)
+                    {
+                      ProcessDefinitionRef definition = getCurrentDefinition();
+                      iframeWindow = new IFrameWindowPanel(
+                          definition.getFormUrl(), "New Process Instance: " + definition.getId()
+                      );
 
+                      iframeWindow.setCallback(
+                          new IFrameWindowCallback()
+                          {
+                            public void onWindowClosed()
+                            {
+                              controller.handleEvent(
+                                  new Event(UpdateInstancesAction.ID, getCurrentDefinition())
+                              );
+                            }
+                          }
+                      );
 
-      toolBar.add(
-          new Button("Start", new ClickHandler()
-          {
-            public void onClick(ClickEvent clickEvent)
-            {
-              MessageBox.confirm("Start new execution",
-                  "Do you want to start a new execution of this process?",
-                  new MessageBox.ConfirmationCallback() {
-                    public void onResult(boolean doIt)
+                      iframeWindow.show();
+                    }
+                    else
                     {
-                      if(doIt)
-                      {
-                        String url = getCurrentDefinition().getFormUrl();
-                        boolean hasForm = (url !=null && !url.equals(""));
-                        if(hasForm)
-                        {
-                          ProcessDefinitionRef definition = getCurrentDefinition();
-                          iframeWindow = new IFrameWindowPanel(
-                              definition.getFormUrl(), "New Process Instance: "+ definition.getId()
-                          );
+                      controller.handleEvent(
+                          new Event(
+                              StartNewInstanceAction.ID,
+                              getCurrentDefinition()
+                          )
+                      );
+                    }
+                  }
 
-                          iframeWindow.setCallback(
-                              new IFrameWindowCallback()
-                              {
-                                public void onWindowClosed()
-                                {
-                                  controller.handleEvent(
-                                      new Event(UpdateInstancesAction.ID, getCurrentDefinition())
-                                  );
-                                }
-                              }
-                          );
+                }
+              });
 
-                          iframeWindow.show();
-                        }
-                        else
-                        {
-                          controller.handleEvent(
-                              new Event(
-                                  StartNewInstanceAction.ID,
-                                  getCurrentDefinition()
-                              )
-                          );
-                        }
-                      }
-
-                    }
-                  });
-
-            }
-          }
-          )
-          {{
-              setVisible(!isRiftsawInstance);
-            }}
+        }
+      }
+      )
+      {{
+          setVisible(!isRiftsawInstance);
+        }};
+      
+      toolBar.add(
+          startBtn
       );
 
 
-
-      toolBar.add(
-          new Button("Terminate", new ClickHandler()
+      terminateBtn = new Button("Terminate", new ClickHandler()
+      {
+        public void onClick(ClickEvent clickEvent)
+        {
+          if (getSelection() != null)
           {
-            public void onClick(ClickEvent clickEvent)
-            {
-              if(getSelection()!=null)
-              {
 
-                MessageBox.confirm("Terminate instance",
-                    "Terminating this instance will stop further execution.",
-                    new MessageBox.ConfirmationCallback() {
-                      public void onResult(boolean doIt)
-                      {
-                        if(doIt)
-                        {
-                          ProcessInstanceRef selection = getSelection();
-                          selection.setState(ProcessInstanceRef.STATE.ENDED);
-                          selection.setEndResult(ProcessInstanceRef.RESULT.OBSOLETE);
-                          controller.handleEvent(
-                              new Event(
-                                  StateChangeAction.ID,
-                                  selection
-                              )
-                          );
-                        }
-                      }
-                    });
-              }
-              else
-              {
-                MessageBox.alert("Missing selection", "Please select an instance");
-              }
-            }
+            MessageBox.confirm("Terminate instance",
+                "Terminating this instance will stop further execution.",
+                new MessageBox.ConfirmationCallback()
+                {
+                  public void onResult(boolean doIt)
+                  {
+                    if (doIt)
+                    {
+                      ProcessInstanceRef selection = getSelection();
+                      selection.setState(ProcessInstanceRef.STATE.ENDED);
+                      selection.setEndResult(ProcessInstanceRef.RESULT.OBSOLETE);
+                      controller.handleEvent(
+                          new Event(
+                              StateChangeAction.ID,
+                              selection
+                          )
+                      );
+                    }
+                  }
+                });
           }
-          )
+          else
+          {
+            MessageBox.alert("Missing selection", "Please select an instance");
+          }
+        }
+      }
       );
 
+      toolBar.add(
+          terminateBtn
+      );
 
-
-      toolBar.add(
-          new Button("Delete", new ClickHandler()
+      deleteBtn = new Button("Delete", new ClickHandler()
+      {
+        public void onClick(ClickEvent clickEvent)
+        {
+          if (getSelection() != null)
           {
-            public void onClick(ClickEvent clickEvent)
-            {
-              if(getSelection()!=null)
-              {
-                MessageBox.confirm("Delete instance",
-                    "Deleting this instance will remove any history information and associated tasks as well.",
-                    new MessageBox.ConfirmationCallback() {
-                      public void onResult(boolean doIt)
-                      {
+            MessageBox.confirm("Delete instance",
+                "Deleting this instance will remove any history information and associated tasks as well.",
+                new MessageBox.ConfirmationCallback()
+                {
+                  public void onResult(boolean doIt)
+                  {
 
-                        if(doIt)
-                        {
-                          ProcessInstanceRef selection = getSelection();
-                          selection.setState(ProcessInstanceRef.STATE.ENDED);
+                    if (doIt)
+                    {
+                      ProcessInstanceRef selection = getSelection();
+                      selection.setState(ProcessInstanceRef.STATE.ENDED);
 
-                          controller.handleEvent(
-                              new Event(
-                                  DeleteInstanceAction.ID,
-                                  selection
-                              )
-                          );
-                        }
-                      }
-                    });
+                      controller.handleEvent(
+                          new Event(
+                              DeleteInstanceAction.ID,
+                              selection
+                          )
+                      );
+                    }
+                  }
+                });
 
-              }
-              else
-              {
-                MessageBox.alert("Missing selection", "Please select an instance");
-              }
-            }
           }
-          )
-          {{
-              setVisible(!isRiftsawInstance);
-            }}
+          else
+          {
+            MessageBox.alert("Missing selection", "Please select an instance");
+          }
+        }
+      }
+      )
+      {{
+          setVisible(!isRiftsawInstance);
+        }};
+      
+      toolBar.add(
+          deleteBtn
       );
 
+      startBtn.setEnabled(false);
+      terminateBtn.setEnabled(false);
+      deleteBtn.setEnabled(false);
+      
       toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+      
 
       instanceList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
       instanceList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
@@ -342,7 +353,7 @@
             }
           }
       );
-      instanceList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+      //instanceList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
 
       // cached data?
       if(this.cachedInstances!=null)
@@ -353,9 +364,10 @@
       layout.add(instanceList, new BorderLayoutData(BorderLayout.Region.CENTER));
 
       // details
-      InstanceDetailView detailsView = new InstanceDetailView(appContext);
+      InstanceDetailView detailsView = new InstanceDetailView();
       controller.addView(InstanceDetailView.ID, detailsView);
       controller.addAction(UpdateInstanceDetailAction.ID, new UpdateInstanceDetailAction());
+      controller.addAction(ClearInstancesAction.ID, new ClearInstancesAction());
       layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH,10,200));
 
       panel.add(layout);
@@ -383,7 +395,17 @@
     this.controller = controller;
   }
 
+  public void reset()
+  {
+    this.currentDefinition = null;
+    this.cachedInstances = new ArrayList<ProcessInstanceRef>();    
+    renderUpdate();
 
+    startBtn.setEnabled(false);
+    terminateBtn.setEnabled(false);
+    deleteBtn.setEnabled(false);
+  }
+
   public void update(final ProcessDefinitionRef def, List<ProcessInstanceRef> instances)
   {
     this.currentDefinition = def;
@@ -405,7 +427,10 @@
               new InstanceEvent(this.currentDefinition, null)
           )
       );
-
+      
+      startBtn.setEnabled(true);
+      terminateBtn.setEnabled(true);
+      deleteBtn.setEnabled(true);
     }
   }
 

Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java	                        (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java	2010-01-28 14:44:47 UTC (rev 939)
@@ -0,0 +1,60 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.process;
+
+import com.google.gwt.user.client.ui.Widget;
+import com.mvc4g.client.Controller;
+import org.gwt.mosaic.ui.client.layout.*;
+import org.jboss.errai.common.client.framework.WSComponent;
+import org.jboss.errai.workspaces.client.Registry;
+import org.jboss.errai.workspaces.client.framework.annotations.LoadTool;
+
+/**
+ * Combined view of process and instance data in a single screen
+ */
+ at LoadTool(name = "Process Overview", group = "Processes")
+public class MergedProcessView implements WSComponent
+{
+  MosaicPanel panel;
+
+  DefinitionListView definitionView;
+  InstanceListView instanceView;
+
+  public Widget getWidget()
+  {
+    Controller controller = Registry.get(Controller.class);
+
+    panel = new MosaicPanel(new BorderLayout());
+    panel.setPadding(0);
+    definitionView = new DefinitionListView();
+    instanceView = new InstanceListView();
+
+    MosaicPanel splitPanel = new MosaicPanel(new ColumnLayout());
+    splitPanel.setPadding(0);
+    splitPanel.add(definitionView.getWidget(), new ColumnLayoutData("250 px"));
+    splitPanel.add(instanceView.getWidget());
+
+    panel.add(splitPanel, new BorderLayoutData(BorderLayout.Region.CENTER, false));
+
+    return panel; 
+  }
+}

Modified: bpm-console/trunk/gui/war/war/app.html
===================================================================
--- bpm-console/trunk/gui/war/war/app.html	2010-01-26 16:16:30 UTC (rev 938)
+++ bpm-console/trunk/gui/war/war/app.html	2010-01-28 14:44:47 UTC (rev 939)
@@ -15,7 +15,7 @@
   <link rel="stylesheet" href="../console.css" type="text/css">
 
   <style type="text/css">
-    html, body { height: 100%; overflow: hidden; margin: 0; padding: 0; }
+    html { height: 100%; overflow: hidden; margin: 0; padding: 0; }
     #splash {
       background:#ffffff;
       cursor: wait;

Modified: bpm-console/trunk/gui/war/war/console.css
===================================================================
--- bpm-console/trunk/gui/war/war/console.css	2010-01-26 16:16:30 UTC (rev 938)
+++ bpm-console/trunk/gui/war/war/console.css	2010-01-28 14:44:47 UTC (rev 939)
@@ -1,3 +1,9 @@
+body {   
+    height: 100%;
+    overflow: hidden;
+    margin: 0;
+    padding: 0;
+}
 
 .bpm-layout {
   border: 1px solid green;
@@ -355,4 +361,10 @@
 
 .mosaic-Label {
   font-weight:bold;
+}
+
+.gwt-Button {
+    font-size: 10px;
+    -moz-border-radius: 3px;
+    -webkit-border-radius: 3px;
 }
\ No newline at end of file



More information about the overlord-commits mailing list