diff --git a/README.txt b/README.txt index e63b382..3b23d2e 100644 --- a/README.txt +++ b/README.txt @@ -2,7 +2,7 @@ Prerequisites ------------- -The server module needs to be deployed on a running jboss instance, +The server module needs to be deployed on a running jboss instance, along with a process engine that provides an implementation of the integration layer. See http://www.jboss.org/community/wiki/BPMConsoleReference for further explanations. @@ -16,12 +16,12 @@ But the basics steps to get going are as follows: mvn clean install 2) Make sure both process engine and the server module are installed on JBoss AS instance - + http://www.jboss.org/community/wiki/BPMConsoleReference 3) Boot the AS and start the gwt console in hosted mode - See gui/war/README.txt for further information + See gui/war/README.txt for further information Publish console artifacts diff --git a/gui/pom.xml b/gui/pom.xml index e1b6c41..7decab5 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -18,6 +18,6 @@ profiles - war + war diff --git a/gui/profiles/drools/pom.xml b/gui/profiles/drools/pom.xml index d745fd1..039e324 100644 --- a/gui/profiles/drools/pom.xml +++ b/gui/profiles/drools/pom.xml @@ -15,5 +15,5 @@ 2.3.0-SNAPSHOT ../pom.xml - + diff --git a/gui/profiles/jbpm/pom.xml b/gui/profiles/jbpm/pom.xml index 18e8726..0ab6fc2 100644 --- a/gui/profiles/jbpm/pom.xml +++ b/gui/profiles/jbpm/pom.xml @@ -15,5 +15,5 @@ 2.3.0-SNAPSHOT ../pom.xml - + diff --git a/gui/profiles/riftsaw/pom.xml b/gui/profiles/riftsaw/pom.xml index 3dc7b8a..3ce6717 100644 --- a/gui/profiles/riftsaw/pom.xml +++ b/gui/profiles/riftsaw/pom.xml @@ -15,5 +15,5 @@ 2.3.0-SNAPSHOT ../pom.xml - + diff --git a/gui/profiles/riftsaw/src/main/resources/app.html b/gui/profiles/riftsaw/src/main/resources/app.html index 27d29a5..91e2167 100644 --- a/gui/profiles/riftsaw/src/main/resources/app.html +++ b/gui/profiles/riftsaw/src/main/resources/app.html @@ -22,7 +22,7 @@ position: absolute; top: 0; left: 0; z-index:1000; } - .bpm-loader { + .bpm-loader { background-image: url('images/loading_lite.gif'); background-repeat:no-repeat; height: 24px; width: 130px; @@ -38,7 +38,7 @@ - + diff --git a/gui/war/GWT_TEST_README.txt b/gui/war/GWT_TEST_README.txt index 4192233..6257c14 100644 --- a/gui/war/GWT_TEST_README.txt +++ b/gui/war/GWT_TEST_README.txt @@ -2,7 +2,7 @@ Special node for executing GWT tests under linux: The GWT-maven plugin executes any test prefixed "GwtTest" (See http://gwt-maven.googlecode.com/svn/docs/maven-googlewebtoolkit2-plugin/testing.html) It reads stderr in order to figure wether or not the test has been successful. -On fedora (or any other linux) it happens that that mozilla components issue the following +On fedora (or any other linux) it happens that that mozilla components issue the following INFO message to stderr, which causes the test to fail: > Gtk-WARNING **: Unable to locate theme engine in module_path: "nodoka" diff --git a/gui/war/README.txt b/gui/war/README.txt index 0a154d9..afd8955 100644 --- a/gui/war/README.txt +++ b/gui/war/README.txt @@ -1,14 +1,14 @@ Running in hosted mode: ---------------------- -Start the GWT shell with +Start the GWT shell with mvn gwt: When the hosted browser is started, it's enough to hit the 'refresh' button to recompile and verfiy changes. -NOTE: Really quick turnaround through +NOTE: Really quick turnaround through mvn -Dhosted gwt: @@ -18,7 +18,7 @@ NOTE: Really quick turnaround through Running in web mode: ------------------- -mvn package +mvn package Produces a war file in target/gwt-console.war, which can be deployed to a running jboss instance. diff --git a/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java b/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java index 223da7c..f0596c7 100644 --- a/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java +++ b/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java @@ -37,12 +37,12 @@ public MosaicPanel() protected MosaicPanel(Element elem) { - super(elem); + super(elem); } protected MosaicPanel(Element elem, LayoutManager layout) { - super(elem, layout); + super(elem, layout); } public MosaicPanel(LayoutManager layout) @@ -50,5 +50,5 @@ public MosaicPanel(LayoutManager layout) super(layout); setPadding(5); } - + } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml b/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml index cfa083d..bfab424 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml +++ b/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml @@ -5,22 +5,22 @@ - + - + - + - - + + diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java b/gui/war/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java index 68d41ba..9fbfe56 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java @@ -23,12 +23,12 @@ /** * Provides context information to console components and plugins. - * + * * @author Heiko.Braun */ public interface ApplicationContext { - + void displayMessage(String message, boolean isError); Authentication getAuthentication(); @@ -36,5 +36,5 @@ public interface ApplicationContext ConsoleConfig getConfig(); void refreshView(); - + } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/Authentication.java b/gui/war/src/main/java/org/jboss/bpm/console/client/Authentication.java index c9e683d..e0bc532 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/Authentication.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/Authentication.java @@ -216,7 +216,7 @@ public void onResponseReceived(Request request, Response response) if(response.getStatusCode()!=200) { - ConsoleLog.error(response.getText()); + ConsoleLog.error(response.getText()); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java index a3f7e36..ff3a70e 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java @@ -64,6 +64,6 @@ public RequestBuilder.Method getRequestMethod() public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) { ServerStatus status = JSOParser.parseStatus(response.getText()); - ServerPlugins.setStatus(status); + ServerPlugins.setStatus(status); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java b/gui/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java index 35120db..0f87591 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/ConsoleConfig.java @@ -51,7 +51,7 @@ public class ConsoleConfig private String consoleServerUrl; private String defaultEditor; - + public ConsoleConfig(String proxyUrl) { Dictionary theme = Dictionary.getDictionary("consoleConfig"); @@ -65,7 +65,7 @@ public ConsoleConfig(String proxyUrl) instanceSummaryReportFile = theme.get("instanceSummaryReportFile"); defaultEditor = theme.get("defaultEditor"); - + if(null==proxyUrl) { // extract host diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java b/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java index 9cbb173..61bd11b 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java @@ -92,7 +92,7 @@ public void run() ); bus.addSubscribeListener(this); - + Controller mainController = new com.mvc4g.client.Controller(); Registry.set(Controller.class, mainController); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java index 5917042..b99935d 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/LoginAction.java @@ -31,7 +31,7 @@ public class LoginAction implements ActionInterface { public void execute(Controller controller, Object object) - { + { LoginView loginView = (LoginView)controller.getView(LoginView.NAME); loginView.display(); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java index fc36014..c549750 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java @@ -289,7 +289,7 @@ private Widget createForm() panel.setPadding(0); MosaicPanel box1 = new MosaicPanel(new BoxLayout()); - box1.setPadding(0); + box1.setPadding(0); MosaicPanel box2 = new MosaicPanel(new BoxLayout()); box2.setPadding(0); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java index bfdb036..1245df7 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java @@ -59,7 +59,7 @@ public void setController(Controller controller) { this.controller = controller; } - + public void provideWidget(ProvisioningCallback callback) { panel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/ServerPlugins.java b/gui/war/src/main/java/org/jboss/bpm/console/client/ServerPlugins.java index 8530c07..2216580 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/ServerPlugins.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/ServerPlugins.java @@ -52,7 +52,7 @@ public static boolean has(String type) if(p.getType().equals(type)) { match = p.isAvailable(); - break; + break; } } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusModule.java b/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusModule.java index bda06d4..1680940 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusModule.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/ServerStatusModule.java @@ -53,6 +53,6 @@ public void onSuccess() } ); - + } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java b/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java index 4492969..de9e83d 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java @@ -106,7 +106,7 @@ public String getActiveNodeInfoURL(String instanceId) public String getActivityImage(String processId, String instanceId) { String encodedId = URL.encode(processId); - return config.getConsoleServerUrl() + "/rs/process/definition/"+ encodedId+ "/image/"+instanceId; + return config.getConsoleServerUrl() + "/rs/process/definition/"+ encodedId+ "/image/"+instanceId; } @@ -244,7 +244,7 @@ public String getDefinitionHistoryURL(String definitionId) { return config.getConsoleServerUrl() + "/rs/process/definition/history/" + definitionId; } - + public String getProcessHistoryURL(String definitionId, String querystring) { String encodedId = URL.encode(definitionId); return config.getConsoleServerUrl()+"/rs/history/definition/"+ encodedId + "/instances?" + querystring; diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractView.java index 5524546..ed814a8 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractView.java @@ -36,7 +36,7 @@ public abstract class AbstractView extends MosaicPanel private AbstractImagePrototype icon; protected boolean initialized; - + protected AbstractView() { } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/common/HeaderLabel.java b/gui/war/src/main/java/org/jboss/bpm/console/client/common/HeaderLabel.java index 5329b46..8ead223 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/common/HeaderLabel.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/common/HeaderLabel.java @@ -34,7 +34,7 @@ public HeaderLabel(String string) super(string); applyStyle(false); } - + public HeaderLabel(String string, boolean invert) { super(string); @@ -42,7 +42,7 @@ public HeaderLabel(String string, boolean invert) } private void applyStyle(boolean invert) - { + { if(invert) this.setStyleName("bpm-label-header-invert"); else diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java b/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java index d6065aa..87f526f 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowCallback.java @@ -27,5 +27,5 @@ public interface IFrameWindowCallback { void onWindowClosed(); - + } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java b/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java index 492359e..275ffcf 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/common/IFrameWindowPanel.java @@ -51,7 +51,7 @@ * window dimension. * * @see org.jboss.bpm.console.client.common.IFrameWindowCallback - * + * * @author Heiko.Braun */ public class IFrameWindowPanel @@ -73,7 +73,7 @@ public IFrameWindowPanel(String url, String title) private void createWindow() { windowPanel = new WindowPanel(); - windowPanel.setAnimationEnabled(true); + windowPanel.setAnimationEnabled(true); ScrollLayoutPanel layout = new ScrollLayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); layout.setStyleName("bpm-window-layout"); @@ -82,7 +82,7 @@ private void createWindow() HeaderLabel header = new HeaderLabel(title, true); layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - + windowPanel.addWindowCloseListener(new WindowCloseListener() { public void onWindowClosed() { if(getCallback()!=null) @@ -202,6 +202,6 @@ public native String getContents(Element iframe) /*-{ public void show() { - createWindow(); + createWindow(); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java b/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java index bed10a9..dc99645 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/common/IconHeader.java @@ -37,7 +37,7 @@ public IconHeader(AbstractImagePrototype icon, String title) super(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); setPadding(5); - this.add(icon.createImage()); + this.add(icon.createImage()); this.add(new HTML(""+title+"")); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/common/ListBoxToolbar.java b/gui/war/src/main/java/org/jboss/bpm/console/client/common/ListBoxToolbar.java index 5112295..9202beb 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/common/ListBoxToolbar.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/common/ListBoxToolbar.java @@ -38,7 +38,7 @@ public ListBoxToolbar(String title) setStyleName("bpm-toolbar-panel"); toolPanel = new HorizontalPanel(); - + this.add(new HTML(""+title+""), new ColumnLayoutData("80%")); this.add(toolPanel, new ColumnLayoutData("20%")); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/common/PropertyGrid.java b/gui/war/src/main/java/org/jboss/bpm/console/client/common/PropertyGrid.java index 75637d0..b51bf52 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/common/PropertyGrid.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/common/PropertyGrid.java @@ -54,7 +54,7 @@ public PropertyGrid(String[] fieldDesc) this.fieldNames = fieldDesc; this.add(grid); - + initReset(); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java b/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java index 31aedee..567c323 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/common/WidgetWindowPanel.java @@ -47,7 +47,7 @@ public WidgetWindowPanel(String title, final Widget widget, boolean overlay) window = new WindowPanel(title); window.setAnimationEnabled(true); window.setWidget(widget); - + WindowUtil.addMaximizeButton(window, Caption.CaptionRegion.RIGHT); WindowUtil.addMinimizeButton(window, Caption.CaptionRegion.RIGHT); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java index 0284ff0..1be37e1 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java @@ -55,7 +55,7 @@ public class DeploymentDetailView extends CaptionLayoutPanel implements ViewInte Button suspendBtn; Button resumeBtn; - + public DeploymentDetailView() { super("Deployment details"); @@ -101,7 +101,7 @@ public void onResult(boolean doIt) resumeBtn = new Button("Activate", new ClickHandler() { public void onClick(ClickEvent clickEvent) - { + { DeploymentRef deploymentRef = getSelection(); if(deploymentRef!=null) { @@ -134,7 +134,7 @@ public void onResult(boolean doIt) btnLayout.add(suspendBtn, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); btnLayout.add(resumeBtn, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); propLayout.add(btnLayout); - + // properties final DeckLayoutPanel deck = new DeckLayoutPanel(); deck.add(propLayout); @@ -188,7 +188,7 @@ public void update(DeploymentRef deployment) }; resumeBtn.setEnabled(deployment.isSuspended()); - suspendBtn.setEnabled(!resumeBtn.isEnabled()); + suspendBtn.setEnabled(!resumeBtn.isEnabled()); grid.update(values); resourcePanel.update(deployment); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java index 1cbf29a..8902e70 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java @@ -107,14 +107,14 @@ public void provideWidget(ProvisioningCallback callback) controller.addAction(UpdateDeploymentDetailAction.ID, new UpdateDeploymentDetailAction()); controller.addAction(DeleteDeploymentAction.ID, new DeleteDeploymentAction()); controller.addAction(SuspendDeploymentAction.ID, new SuspendDeploymentAction()); - controller.addAction(ResumeDeploymentAction.ID, new ResumeDeploymentAction()); - //controller.addAction(ViewDeploymentAction.ID, new ViewDeploymentAction()); + controller.addAction(ResumeDeploymentAction.ID, new ResumeDeploymentAction()); + //controller.addAction(ViewDeploymentAction.ID, new ViewDeploymentAction()); controller.addView(DeploymentListView.ID, this); callback.onSuccess(panel); - + } private ListBox createListBox() @@ -200,7 +200,7 @@ public void initialize() public void onClick(ClickEvent clickEvent) { reset(); - + // force loading controller.handleEvent( new Event(UpdateDeploymentsAction.ID, null) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ExecuteJobAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ExecuteJobAction.java index 05367f0..edbef83 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ExecuteJobAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ExecuteJobAction.java @@ -58,7 +58,7 @@ public void handleSuccessfulResponse(final Controller controller, final Object e String id = (String)event; ConsoleLog.debug("Executed jod with id " + id + " and response from server is " + response.getText()); - + // reload job list controller.handleEvent( new Event(UpdateJobsAction.ID, null) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java index 74036c4..806b126 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java @@ -85,7 +85,7 @@ public JobListView() { controller = Registry.get(Controller.class); } - + public void provideWidget(ProvisioningCallback callback) { panel = new MosaicPanel(); @@ -184,7 +184,7 @@ public void initialize() toolBar.add( new Button("Refresh", new ClickHandler() { public void onClick(ClickEvent clickEvent) - { + { // force loading controller.handleEvent( new Event(UpdateJobsAction.ID, null) @@ -198,7 +198,7 @@ public void onClick(ClickEvent clickEvent) new Button("Execute", new ClickHandler() { public void onClick(ClickEvent clickEvent) - { + { JobRef selection = getSelection(); if(null==selection) { @@ -270,7 +270,7 @@ public void run() }; t.schedule(500); - + controller.addAction(UpdateJobsAction.ID, new UpdateJobsAction()); this.initialized = true; @@ -302,7 +302,7 @@ private void renderFiltered() if(this.jobs!=null) { reset(); - + final DefaultListModel model = (DefaultListModel) listBox.getModel(); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ResourcePanel.java b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ResourcePanel.java index 0b7f530..ce2d66b 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ResourcePanel.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/ResourcePanel.java @@ -31,7 +31,7 @@ /** * List resources associated with a process deployment. - * + * * @author Heiko.Braun */ public class ResourcePanel extends MosaicPanel @@ -61,7 +61,7 @@ private void initialize() this.add(propGrid); this.add(resources, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - + this.initialized = true; } } @@ -88,7 +88,7 @@ public void update(DeploymentRef deployment) HTML html = new HTML(sb.toString()); resources.clear(); resources.add(html); - + propGrid.update(new String[]{deployment.getId()}); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentDetailAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentDetailAction.java index cd007bb..21be434 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentDetailAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentDetailAction.java @@ -46,6 +46,6 @@ public void execute(Controller controller, Object object) { // update view view.update(ref); - } + } } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentsAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentsAction.java index 1981e96..93efee2 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentsAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/engine/UpdateDeploymentsAction.java @@ -84,7 +84,7 @@ public void handleSuccessfulResponse( // optional String deploymentId = (String)event; - if(deploymentId!=null) + if(deploymentId!=null) view.select(deploymentId); // refresh process definitions diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/history/LoadProcessHistoryAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/history/LoadProcessHistoryAction.java index e6b2a4c..3e02331 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/history/LoadProcessHistoryAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/history/LoadProcessHistoryAction.java @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.bpm.console.client.history; @@ -23,15 +23,15 @@ * @date Mar 17, 2011 */ public class LoadProcessHistoryAction extends AbstractRESTAction { - + public static final String ID = LoadProcessHistoryAction.class.getName(); - + @Override public String getId() { return ID; } - - + + @Override protected DataDriven getDataDriven(Controller controller) { return (ProcessHistoryInstanceListView)controller.getView(ProcessHistoryInstanceListView.ID); @@ -54,7 +54,7 @@ public String getUrl(Object event) { return URLBuilder.getInstance().getProcessHistoryURL(searchEvent.getDefinitionKey(), sbuffer.toString()); } - + @Override public Method getRequestMethod() { return RequestBuilder.GET; @@ -68,7 +68,7 @@ public void handleSuccessfulResponse(Controller controller, Object event, Respon ProcessHistoryInstanceListView view = (ProcessHistoryInstanceListView) controller.getView(ProcessHistoryInstanceListView.ID); List ref = JSOParser.parseProcessDefinitionHistory(response.getText()); view.update(ref); - + ConsoleLog.debug("Loaded " + ref.size() + " process instance(s) : " + response.getText()); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistoryInstanceListView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistoryInstanceListView.java index a5e7213..7dc90a3 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistoryInstanceListView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistoryInstanceListView.java @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.bpm.console.client.history; @@ -36,40 +36,40 @@ * @date Mar 18, 2011 */ public class ProcessHistoryInstanceListView implements ViewInterface, WidgetProvider, DataDriven { - + public static final String ID = ProcessHistoryInstanceListView.class.getName(); - + private Controller controller; - + private MosaicPanel panel; - + private MosaicPanel instanceList; - + private ListBox listbox; - + private SimpleDateFormat dateFormat = new SimpleDateFormat(); - + private WidgetWindowPanel processEventsWindow; - + private ListBox processEvents; private String selectedProcessInstanceId; - + @Override public void provideWidget(ProvisioningCallback callback) { - + controller = Registry.get(Controller.class); controller.addView(ID, this); controller.addAction(LoadProcessInstanceEventsAction.ID, new LoadProcessInstanceEventsAction()); - + panel = new MosaicPanel(); panel.setPadding(0); panel.setWidgetSpacing(5); - + instanceList = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); instanceList.setPadding(0); instanceList.setWidgetSpacing(5); - + listbox = new org.gwt.mosaic.ui.client.ListBox(new String[]{"Instance Id", "Correlation Key", "Status", "Start Time", "Finish Time"}); listbox.setCellRenderer(new org.gwt.mosaic.ui.client.ListBox.CellRenderer(){ @@ -93,11 +93,11 @@ public void renderCell(org.gwt.mosaic.ui.client.ListBox result = (List)data[0]; DefaultListModel model = (DefaultListModel)listbox.getModel(); model.clear(); - + for (HistoryProcessInstanceRef ref : result) { model.add(ref); } - panel.invalidate(); - + panel.invalidate(); + } @Override public void setLoading(boolean isLoading) { LoadingOverlay.on(instanceList, isLoading); } - - + + public void createHistoryInstanceDetailWindow() { - + org.gwt.mosaic.ui.client.layout.LayoutPanel layout = new ScrollLayoutPanel(); layout.setStyleName("bpm-window-layout"); layout.setPadding(5); @@ -163,10 +163,10 @@ public void createHistoryInstanceDetailWindow() { Label header = new Label("Instance: "+ selectedProcessInstanceId); header.setStyleName("bpm-label-header"); layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - + final DecoratedTabLayoutPanel tabPanel = new DecoratedTabLayoutPanel(false); tabPanel.setPadding(5); - + processEvents = new ListBox(new String[]{"Process Events"}); processEvents.setCellRenderer(new CellRenderer(){ @@ -178,18 +178,18 @@ public void renderCell(ListBox listBox, int row, int column, String item break; default: throw new RuntimeException("Should not happen!"); - } + } } }); MosaicPanel sourcePanel = new MosaicPanel(); - sourcePanel.add(processEvents, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); + sourcePanel.add(processEvents, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); tabPanel.add(sourcePanel, "Activity Events"); - + tabPanel.selectTab(0); - + layout.add(tabPanel, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); - + processEventsWindow = new WidgetWindowPanel("History Instance Activity", layout, true); controller.handleEvent(new Event(LoadProcessInstanceEventsAction.ID, selectedProcessInstanceId)); @@ -206,17 +206,17 @@ public void populateInstanceEvents(List refs) { } } - + private String formatResult(String value) { StringBuffer sbuffer = new StringBuffer(); StringTokenizer st = new StringTokenizer(value, "~"); sbuffer.append(st.nextToken() + " : "); - + while (st.hasMoreTokens()) { sbuffer.append("
"); sbuffer.append(st.nextToken()); } - + return sbuffer.toString(); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistorySearchModule.java b/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistorySearchModule.java index 3e3bc0e..8f2b991 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistorySearchModule.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistorySearchModule.java @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.bpm.console.client.history; @@ -17,10 +17,10 @@ */ @LoadTool(name="History Query", group = "Processes", icon = "historySearchIcon", priority= 3 ) public class ProcessHistorySearchModule implements WidgetProvider { - + private ProcessHistorySearchView instance; - - + + @Override public void provideWidget(final ProvisioningCallback callback) { GWT.runAsync( diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistorySearchView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistorySearchView.java index 9594732..6d32269 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistorySearchView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessHistorySearchView.java @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.bpm.console.client.history; @@ -34,23 +34,23 @@ * @date: Mar 02, 2011 */ public class ProcessHistorySearchView implements WidgetProvider, ViewInterface { - + public static final String ID = ProcessHistorySearchView.class.getName(); - + private Controller controller; - + private ListBox processStatusList; - + private ListBox definitionList; - + private TextBox correlationKey; - + private DateBox startTime; - + private DateBox endTime; private ProvisioningCallback callback; - + public ProcessHistorySearchView() { this.controller = Registry.get(Controller.class); @@ -58,14 +58,14 @@ public ProcessHistorySearchView() { this.controller.addAction(LoadProcessHistoryAction.ID, new LoadProcessHistoryAction()); this.controller.addAction(LoadProcessDefinitionsAction.ID, new LoadProcessDefinitionsAction()); } - + @Override public void provideWidget(final ProvisioningCallback callback) { controller.handleEvent(new Event(LoadProcessDefinitionsAction.ID, null)); this.callback = callback; - + } public void initialize(final List processDefinitions) { @@ -76,7 +76,7 @@ public void initialize(final List processDefinitions) { final ToolBar toolbar = new ToolBar(); panel.add(toolbar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - + toolbar.add(new Button("Search", new ClickHandler() { @Override @@ -106,63 +106,63 @@ public void onClick(ClickEvent clickEvent) { edate = new Date(); } String ckey = correlationKey.getValue(); - + ProcessSearchEvent event = new ProcessSearchEvent(); event.setDefinitionKey(definitionId); event.setStatus(theStatus); event.setStartTime(theDate.getTime()); event.setEndTime(edate.getTime()); event.setKey(ckey); - + controller.handleEvent(new Event(LoadProcessHistoryAction.ID, event)); } - + }) ); - + final MosaicPanel formPanel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); panel.add(formPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); BoxLayoutData bld1 = new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL); bld1.setPreferredWidth("130px"); - + final MosaicPanel processDefBox = new MosaicPanel(new BoxLayout()); processDefBox.add(new Label("Process Definition: "), bld1); - + definitionList = new ListBox(); for (ProcessDefinitionRef ref : processDefinitions) { definitionList.addItem(ref.getName()); } processDefBox.add(definitionList); - - formPanel.add(processDefBox); - formPanel.add(createProcessStatusListBox(bld1)); - formPanel.add(createCorrelationKeyTextBox(bld1)); - formPanel.add(createStartTimeDateBox(bld1)); + + formPanel.add(processDefBox); + formPanel.add(createProcessStatusListBox(bld1)); + formPanel.add(createCorrelationKeyTextBox(bld1)); + formPanel.add(createStartTimeDateBox(bld1)); formPanel.add(createEndTimeDateBox(bld1)); - + ProcessHistoryInstanceListView listview = new ProcessHistoryInstanceListView(); final DecoratedTabLayoutPanel tabPanel = new DecoratedTabLayoutPanel(false); listview.provideWidget(new ProvisioningCallback(){ @Override public void onSuccess(Widget instance) { - tabPanel.add(instance, "History Instances"); + tabPanel.add(instance, "History Instances"); } @Override public void onUnavailable() { - + } - + }); - + panel.add(tabPanel, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); callback.onSuccess(panel); } - + private MosaicPanel createEndTimeDateBox(BoxLayoutData bld1) { MosaicPanel box4 = new MosaicPanel(new BoxLayout()); endTime = new DateBox(); @@ -199,7 +199,7 @@ private MosaicPanel createProcessStatusListBox(BoxLayoutData bld1) { processStatusList = new ListBox(); processStatusList.addItem("COMPLETED"); processStatusList.addItem("FAILED"); - processStatusList.addItem("TERMINATED"); + processStatusList.addItem("TERMINATED"); box1.add(new Label("Process Status: "), bld1); box1.add(processStatusList); return box1; diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessSearchEvent.java b/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessSearchEvent.java index e6304c3..c9c881f 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessSearchEvent.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/history/ProcessSearchEvent.java @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.bpm.console.client.history; @@ -8,15 +8,15 @@ * @date Mar 17, 2011 */ public class ProcessSearchEvent { - + private String definitionKey; - + private String key; - + private String status; - + private long startTime; - + private long endTime; public String getDefinitionKey() { @@ -58,7 +58,7 @@ public long getEndTime() { public void setEndTime(long endTime) { this.endTime = endTime; } - - + + } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java b/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java index 9d30dd8..3abbef2 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java @@ -113,7 +113,7 @@ public interface ConsoleIconBundle extends ClientBundle @ClientBundle.Source("grey.png") ImageResource greyIcon(); - + @ClientBundle.Source("large.png") ImageResource historySearchIcon(); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java b/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java index 1f17acc..4eaa32a 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java @@ -35,7 +35,7 @@ * @author Heiko.Braun */ public class DTOParser -{ +{ public static List parseTaskReferenceList(String json) { ConsoleLog.debug("parse " + json); @@ -196,9 +196,9 @@ public static ProcessInstanceRef parseProcessInstance(JSONValue root) JSONWalk.JSONWrapper rootTokenJSON = JSONWalk.on(root).next("rootToken"); if (rootTokenJSON != null) { JSONObject tokJso = rootTokenJSON.asObject(); - + TokenReference rootToken = parseTokenReference(tokJso); - processInstance.setRootToken(rootToken); + processInstance.setRootToken(rootToken); } return processInstance; @@ -282,7 +282,7 @@ public static List parseDeploymentRefList(JSONValue json) String name = JSONWalk.on(item).next("name").asString(); JSONWalk.JSONWrapper tsWrapper = JSONWalk.on(item).next("timestamp"); long ts = tsWrapper != null ? tsWrapper.asLong() : -1; - + DeploymentRef ref = new DeploymentRef(id, suspended); ref.setName(name); ref.setTimestamp(ts); @@ -328,8 +328,8 @@ public static List parseJobRefList(JSONValue json) JSONWalk.JSONWrapper tsEl = JSONWalk.on(item).next("timestamp"); if(tsEl!=null) - ref.setTimestamp(tsEl.asLong()); - + ref.setTimestamp(tsEl.asLong()); + JSONWalk.JSONWrapper err = JSONWalk.on(item).next("errMsg"); if(err!=null) // optional ref.setErrMsg(err.asString()); @@ -338,8 +338,8 @@ public static List parseJobRefList(JSONValue json) } return result; - } - + } + public static List parseActiveNodeInfo(String json) { ConsoleLog.debug("Parse: " + json); @@ -350,19 +350,19 @@ public static List parseActiveNodeInfo(String json) { if (root instanceof JSONArray) { JSONArray array = (JSONArray) root; - + for (int i = 0; i < array.size(); i++) { JSONWalk walk = JSONWalk.on(array.get(i)); JSONWrapper wrapper = walk.next("activeNode"); JSONObject activeNode = wrapper.asObject(); - + int x = JSONWalk.on(activeNode).next("x").asInt(); int y = JSONWalk.on(activeNode).next("y").asInt(); - + int width = JSONWalk.on(activeNode).next("width").asInt(); int height = JSONWalk.on(activeNode).next("height").asInt(); String name = JSONWalk.on(activeNode).next("name").asString(); - + activeNodeInfos.add( new ActiveNodeInfo( -1, -1, diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java b/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java index 6c59109..325cd1f 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOModel.java @@ -134,7 +134,7 @@ public final Date getDate(String key) SimpleDateFormat df = new SimpleDateFormat(); result = df.parse(value); } - + return result; } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java b/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java index 10b0025..c678ab4 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/model/JSOParser.java @@ -92,9 +92,9 @@ public static ProcessInstanceRef parseProcessInstance(JSOModel root) start, end, suspended ); - + JSOModel rootTokenJson = root.getObject("rootToken"); - + if (rootTokenJson != null) { TokenReference rootToken = parseTokenReference(rootTokenJson); processInstance.setRootToken(rootToken); @@ -117,23 +117,23 @@ private static TokenReference parseTokenReference(JSOModel rootToken) { tokenReference.setId(rootToken.get("id")); tokenReference.setCurrentNodeName(rootToken.get("currentNodeName")); tokenReference.setCanBeSignaled(rootToken.getBoolean("canBeSignaled")); - + if (rootToken.hasKey("name")) { tokenReference.setName(rootToken.get("name")); } - + JsArray tokenChildrenJson = rootToken.getArray("children"); // parse children elements if (tokenChildrenJson != null) { List children = new ArrayList(); - + for (int i = 0; i < tokenChildrenJson.length(); i++) { children.add(parseTokenReference(tokenChildrenJson.get(i))); } - + tokenReference.setChildren(children); } - + JsArray tokenSignalsJson = rootToken.getArray("availableSignals"); // parse availableSignals elements if (tokenSignalsJson != null) { @@ -142,10 +142,10 @@ private static TokenReference parseTokenReference(JSOModel rootToken) { for (int i = 0; i < tokenSignalsJson.length(); i++) { availableSignals.add(tokenSignalsJson.get(i).toString()); } - + tokenReference.setAvailableSignals(availableSignals); } - + return tokenReference; } @@ -201,7 +201,7 @@ public static ServerStatus parseStatus(String json) JSOModel item = plugins.get(i); String type = item.get("type"); boolean avail = item.getBoolean("available"); - status.getPlugins().add( new PluginInfo(type, avail) ); + status.getPlugins().add( new PluginInfo(type, avail) ); } return status; @@ -221,15 +221,15 @@ public static List parseStringRef(String json) { } return refs; } - + public static List parseProcessInstanceHistory(String json) { - + List results = new ArrayList(); JSOModel rootModel = JSOModel.fromJson(json); - + JsArray historyEntires = rootModel.getArray("historyEntires"); - + for(int i=0; i parseProcessInstanceHistory(Strin return results; } - + public static HistoryActivityInstanceRef parseProcessInstanceHistory(JSOModel rootModel) { HistoryActivityInstanceRef def = new HistoryActivityInstanceRef(); @@ -250,18 +250,18 @@ public static HistoryActivityInstanceRef parseProcessInstanceHistory(JSOModel ro def.setExecutionId(rootModel.get("executionId")); def.setDuration(rootModel.getLong("duration")); - + return def; } - + public static List parseProcessDefinitionHistory(String json) { - + List results = new ArrayList(); JSOModel rootModel = JSOModel.fromJson(json); - + JsArray historyEntires = rootModel.getArray("historyEntires"); - + for(int i=0; i parseProcessDefinitionHistory(Stri return results; } - + public static HistoryProcessInstanceRef parseProcessDefinitionHistory(JSOModel rootModel) { HistoryProcessInstanceRef def = new HistoryProcessInstanceRef(); @@ -284,7 +284,7 @@ public static HistoryProcessInstanceRef parseProcessDefinitionHistory(JSOModel r def.setKey(rootModel.get("key")); def.setDuration(rootModel.getLong("duration")); - + return def; } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/monitor/ExecutionHistoryView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/monitor/ExecutionHistoryView.java index d74f2d7..e38fa9c 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/monitor/ExecutionHistoryView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/monitor/ExecutionHistoryView.java @@ -75,7 +75,7 @@ * @author: Heiko Braun * @author: Jeff Yu * @date: Mar 11, 2010 - */ + */ @LoadTool(name="Execution History", group = "Processes") public class ExecutionHistoryView implements WidgetProvider, ViewInterface { @@ -112,7 +112,7 @@ public class ExecutionHistoryView implements WidgetProvider, ViewInterface private final static int DATASET_TERMINATED = 2; private List processDefinitions; - + public void provideWidget(ProvisioningCallback callback) { @@ -124,7 +124,7 @@ public void provideWidget(ProvisioningCallback callback) controller.addAction(LoadChartProcessInstancesAction.ID, new LoadChartProcessInstancesAction()); LayoutPanel panel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - + final ToolBar toolBar = new ToolBar(); panel.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); @@ -135,7 +135,7 @@ public void provideWidget(ProvisioningCallback callback) public void onClick(ClickEvent clickEvent) { controller.handleEvent(new Event(GetProcessDefinitionsAction.ID, null)); } - }); + }); toolBar.add(menuButton); @@ -234,7 +234,7 @@ public void onValueChange(ValueChangeEvent isEnabled) { buttonPanel = new LayoutPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); buttonPanel.add(includeFailed); - + // ------------ panel.add(contents, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); @@ -450,7 +450,7 @@ public void onFocus(final PlotFocusEvent event) } }); - // ------ + // ------ final ViewReadyCallback callback = new ViewReadyCallback() { public void onViewReady(View view) { diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java index 6259a61..8e0b0bb 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/ActivityDiagramView.java @@ -104,5 +104,5 @@ public void update(String imageUrl) this.add(html); invalidate(); - } + } } \ No newline at end of file diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/ClearInstancesAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/ClearInstancesAction.java index e3eed60..6d7e4e7 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/ClearInstancesAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/ClearInstancesAction.java @@ -30,7 +30,7 @@ public class ClearInstancesAction implements ActionInterface { public static String ID = ClearInstancesAction.class.getName(); - + public void execute(Controller controller, Object o) { InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionHistoryListView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionHistoryListView.java index 51862c5..46b8353 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionHistoryListView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionHistoryListView.java @@ -78,14 +78,14 @@ public class DefinitionHistoryListView implements WidgetProvider, ViewInterface, private PagingPanel pagingPanel; private MosaicPanel panel; - + public void provideWidget(ProvisioningCallback callback) { panel = new MosaicPanel(); panel.setWidgetSpacing(0); panel.setPadding(0); - + listBox = createListBox(); final Controller controller = Registry.get(Controller.class); controller.addView(ID, this); @@ -97,7 +97,7 @@ public void provideWidget(ProvisioningCallback callback) initialize(); - + Timer t = new Timer() { @Override @@ -136,7 +136,7 @@ public void initialize() toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); // toolbar - final ToolBar toolBar = new ToolBar(); + final ToolBar toolBar = new ToolBar(); ClickHandler clickHandler = new ClickHandler() { public void onClick(ClickEvent clickEvent) @@ -144,7 +144,7 @@ public void onClick(ClickEvent clickEvent) reload(); } }; - + toolBar.add( new Button("Refresh", clickHandler ) @@ -153,7 +153,7 @@ public void onClick(ClickEvent clickEvent) toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); definitionList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - + definitionList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); pagingPanel = new PagingPanel( new PagingCallback() @@ -171,7 +171,7 @@ public void ffw() ); definitionList.add(pagingPanel,new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - + panel.add(definitionList); // deployments model listener @@ -222,21 +222,21 @@ private ListBox createListBox() "Process", "v."//, "Version", "Suspended" } ); - - listBox.setFocus(true); + + listBox.setFocus(true); listBox.setCellRenderer(new ListBox.CellRenderer() { public void renderCell(ListBox listBox, int row, int column, ProcessDefinitionRef item) { switch (column) { case 0: - + String name = item.getName(); String s = name.indexOf("}") > 0 ? name.substring(name.lastIndexOf("}")+1, name.length()) : name; String color= item.isSuspended() ? "#CCCCCC" : "#000000"; - String text = "
"+ s +"
"; + String text = "
"+ s +"
"; listBox.setWidget(row, column, new HTML(text)); break; @@ -254,7 +254,7 @@ public void renderCell(ListBox listBox, int row, int colum listBox.setMinimumColumnWidth(0, 190); listBox.setColumnResizePolicy(AbstractScrollTable.ColumnResizePolicy.MULTI_CELL); - + listBox.addRowSelectionHandler( new RowSelectionHandler() { @@ -264,7 +264,7 @@ public void onRowSelection(RowSelectionEvent rowSelectionEvent) if(index!=-1) { ProcessDefinitionRef item = listBox.getItem(index); - + // load history instances controller.handleEvent( new Event( @@ -272,13 +272,13 @@ public void onRowSelection(RowSelectionEvent rowSelectionEvent) item ) ); - - + + } } } ); - + return listBox; } @@ -316,14 +316,14 @@ private void renderFiltered() reset(); final DefaultListModel model = - (DefaultListModel) listBox.getModel(); + (DefaultListModel) listBox.getModel(); List tmp = new ArrayList(); for(ProcessDefinitionRef def : definitions) { - + tmp.add(def); - + } for(ProcessDefinitionRef def : (List) pagingPanel.trim(tmp) ) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java index 8ec5fe7..13f5918 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java @@ -86,7 +86,7 @@ public void provideWidget(ProvisioningCallback callback) panel = new MosaicPanel(); panel.setWidgetSpacing(0); panel.setPadding(0); - + listBox = createListBox(); final Controller controller = Registry.get(Controller.class); controller.addView(ID, this); @@ -138,7 +138,7 @@ public void initialize() toolBox.setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); // toolbar - final ToolBar toolBar = new ToolBar(); + final ToolBar toolBar = new ToolBar(); ClickHandler clickHandler = new ClickHandler() { public void onClick(ClickEvent clickEvent) @@ -146,7 +146,7 @@ public void onClick(ClickEvent clickEvent) reload(); } }; - + toolBar.add( new Button("Refresh", clickHandler ) @@ -166,7 +166,7 @@ public void onClick(ClickEvent clickEvent) dropBox.addChangeHandler(new ChangeHandler() { public void onChange(ChangeEvent changeEvent) - { + { switch (dropBox.getSelectedIndex()) { case 0: @@ -269,21 +269,21 @@ private ListBox createListBox() "Process", "v."//, "Version", "Suspended" } ); - - listBox.setFocus(true); + + listBox.setFocus(true); listBox.setCellRenderer(new ListBox.CellRenderer() { public void renderCell(ListBox listBox, int row, int column, ProcessDefinitionRef item) { switch (column) { case 0: - + String name = item.getName(); String s = name.indexOf("}") > 0 ? name.substring(name.lastIndexOf("}")+1, name.length()) : name; String color= item.isSuspended() ? "#CCCCCC" : "#000000"; - String text = "
"+ s +"
"; + String text = "
"+ s +"
"; listBox.setWidget(row, column, new HTML(text)); break; @@ -301,7 +301,7 @@ public void renderCell(ListBox listBox, int row, int colum listBox.setMinimumColumnWidth(0, 190); listBox.setColumnResizePolicy(AbstractScrollTable.ColumnResizePolicy.MULTI_CELL); - + listBox.addRowSelectionHandler( new RowSelectionHandler() { @@ -330,7 +330,7 @@ public void onRowSelection(RowSelectionEvent rowSelectionEvent) } } ); - + return listBox; } @@ -349,7 +349,7 @@ public void reset() // clear instance panel controller.handleEvent(new Event(ClearInstancesAction.ID, null)); - + // clear details /*controller.handleEvent( new Event(UpdateProcessDetailAction.ID, null) @@ -376,7 +376,7 @@ private void renderFiltered() reset(); final DefaultListModel model = - (DefaultListModel) listBox.getModel(); + (DefaultListModel) listBox.getModel(); List tmp = new ArrayList(); for(ProcessDefinitionRef def : definitions) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java index 26ecdd1..bb70035 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/DeleteDefinitionAction.java @@ -49,7 +49,7 @@ public String getUrl(Object event) public RequestBuilder.Method getRequestMethod() { - return RequestBuilder.POST; + return RequestBuilder.POST; } public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/HistoryInstanceListView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/HistoryInstanceListView.java index 5e45743..e94b200 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/HistoryInstanceListView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/HistoryInstanceListView.java @@ -93,7 +93,7 @@ public void provideWidget(ProvisioningCallback callback) { this.appContext = Registry.get(ApplicationContext.class); - + panel = new MosaicPanel(); panel.setPadding(0); @@ -390,7 +390,7 @@ private ListBox createHistoryActivitiesListBox() "ActivityName", "StartTime", "EndTime", "Duration" } ); - + listBox.setCellRenderer(new ListBox.CellRenderer() { public void renderCell(ListBox listBox, int row, int column, HistoryActivityInstanceRef item) { diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java index 48e16c5..865b41f 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java @@ -61,7 +61,7 @@ public InstanceDataView() super(); this.setPadding(5); ApplicationContext appContext = Registry.get(ApplicationContext.class); - isRiftsawInstance = appContext.getConfig().getProfileName().equals("BPEL Console"); + isRiftsawInstance = appContext.getConfig().getProfileName().equals("BPEL Console"); } public void initialize() @@ -75,7 +75,7 @@ public void initialize() ); listBox.setColumnResizePolicy(AbstractScrollTable.ColumnResizePolicy.MULTI_CELL); - + listBox.setCellRenderer(new ListBox.CellRenderer() { public void renderCell(ListBox listBox, int row, int column, DataEntry item) { @@ -157,7 +157,7 @@ private void parseMessage(Document messageDom) && valueNode.hasChildNodes() && Node.TEXT_NODE == valueNode.getChildNodes().item(0).getNodeType()) { - dataEntry.value = valueNode.getFirstChild().getNodeValue(); + dataEntry.value = valueNode.getFirstChild().getNodeValue(); } else { diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java index 2b6b556..7b161b1 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java @@ -83,7 +83,7 @@ public class InstanceDetailView extends CaptionLayoutPanel implements ViewInterf private ProcessDefinitionRef currentDefintion; private boolean isRiftsawInstance; - + private ListBox processEvents; public InstanceDetailView() @@ -173,7 +173,7 @@ public void onClick(ClickEvent clickEvent) private void createDiagramWindow(ProcessInstanceRef inst) { - + org.gwt.mosaic.ui.client.layout.LayoutPanel layout = new ScrollLayoutPanel(); layout.setStyleName("bpm-window-layout"); layout.setPadding(5); @@ -181,15 +181,15 @@ private void createDiagramWindow(ProcessInstanceRef inst) Label header = new Label("Instance: "+inst.getId()); header.setStyleName("bpm-label-header"); layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - + final DecoratedTabLayoutPanel tabPanel = new DecoratedTabLayoutPanel(false); tabPanel.setPadding(5); - + MosaicPanel diaViewLayout = new MosaicPanel(); diaViewLayout.add(diagramView, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - + tabPanel.add(diagramView, "View"); - + processEvents = new ListBox(new String[]{"Process Events"}); processEvents.setCellRenderer(new CellRenderer(){ @@ -202,16 +202,16 @@ public void renderCell(ListBox listBox, int row, break; default: throw new RuntimeException("Should not happen!"); - } + } } }); - + MosaicPanel sourcePanel = new MosaicPanel(); - sourcePanel.add(processEvents, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); + sourcePanel.add(processEvents, new BoxLayoutData(BoxLayoutData.FillStyle.VERTICAL)); tabPanel.add(sourcePanel, "Source"); - + tabPanel.selectTab(0); - + layout.add(tabPanel, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); diagramWindowPanel = new WidgetWindowPanel( @@ -230,17 +230,17 @@ public void populateProcessInstanceEvents(List refs) { model.add(formatResult(value.getValue())); } } - + private String formatResult(String value) { StringBuffer sbuffer = new StringBuffer(); StringTokenizer st = new StringTokenizer(value, "~"); sbuffer.append(st.nextToken() + " : "); - + while (st.hasMoreTokens()) { sbuffer.append("
"); sbuffer.append(st.nextToken()); } - + return sbuffer.toString(); } @@ -276,7 +276,7 @@ public void update(ProcessDefinitionRef def, ProcessInstanceRef instance) String[] values = new String[] { def.getName(), - instance.getId(), + instance.getId(), String.valueOf( instance.getState() ), dateFormat.format(instance.getStartDate()), currentNodeName diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java index df7290c..d2b6fec 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java @@ -306,7 +306,7 @@ public void onResult(boolean doIt) } } } - ); + ); deleteBtn = new Button("Delete", new ClickHandler() @@ -474,7 +474,7 @@ private void renderUpdate() ) ); - startBtn.setEnabled(true); + startBtn.setEnabled(true); deleteBtn.setEnabled(true); refreshBtn.setEnabled(true); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/JSONTree.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/JSONTree.java index 6609d7e..6600780 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/JSONTree.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/JSONTree.java @@ -41,7 +41,7 @@ public JSONTree(String json) TreeItem root = tree.addItem("message"); parseObject(root, "root", JSONParser.parse(json)); - + this.add(tree); } @@ -71,7 +71,7 @@ else if(jsonValue.isString()!=null) private void parseArray(TreeItem root, String key, JSONValue jsonValue) { - + } private void parseObject(TreeItem root, String key, JSONValue topLevel) @@ -79,7 +79,7 @@ private void parseObject(TreeItem root, String key, JSONValue topLevel) JSONObject rootJSO = topLevel.isObject(); if(null==rootJSO) throw new IllegalArgumentException("Not a JSON object: "+topLevel); - + for(String innerKey : rootJSO.keySet()) { JSONValue jsonValue = rootJSO.get(innerKey); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadActivityDiagramAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadActivityDiagramAction.java index e0d5ff0..e6c5080 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadActivityDiagramAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadActivityDiagramAction.java @@ -67,5 +67,5 @@ public void handleSuccessfulResponse( ActivityDiagramView view = (ActivityDiagramView) controller.getView(ActivityDiagramView.ID); view.update(new ActivityDiagramResultEvent(URLBuilder.getInstance().getProcessImageURL(inst.getDefinitionId()), activeNodeInfos)); } - + } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstanceActivityImage.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstanceActivityImage.java index d39ca8a..640a6f9 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstanceActivityImage.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstanceActivityImage.java @@ -35,7 +35,7 @@ public String getId() } public String getUrl(Object event) - { + { ProcessInstanceRef inst = (ProcessInstanceRef)event; return URLBuilder.getInstance().getActivityImage(inst.getDefinitionId(),inst.getId()); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessHistoryView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessHistoryView.java index 1339f76..f6bc7cc 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessHistoryView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessHistoryView.java @@ -25,10 +25,10 @@ public class MergedProcessHistoryView implements WidgetProvider public void provideWidget(ProvisioningCallback callback) { Controller controller = Registry.get(Controller.class); - + panel = new MosaicPanel(); - panel.setPadding(0); - + panel.setPadding(0); + definitionView = new DefinitionHistoryListView(); instanceView = new HistoryInstanceListView(); @@ -64,7 +64,7 @@ public void onUnavailable() ); panel.add(splitPanel); - + callback.onSuccess(panel); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java index d57b053..6ad9b38 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java @@ -42,10 +42,10 @@ public class MergedProcessView implements WidgetProvider public void provideWidget(ProvisioningCallback callback) { Controller controller = Registry.get(Controller.class); - + panel = new MosaicPanel(); - panel.setPadding(0); - + panel.setPadding(0); + definitionView = new DefinitionListView(); instanceView = new InstanceListView(); @@ -81,7 +81,7 @@ public void onUnavailable() ); panel.add(splitPanel); - + callback.onSuccess(panel); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java index b17a70f..e495f9a 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDetailView.java @@ -53,8 +53,8 @@ public class ProcessDetailView extends CaptionLayoutPanel implements ViewInterfa public ProcessDetailView() { super("Process details"); - super.setStyleName("bpm-detail-panel"); - + super.setStyleName("bpm-detail-panel"); + grid = new PropertyGrid( new String[] {"ID:", "Key:", "Name:", "Suspended:", "Package:", "Description:"} ); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/SignalExecutionAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/SignalExecutionAction.java index 861c0d1..3794bb8 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/SignalExecutionAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/SignalExecutionAction.java @@ -34,7 +34,7 @@ /** * Signals execution - * + * * @author Maciej Swiderski */ class SignalExecutionAction extends AbstractRESTAction @@ -68,7 +68,7 @@ public void handleSuccessfulResponse(final Controller controller, final Object e final SignalInstanceEvent def = (SignalInstanceEvent)event; InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID); if(view!=null) view.renderSignalListBox(def.getIndex()); - + // delay reload of instance list to avoid incorrect activity being fetched // for instance when going through decision node Timer t = new Timer() @@ -84,6 +84,6 @@ public void run() }; t.schedule(500); - + } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java index c3a79c7..3ade658 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/StartNewInstanceAction.java @@ -58,7 +58,7 @@ public RequestBuilder.Method getRequestMethod() public void handleSuccessfulResponse(final Controller controller, final Object event, Response response) { final ProcessDefinitionRef def = (ProcessDefinitionRef)event; - + // force reload instance list controller.handleEvent( new Event(UpdateInstancesAction.ID, def) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java index 295787e..f4885f8 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateDefinitionsAction.java @@ -48,9 +48,9 @@ public String getId() { return ID; } - + public String getUrl(Object event) - { + { return URLBuilder.getInstance().getProcessDefinitionsURL(); } @@ -71,7 +71,7 @@ public void handleSuccessfulResponse(final Controller controller, final Object e Explorer view = (Explorer) controller.getView(Explorer.class.getName()); if(view!=null) // may not be initialized (lazy) - { + { List definitions = JSOParser.parseProcessDefinitions(response.getText()); view.update(definitions); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionsAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionsAction.java index c17119a..34ef46b 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionsAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/UpdateHistoryDefinitionsAction.java @@ -47,9 +47,9 @@ public String getId() { return ID; } - + public String getUrl(Object event) - { + { return URLBuilder.getInstance().getProcessDefinitionsURL(); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/SignalInstanceEvent.java b/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/SignalInstanceEvent.java index ffc2f1d..e1b764d 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/SignalInstanceEvent.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/process/events/SignalInstanceEvent.java @@ -26,38 +26,38 @@ import org.jboss.bpm.console.client.model.TokenReference; /** - * + * * @author Maciej Swiderski * */ public class SignalInstanceEvent extends InstanceEvent { - + private String signalName; - + private TokenReference token; - + private int index; - - + + public int getIndex() { return index; } public SignalInstanceEvent(ProcessDefinitionRef definition, ProcessInstanceRef instance, TokenReference token, String signalName, int index) { super(definition, instance); - + this.signalName = signalName; this.token = token; this.index = index; } - + public String getSignalName() { return signalName; } - - + + public TokenReference getToken() { return token; } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java b/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java index 99bda27..1433a57 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderDispatchEvent.java @@ -27,7 +27,7 @@ public final class RenderDispatchEvent { String title; - String dispatchUrl; + String dispatchUrl; String parameters = "None"; public RenderDispatchEvent(String targetView, String dispatchUrl) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java index 69d423a..1e08f54 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java @@ -91,7 +91,7 @@ else if (200 == response.getStatusCode()) view.displayReport(event.getTitle(), event.getDispatchUrl()); } else - { + { final String msg = response.getText().equals("") ? "Unknown error" : response.getText(); handleError( controller, diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java b/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java index da7d359..625b532 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportFrame.java @@ -29,7 +29,7 @@ /** * Embeds an HTML report. - * + * * @author Heiko.Braun */ public class ReportFrame extends MosaicPanel @@ -39,14 +39,14 @@ public class ReportFrame extends MosaicPanel public ReportFrame() { - super(); + super(); setPadding(0); - + // report frame frame = new Frame(); DOM.setStyleAttribute(frame.getElement(), "border", "1px solid #E8E8E8"); DOM.setStyleAttribute(frame.getElement(), "backgroundColor", "#ffffff"); - this.add(frame); + this.add(frame); } public void setFrameUrl(String url) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java index 79168dc..72469d7 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java @@ -77,19 +77,19 @@ public ReportLaunchPadView() CaptionLayoutPanel header = new CaptionLayoutPanel("Report configuration"); header.setStyleName("bpm-detail-panel"); - - header.setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); - MosaicPanel templatePanel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); + header.setLayout(new BoxLayout(BoxLayout.Orientation.HORIZONTAL)); + + MosaicPanel templatePanel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL)); description = new HTML(); - dropBox = new com.google.gwt.user.client.ui.ListBox(false); + dropBox = new com.google.gwt.user.client.ui.ListBox(false); dropBox.addChangeHandler(new ChangeHandler() { public void onChange(ChangeEvent changeEvent) { String reportTitle = dropBox.getItemText(dropBox.getSelectedIndex()); - selectForm(reportTitle); + selectForm(reportTitle); } }); @@ -98,9 +98,9 @@ public void onChange(ChangeEvent changeEvent) // ---- inputPanel = new MosaicPanel(); - + // --- - + header.add(templatePanel, new BoxLayoutData("250 px", "100 px")); header.add(inputPanel, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH)); @@ -154,7 +154,7 @@ private ReportReference getCurrentSelection() if(r.getTitle().equals(template)) return r; } - + return null; } @@ -174,7 +174,7 @@ public void update(List reports) // default form selectForm(dropBox.getItemText(0)); - + Registry.get(ApplicationContext.class).refreshView(); } @@ -188,8 +188,8 @@ private void selectForm(String reportTitle) } public void displayReport(String title, String dispatchUrl) - { - reportFrame.setFrameUrl(dispatchUrl); + { + reportFrame.setFrameUrl(dispatchUrl); } public void reset() diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java b/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java index ae1936e..17ece59 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportParameterForm.java @@ -57,7 +57,7 @@ private Widget getFormPanel(final ReportReference reportRef, final ReportParamCa { MosaicPanel p = new MosaicPanel(); p.setPadding(5); - p.add(createForm(reportRef, callback)); + p.add(createForm(reportRef, callback)); return p; } @@ -87,7 +87,7 @@ public void onClick(ClickEvent clickEvent) callback.onSumbit(values); } - }); + }); Map preferenceValues = readPrefs(reportRef); @@ -99,7 +99,7 @@ public void onClick(ClickEvent clickEvent) final TextBox textBox = new TextBox(); String prefValue = preferenceValues.get(reportParam.getName()); if(prefValue !=null) - textBox.setText(prefValue); + textBox.setText(prefValue); // retain reference to values final InputField field = new InputField() @@ -118,7 +118,7 @@ String getValue() fields.add(field); - form.add(new HTML(""+promptText+"
"+helpText)); + form.add(new HTML(""+promptText+"
"+helpText)); form.add(textBox); } @@ -126,7 +126,7 @@ String getValue() if(!hasParameters) { form.add(new HTML("This report doesn't require any paramters.") - , new GridLayoutData(2,1, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_TOP)); + , new GridLayoutData(2,1, HasHorizontalAlignment.ALIGN_CENTER, HasVerticalAlignment.ALIGN_TOP)); } // submit @@ -159,7 +159,7 @@ private Map readPrefs(ReportReference reportRef) Map values = new HashMap(); String name = reportRef.getTitle().replaceAll(" ","_"); String prefKey = "bpm-form-"+name; - + if(prefs.has(prefKey)) { String prefValue = prefs.get(prefKey); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java index 0d337e0..d662e1e 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java @@ -44,7 +44,7 @@ public class ReportView implements ViewInterface, WidgetProvider public final static String ID = ReportView.class.getName(); private Controller controller; - private boolean isInitialized; + private boolean isInitialized; private ReportLaunchPadView coverpanel; private MosaicPanel panel; @@ -59,7 +59,7 @@ public void provideWidget(ProvisioningCallback callback) controller.addView(ReportView.ID, this); controller.addAction(UpdateReportConfigAction.ID, new UpdateReportConfigAction()); - + // ---- Timer t = new Timer() @@ -89,7 +89,7 @@ public void initialize() coverpanel = new ReportLaunchPadView(); panel.add(coverpanel); - // views and actions + // views and actions controller.addView(ReportLaunchPadView.ID, coverpanel); controller.addAction(UpdateSearchDefinitionsAction.ID, new UpdateSearchDefinitionsAction()); @@ -107,7 +107,7 @@ public void setController(Controller controller) public void configure(List reports) { // update coverview - coverpanel.update(reports); + coverpanel.update(reports); } public void displayReport(String title, String dispatchUrl) diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java index b9633be..6d67e4e 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/report/UpdateReportConfigAction.java @@ -36,9 +36,9 @@ * Retrieves the inital reporting config in order to setup the * {@link org.jboss.bpm.console.client.report.ReportLaunchPadView} * - * @see org.jboss.bpm.console.client.report.ReportView#configure(java.util.List) + * @see org.jboss.bpm.console.client.report.ReportView#configure(java.util.List) * @see org.jboss.bpm.console.client.report.ReportLaunchPadView#update(java.util.List) - * + * * @author Heiko.Braun */ public class UpdateReportConfigAction extends AbstractRESTAction @@ -70,9 +70,9 @@ public RequestBuilder.Method getRequestMethod() public void handleSuccessfulResponse( final Controller controller, final Object event, Response response) { - String json = response.getText(); + String json = response.getText(); List reports = JSOParser.parseReportConfig(json); ReportView view = (ReportView)controller.getView(ReportView.ID); - view.configure(reports); + view.configure(reports); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java index a3ef326..3f77385 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDefinitionView.java @@ -51,7 +51,7 @@ public class SearchDefinitionView public SearchDefinitionView(ApplicationContext appContext, SearchDelegate delegate) { super(new BoxLayout(BoxLayout.Orientation.VERTICAL)); - + this.appContext = appContext; this.delegate = delegate; this.setPadding(5); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDelegate.java b/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDelegate.java index d900e31..7aaf956 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDelegate.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/search/SearchDelegate.java @@ -28,5 +28,5 @@ public interface SearchDelegate { void handleResult(String procDefId); - String getActionName(); + String getActionName(); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java index f873284..400a251 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/search/UpdateSearchDefinitionsAction.java @@ -64,7 +64,7 @@ public void handleSuccessfulResponse(final Controller controller, final Object e List definitions = JSOParser.parseProcessDefinitions(response.getText()); SearchDefinitionView view = (SearchDefinitionView)controller.getView(target); view.update(definitions); - + ConsoleLog.info("Loaded " + definitions.size() + " process definitions"); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java b/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java index bdb84bc..b58afab 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/task/AbstractTaskList.java @@ -33,11 +33,11 @@ /** * Base class for task lists. - * + * * @author Heiko.Braun */ public abstract class AbstractTaskList implements ViewInterface -{ +{ protected Controller controller; protected MosaicPanel taskList = null; protected ListBox listBox; @@ -65,7 +65,7 @@ public TaskRef getSelection() TaskRef selection = null; if(isInitialized() && listBox.getSelectedIndex()!=-1) { - selection = listBox.getItem( listBox.getSelectedIndex()); + selection = listBox.getItem( listBox.getSelectedIndex()); } return selection; } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java index d30bae4..c70d6fe 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java @@ -86,7 +86,7 @@ public void provideWidget(ProvisioningCallback callback) panel.add(taskList, new BorderLayoutData(BorderLayout.Region.CENTER)); panel.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10 , 200)); - + controller.addView(AssignedTasksView.ID, this); callback.onSuccess(panel); @@ -98,7 +98,7 @@ public void initialize() { // workaround OpenTasksView.registerCommonActions(controller); - + taskList = new MosaicPanel( new BoxLayout(BoxLayout.Orientation.VERTICAL)); taskList.setPadding(0); taskList.setWidgetSpacing(0); @@ -258,7 +258,7 @@ public void ffw() ); this.taskList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL)); - + detailsView = new TaskDetailView(false); controller.addView("AssignedDetailView", detailsView); detailsView.initialize(); @@ -297,7 +297,7 @@ public void run() }; t.schedule(500); - + isInitialized = true; } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java index 1f7435c..c204c9b 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/task/ClaimTaskAction.java @@ -44,7 +44,7 @@ public String getId() public String getUrl(Object event) { TaskIdentityEvent claimEvent = (TaskIdentityEvent)event; - + return URLBuilder.getInstance().getTaskAssignURL( claimEvent.getTask().getId(), claimEvent.getIdentity() ); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java index 21a9a08..6e66cd7 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java @@ -37,7 +37,7 @@ * Loads a task list for a particular identity. * * @see org.jboss.bpm.console.client.task.AssignedTasksView - * + * * @author Heiko.Braun */ public class LoadTasksAction extends AbstractRESTAction @@ -57,7 +57,7 @@ public String getUrl(Object event) public RequestBuilder.Method getRequestMethod() { - return RequestBuilder.GET; + return RequestBuilder.GET; } @Override @@ -75,7 +75,7 @@ public void handleSuccessfulResponse( AssignedTasksView view = (AssignedTasksView)controller.getView(AssignedTasksView.ID); view.update(identity, tasks); - + ConsoleLog.info("Loaded " + tasks.size() + " tasks"); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java b/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java index 6442a75..7ded0f3 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java @@ -108,7 +108,7 @@ public void onClick(Widget widget) controller.handleEvent( new Event(AssignTaskAction.ID, new AssignEvent(selection, currentTask)) ); - } + } } } ); @@ -129,7 +129,7 @@ public void update(TaskRef task) currentTask = task; tree.clear(); - + TreeItem root = tree.addItem(PARTICIPANTS); // groups @@ -147,7 +147,7 @@ public void update(TaskRef task) } root.setState(true); // open users - + this.invalidate(); } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java b/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java index a729661..8a93175 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java @@ -57,7 +57,7 @@ public TaskDetailView(boolean openView) { // render - super("Task details"); + super("Task details"); super.setStyleName("bpm-detail-panel"); diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java b/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java index d90f92e..ef3830f 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/task/UpdateDetailsAction.java @@ -33,7 +33,7 @@ public class UpdateDetailsAction implements ActionInterface { public final static String ID = UpdateDetailsAction.class.getName(); - + public void execute(Controller controller, Object object) { DetailViewEvent event = (DetailViewEvent)object; @@ -43,6 +43,6 @@ public void execute(Controller controller, Object object) if(task!=null) view.update(task); else - view.clearView(); + view.clearView(); } } diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java b/gui/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java index 3bf59d0..cc052e2 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/task/events/TaskIdentityEvent.java @@ -25,7 +25,7 @@ /** * Composite event that represents Identities working on tasks. - * + * * @author Heiko.Braun */ public final class TaskIdentityEvent diff --git a/gui/war/src/main/java/org/jboss/bpm/console/client/util/SimpleDateFormat.java b/gui/war/src/main/java/org/jboss/bpm/console/client/util/SimpleDateFormat.java index 55f6084..0c0a123 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/client/util/SimpleDateFormat.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/client/util/SimpleDateFormat.java @@ -22,7 +22,7 @@ public class SimpleDateFormat { private String format; private DateLocale locale = new DateLocale(); public static final String DEFAULT_FORMAT = "yyyy-MM-dd HH:mm:ss"; - + /** * Gets the support locale for formatting and parsing dates @@ -45,7 +45,7 @@ public SimpleDateFormat() } /** - * Use a custom format + * Use a custom format */ public SimpleDateFormat(String pattern) { format = pattern; diff --git a/gui/war/src/main/java/org/jboss/bpm/console/rebind/WorkspaceGenerator.java b/gui/war/src/main/java/org/jboss/bpm/console/rebind/WorkspaceGenerator.java index 39578bb..eb4b6d5 100644 --- a/gui/war/src/main/java/org/jboss/bpm/console/rebind/WorkspaceGenerator.java +++ b/gui/war/src/main/java/org/jboss/bpm/console/rebind/WorkspaceGenerator.java @@ -179,7 +179,7 @@ private void generateMethods(SourceWriter sourceWriter) sourceWriter.println("public " + className + "() { "); sourceWriter.indent(); sourceWriter.println("super();"); - // end constructor source generation + // end constructor source generation sourceWriter.outdent(); sourceWriter.println("}"); }*/ diff --git a/gui/war/src/main/resources/xhp.json b/gui/war/src/main/resources/xhp.json index e6247f5..4cdd501 100644 --- a/gui/war/src/main/resources/xhp.json +++ b/gui/war/src/main/resources/xhp.json @@ -8,7 +8,7 @@ {"id": "birt", "url":"http://127.0.0.1:8080/gwt-console-server", "passthrough":true, - "contentType":"text/html" + "contentType":"text/html" } ] } diff --git a/pom.xml b/pom.xml index f959dee..dbc69b8 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,7 @@ 1.2.2 2.0.4 - 1.3-12393 + 1.3-12393 1.1 3.0 2.1 @@ -133,7 +133,7 @@ com.google.code.gson gson ${gson.version} - + com.googlecode.mvc4g mvc4g @@ -320,7 +320,7 @@ - + diff --git a/server/integration/pom.xml b/server/integration/pom.xml index 618edb6..63af1bd 100644 --- a/server/integration/pom.xml +++ b/server/integration/pom.xml @@ -45,7 +45,7 @@ commons-logging provided - + @@ -67,7 +67,7 @@ 1.5 1.5 - + gwt-console-server-integration diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java b/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java index c156fbd..819683f 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ManagementFactory.java @@ -28,7 +28,7 @@ /** * Construct management implementation. * It uses the {@link org.jboss.bpm.console.server.util.ServiceLoader} to load concrete - * factory implementations. + * factory implementations. * * @author Heiko.Braun * @author Thomas.Diesler@jboss.com @@ -49,5 +49,5 @@ public static ManagementFactory newInstance() public abstract TaskManagement createTaskManagement(); public abstract UserManagement createUserManagement(); - + } diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java b/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java index 59e73be..a083fdf 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java @@ -46,7 +46,7 @@ public interface ProcessManagement ProcessInstanceRef newInstance(String defintionId); ProcessInstanceRef newInstance(String definitionId, Map processVars); - + Map getInstanceData(String instanceId); void setInstanceData(String instanceId, Map data); @@ -58,5 +58,5 @@ public interface ProcessManagement void setProcessState(String instanceId, ProcessInstanceRef.STATE nextState); void signalExecution(String executionId, String signal); - + } diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java b/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java index 2a919c3..4caf678 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/integration/TaskManagement.java @@ -32,7 +32,7 @@ public interface TaskManagement { /** - * fetch a single task + * fetch a single task */ TaskRef getTaskById(long taskId); @@ -62,7 +62,7 @@ public interface TaskManagement List getAssignedTasks(String idRef); /** - * get unassigned tasks where a user participates + * get unassigned tasks where a user participates */ List getUnassignedTasks(String idRef, String participationType); } diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/FormAuthorityRef.java b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/FormAuthorityRef.java index db50230..280ef93 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/FormAuthorityRef.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/FormAuthorityRef.java @@ -34,7 +34,7 @@ public enum Type {TASK, PROCESS} private Type currentType = null; private String referenceId; - + public FormAuthorityRef(String referenceId) { this.referenceId = referenceId; diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java index 79133d1..deee7a5 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java @@ -33,6 +33,6 @@ public interface FormDispatcherPlugin { URL getDispatchUrl(FormAuthorityRef ref); - + DataHandler provideForm(FormAuthorityRef ref); } diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/GraphViewerPlugin.java b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/GraphViewerPlugin.java index 0d0ea23..717eacc 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/GraphViewerPlugin.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/GraphViewerPlugin.java @@ -35,7 +35,7 @@ public interface GraphViewerPlugin { /** - * Check {@link #getDiagramURL(String)} != null before invoking. + * Check {@link #getDiagramURL(String)} != null before invoking. */ byte[] getProcessImage(String processId); @@ -44,10 +44,10 @@ public interface GraphViewerPlugin List getActiveNodeInfo(String instanceId); /** - * Can be null, in case no diagram is associated with the process + * Can be null, in case no diagram is associated with the process */ URL getDiagramURL(String id); - + /** * Collects node information (such as coordinates) for given processDefinitionId and selected activities. * Both arguments must be specified. diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessEnginePlugin.java b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessEnginePlugin.java index fa5185a..73408a7 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessEnginePlugin.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessEnginePlugin.java @@ -28,7 +28,7 @@ /** * Manages runtime aspects of the underlying process engine. - * + * * @author Heiko.Braun */ public interface ProcessEnginePlugin @@ -36,7 +36,7 @@ public interface ProcessEnginePlugin List getDeployments(); void deleteDeployment(String id); - + void suspendDeployment(String id, boolean isSuspended); List getJobs(); diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessHistoryPlugin.java b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessHistoryPlugin.java index f62a96a..8c3e7df 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessHistoryPlugin.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/plugin/ProcessHistoryPlugin.java @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.bpm.console.server.plugin; @@ -14,7 +14,7 @@ * @date Mar 17, 2011 */ public interface ProcessHistoryPlugin { - + List getHistoryProcessInstances(String definitionkey, String status, long starttime, long endtime, String correlationkey); @@ -36,5 +36,5 @@ List getHistoryProcessInstances(String definitionkey, String getFailedInstances4Chart(String definitionId, String timespan); - + } diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/util/InvocationProxy.java b/server/integration/src/main/java/org/jboss/bpm/console/server/util/InvocationProxy.java index 863f746..e3a745d 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/util/InvocationProxy.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/util/InvocationProxy.java @@ -53,7 +53,7 @@ public Object invoke(Object proxy, Method m, Object[] args) InitialContext ctx = new InitialContext(); UserTransaction tx = (UserTransaction)ctx.lookup("UserTransaction"); - + try { diff --git a/server/integration/src/main/java/org/jboss/bpm/console/server/util/ServiceLoader.java b/server/integration/src/main/java/org/jboss/bpm/console/server/util/ServiceLoader.java index 7d133d6..e92fd50 100644 --- a/server/integration/src/main/java/org/jboss/bpm/console/server/util/ServiceLoader.java +++ b/server/integration/src/main/java/org/jboss/bpm/console/server/util/ServiceLoader.java @@ -31,7 +31,7 @@ * * @author Thomas.Diesler@jboss.com * @author Heiko.Braun@jboss.com - * + * * @since 14-Dec-2006 */ public abstract class ServiceLoader diff --git a/server/war/pom.xml b/server/war/pom.xml index 9f3de79..05a7363 100644 --- a/server/war/pom.xml +++ b/server/war/pom.xml @@ -70,7 +70,7 @@ log4j - + javax.ejb @@ -126,7 +126,7 @@ org.slf4j slf4j-simple - + javassist javassist @@ -324,7 +324,7 @@ - + gwt-console-server diff --git a/server/war/scripts/assembly-config.xml b/server/war/scripts/assembly-config.xml index 270d93f..48e7c83 100644 --- a/server/war/scripts/assembly-config.xml +++ b/server/war/scripts/assembly-config.xml @@ -10,7 +10,7 @@ ${project.build.outputDirectory} / - *.rpt* + *.rpt* diff --git a/server/war/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java b/server/war/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java index 07846e5..70d9489 100644 --- a/server/war/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java +++ b/server/war/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java @@ -42,7 +42,7 @@ public ConsoleServerApplication() singletons.add(new ProcessMgmtFacade()); singletons.add(new TaskListFacade()); singletons.add(new TaskMgmtFacade()); - singletons.add(new UserMgmtFacade()); + singletons.add(new UserMgmtFacade()); singletons.add(new EngineFacade()); singletons.add(new FormProcessingFacade()); singletons.add(new ReportFacade() ); diff --git a/server/war/src/main/java/org/jboss/bpm/console/server/InfoFacade.java b/server/war/src/main/java/org/jboss/bpm/console/server/InfoFacade.java index 1a94c40..e68f69d 100644 --- a/server/war/src/main/java/org/jboss/bpm/console/server/InfoFacade.java +++ b/server/war/src/main/java/org/jboss/bpm/console/server/InfoFacade.java @@ -105,7 +105,7 @@ public Response getPublishedUrls( if (request.getServletPath() != null && !"".equals(request.getServletPath())) { rsServer = request.getContextPath() + request.getServletPath(); } - + RsDocBuilder rsDocBuilder = new RsDocBuilder(rsServer,rootResources); StringBuffer sb = rsDocBuilder.build2HTML(projectName); return Response.ok(sb.toString()).build(); diff --git a/server/war/src/main/java/org/jboss/bpm/console/server/ProcessHistoryFacade.java b/server/war/src/main/java/org/jboss/bpm/console/server/ProcessHistoryFacade.java index 047ee73..27e0ae2 100644 --- a/server/war/src/main/java/org/jboss/bpm/console/server/ProcessHistoryFacade.java +++ b/server/war/src/main/java/org/jboss/bpm/console/server/ProcessHistoryFacade.java @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.bpm.console.server; @@ -26,7 +26,7 @@ import com.google.gson.Gson; /** - * + * * @author Jeff Yu * @date Mar 13, 2011 */ @@ -37,18 +37,18 @@ project = {ProjectName.RIFTSAW} ) public class ProcessHistoryFacade { - + private static final Log log = LogFactory.getLog(ProcessHistoryFacade.class); - + private ProcessHistoryPlugin historyPlugin; - + public ProcessHistoryPlugin getProcessHistoryPlugin() { if (historyPlugin == null) { historyPlugin = PluginMgr.load(ProcessHistoryPlugin.class); } return historyPlugin; } - + @GET @Produces("applications/json") @Path("definition/{id}/instances") @@ -65,7 +65,7 @@ public Response findHisotryInstances(@PathParam("id") String id, @Context UriInf List refs = getProcessHistoryPlugin().getHistoryProcessInstances(id, status, new Long(stime), new Long(etime), ckey); HistoryProcessInstanceRefWrapper wrapper = new HistoryProcessInstanceRefWrapper(refs); - + return createJsonResponse(wrapper); } @@ -226,6 +226,6 @@ private void checkNotNull(String name, String value) { throw new NullPointerException(" " + name + " is null."); } } - - + + } diff --git a/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java b/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java index d110a8e..70eaf33 100644 --- a/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java +++ b/server/war/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java @@ -124,7 +124,7 @@ public Response getDefinitionsJSON() /** * Enriches {@link org.jboss.bpm.console.client.model.ProcessDefinitionRef} with - * form and diagram URLs if applicable. + * form and diagram URLs if applicable. */ private Response decorateProcessDefintions( List processDefinitions) { @@ -387,7 +387,7 @@ public Response getActiveNodeInfo( ); } - + @GET @Path("definition/history/{id}/nodeInfo") @Produces("application/json") diff --git a/server/war/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java b/server/war/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java index cc1a3f4..29137b3 100644 --- a/server/war/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java +++ b/server/war/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java @@ -33,7 +33,7 @@ public static Gson createInstance() { Gson gson = new GsonBuilder() .setDateFormat("yyyy-MM-dd HH:mm:ss") - .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) + .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) .create(); return gson; } diff --git a/server/war/src/main/java/org/jboss/bpm/console/server/util/BufferedResponseWrapper.java b/server/war/src/main/java/org/jboss/bpm/console/server/util/BufferedResponseWrapper.java index 2b0704f..b0f4b5f 100644 --- a/server/war/src/main/java/org/jboss/bpm/console/server/util/BufferedResponseWrapper.java +++ b/server/war/src/main/java/org/jboss/bpm/console/server/util/BufferedResponseWrapper.java @@ -41,7 +41,7 @@ public class BufferedResponseWrapper extends HttpServletResponseWrapper public BufferedResponseWrapper(HttpServletResponse httpServletResponse) { super(httpServletResponse); - output=new ByteArrayOutputStream(); + output=new ByteArrayOutputStream(); } public byte[] getData() { diff --git a/server/war/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java b/server/war/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java index 9b4e8e9..e4a6d2a 100644 --- a/server/war/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java +++ b/server/war/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java @@ -106,11 +106,11 @@ private String build2HTML(Class root, String pname) sb.append("").append("").append(""); // description sb.append("").append(r.consume).append(""); sb.append("").append(r.produce).append(""); - sb.append(""); + sb.append(""); } sb.append(" "); - + return sb.toString(); } @@ -149,7 +149,7 @@ public StringBuffer build2HTML(String pname) sb.append("").append("Consumes").append(""); sb.append("").append("Produces").append(""); sb.append(""); - + for(Class c : rootResources) { sb.append( diff --git a/server/war/src/main/webapp/WEB-INF/web.xml b/server/war/src/main/webapp/WEB-INF/web.xml index 0bd3dfa..9e098fe 100644 --- a/server/war/src/main/webapp/WEB-INF/web.xml +++ b/server/war/src/main/webapp/WEB-INF/web.xml @@ -49,7 +49,7 @@ - Resteasy + Resteasy /rs/process/* /rs/task/* /rs/form/* diff --git a/server/war/src/main/webapp/login.html b/server/war/src/main/webapp/login.html index c4453b0..0e8b3d3 100644 --- a/server/war/src/main/webapp/login.html +++ b/server/war/src/main/webapp/login.html @@ -10,7 +10,7 @@

