[jbpm-commits] JBoss JBPM SVN: r4756 - in projects/gwt-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/icons and 4 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu May 7 05:06:36 EDT 2009


Author: heiko.braun at jboss.com
Date: 2009-05-07 05:06:35 -0400 (Thu, 07 May 2009)
New Revision: 4756

Added:
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractView.java
Modified:
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
   projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
   projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java
   projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/InfoFacade.java
Log:
Pimp up image bundle. Added editor icons

Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractView.java	                        (rev 0)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractView.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -0,0 +1,61 @@
+/*
+ * 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.common;
+
+import com.mvc4g.client.ViewInterface;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
+import com.google.gwt.user.client.ui.HTML;
+import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.jboss.bpm.console.client.LazyPanel;
+
+/**
+ * @author Heiko.Braun <heiko.braun at jboss.com>
+ */
+public abstract class AbstractView extends LayoutPanel
+    implements ViewInterface, LazyPanel
+{
+  private AbstractImagePrototype icon;
+
+  protected AbstractView()
+  {
+  }
+
+  protected AbstractImagePrototype getIcon()
+  {
+    return icon;
+  }
+
+  protected void setIcon(AbstractImagePrototype icon)
+  {
+    this.icon = icon;
+  }
+
+  public String getIconTitle()
+  {
+    HTML html = new HTML(
+        (icon != null ? (icon.getHTML() + "&nbsp;")
+            : (""))
+            + this.getTitle());
+
+    return html.toString();
+  }
+}

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -27,11 +27,16 @@
 public interface ConsoleIconBundle extends ImageBundle
 {
   /**
-   * @gwt.resource processIcon.png   
+   * @gwt.resource processIcon.png
    */
   AbstractImagePrototype processIcon();
 
   /**
+   * @gwt.resource play.png
+   */
+  AbstractImagePrototype instanceIcon();
+
+  /**
    * Would bundle the file 'open-file-icon.gif' residing in the same package as this type.
    * @gwt.resource open-file-icon.gif
 
@@ -45,7 +50,7 @@
   */
 
   /**
-   * @gwt.resource docIcon.png
+   * @gwt.resource toolsIcon.png
    */
   AbstractImagePrototype settingsIcon();
 
@@ -53,4 +58,9 @@
    * @gwt.resource taskIcon.png
    */
   AbstractImagePrototype taskIcon();
+
+   /**
+   * @gwt.resource userIcon.png
+   */
+  AbstractImagePrototype userIcon();
 }

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -24,6 +24,7 @@
 import com.google.gwt.user.client.ui.ChangeListener;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.core.client.GWT;
 import com.mvc4g.client.Controller;
 import com.mvc4g.client.Event;
 import com.mvc4g.client.ViewInterface;
@@ -36,14 +37,15 @@
 import org.gwt.mosaic.ui.client.list.DefaultListModel;
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
 import org.jboss.bpm.console.client.LazyPanel;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
+import org.jboss.bpm.console.client.common.AbstractView;
 
 import java.util.List;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
-class DefinitionListView extends LayoutPanel
-    implements ViewInterface, LazyPanel
+class DefinitionListView extends AbstractView
 {
   public final static String ID = DefinitionListView.class.getName();
 
@@ -58,7 +60,9 @@
   public DefinitionListView()
   {
     super();
+    ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
     setTitle("Process Definitions");
+    setIcon(icons.processIcon());
   }
 
   public boolean isInitialized()

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -23,6 +23,7 @@
 
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.core.client.GWT;
 import com.mvc4g.client.Controller;
 import com.mvc4g.client.ViewInterface;
 import com.mvc4g.client.Event;
@@ -37,14 +38,15 @@
 import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
 import org.jboss.bpm.console.client.model.ProcessInstanceRef;
 import org.jboss.bpm.console.client.LazyPanel;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
+import org.jboss.bpm.console.client.common.AbstractView;
 
 import java.util.List;
 
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
-class InstanceListView extends LayoutPanel
-    implements ViewInterface, LazyPanel
+class InstanceListView extends AbstractView
 {
   public final static String ID = InstanceListView.class.getName();
 
@@ -63,8 +65,9 @@
   public InstanceListView()
   {
     super();
+    ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
     setTitle("Process Instances");
-
+    setIcon(icons.instanceIcon());
   }
 
   public boolean isInitialized()

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -37,6 +37,7 @@
 import org.jboss.bpm.console.client.Editor;
 import org.jboss.bpm.console.client.MenuSection;
 import org.jboss.bpm.console.client.LazyPanel;
+import org.jboss.bpm.console.client.common.AbstractView;
 import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
 
 /**
@@ -119,13 +120,13 @@
     }
   }
 
-  private void registerView(String id, Widget view)
+  private void registerView(String id, AbstractView view)
   {
     // register view with controller
-    super.controller.addView(id, (ViewInterface)view);
+    super.controller.addView(id, view);
 
     // add to tab layout
-    this.tabPanel.add(view, view.getTitle());
+    this.tabPanel.add(view, view.getIconTitle(), true);
   }
 
   private void registerAction(String name, ActionInterface action)

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -25,6 +25,7 @@
 import org.gwt.mosaic.ui.client.list.DefaultListModel;
 import org.gwt.mosaic.ui.client.ListBox;
 import org.jboss.bpm.console.client.LazyPanel;
+import org.jboss.bpm.console.client.common.AbstractView;
 import org.jboss.bpm.console.client.model.TaskRef;
 import com.mvc4g.client.ViewInterface;
 import com.mvc4g.client.Controller;
@@ -36,8 +37,7 @@
  * 
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
-public abstract class AbstractTaskList extends LayoutPanel
-    implements ViewInterface, LazyPanel
+public abstract class AbstractTaskList extends AbstractView
 {  
   protected Controller controller;
   protected LayoutPanel taskList = null;

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -27,6 +27,7 @@
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Frame;
 import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.core.client.GWT;
 import com.mvc4g.client.Event;
 import org.gwt.mosaic.ui.client.*;
 import org.gwt.mosaic.ui.client.layout.BoxLayout;
@@ -34,6 +35,7 @@
 import org.gwt.mosaic.ui.client.layout.LayoutPanel;
 import org.gwt.mosaic.ui.client.list.DefaultListModel;
 import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
 import org.jboss.bpm.console.client.model.TaskRef;
 import org.jboss.bpm.console.client.task.events.TaskIdentityEvent;
 import org.jboss.bpm.console.client.util.WindowUtil;
@@ -56,7 +58,9 @@
   {
     super();
     this.appContext = appContext;
+    ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
     setTitle("Your Tasks");
+    setIcon(icons.userIcon());
 
   }
 

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -21,6 +21,7 @@
  */
 package org.jboss.bpm.console.client.task;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Widget;
 import com.mvc4g.client.Event;
@@ -32,6 +33,7 @@
 import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
 import org.gwt.mosaic.ui.client.layout.LayoutPanel;
 import org.gwt.mosaic.ui.client.list.DefaultListModel;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
 import org.jboss.bpm.console.client.model.TaskRef;
 import org.jboss.bpm.console.client.task.events.TaskIdentityEvent;
 
@@ -48,7 +50,9 @@
   public OpenTasksView()
   {
     super();
+    ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
     setTitle("Open Tasks");
+    setIcon(icons.taskIcon());
   }
 
   public void initialize()

Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -21,11 +21,9 @@
  */
 package org.jboss.bpm.console.client.task;
 
+import com.google.gwt.core.client.GWT;
 import com.google.gwt.user.client.ui.SourcesTabEvents;
 import com.google.gwt.user.client.ui.TabListener;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.core.client.GWT;
-import com.mvc4g.client.ViewInterface;
 import com.mvc4g.client.ActionInterface;
 import com.mvc4g.client.Event;
 import org.gwt.mosaic.ui.client.DecoratedTabLayoutPanel;
@@ -34,8 +32,9 @@
 import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
 import org.jboss.bpm.console.client.ApplicationContext;
 import org.jboss.bpm.console.client.Editor;
-import org.jboss.bpm.console.client.MenuSection;
 import org.jboss.bpm.console.client.LazyPanel;
+import org.jboss.bpm.console.client.MenuSection;
+import org.jboss.bpm.console.client.common.AbstractView;
 import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
 
 /**
@@ -104,13 +103,13 @@
     }
   }
 
-  private void registerView(String id, Widget view)
+  private void registerView(String id, AbstractView view)
   {
     // register view with controller
-    super.controller.addView(id, (ViewInterface)view);
+    super.controller.addView(id, view);
 
     // add to tab layout
-    this.tabPanel.add(view, view.getTitle());
+    this.tabPanel.add(view, view.getIconTitle(), true);
   }
 
   private void registerAction(String name, ActionInterface action)

Modified: projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java
===================================================================
--- projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/MenuSection.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -42,7 +42,7 @@
     super();  
 
     this.menuTitle = new HTML(
-				(icon != null ? (icon.getHTML() + "&nbsp;&nbsp;")
+				(icon != null ? (icon.getHTML() + "&nbsp;")
 						: (""))
 						+ title);
     

Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/InfoFacade.java
===================================================================
--- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/InfoFacade.java	2009-05-07 09:03:27 UTC (rev 4755)
+++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/InfoFacade.java	2009-05-07 09:06:35 UTC (rev 4756)
@@ -44,21 +44,31 @@
 
   private Class[] pluginInterfaces = {TaskDispatcherPlugin.class};
 
+  private ServerStatus status = null;
+
   @GET
   @Path("status")
   @Produces("application/json")
   public Response getServerInfo()
   {
-    ServerStatus status = new ServerStatus();
-    for(Class type : pluginInterfaces)
+    ServerStatus status = getServerStatus();
+    return createJsonResponse(status);
+  }
+
+  private ServerStatus getServerStatus()
+  {
+    if(null==this.status) // expensive to create
     {
-      Object impl = PluginMgr.load(type);
-      boolean isAvailable = (impl!=null);
+      this.status = new ServerStatus();
+      for(Class type : pluginInterfaces)
+      {
+        Object impl = PluginMgr.load(type);
+        boolean isAvailable = (impl!=null);
 
-      status.getPlugins().add(new PluginInfo(type.getName(), isAvailable));
+        status.getPlugins().add(new PluginInfo(type.getName(), isAvailable));
+      }
     }
-
-    return createJsonResponse(status);
+    return status;
   }
 
   private Response createJsonResponse(Object wrapper)




More information about the jbpm-commits mailing list