[jbpm-commits] JBoss JBPM SVN: r4760 - in projects/gwt-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client/common and 9 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu May 7 10:14:43 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-05-07 10:14:42 -0400 (Thu, 07 May 2009)
New Revision: 4760
Added:
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/catForms.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/collapseDown.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/collapseLeft.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-error.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-information.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-password.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-question.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-warning.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/loading.gif
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-down.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-left.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-right.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-up.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-minus.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-plus.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-refresh.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-close.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-maximize.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-minimize.png
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-restore.png
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/icons/loading.gif
Removed:
projects/gwt-console/trunk/server/server-core/src/test/java/org/
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/Header.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/ServerStatusAction.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/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
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/LoadDefinitionsAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/util/ConsoleLog.java
projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java
Log:
Added log message console.
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-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Application.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -22,8 +22,11 @@
package org.jboss.bpm.console.client;
import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.user.client.Command;
+import com.google.gwt.user.client.DeferredCommand;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
+import com.allen_sauer.gwt.log.client.Log;
/**
* Setup the main {@link com.mvc4g.client.Controller} and fire
@@ -34,7 +37,17 @@
public class Application implements EntryPoint
{
- public void onModuleLoad()
+ public void onModuleLoad() {
+ Log.setUncaughtExceptionHandler();
+
+ DeferredCommand.addCommand(new Command() {
+ public void execute() {
+ onModuleLoad2();
+ }
+ });
+ }
+
+ public void onModuleLoad2()
{
Controller mainController = new com.mvc4g.client.Controller();
mainController.addAction("login", new LoginAction());
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -23,12 +23,14 @@
import com.google.gwt.user.client.ui.*;
import com.google.gwt.user.client.Timer;
+import com.google.gwt.core.client.GWT;
import com.mvc4g.client.Controller;
import com.mvc4g.client.ViewInterface;
import java.util.List;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
@@ -70,13 +72,15 @@
// load status image
LayoutPanel loadingImageContainer = new LayoutPanel();
loadingImageContainer.setStyleName("bpm-loading-image");
- loadingImage = new Image("images/loading.gif");
+
+ ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+ loadingImage = new Image("images/icons/loading.gif");
loadingImageContainer.add(loadingImage);
setLoading(false);
// account info
- Image img = new Image("images/icons/05.png");
+ Image img = icons.userIcon().createImage();
HTML html = new HTML(appContext.getAuthentication().getUsername());
Button btn = new Button("Logout", new ClickListener()
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-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -38,6 +38,7 @@
import org.jboss.bpm.console.client.ConsoleConfig;
import org.jboss.bpm.console.client.URLBuilder;
import org.jboss.bpm.console.client.MainLayout;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.util.ConsoleLog;
/**
@@ -95,8 +96,8 @@
private void createLayoutWindowPanel() {
window = new WindowPanel("jBPM Management Console");
window.setAnimationEnabled(false);
- window.setSize("320px", "180px");
-
+ window.setSize("320px", "180px");
+
LayoutPanel panel = new LayoutPanel();
window.setWidget(panel);
createLayoutContent(panel);
@@ -160,6 +161,9 @@
}
});
+ // TODO: does this load the imagebundle already?
+ ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+
layoutPanel.add(createForm(), new BorderLayoutData(BorderLayout.Region.CENTER, 10, 200));
layoutPanel.add(submit, new BorderLayoutData(BorderLayout.Region.SOUTH, 10, 200));
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-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -21,18 +21,20 @@
*/
package org.jboss.bpm.console.client;
+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.ui.Composite;
-import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.*;
import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.Window;
import com.mvc4g.client.Controller;
import org.gwt.mosaic.ui.client.*;
import org.gwt.mosaic.ui.client.layout.BorderLayout;
import static org.gwt.mosaic.ui.client.layout.BorderLayout.Region;
import org.gwt.mosaic.ui.client.layout.BorderLayoutData;
import org.gwt.mosaic.ui.client.layout.LayoutPanel;
+import org.gwt.mosaic.ui.client.util.ButtonHelper;
+import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.util.WindowUtil;
/**
@@ -42,12 +44,12 @@
*/
public class MainLayout extends Composite implements ApplicationContext
{
-
+
public final static String NAME = "mainLayout";
-
+
private Header header;
private Menu menu;
-
+
private Workspace workspace;
private URLBuilder urlBuilder;
private Authentication auth;
@@ -58,7 +60,7 @@
public MainLayout(Controller controller, Authentication auth, URLBuilder urlBuilder, ConsoleConfig config)
{
- this.controller = controller;
+ this.controller = controller;
this.auth = auth;
this.config = config;
this.urlBuilder = urlBuilder;
@@ -67,13 +69,18 @@
}
public void display()
- {
+ {
viewport = new Viewport();
+ // manually, otherwise it will appear on the login screen
+ Log.addLogger(new DivLogger());
+
LayoutPanel layout = createLayout();
viewport.add(layout);
-
+
RootPanel.get().add(viewport);
+
+
}
private LayoutPanel createLayout()
@@ -95,10 +102,18 @@
// register views and actions
controller.addView(Header.ID, header);
-
+
controller.addAction(LoadingStatusAction.ID, new LoadingStatusAction());
+ // 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
+ Log.getDivLogger().getWidget().setVisible(true);
+
// default editor
if(workspace.hasEditor(SettingsEditor.ID))
workspace.showEditor(SettingsEditor.ID);
@@ -106,6 +121,35 @@
return layoutPanel;
}
+ private CaptionLayoutPanel createMessagePanel(final LayoutPanel layoutPanel)
+ {
+ final CaptionLayoutPanel messagePanel = new CaptionLayoutPanel("Messages", true);
+
+ ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
+ Button collapse = new Button(
+ ButtonHelper.createButtonLabel(
+ icons.collapseDownIcon(),
+ "",
+ ButtonHelper.ButtonLabelType.TEXT_ON_TOP)
+ );
+ collapse.addClickListener(
+ new ClickListener()
+ {
+ public void onClick(Widget sender)
+ {
+ messagePanel.setCollapsed(!messagePanel.isCollapsed());
+ layoutPanel.layout();
+ }
+ }
+ );
+
+ messagePanel.getHeader().add(
+ collapse,
+ Caption.CaptionRegion.RIGHT
+ );
+ return messagePanel;
+ }
+
private Workspace createWorkspace()
{
Workspace workspace = new Workspace(menu);
@@ -142,11 +186,11 @@
err.setSize("320px", "240px");
ScrollLayoutPanel scrollLayoutPanel = new ScrollLayoutPanel();
scrollLayoutPanel.add(new HTML(message));
- err.setWidget(scrollLayoutPanel);
+ err.setWidget(scrollLayoutPanel);
WindowUtil.addMaximizeButton(err, Caption.CaptionRegion.RIGHT);
WindowUtil.addMinimizeButton(err, Caption.CaptionRegion.RIGHT);
-
+
err.center();
}
else
@@ -170,7 +214,7 @@
return workspace;
}
- /**
+ /**
* hack in order to correctly display widgets that have
* been rendered hidden
*/
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusAction.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusAction.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -24,6 +24,7 @@
import org.jboss.bpm.console.client.common.AbstractRESTAction;
import org.jboss.bpm.console.client.model.ServerStatus;
import org.jboss.bpm.console.client.model.DTOParser;
+import org.jboss.bpm.console.client.util.ConsoleLog;
import com.google.gwt.http.client.RequestBuilder;
import com.google.gwt.http.client.Response;
import com.google.gwt.json.client.JSONValue;
@@ -62,6 +63,9 @@
JSONValue json = JSONParser.parse(response.getText());
ServerStatus status = DTOParser.parseStatus(json);
ServerStatusView view = (ServerStatusView)controller.getView(ServerStatusView.ID);
+
+ ConsoleLog.info("Loaded server status");
+
view.update(status);
}
}
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-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -22,10 +22,11 @@
package org.jboss.bpm.console.client;
import com.google.gwt.user.client.ui.*;
+import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.core.client.GWT;
import com.mvc4g.client.Event;
+import org.gwt.mosaic.ui.client.*;
import org.gwt.mosaic.ui.client.Label;
-import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
import org.gwt.mosaic.ui.client.layout.*;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
@@ -37,6 +38,8 @@
public final static String ID = SettingsEditor.class.getName();
+ private TabLayoutPanel tabPanel;
+
public SettingsEditor(ApplicationContext appContext)
{
super(appContext);
@@ -46,22 +49,19 @@
{
if(!isInitialized())
{
-
- final LayoutPanel layoutPanel = new LayoutPanel(
+
+ tabPanel = new DecoratedTabLayoutPanel();
+ tabPanel.setPadding(5);
+
+ final ScrollLayoutPanel layoutPanel = new ScrollLayoutPanel(
new BoxLayout(BoxLayout.Orientation.VERTICAL)
);
- // provide console overview
- CaptionLayoutPanel infoPanel = new CaptionLayoutPanel(
- "System Overview"
- );
-
- infoPanel.setLayout(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-
+
// console info
HTML console = new HTML("<h3>Console Info</h3>");
- infoPanel.add(console);
+ layoutPanel.add(console);
Grid g1 = new Grid(2,2);
g1.setWidget(0,0, new Label("Build:"));
@@ -69,12 +69,12 @@
g1.setWidget(1,0, new Label("Version:"));
g1.setText(1,1, Version.VERSION);
- infoPanel.add(g1);
+ layoutPanel.add(g1);
// server info
HTML server = new HTML("<h3>Server Info</h3>");
- infoPanel.add(server);
+ layoutPanel.add(server);
Grid g2 = new Grid(1,2);
g2.setWidget(0,0, new Label("Host:"));
@@ -82,12 +82,14 @@
ServerStatusView serverStatus = new ServerStatusView(appContext);
- infoPanel.add(g2);
- infoPanel.add(serverStatus); // Doesn't render in grid
+ layoutPanel.add(g2);
+ layoutPanel.add(serverStatus); // Doesn't render in grid
- layoutPanel.add(infoPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL, true));
- this.add(layoutPanel, new BorderLayoutData(BorderLayout.Region.CENTER));
+
+ tabPanel.add(layoutPanel, "System Overview");
+ this.add(tabPanel, new BorderLayoutData(BorderLayout.Region.CENTER));
+
// view and actions
super.controller.addView(ServerStatusView.ID, serverStatus);
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditorNavigation.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -37,7 +37,7 @@
{
super.setTitle("Settings");
- TreeItem root = addItem("Console");
+ TreeItem root = addItem("System");
root.addItem("Overview");
addTreeListener(
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -27,6 +27,7 @@
import com.mvc4g.client.Controller;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.LoadingStatusAction;
+import org.jboss.bpm.console.client.util.ConsoleLog;
import java.io.IOException;
@@ -125,7 +126,8 @@
"<li>Exception: '" + t.getClass() +
"</ul>'\n\n"+
t.getMessage();
-
+
+ ConsoleLog.error(out, t);
appContext.displayMessage(out, true);
}
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 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -63,4 +63,39 @@
* @gwt.resource userIcon.png
*/
AbstractImagePrototype userIcon();
+
+ /**
+ * @gwt.resource tool-button-collapse-down.png
+ */
+ AbstractImagePrototype collapseDownIcon();
+
+ /**
+ * @gwt.resource tool-button-collapse-left.png
+ */
+ AbstractImagePrototype collapseLeftIcon();
+
+ /**
+ * @gwt.resource dialog-error.png
+ */
+ AbstractImagePrototype errorIcon();
+
+ /**
+ * @gwt.resource dialog-information.png
+ */
+ AbstractImagePrototype infoIcon();
+
+ /**
+ * @gwt.resource dialog-warning.png
+ */
+ AbstractImagePrototype warnIcon();
+
+ /**
+ * @gwt.resource dialog-question.png
+ */
+ AbstractImagePrototype questionIcon();
+
+ /**
+ * @gwt.resource loading.gif
+ */
+ AbstractImagePrototype loadingIcon();
}
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/catForms.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/catForms.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/collapseDown.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/collapseDown.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/collapseLeft.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/collapseLeft.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-error.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-error.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-information.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-information.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-password.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-password.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-question.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-question.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-warning.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/dialog-warning.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/loading.gif
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/loading.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-down.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-down.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-left.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-left.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-right.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-right.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-up.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-collapse-up.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-minus.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-minus.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-plus.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-plus.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-refresh.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/tool-button-refresh.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-close.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-close.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-maximize.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-maximize.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-minimize.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-minimize.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-restore.png
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/window-button-restore.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -27,6 +27,7 @@
import com.google.gwt.json.client.JSONValue;
import com.mvc4g.client.Controller;
import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.common.AbstractRESTAction;
import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
@@ -71,16 +72,16 @@
DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID);
view.update(definitions);
- appContext.displayMessage("Loaded " + definitions.size() + " process definitions", false);
+ ConsoleLog.info("Loaded " + definitions.size() + " process definitions");
}
else
{
// Handle the error. Can get the status text from response.getStatusText()
- appContext.displayMessage("Failed to load instances. " +
- "HTTP " + response.getStatusCode()+
- ": " +response.getText(),
- true
- );
+ String message = "Failed to load instances. " +
+ "HTTP " + response.getStatusCode() +
+ ": " + response.getText();
+ ConsoleLog.error(message);
+ appContext.displayMessage(message,true);
}
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -27,6 +27,7 @@
import com.google.gwt.json.client.JSONValue;
import com.mvc4g.client.Controller;
import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.common.AbstractRESTAction;
import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
@@ -74,7 +75,7 @@
InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
view.update(def, instances);
- appContext.displayMessage("Loaded " + instances.size() + " process instances", false);
+ ConsoleLog.info("Loaded " + instances.size() + " process instances");
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -23,6 +23,7 @@
import org.jboss.bpm.console.client.common.AbstractRESTAction;
import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.bpm.console.client.model.DTOParser;
import org.jboss.bpm.console.client.model.TaskRef;
import com.google.gwt.http.client.RequestBuilder;
@@ -73,6 +74,7 @@
OpenTasksView openTasks = (OpenTasksView)controller.getView(OpenTasksView.ID);
AssignedTasksView personalTasks = (AssignedTasksView)controller.getView(AssignedTasksView.ID);
+ ConsoleLog.info("Loaded " + tasks.size() + " tasks");
openTasks.update(identity, tasks);
personalTasks.update(identity, tasks);
}
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-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-07 14:14:42 UTC (rev 4760)
@@ -63,8 +63,8 @@
.bpm-loading-image {
background-color:#ffffff;
- width:16pt;
- height:16pt;
+ width:16px;
+ height:16px;
}
.bpm-ProcessImage {
@@ -194,4 +194,26 @@
div.activeNode-header-link a:hover {
text-decoration:underline;
-}
\ No newline at end of file
+}
+
+.log-panel {
+ background-color: #ECF2FC;
+ border: 0px solid black;
+ margin: 0px;
+ padding:10px;
+}
+
+.log-panel .log-scroll-panel {
+ width: 100% !important;
+ height: 80px !important;
+}
+
+.log-panel .log-text-area,.log-panel BUTTON {
+ font-size: 8pt;
+ margin: 0em;
+}
+
+.log-resize-se {
+ visibility:hidden;
+}
+
Added: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/icons/loading.gif
===================================================================
(Binary files differ)
Property changes on: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/images/icons/loading.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -23,8 +23,8 @@
import com.google.gwt.json.client.*;
import org.jboss.bpm.console.client.model.jbpm3.TokenReference;
+import org.jboss.bpm.console.client.util.JSONWalk;
import org.jboss.bpm.console.client.util.ConsoleLog;
-import org.jboss.bpm.console.client.util.JSONWalk;
import java.util.ArrayList;
import java.util.Date;
@@ -51,6 +51,8 @@
public static ProcessDefinitionRef parseProcessDefinition(JSONValue root)
{
+ ConsoleLog.debug("parse " + root);
+
String id = JSONWalk.on(root).next("id").asString();
Long version = JSONWalk.on(root).next("version").asLong();
String name = JSONWalk.on(root).next("name").asString();
@@ -91,12 +93,8 @@
public static List<TaskRef> parseTaskReferenceList(String json)
{
- List<TaskRef> results = new ArrayList<TaskRef>();
+ List<TaskRef> results = new ArrayList<TaskRef>();
- // {"tasks":[{"id":14,"name":"manager evaluation","isSignalling":true,
- // "isBlocking":false,"tokenId":6,"processInstanceId":4,"actor":"manager",
- // "transitionNames":["reject","approve"]}]}
-
JSONValue root = JSONParser.parse(json);
JSONArray array = JSONWalk.on(root).next("tasks").asArray();
@@ -112,8 +110,9 @@
public static TaskRef parseTaskReference(JSONObject item)
{
+ ConsoleLog.debug("parse " + item);
- long id = JSONWalk.on(item).next("id").asLong();
+ long id = JSONWalk.on(item).next("id").asLong();
String executionId = JSONWalk.on(item).next("processInstanceId").asString();
String processId = JSONWalk.on(item).next("processId").asString();
String name = JSONWalk.on(item).next("name").asString();
@@ -165,7 +164,7 @@
JSONValue jsonValue = arr.get(k);
if (jsonValue.toString().equals("null"))
{
- ConsoleLog.debug("FIXME JBPM-1828: Null value on outcomes:" + arr.toString());
+ ConsoleLog.warn("FIXME JBPM-1828: Null value on outcomes:" + arr.toString());
continue; // TODO: JBPM-1828
}
JSONString t = jsonValue.isString();
@@ -174,6 +173,23 @@
}
+ int prio = JSONWalk.on(item).next("priority").asInt();
+ ref.setPriority(prio);
+
+ JSONWalk.JSONWrapper dueDate = JSONWalk.on(item).next("dueDate");
+ if(dueDate!=null) // optional
+ {
+ Date due = dueDate.asDate();
+ ref.setDueDate(due);
+ }
+
+ JSONWalk.JSONWrapper createDate = JSONWalk.on(item).next("createDate");
+ if(createDate!=null) // optional
+ {
+ Date due = createDate.asDate();
+ ref.setDueDate(due);
+ }
+
return ref;
}
@@ -204,11 +220,7 @@
public static ProcessInstanceRef parseProcessInstance(JSONValue root)
{
ConsoleLog.debug("parse " + root);
-
- // {"id":"StateSequence/8", "definitionId":"StateSequence:1",
- // "startDate":"2009-02-19 14:36:50", "suspended":false}
-
-
+
String id = JSONWalk.on(root).next("id").asString();
String definitionId = JSONWalk.on(root).next("definitionId").asString();
Date start = JSONWalk.on(root).next("startDate").asDate();
@@ -235,6 +247,8 @@
public static TokenReference parseTokenReference(JSONObject jso)
{
+ ConsoleLog.debug("parse " + jso);
+
String rootTokenId = JSONWalk.on(jso).next("id").asString();
//String name = JSONWalk.on(jso).next("name").asString();
String nodeName = JSONWalk.on(jso).next("currentNodeName").asString();
@@ -251,7 +265,7 @@
JSONValue jsonValue = signals.get(i);
if (jsonValue.toString().equals("null"))
{
- ConsoleLog.debug("FIXME JBPM-1828: Null value on availableSignals:" + signals.toString());
+ ConsoleLog.warn("FIXME JBPM-1828: Null value on availableSignals:" + signals.toString());
continue; // TODO: JBPM-1828
}
JSONString item = jsonValue.isString();
@@ -282,7 +296,7 @@
JSONValue jsonValue = jsonArray.get(i);
if (jsonValue.toString().equals("null"))
{
- ConsoleLog.debug("FIXME JBPM-1828: Null value on string array:" + jsonArray.toString());
+ ConsoleLog.warn("FIXME JBPM-1828: Null value on string array:" + jsonArray.toString());
continue; // TODO: JBPM-1828
}
JSONString item = jsonValue.isString();
@@ -294,7 +308,8 @@
public static ServerStatus parseStatus(JSONValue json)
{
- // {"plugins":[{"type":"xyz","available":true}]}
+ ConsoleLog.debug("parse " + json);
+
ServerStatus status = new ServerStatus();
JSONArray jsonArray = JSONWalk.on(json).next("plugins").asArray();
Modified: projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/util/ConsoleLog.java
===================================================================
--- projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/util/ConsoleLog.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/gui/workspace-api/src/main/java/org/jboss/bpm/console/client/util/ConsoleLog.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -33,8 +33,20 @@
*/
public class ConsoleLog
{
- private static boolean enabled = false;
+ private static boolean enabled = true; // see javadoc comments
+ public static void warn(String msg)
+ {
+ if (enabled)
+ com.allen_sauer.gwt.log.client.Log.warn(msg);
+ }
+
+ public static void info(String msg)
+ {
+ if (enabled)
+ com.allen_sauer.gwt.log.client.Log.info(msg);
+ }
+
public static void debug(String msg)
{
if (enabled)
Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java
===================================================================
--- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java 2009-05-07 13:21:23 UTC (rev 4759)
+++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/TaskRef.java 2009-05-07 14:14:42 UTC (rev 4760)
@@ -24,6 +24,7 @@
import javax.xml.bind.annotation.XmlRootElement;
import java.util.ArrayList;
import java.util.List;
+import java.util.Date;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
@@ -51,6 +52,12 @@
private String url;
+ private Date dueDate;
+ private Date createDate;
+ private int priority;
+
+ private String description;
+
public TaskRef()
{
initOrUpdateState();
@@ -198,6 +205,46 @@
this.url = url;
}
+ public Date getDueDate()
+ {
+ return dueDate;
+ }
+
+ public void setDueDate(Date dueDate)
+ {
+ this.dueDate = dueDate;
+ }
+
+ public int getPriority()
+ {
+ return priority;
+ }
+
+ public void setPriority(int priority)
+ {
+ this.priority = priority;
+ }
+
+ public Date getCreateDate()
+ {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate)
+ {
+ this.createDate = createDate;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
public String toString()
{
return "TaskRef{id:"+id+",state:"+currentState+"}";
More information about the jbpm-commits
mailing list