BPM Console Server

- + diff --git a/server/war/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java b/server/war/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java index 50752a3..c67028e 100644 --- a/server/war/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java +++ b/server/war/src/test/java/org/jboss/bpm/test/typeconversion/TypeConversionTestCase.java @@ -44,7 +44,7 @@ public void testComplexTypes() throws Exception javaPayload.put("illegal type", new IllegalType()); javaPayload.put("77illegal name % $$ - 1", "Hi There"); Payload2XML t = new Payload2XML(); - System.out.println(t.convert("SampleProcess", javaPayload).toString()); + System.out.println(t.convert("SampleProcess", javaPayload).toString()); } } diff --git a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/DeploymentRef.java b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/DeploymentRef.java index f3c1ca8..72322c5 100644 --- a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/DeploymentRef.java +++ b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/DeploymentRef.java @@ -38,7 +38,7 @@ public class DeploymentRef private String name; private long timestamp; - + private List definitions = new ArrayList(); private List resourceNames = new ArrayList(); diff --git a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ParticipantRef.java b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ParticipantRef.java index 913b22e..887e628 100644 --- a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ParticipantRef.java +++ b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ParticipantRef.java @@ -25,7 +25,7 @@ * @author Heiko.Braun */ public class ParticipantRef -{ +{ private String type; private String idRef; private boolean isGroup; diff --git a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionRef.java b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionRef.java index d7b7452..4567739 100644 --- a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionRef.java +++ b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessDefinitionRef.java @@ -28,10 +28,10 @@ * @author Heiko.Braun */ @XmlRootElement(name="processDefinition") -public class ProcessDefinitionRef +public class ProcessDefinitionRef { private String id; - + private String name; private long version; private String key; diff --git a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java index 96e4122..7d46be2 100644 --- a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java +++ b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstanceRef.java @@ -48,7 +48,7 @@ public static enum STATE {RUNNING, SUSPENDED, ENDED}; * the end state of an instance */ public static enum RESULT {COMPLETED, FAILED, ERROR, EXITED, OBSOLETE}; - + private Date startDate; private Date endDate; @@ -214,7 +214,7 @@ public Lifecycle transitionTo(STATE next) { nextLifecycle = new Lifecycle(instance, next); instance.suspended = false; - instance.endDate = new Date(); + instance.endDate = new Date(); break; } else @@ -300,7 +300,7 @@ public void setEndResult(RESULT endResult) { if(getState()!=STATE.ENDED) throw new IllegalArgumentException("Cannot set end result in state "+getState()); - + this.endResult = endResult; } diff --git a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ServerStatus.java b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ServerStatus.java index b1543a4..9514d75 100644 --- a/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ServerStatus.java +++ b/shared/rpc/src/main/java/org/jboss/bpm/console/client/model/ServerStatus.java @@ -30,7 +30,7 @@ public class ServerStatus { List plugins = new ArrayList(); - + public List getPlugins() { return plugins;
Username: