[overlord-commits] Overlord SVN: r934 - in bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client: common and 3 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Tue Jan 26 08:11:03 EST 2010
Author: heiko.braun at jboss.com
Date: 2010-01-26 08:11:02 -0500 (Tue, 26 Jan 2010)
New Revision: 934
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/LoginView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.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/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorModule.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditorModule.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditorNavigation.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorModule.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java
Log:
Moved report tool to errai workspace scheme
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 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -92,14 +92,7 @@
@Override
public Authentication getAuthentication()
{
- return new Authentication(config, "", "")
- {
- @Override
- public void handleSessionTimeout()
- {
- MessageBox.alert("Session?!", "HTTP Session not valid!");
- }
- };
+ return Registry.get(Authentication.class); // set in login view
}
@Override
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 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -143,6 +143,14 @@
.noErrorHandling()
.sendNowWith(ErraiBus.get()
);
+
+ MessageBuilder.createMessage()
+ .toSubject("appContext")
+ .signalling()
+ .with("username", auth.getUsername())
+ .noErrorHandling()
+ .sendNowWith(ErraiBus.get()
+ );
}
}
);
@@ -162,6 +170,7 @@
}
);
+ Registry.set(Authentication.class, auth);
createLayoutWindowPanel();
window.pack();
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -32,7 +32,7 @@
/**
* General purpose window panel
- *
+ *
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
public class WidgetWindowPanel
@@ -41,48 +41,38 @@
public WidgetWindowPanel(String title, final Widget widget)
{
+ this(title, widget, false);
+ }
+
+ public WidgetWindowPanel(String title, final Widget widget, boolean overlay)
+ {
window = new WindowPanel(title);
window.setAnimationEnabled(true);
- //instanceDataWindowPanel.setSize("320px", "240px");
-
- window.addWindowCloseListener(new WindowCloseListener() {
- public void onWindowClosed() {
-
- }
-
- public String onWindowClosing() {
- return null;
- }
- });
-
- window.addWindowResizeListener(
- new WindowResizeListener() {
-
- public void onWindowResized(int i, int i1)
- {
-
- }
- }
- );
-
window.setWidget(widget);
WindowUtil.addMaximizeButton(window, Caption.CaptionRegion.RIGHT);
WindowUtil.addMinimizeButton(window, Caption.CaptionRegion.RIGHT);
+ window.pack();
- final int width = Window.getClientWidth()-200;
- final int height = Window.getClientHeight()-100;
+ if(overlay)
+ {
+ final int width = Window.getClientWidth()-120;
+ final int height = Window.getClientHeight()-80;
- window.setContentSize(
- new Dimension(width,height)
- );
+ window.setSize(width+ " px", height + " px");
+ window.setPopupPosition(60,40);
- window.center();
+ window.show();
+ }
+ else
+ {
+ window.center();
+ }
}
public void close()
{
- window.hide();
+ window.hide();
}
}
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 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -49,7 +49,7 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
- at LoadTool(name = "Definitions", group = "Process")
+ at LoadTool(name = "Definitions", group = "Processes")
public class DefinitionListView implements WSComponent, ViewInterface
{
public final static String ID = DefinitionListView.class.getName();
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 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -23,28 +23,23 @@
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.logical.shared.ResizeEvent;
-import com.google.gwt.event.logical.shared.ResizeHandler;
-import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.Label;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import com.mvc4g.client.ViewInterface;
-import org.gwt.mosaic.ui.client.Caption;
import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
import org.gwt.mosaic.ui.client.MessageBox;
-import org.gwt.mosaic.ui.client.WindowPanel;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.MosaicPanel;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.ServerPlugins;
import org.jboss.bpm.console.client.common.PropertyGrid;
+import org.jboss.bpm.console.client.common.WidgetWindowPanel;
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.bpm.console.client.util.WindowUtil;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
@@ -63,9 +58,9 @@
private Button instanceDataBtn;
- private WindowPanel diagramWindowPanel;
+ private WidgetWindowPanel diagramWindowPanel;
- private WindowPanel instanceDataWindowPanel;
+ private WidgetWindowPanel instanceDataWindowPanel;
private ApplicationContext appContext;
@@ -152,9 +147,6 @@
private void createDiagramWindow(ProcessInstanceRef inst)
{
- diagramWindowPanel = new WindowPanel("Process Instance Activity");
- diagramWindowPanel.setAnimationEnabled(true);
- diagramWindowPanel.setSize("320px", "240px");
MosaicPanel layout = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
layout.setStyleName("bpm-window-layout");
@@ -164,65 +156,20 @@
header.setStyleName("bpm-label-header");
layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- diagramWindowPanel.addWindowClosingHandler(new Window.ClosingHandler() {
-
- public void onWindowClosing(Window.ClosingEvent closingEvent)
- {
- diagramWindowPanel = null;
- }
- });
-
-
layout.add(diagramView, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
- diagramWindowPanel.setWidget(layout);
- WindowUtil.addMaximizeButton(diagramWindowPanel, Caption.CaptionRegion.RIGHT);
- WindowUtil.addMinimizeButton(diagramWindowPanel, Caption.CaptionRegion.RIGHT);
-
- // display
- diagramWindowPanel.pack();
- diagramWindowPanel.center();
-
+ diagramWindowPanel = new WidgetWindowPanel(
+ "Process Instance Activity",
+ layout, true
+ );
}
private void createDataWindow(ProcessInstanceRef inst)
{
- instanceDataWindowPanel = new WindowPanel("Process Instance Data: "+inst.getId());
- instanceDataWindowPanel.setAnimationEnabled(true);
-
- instanceDataWindowPanel.addWindowClosingHandler(new Window.ClosingHandler() {
-
- public void onWindowClosing(Window.ClosingEvent closingEvent)
- {
- instanceDataWindowPanel = null;
- }
- });
-
- instanceDataWindowPanel.addResizeHandler(
- new ResizeHandler() {
-
- public void onResize(ResizeEvent resizeEvent)
- {
- instanceDataView.invalidate();
- }
- }
- );
-
- instanceDataWindowPanel.setWidget(instanceDataView);
-
- WindowUtil.addMaximizeButton(instanceDataWindowPanel, Caption.CaptionRegion.RIGHT);
- WindowUtil.addMinimizeButton(instanceDataWindowPanel, Caption.CaptionRegion.RIGHT);
-
-
- /*final int width = Window.getClientWidth()-200;
- final int height = Window.getClientHeight()-100;
-
- instanceDataWindowPanel.setContentSize(
- new Dimension(width,height)
- );*/
-
- instanceDataWindowPanel.pack();
- instanceDataWindowPanel.center();
+ instanceDataWindowPanel = new WidgetWindowPanel(
+ "Process Instance Data: "+inst.getId(),
+ instanceDataView, true
+ );
}
public void setController(Controller controller)
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 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -53,7 +53,7 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
- at LoadTool(name = "Instances", group = "Process")
+ at LoadTool(name = "Instances", group = "Processes")
public class InstanceListView implements WSComponent, ViewInterface
{
public final static String ID = InstanceListView.class.getName();
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -33,6 +33,7 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
+ at Deprecated
public class ProcessEditor implements WSComponent
{
public final static String ID = ProcessEditor.class.getName();
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorModule.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorModule.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorModule.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -39,6 +39,7 @@
import org.jboss.errai.workspaces.client.EditorWidgetClient;
import org.jboss.errai.workspaces.client.Registry;
+ at Deprecated
public class ProcessEditorModule
{
// the module instance; instantiate it behind a runAsync
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditorNavigation.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -30,6 +30,7 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
+ at Deprecated
class ProcessEditorNavigation extends Tree
{
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -58,7 +58,7 @@
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, url);
ConsoleLog.debug(RequestBuilder.POST+": " + url);
- final ReportEditor view = (ReportEditor)controller.getView(ReportEditor.ID);
+ final ReportView view = (ReportView)controller.getView(ReportView.ID);
try
{
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -39,6 +39,7 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
+ at Deprecated
public class ReportEditor extends Editor
{
public final static String ID = ReportEditor.class.getName();
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditorModule.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditorModule.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditorModule.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -37,6 +37,7 @@
import org.jboss.errai.workspaces.client.EditorWidgetClient;
import org.jboss.errai.workspaces.client.Registry;
+ at Deprecated
public class ReportEditorModule
{
public final static String ID = ReportEditor.class.getName();
@@ -123,7 +124,7 @@
// create and register views
ReportView view = new ReportView();
- registerView(controller, tabPanel, ReportView.ID, view);
+ //registerView(controller, tabPanel, ReportView.ID, view);
view.initialize();
//controller.addView(ID, this);
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditorNavigation.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditorNavigation.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditorNavigation.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -30,6 +30,7 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
+ at Deprecated
class ReportEditorNavigation extends Tree
{
public ReportEditorNavigation(final ApplicationContext appContext)
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -22,22 +22,32 @@
package org.jboss.bpm.console.client.report;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.AbstractImagePrototype;
-import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Timer;
+import com.google.gwt.user.client.ui.*;
import com.mvc4g.client.Controller;
+import com.mvc4g.client.Event;
+import com.mvc4g.client.ViewInterface;
+import org.gwt.mosaic.ui.client.Caption;
import org.gwt.mosaic.ui.client.DeckLayoutPanel;
+import org.gwt.mosaic.ui.client.ImageButton;
import org.gwt.mosaic.ui.client.layout.MosaicPanel;
import org.jboss.bpm.console.client.common.AbstractView;
+import org.jboss.bpm.console.client.common.WidgetWindowPanel;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.search.UpdateSearchDefinitionsAction;
import org.jboss.bpm.report.model.ReportReference;
+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.List;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
-public class ReportView extends AbstractView
+ at LoadTool(name = "Available Reports", group = "Reporting")
+public class ReportView implements ViewInterface, WSComponent
{
public final static String ID = ReportView.class.getName();
@@ -45,13 +55,35 @@
private boolean isInitialized;
private DeckLayoutPanel deck;
private ReportLaunchPadView coverpanel;
-
- public ReportView()
+
+ MosaicPanel panel;
+
+ @Override
+ public Widget getWidget()
{
- super();
- ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- setTitle("Available Reports");
- setIcon(AbstractImagePrototype.create(icons.reportIcon()));
+ panel = new MosaicPanel();
+ controller = Registry.get(Controller.class);
+
+ initialize();
+ panel.add(deck);
+
+ controller.addView(ReportView.ID, this);
+ controller.addAction(UpdateReportConfigAction.ID, new UpdateReportConfigAction());
+
+ // ----
+
+ Timer t = new Timer()
+ {
+ @Override
+ public void run()
+ {
+ controller.handleEvent(new Event(UpdateReportConfigAction.ID, null));
+ }
+ };
+
+ t.schedule(50);
+
+ return panel;
}
public boolean isInitialized()
@@ -75,8 +107,6 @@
// cover
coverpanel = new ReportLaunchPadView();
deck.add(coverpanel);
-
- this.add(deck);
// views and actions
controller.addView(ReportLaunchPadView.ID, coverpanel);
@@ -94,11 +124,18 @@
{
this.controller = controller;
}
-
+
public void configure(List<ReportReference> reports)
{
// update coverview
- coverpanel.update(reports);
+ coverpanel.update(reports);
deck.showWidget(1);
}
+
+ public void displayReport(String title, String dispatchUrl)
+ {
+ ReportFrame reportFrame = new ReportFrame(dispatchUrl);
+ reportFrame.initialize();
+ new WidgetWindowPanel(title, reportFrame, true);
+ }
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -22,10 +22,14 @@
package org.jboss.bpm.console.client.task;
import com.mvc4g.client.Controller;
+import com.mvc4g.client.ViewInterface;
import org.gwt.mosaic.ui.client.ListBox;
import org.gwt.mosaic.ui.client.layout.MosaicPanel;
+import org.jboss.bpm.console.client.ApplicationContext;
+import org.jboss.bpm.console.client.Authentication;
import org.jboss.bpm.console.client.common.AbstractView;
import org.jboss.bpm.console.client.model.TaskRef;
+import org.jboss.errai.workspaces.client.Registry;
import java.util.List;
@@ -34,7 +38,7 @@
*
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
-public abstract class AbstractTaskList extends AbstractView
+public abstract class AbstractTaskList implements ViewInterface
{
protected Controller controller;
protected MosaicPanel taskList = null;
@@ -72,6 +76,6 @@
public String getAssignedIdentity()
{
- return identity;
+ return Registry.get(Authentication.class).getUsername();
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -21,13 +21,13 @@
*/
package org.jboss.bpm.console.client.task;
-import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.Widget;
+import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.ListBox;
import org.gwt.mosaic.ui.client.MessageBox;
@@ -40,18 +40,21 @@
import org.jboss.bpm.console.client.common.IFrameWindowPanel;
import org.jboss.bpm.console.client.common.PagingCallback;
import org.jboss.bpm.console.client.common.PagingPanel;
-import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.client.task.events.DetailViewEvent;
import org.jboss.bpm.console.client.task.events.TaskIdentityEvent;
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.List;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
-public class AssignedTasksView extends AbstractTaskList
+ at LoadTool(name = "Personal Tasks", group = "Tasks", priority = 2)
+public class AssignedTasksView extends AbstractTaskList implements WSComponent
{
public final static String ID = AssignedTasksView.class.getName();
@@ -68,15 +71,27 @@
private PagingPanel pagingPanel;
- public AssignedTasksView(ApplicationContext appContext, TaskDetailView detailsView)
+ MosaicPanel panel;
+
+ public AssignedTasksView()
{
- super();
- this.appContext = appContext;
- ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- setTitle("Personal Tasks");
- setIcon(AbstractImagePrototype.create(icons.userIcon()));
+ controller = Registry.get(Controller.class);
+ appContext = Registry.get(ApplicationContext.class);
+ }
- this.detailsView = detailsView;
+ @Override
+ public Widget getWidget()
+ {
+ panel = new MosaicPanel(new BorderLayout());
+
+ initialize();
+
+ panel.add(taskList, new BorderLayoutData(BorderLayout.Region.CENTER));
+ panel.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10 , 200));
+
+ controller.addView(AssignedTasksView.ID, this);
+
+ return panel;
}
public void initialize()
@@ -246,13 +261,12 @@
);
this.taskList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+
+ detailsView = new TaskDetailView(false);
+ controller.addView("AssignedDetailView", detailsView);
+ detailsView.initialize();
- MosaicPanel layout = new MosaicPanel(new BorderLayout());
- layout.add(taskList, new BorderLayoutData(BorderLayout.Region.CENTER));
- layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10 , 200));
- this.add(layout);
-
// plugin availability
this.hasDispatcherPlugin =
ServerPlugins.has("org.jboss.bpm.console.server.plugin.FormDispatcherPlugin");
@@ -292,7 +306,6 @@
new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null))
);
- this.invalidate();
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -21,13 +21,13 @@
*/
package org.jboss.bpm.console.client.task;
-import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.Widget;
+import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.ListBox;
import org.gwt.mosaic.ui.client.MessageBox;
@@ -37,18 +37,21 @@
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.common.PagingCallback;
import org.jboss.bpm.console.client.common.PagingPanel;
-import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.model.TaskRef;
import org.jboss.bpm.console.client.task.events.DetailViewEvent;
import org.jboss.bpm.console.client.task.events.TaskIdentityEvent;
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.List;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
-class OpenTasksView extends AbstractTaskList
+ at LoadTool(name = "Group Tasks", group = "Tasks", priority = 1)
+public class OpenTasksView extends AbstractTaskList implements WSComponent
{
public final static String ID = OpenTasksView.class.getName();
@@ -61,16 +64,45 @@
private PagingPanel pagingPanel;
- public OpenTasksView(ApplicationContext appContext, TaskDetailView detailView)
+ private MosaicPanel panel;
+
+ private Controller controller;
+
+ @Override
+ public Widget getWidget()
{
- super();
- this.appContext = appContext;
+ panel = new MosaicPanel(new BorderLayout());
- ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- setTitle("Group Tasks");
- setIcon(AbstractImagePrototype.create(icons.taskIcon()));
+ controller = Registry.get(Controller.class);
+ appContext = Registry.get(ApplicationContext.class);
- this.detailsView = detailView;
+ initialize();
+
+ // ----
+
+ // create and register actions
+ controller.addAction(LoadTasksAction.ID, new LoadTasksAction());
+ controller.addAction(LoadTasksParticipationAction.ID, new LoadTasksParticipationAction());
+ controller.addAction(ClaimTaskAction.ID, new ClaimTaskAction());
+ controller.addAction(ReleaseTaskAction.ID, new ReleaseTaskAction());
+ controller.addAction(UpdateDetailsAction.ID, new UpdateDetailsAction());
+ controller.addAction(AssignTaskAction.ID, new AssignTaskAction());
+ controller.addAction(ReloadAllTaskListsAction.ID, new ReloadAllTaskListsAction());
+
+
+ /*TaskDetailView assignedDetailView = new TaskDetailView(false);
+controller.addView("AssignedDetailView", assignedDetailView);
+assignedDetailView.initialize();
+registerView(controller, tabPanel, AssignedTasksView.ID, new AssignedTasksView(appContext, assignedDetailView));*/
+
+ controller.addView(OpenTasksView.ID, this);
+
+ // ----
+
+ panel.add(taskList, new BorderLayoutData(BorderLayout.Region.CENTER));
+ panel.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10,200));
+
+ return panel;
}
public void initialize()
@@ -141,10 +173,10 @@
new Button("Refresh", new ClickHandler() {
public void onClick(ClickEvent clickEvent)
{
- // force loading
- controller.handleEvent(
- new Event(LoadTasksParticipationAction.ID, getAssignedIdentity())
- );
+ // force loading
+ controller.handleEvent(
+ new Event(LoadTasksParticipationAction.ID, getAssignedIdentity())
+ );
}
}
@@ -197,12 +229,15 @@
this.taskList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- // main layout
- MosaicPanel layout = new MosaicPanel(new BorderLayout());
- layout.add(taskList, new BorderLayoutData(BorderLayout.Region.CENTER));
- layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10,200));
- this.add(layout);
+ // ----
+
+
+ // create and register views
+ detailsView = new TaskDetailView(true);
+ controller.addView("OpenDetailView", detailsView);
+ detailsView.initialize();
+
isInitialized = true;
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -36,6 +36,7 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
+ at Deprecated
public class TaskEditor extends Editor
{
public final static String ID = TaskEditor.class.getName();
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorModule.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorModule.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorModule.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -38,6 +38,7 @@
import org.jboss.errai.workspaces.client.EditorWidgetClient;
import org.jboss.errai.workspaces.client.Registry;
+ at Deprecated
public class TaskEditorModule
{
@@ -124,8 +125,8 @@
openDetailView.initialize();
assignedDetailView.initialize();
- registerView(controller, tabPanel, OpenTasksView.ID, new OpenTasksView(appContext, openDetailView));
- registerView(controller, tabPanel, AssignedTasksView.ID, new AssignedTasksView(appContext, assignedDetailView));
+ //registerView(controller, tabPanel, OpenTasksView.ID, new OpenTasksView(appContext, openDetailView));
+ //registerView(controller, tabPanel, AssignedTasksView.ID, new AssignedTasksView(appContext, assignedDetailView));
// create and register actions
controller.addAction(LoadTasksAction.ID, new LoadTasksAction());
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java 2010-01-26 09:32:49 UTC (rev 933)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditorNavigation.java 2010-01-26 13:11:02 UTC (rev 934)
@@ -30,6 +30,7 @@
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
+ at Deprecated
class TaskEditorNavigation extends Tree
{
public TaskEditorNavigation(final ApplicationContext appContext)
More information about the overlord-commits
mailing list