[jbpm-commits] JBoss JBPM SVN: r4811 - in projects/gwt-console/trunk/gui/war/src/main: resources/org/jboss/bpm/console/public and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu May 14 09:10:14 EDT 2009


Author: heiko.braun at jboss.com
Date: 2009-05-14 09:10:14 -0400 (Thu, 14 May 2009)
New Revision: 4811

Added:
   projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/blank_loading.gif
   projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/blank_splash.gif
   projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/loading_lite.gif
Modified:
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
   projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html
   projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Fix sluggish loading

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java	2009-05-14 12:19:13 UTC (rev 4810)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java	2009-05-14 13:10:14 UTC (rev 4811)
@@ -24,6 +24,7 @@
 import com.google.gwt.core.client.EntryPoint;
 import com.google.gwt.user.client.Command;
 import com.google.gwt.user.client.DeferredCommand;
+import com.google.gwt.user.client.DOM;
 import com.mvc4g.client.Controller;
 import com.mvc4g.client.Event;
 import com.allen_sauer.gwt.log.client.Log;
@@ -42,6 +43,13 @@
 
     DeferredCommand.addCommand(new Command() {
       public void execute() {
+
+        // hide spash image
+        DOM.getElementById("splash_loading").getStyle().setProperty("display", "none");
+        
+        // move the loading div to background
+        DOM.getElementById("splash").getStyle().setProperty("z-index", "-1");
+        
         onModuleLoad2();
       }
     });

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java	2009-05-14 12:19:13 UTC (rev 4810)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java	2009-05-14 13:10:14 UTC (rev 4811)
@@ -23,6 +23,9 @@
 
 import com.mvc4g.client.ActionInterface;
 import com.mvc4g.client.Controller;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.DeferredCommand;
+import com.google.gwt.user.client.Command;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
@@ -31,7 +34,7 @@
 {
 
   public void execute(Controller controller, Object object)
-  {
+  {    
     LoginView loginView = (LoginView)controller.getView(LoginView.NAME);
     loginView.display();
   }

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java	2009-05-14 12:19:13 UTC (rev 4810)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java	2009-05-14 13:10:14 UTC (rev 4811)
@@ -23,7 +23,7 @@
 
 import com.google.gwt.http.client.Request;
 import com.google.gwt.http.client.Response;
-import com.google.gwt.user.client.WindowCloseListener;
+import com.google.gwt.user.client.*;
 import com.google.gwt.user.client.ui.*;
 import com.google.gwt.core.client.GWT;
 import com.mvc4g.client.Controller;
@@ -31,9 +31,7 @@
 import org.gwt.mosaic.forms.client.builder.DefaultFormBuilder;
 import org.gwt.mosaic.forms.client.layout.FormLayout;
 import org.gwt.mosaic.ui.client.WindowPanel;
-import org.gwt.mosaic.ui.client.layout.BorderLayout;
-import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
-import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.layout.*;
 import org.jboss.bpm.console.client.Authentication;
 import org.jboss.bpm.console.client.ConsoleConfig;
 import org.jboss.bpm.console.client.URLBuilder;
@@ -85,9 +83,10 @@
   }
 
   public void display()
-  {
-    createLayoutWindowPanel();   
+  {    
+    createLayoutWindowPanel();
     window.center();
+    
   }
 
   /**
@@ -95,7 +94,7 @@
    */
   private void createLayoutWindowPanel() {
     window = new WindowPanel("jBPM Management Console");
-    window.setAnimationEnabled(false);
+    window.setAnimationEnabled(true);
     window.setSize("320px", "180px");    
     
     LayoutPanel panel = new LayoutPanel();
@@ -145,8 +144,19 @@
                 // display main console
                 window.hide();
 
-                // assemble main layout                
-                new MainLayout(controller, auth, urlBuilder, config);
+                // assemble main layout
+                DeferredCommand.add( new Command()
+                {
+                  public void execute()
+                  {
+                    // move the loading div to foreground
+                    DOM.getElementById("splash").getStyle().setProperty("z-index", "1000");
+                    DOM.getElementById("ui_loading").getStyle().setProperty("display", "run-in");
+                    new MainLayout(controller, auth, urlBuilder, config);
+                  }
+                });
+
+                window = null;
               }
 
               public void onLoginFailed(Request request, Throwable t)
@@ -161,38 +171,31 @@
       }
     });
 
-    // TODO: does this load the imagebundle already?
-    ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+    Widget form = createForm();
+    layoutPanel.add(form, new BorderLayoutData(BorderLayout.Region.CENTER));
+    layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH));
 
-    LayoutPanel imgPanel = new LayoutPanel();
-    imgPanel.add(icons.userIcon().createImage());
-    imgPanel.setVisible(false);
-    
-    layoutPanel.add(imgPanel, new BorderLayoutData(BorderLayout.Region.NORTH, 50, 200));
-    layoutPanel.add(createForm(), new BorderLayoutData(BorderLayout.Region.CENTER, 10, 200));
-    layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH, 10, 200));
-
   }
 
   private Widget createForm()
   {
-    FormLayout layout = new FormLayout(
-        "right:pref, 10px, left:pref:grow",   // 3 columns
-        "pref, pref, 5px, pref");             // 4 rows
+    LayoutPanel p = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+    Label label = new Label("Login");
+    label.setStyleName("bpm-label-header");
+    p.add(label, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
 
-    DefaultFormBuilder builder = new DefaultFormBuilder(layout);
-    builder.appendSeparator("Login");
-
     usernameInput = new TextBox();
-    builder.append("Username:", usernameInput);
-    builder.nextLine();
+    passwordInput = new PasswordTextBox();
 
-    builder.nextLine();   // empty space
+    Grid grid = new Grid(2,2);
+    grid.setWidget(0,0, new Label("Username:"));
+    grid.setWidget(0,1, usernameInput);
 
-    passwordInput = new PasswordTextBox();
-    builder.append("Password:", passwordInput);
-    builder.nextLine();
+    grid.setWidget(1,0, new Label("Password:"));
+    grid.setWidget(1,1, passwordInput);
 
-    return builder.getPanel();
+    p.add(grid);
+    
+    return p;
   }
 }

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java	2009-05-14 12:19:13 UTC (rev 4810)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java	2009-05-14 13:10:14 UTC (rev 4811)
@@ -24,7 +24,7 @@
 import com.allen_sauer.gwt.log.client.DivLogger;
 import com.allen_sauer.gwt.log.client.Log;
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.*;
 import com.google.gwt.user.client.ui.*;
 import com.google.gwt.user.client.ui.HTML;
 import com.mvc4g.client.Controller;
@@ -78,43 +78,59 @@
     LayoutPanel layout = createLayout();
     viewport.add(layout);
 
+    Timer t = new Timer() {
+
+      public void run()
+      {
+        // hide the loading div
+        DeferredCommand.add( new Command()
+        {
+          public void execute()
+          {
+            DOM.getElementById("splash").getStyle().setProperty("display", "none");
+          }
+        });
+
+      }
+    };
+    t.schedule(2000);
+
     RootPanel.get().add(viewport);
 
-
   }
 
   private LayoutPanel createLayout()
   {
     final LayoutPanel layoutPanel = new LayoutPanel(new BorderLayout());
 
-    // header
+// header
     header = new Header(this, auth.getUsername(), auth.getRolesAssigned());
     layoutPanel.add(header, new BorderLayoutData(Region.NORTH, 50));
 
-    // menu
+// menu
     menu = new Menu();
     layoutPanel.add(menu, new BorderLayoutData(Region.WEST, 200));
 
-    // workspace
+// workspace
     workspace = createWorkspace();
     layoutPanel.add(workspace, new BorderLayoutData(Region.CENTER, false));
 
 
-    // register views and actions
+// register views and actions
     controller.addView(Header.ID, header);
 
     controller.addAction(LoadingStatusAction.ID, new LoadingStatusAction());
 
-    // message Panel    
+// message Panel
     final CaptionLayoutPanel messagePanel = createMessagePanel(layoutPanel);
     messagePanel.add(Log.getDivLogger().getWidget());
     messagePanel.setCollapsed(true);
     layoutPanel.add(messagePanel, new BorderLayoutData(Region.SOUTH, true));
 
-    // Turn on DivLogger
+// Turn on DivLogger
     Log.getDivLogger().getWidget().setVisible(true);
 
-    // default editor
+// default editor
     if(workspace.hasEditor(SettingsEditor.ID))
       workspace.showEditor(SettingsEditor.ID);
 
@@ -158,7 +174,7 @@
     return workspace;
   }
 
-  // ---- ApplicationContext interface ----
+// ---- ApplicationContext interface ----
 
 
   public Viewport getViewport()

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java	2009-05-14 12:19:13 UTC (rev 4810)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java	2009-05-14 13:10:14 UTC (rev 4811)
@@ -54,47 +54,39 @@
       tabPanel.setPadding(5);
 
       final ScrollLayoutPanel layoutPanel = new ScrollLayoutPanel(
-          new BoxLayout(BoxLayout.Orientation.VERTICAL)
+        new BoxLayout(BoxLayout.Orientation.VERTICAL)
       );
 
       // console info
-      StringBuffer sb = new StringBuffer();
-      sb.append("<table>");
-      sb.append("<tr>");
-      sb.append("<td colspan=2><h3>Console Info</h3></td>");      
-      sb.append("</tr>");
+      Label console = new Label("Console Info");
+      console.setStyleName("bpm-label-header");
+      layoutPanel.add(console, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
 
-      sb.append("<tr>");
-      sb.append("<td>Version: </td>");
-      sb.append("<td>"+Version.VERSION+"</td>");
-      sb.append("</tr>");
+      Grid g1 = new Grid(1,2);
+      g1.setWidget(0,0, new Label("Version:"));
+      g1.setWidget(0,1, new Label(Version.VERSION));
 
-      sb.append("<tr>");
-      sb.append("<td colspan=2><br/></td>");      
-      sb.append("</tr>");
+      layoutPanel.add(g1);
 
-      sb.append("<tr>");
-      sb.append("<td colspan=2><h3>Server Info</h3></td>");
-      sb.append("</tr>");
+      // server info
+      Label server = new Label("Server Info");
+      server.setStyleName("bpm-label-header");
+      layoutPanel.add(server, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
 
-      sb.append("<tr>");
-      sb.append("<td>Host: </td>");
-      sb.append("<td>"+appContext.getConfig().getConsoleServerUrl()+"</td>");
-      sb.append("</tr>");
+      Grid g2 = new Grid(1,2);
+      g2.setWidget(0,0, new Label("Host:"));
+      g2.setWidget(0,1, new Label(appContext.getConfig().getConsoleServerUrl()));
 
-      sb.append("</table>");
-
-      layoutPanel.add(new HTML(sb.toString()));
+      layoutPanel.add(g2);
+      
       ServerStatusView serverStatus = new ServerStatusView(appContext);
       layoutPanel.add(serverStatus); // Doesn't render in grid
-      
 
       tabPanel.add(layoutPanel, "System Overview");
 
       this.add(tabPanel, new BorderLayoutData(BorderLayout.Region.CENTER));
 
       // view and actions
-
       super.controller.addView(ServerStatusView.ID, serverStatus);
       super.controller.addAction(ServerStatusAction.ID, new ServerStatusAction(appContext));
 

Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html	2009-05-14 12:19:13 UTC (rev 4810)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/Application.html	2009-05-14 13:10:14 UTC (rev 4811)
@@ -1,29 +1,51 @@
 <html>
 <head>
-   <title>GWT Console Application</title>
+  <title>GWT Console Application</title>
 
-   <!-- BPM console configuration -->
-   <script type="text/javascript">
-      var consoleConfig = {
-         consoleServerUrl: "http://localhost:8080/gwt-console-server",
-         reportServerUrl: "http://localhost:8080/report-server",
-         overviewReportFile:"process_activity.rptdesign",
-         definitionReportFile:"definition_report.rptdesign",
-         instanceReportFile:"instance_report.rptdesign"
-      };
-   </script>
+  <!-- BPM console configuration -->
+  <script type="text/javascript">
+    var consoleConfig = {
+      consoleServerUrl: "http://localhost:8080/gwt-console-server",
+      reportServerUrl: "http://localhost:8080/report-server",
+      overviewReportFile:"process_activity.rptdesign",
+      definitionReportFile:"definition_report.rptdesign",
+      instanceReportFile:"instance_report.rptdesign"
+    };
+  </script>
 
-   <!--                                           -->
-   <!-- This script loads your compiled module.   -->
-   <!-- If you add any GWT meta tags, they must   -->
-   <!-- be added before this line.                -->
-   <!--                                           -->
-   <script language='javascript' src='org.jboss.bpm.console.Application.nocache.js'>
-      
-   </script>
+  <!--                                           -->
+  <!-- This script loads your compiled module.   -->
+  <!-- If you add any GWT meta tags, they must   -->
+  <!-- be added before this line.                -->
+  <!--                                           -->
+  <script language='javascript' src='org.jboss.bpm.console.Application.nocache.js'>
 
-   <link rel="stylesheet" href="console.css" type="text/css">
+  </script>
 
+  <link rel="stylesheet" href="console.css" type="text/css">
+
+  <style type="text/css">
+    html, body { height: 100%; overflow: hidden; margin: 0; padding: 0; }
+    #splash {
+      background:#ffffff;
+      cursor: wait;
+      position:
+      absolute; top: 0; left: 0;
+      z-index:1000;
+    }
+    .bpm-loader {      
+      background-image: url('images/loading_lite.gif');
+      background-repeat:no-repeat;
+      height: 24px; width: 130px;
+      padding-left:26px;
+      padding-top:8px;
+      font-family: Arial, sans-serif;
+      font-size: 10px;
+      font-weight: bold;
+      color: #777;
+      cursor: wait;
+    }
+  </style>
 </head>
 
 <!--                                           -->
@@ -36,5 +58,16 @@
 <!-- OPTIONAL: include this if you want history support -->
 <!--iframe src="javascript:''" id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe-->
 
+<div id="splash" style="height:100%;width:100%;">
+  <table width="100%" height="100%" >
+    <tr>
+      <td width="100%" height="100%" align="center" valign="middle">
+        <div id="ui_loading" class="bpm-loader" style="display:none;z-index:1001;" alttext="Error">Creating Workspace  ...</div>
+        <div id="splash_loading" class="bpm-loader" alttext="Error">Loading ...</div>
+      </td>
+    </tr>
+  </table>
+</div>
+
 </body>
 </html>

Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css	2009-05-14 12:19:13 UTC (rev 4810)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css	2009-05-14 13:10:14 UTC (rev 4811)
@@ -1,3 +1,4 @@
+
 .bpm-layout {
   border: 1px solid green;
   margin: 10px;
@@ -10,6 +11,14 @@
   background-repeat:no-repeat;  
 }
 
+.bpm-label-header {
+  background-color:#F8F8F8;
+  font-weight:BOLD;
+  //border-bottom:1px solid #D8D8D8 ;
+  padding-bottom:2px;
+  padding-left:5px;
+  margin-bottom:5px;
+}
 .bpm-header-userinfo {
   font-family: sans-serif;
   width:150px;
@@ -224,7 +233,9 @@
 .bpm-info-table {
   border:0px solid;
   width:100%;
-  background:#F8F8F8;
+  //background:#F8F8F8;
+  background:#ffffff;
+  border-left:5px solid #ffffff; 
   padding:5px;
 }
 

Added: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/blank_loading.gif
===================================================================
(Binary files differ)


Property changes on: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/blank_loading.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/blank_splash.gif
===================================================================
(Binary files differ)


Property changes on: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/blank_splash.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/loading_lite.gif
===================================================================
(Binary files differ)


Property changes on: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/loading_lite.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream




More information about the jbpm-commits mailing list