[overlord-commits] Overlord SVN: r920 - in bpm-console/trunk/gui/war: src/main/java/jmaki/xhp and 11 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Thu Jan 21 03:17:56 EST 2010
Author: heiko.braun at jboss.com
Date: 2010-01-21 03:17:55 -0500 (Thu, 21 Jan 2010)
New Revision: 920
Removed:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/sam/
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ws/
bpm-console/trunk/gui/war/src/main/webapp/
Modified:
bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java
bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PropertyGrid.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
bpm-console/trunk/gui/war/war/WEB-INF/web.xml
bpm-console/trunk/gui/war/war/app.html
Log:
remove legacy code
Modified: bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -13,10 +13,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
+import java.io.*;
import java.net.URL;
import java.net.URLConnection;
import java.net.URLEncoder;
@@ -181,7 +178,7 @@
PrintWriter writer = null;
String serviceKey = null;
try {
- BufferedReader in = req.getReader();
+ BufferedReader in = new BufferedReader(new InputStreamReader(req.getInputStream()));
String line = null;
while ((line = in.readLine()) != null) {
if (bodyContent == null) bodyContent = new StringBuffer();
@@ -319,7 +316,10 @@
// override service url and url params
String path = req.getRequestURI();
- path = path.substring(path.indexOf("xhp/")+3, path.length());
+ if(path.indexOf("xhp/")!=-1)
+ path = path.substring(path.indexOf("xhp/")+3, path.length());
+ else
+ path = path.substring(path.indexOf("xhp")+3, path.length());
StringTokenizer tok = new StringTokenizer(path, "/");
while(tok.hasMoreTokens())
@@ -425,7 +425,7 @@
writer.flush();
} catch (java.io.IOException ix) {
ix.printStackTrace();
- }*/
+ }*/
return;
}
finally
Modified: bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -25,13 +25,9 @@
/**
- * Created by IntelliJ IDEA.
- * User: hbraun
- * Date: Jan 20, 2010
- * Time: 10:39:22 AM
- * To change this template use File | Settings | File Templates.
+ * Avoid naming conflicts
*/
-public class MosaicPanel extends LayoutPanel
+public class MosaicPanel extends org.gwt.mosaic.ui.client.layout.LayoutPanel
{
public MosaicPanel()
{
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/Application.gwt.xml 2010-01-21 08:17:55 UTC (rev 920)
@@ -3,65 +3,63 @@
<module rename-to="app">
- <!-- Inherit the core Web Toolkit stuff. -->
- <inherits name='com.google.gwt.user.User' />
- <inherits name='com.google.gwt.json.JSON'/>
- <inherits name="com.google.gwt.i18n.I18N"/>
- <inherits name="com.google.gwt.user.ImageBundle"/>
- <inherits name="com.google.gwt.xml.XML" />
+ <!-- Inherit the core Web Toolkit stuff. -->
+ <inherits name='com.google.gwt.user.User' />
+ <inherits name='com.google.gwt.json.JSON'/>
+ <inherits name="com.google.gwt.i18n.I18N"/>
+ <inherits name="com.google.gwt.user.ImageBundle"/>
+ <inherits name="com.google.gwt.xml.XML" />
- <!-- Add gwt-log support, default level `DEBUG` -->
- <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" />
+ <!-- Add gwt-log support, default level `DEBUG` -->
+ <inherits name="com.allen_sauer.gwt.log.gwt-log-DEBUG" />
- <!-- Inherit Mosaic Web Toolkit stuff. -->
- <inherits name='org.gwt.mosaic.Mosaic' />
- <inherits name='org.gwt.mosaic.forms.Forms' />
- <inherits name='org.jboss.bpm.report.BPMReport' />
-
- <!-- Includes the public resources used by the GWT Mosaic -->
- <!-- themes. Those files do not inject a style sheet into the -->
- <!-- application. -->
- <!--inherits name="org.gwt.mosaic.theme.standard.StandardResources" />
- <inherits name="org.gwt.mosaic.theme.chrome.ChromeResources" />
- <inherits name="org.gwt.mosaic.theme.dark.DarkResources" /-->
- <inherits name="org.gwt.mosaic.theme.aegean.AegeanResources" />
+ <!-- Inherit Mosaic Web Toolkit stuff. -->
+ <inherits name='org.gwt.mosaic.Mosaic' />
+ <inherits name='org.gwt.mosaic.forms.Forms' />
- <!-- Inherit the default GWT Mosaic style sheet. You can change -->
- <!-- the theme of your GWT Mosaic application by uncommenting -->
- <!-- any one of the following lines. -->
- <!-- <inherits name='org.gwt.mosaic.theme.standard.Standard' /> -->
- <!-- <inherits name="org.gwt.mosaic.chrome.Chrome"/> -->
- <!-- <inherits name="org.gwt.mosaic.dark.Dark"/> -->
- <inherits name='org.gwt.mosaic.theme.aegean.Aegean' />
+ <inherits name='org.jboss.bpm.report.BPMReport' />
- <!-- mvc4g -->
- <inherits name='com.mvc4g.Mvc4gModule'/>
-
- <generate-with class="org.jboss.bpm.console.rebind.WorkspaceGenerator" >
- <when-type-assignable class="org.jboss.bpm.console.client.WorkspaceLauncher"/>
- </generate-with>
+ <!-- Includes the public resources used by the GWT Mosaic -->
+ <!-- themes. Those files do not inject a style sheet into the -->
+ <!-- application. -->
+ <!--inherits name="org.gwt.mosaic.theme.standard.StandardResources" />
+ <inherits name="org.gwt.mosaic.theme.chrome.ChromeResources" />
+ <inherits name="org.gwt.mosaic.theme.dark.DarkResources" /-->
+ <inherits name="org.gwt.mosaic.theme.aegean.AegeanResources" />
- <!-- Add the `WARN` and `DEBUG` compile time log level -->
- <!--extend-property name="log_level" values="DEBUG,WARN"/-->
+ <!-- Inherit the default GWT Mosaic style sheet. You can change -->
+ <!-- the theme of your GWT Mosaic application by uncommenting -->
+ <!-- any one of the following lines. -->
+ <!-- <inherits name='org.gwt.mosaic.theme.standard.Standard' /> -->
+ <!-- <inherits name="org.gwt.mosaic.chrome.Chrome"/> -->
+ <!-- <inherits name="org.gwt.mosaic.dark.Dark"/> -->
+ <inherits name='org.gwt.mosaic.theme.aegean.Aegean' />
- <!-- Loggers Enabled by default -->
- <set-property name="log_ConsoleLogger" value="ENABLED" />
- <set-property name="log_DivLogger" value="DISABLED" />
- <set-property name="log_FirebugLogger" value="DISABLED" />
- <set-property name="log_GWTLogger" value="ENABLED" />
- <set-property name="log_SystemLogger" value="ENABLED" />
+ <!-- mvc4g -->
+ <inherits name='com.mvc4g.Mvc4gModule'/>
- <!-- Loggers Disabled by default -->
- <set-property name="log_RemoteLogger" value="DISABLED" />
- <set-property name="log_WindowLogger" value="DISABLED" />
+ <generate-with class="org.jboss.bpm.console.rebind.WorkspaceGenerator" >
+ <when-type-assignable class="org.jboss.bpm.console.client.WorkspaceLauncher"/>
+ </generate-with>
- <!-- Specify the app entry point class. -->
- <entry-point class="org.jboss.bpm.console.client.Application" />
+ <set-property name="log_ConsoleLogger" value="DISABLED" />
+ <set-property name="log_DivLogger" value="DISABLED" />
+ <set-property name="log_FirebugLogger" value="DISABLED" />
+ <set-property name="log_GWTLogger" value="DISABLED" />
+ <set-property name="log_SystemLogger" value="ENABLED" />
- <servlet path="/xhp" class="jmaki.xhp.XmlHttpProxyServlet"/>
+ <!-- Loggers Disabled by default -->
+ <set-property name="log_RemoteLogger" value="DISABLED" />
+ <set-property name="log_WindowLogger" value="DISABLED" />
- <!-- Specify a css to load into your gwt application -->
- <stylesheet src='console.css' />
+ <!-- Specify the app entry point class. -->
+ <entry-point class="org.jboss.bpm.console.client.Application" />
+
+ <servlet path="/xhp" class="jmaki.xhp.XmlHttpProxyServlet"/>
+
+ <!-- Specify a css to load into your gwt application -->
+ <stylesheet src='/console.css' />
+
</module>
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -89,7 +89,7 @@
setLoading(false);
// account info
- Image img = icons.userIcon().createImage();
+ Image img = new Image(icons.userIcon());
img.addClickListener(
new ClickListener()
{
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,6 +22,7 @@
package org.jboss.bpm.console.client;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwt.http.client.*;
import com.google.gwt.user.client.*;
import com.google.gwt.user.client.ui.*;
@@ -129,7 +130,18 @@
//DOM.getElementById("ui_loading").getStyle().setProperty("visibility", "visible");
// launch workspace
- new MainLayout(controller, auth, config);
+ GWT.runAsync(new RunAsyncCallback() {
+ public void onFailure(Throwable t)
+ {
+ ConsoleLog.error("Code split failure", t);
+ MessageBox.error("Failed to load workspace", t.getMessage());
+ }
+
+ public void onSuccess()
+ {
+ new MainLayout(controller, auth, config);
+ }
+ });
}
});
@@ -147,6 +159,7 @@
createLayoutWindowPanel();
+ window.pack();
window.center();
// focus
@@ -172,7 +185,7 @@
private void createLayoutWindowPanel() {
window = new WindowPanel(config.getProfileName());
window.setAnimationEnabled(true);
- window.setSize("320px", "180px");
+ //window.setSize("320px", "180px");
MosaicPanel panel = new MosaicPanel();
@@ -193,10 +206,10 @@
/**
* Create content for layout.
*/
- private void createLayoutContent(MosaicPanel MosaicPanel) {
+ private void createLayoutContent(MosaicPanel layoutPanel) {
- MosaicPanel.setLayout(new BorderLayout());
- MosaicPanel.setPadding(5);
+ layoutPanel.setLayout(new BorderLayout());
+ layoutPanel.setPadding(5);
Widget form = createForm();
@@ -219,8 +232,8 @@
southContainer.add(submit, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
southContainer.add(html);
- MosaicPanel.add(form, new BorderLayoutData(BorderLayout.Region.CENTER));
- MosaicPanel.add(southContainer, new BorderLayoutData(BorderLayout.Region.SOUTH));
+ layoutPanel.add(form, new BorderLayoutData(BorderLayout.Region.CENTER));
+ layoutPanel.add(southContainer, new BorderLayoutData(BorderLayout.Region.SOUTH));
}
@@ -276,9 +289,7 @@
private Widget createForm()
{
MosaicPanel p = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
- HeaderLabel label = new HeaderLabel("Login", true);
- p.add(label, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
-
+
usernameInput = new TextBox();
passwordInput = new PasswordTextBox();
@@ -289,11 +300,6 @@
grid.setWidget(1,0, new Label("Password:"));
grid.setWidget(1,1, passwordInput);
- /*DisclosurePanel msg = new DisclosurePanel("Contact Address");
-
- grid.setWidget(2,0, new Label(""));
- grid.setWidget(2,1, msg);*/
-
p.add(grid);
passwordInput.addKeyboardListener(
@@ -318,10 +324,6 @@
}
);
-
- /*HTML htmlMsg = new HTML("Messages");
- p.add(htmlMsg);*/
-
return p;
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/MainLayout.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -74,7 +74,7 @@
viewport = new Viewport();
// manually, otherwise it will appear on the login screen
- Log.addLogger(new DivLogger());
+ //Log.addLogger(new DivLogger());
MosaicPanel layout = createLayout();
viewport.getLayoutPanel().add(layout);
@@ -109,31 +109,31 @@
private MosaicPanel createLayout()
{
- final MosaicPanel MosaicPanel = new MosaicPanel(new BorderLayout());
+ final MosaicPanel panel = new MosaicPanel(new BorderLayout());
// header
header = new Header(this, auth.getUsername(), auth.getRolesAssigned());
- MosaicPanel.add(header, new BorderLayoutData(Region.NORTH, 50));
+ panel.add(header, new BorderLayoutData(Region.NORTH, 50));
// menu
menu = new Menu();
- MosaicPanel.add(menu, new BorderLayoutData(Region.WEST, 180));
+ panel.add(menu, new BorderLayoutData(Region.WEST, 180));
// workspace
workspace = createWorkspace();
- MosaicPanel.add(workspace, new BorderLayoutData(Region.CENTER, false));
+ panel.add(workspace, new BorderLayoutData(Region.CENTER, false));
registerGlobalViewsAndActions();
// message Panel
- final CaptionLayoutPanel messagePanel = createMessagePanel(MosaicPanel);
- messagePanel.add(Log.getDivLogger().getWidget());
+ final CaptionLayoutPanel messagePanel = createMessagePanel(panel);
+ //messagePanel.add(Log.getDivLogger().getWidget());
messagePanel.setCollapsed(true);
- MosaicPanel.add(messagePanel, new BorderLayoutData(Region.SOUTH, true));
+ panel.add(messagePanel, new BorderLayoutData(Region.SOUTH, true));
// Turn on DivLogger
- Log.getDivLogger().getWidget().setVisible(true);
+ //Log.getDivLogger().getWidget().setVisible(true);
- return MosaicPanel;
+ return panel;
}
@@ -153,14 +153,14 @@
}
- private CaptionLayoutPanel createMessagePanel(final MosaicPanel MosaicPanel)
+ private CaptionLayoutPanel createMessagePanel(final MosaicPanel panel)
{
final CaptionLayoutPanel messagePanel = new CaptionLayoutPanel("Messages", true);
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
Button collapse = new Button(
ButtonHelper.createButtonLabel(
- icons.collapseDownIcon(),
+ AbstractImagePrototype.create(icons.collapseDownIcon()),
"",
ButtonHelper.ButtonLabelType.TEXT_ON_TOP)
);
@@ -170,7 +170,7 @@
public void onClick(Widget sender)
{
messagePanel.setCollapsed(!messagePanel.isCollapsed());
- MosaicPanel.layout();
+ panel.layout();
}
}
);
@@ -210,7 +210,7 @@
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
WindowPanel err = new WindowPanel("Error");
- err.getHeader().add( icons.errorIcon().createImage() );
+ err.getHeader().add( new Image(icons.errorIcon()) );
err.setAnimationEnabled(true);
err.setSize("320px", "240px");
ScrollLayoutPanel ScrollLayoutPanel = new ScrollLayoutPanel();
@@ -252,7 +252,7 @@
final int width = Window.getClientWidth();
final int height = Window.getClientHeight();
//getViewport().onWindowResized(width, height);
-
+ getViewport().getLayoutPanel().layout();
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/PreferencesView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -21,6 +21,8 @@
*/
package org.jboss.bpm.console.client;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.ListBox;
@@ -28,6 +30,7 @@
import com.mvc4g.client.Controller;
import com.mvc4g.client.ViewInterface;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
+import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.MosaicPanel;
import org.gwt.mosaic.ui.client.layout.FillLayoutData;
import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
@@ -55,9 +58,7 @@
public PreferencesView()
{
super("User Preferences");
-
- MosaicPanel layout = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
-
+
this.appContext = Registry.get(ApplicationContext.class);
//layout.add(new HeaderLabel("User Preferences"));
@@ -82,10 +83,10 @@
multiBox.setItemSelected(multiBox.getItemCount()-1, true);
}
- multiBox.addClickListener(
- new ClickListener()
+ multiBox.addClickHandler(
+ new ClickHandler()
{
- public void onClick(Widget widget)
+ public void onClick(ClickEvent clickEvent)
{
String title = multiBox.getItemText(multiBox.getSelectedIndex());
for(Workspace.EditorRef ref : editors)
@@ -99,9 +100,6 @@
}
);
- // parent
- layout.add(defaultToolPanel);
-
- this.add(layout);
+ this.add(defaultToolPanel);
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/SettingsEditor.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,6 +22,7 @@
package org.jboss.bpm.console.client;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.Grid;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Label;
@@ -97,22 +98,22 @@
{
final CaptionLayoutPanel captionPanel = new CaptionLayoutPanel("System Settings");
- MosaicPanel MosaicPanel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
+ MosaicPanel layoutPanel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
// console info
Label console = new Label("Console Info");
- MosaicPanel.add(console, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ layoutPanel.add(console, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
Grid g1 = new Grid(1,2);
g1.setWidget(0,0, new HTML("Version:"));
g1.setWidget(0,1, new HTML(Version.VERSION));
g1.getColumnFormatter().setWidth(0, "20%");
- MosaicPanel.add(g1, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ layoutPanel.add(g1, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
// server info
Label server = new Label("Server Info");
- MosaicPanel.add(server, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ layoutPanel.add(server, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
ServerStatusView serverStatus = new ServerStatusView(appContext);
serverStatus.initialize();
@@ -123,7 +124,7 @@
g2.getColumnFormatter().setWidth(0, "20%");
- MosaicPanel.add(g2, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ layoutPanel.add(g2, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
MosaicPanel pluginPanel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
pluginPanel.setPadding(0);
@@ -132,12 +133,12 @@
pluginPanel.add(label);
pluginPanel.add(serverStatus);
- MosaicPanel.add(pluginPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ layoutPanel.add(pluginPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
// view and actions
super.controller.addView(ServerStatusView.ID, serverStatus);
- captionPanel.add(MosaicPanel);
+ captionPanel.add(layoutPanel);
return captionPanel;
}
@@ -157,7 +158,7 @@
return new MenuSection(
getTitle(),
- icons.settingsIcon(),
+ AbstractImagePrototype.create(icons.settingsIcon()),
new SettingsEditorNavigation(appContext)
);
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -21,19 +21,20 @@
*/
package org.jboss.bpm.console.client.common;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.PushButton;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.ui.Button;
import org.gwt.mosaic.ui.client.Caption;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.MosaicPanel;
+import org.gwt.mosaic.ui.client.util.ButtonHelper;
import java.util.ArrayList;
import java.util.List;
/**
* Cheap paging helper
- *
+ *
* @author Heiko.Braun <heiko.braun at jboss.com>
*/
public class PagingPanel extends MosaicPanel
@@ -45,34 +46,41 @@
private boolean leftBounds = true;
private boolean rightBounds;
-
- private PushButton revBtn;
- private PushButton ffwBtn;
-
+
+ private Button revBtn;
+ private Button ffwBtn;
+
public PagingPanel(final PagingCallback callback)
{
super(new BoxLayout(BoxLayout.Orientation.HORIZONTAL));
setStyleName("bpm-paging-panel");
this.callback = callback;
-
- revBtn = new PushButton(Caption.IMAGES.toolCollapseLeft().createImage(),
- new ClickListener()
+
+ revBtn = new Button(
+ ButtonHelper.createButtonLabel(
+ Caption.IMAGES.toolCollapseLeft(),"",
+ ButtonHelper.ButtonLabelType.NO_TEXT),
+ new ClickHandler()
{
- public void onClick(Widget widget)
+ public void onClick(ClickEvent clickEvent)
{
- page--;
+ page--;
rightBounds=false;
callback.rev();
}
}
);
+
this.add(revBtn);
- ffwBtn = new PushButton(Caption.IMAGES.toolCollapseRight().createImage(),
- new ClickListener()
+ ffwBtn = new Button(
+ ButtonHelper.createButtonLabel(
+ Caption.IMAGES.toolCollapseRight(),"",
+ ButtonHelper.ButtonLabelType.NO_TEXT),
+ new ClickHandler()
{
- public void onClick(Widget widget)
+ public void onClick(ClickEvent clickEvent)
{
page++;
leftBounds = false;
@@ -80,6 +88,7 @@
}
}
);
+
this.add(ffwBtn);
}
@@ -137,12 +146,12 @@
if(i>=begin && i<end) trimmed.add(o);
i++;
}
-
+
}
revBtn.setEnabled(!leftBounds);
ffwBtn.setEnabled(!rightBounds);
-
+
return trimmed;
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PropertyGrid.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PropertyGrid.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PropertyGrid.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -25,6 +25,7 @@
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Label;
import org.gwt.mosaic.ui.client.ScrollLayoutPanel;
+import org.gwt.mosaic.ui.client.layout.FillLayout;
/**
* A simple property grid that displays name-value pairs.
@@ -47,7 +48,7 @@
public PropertyGrid(String[] fieldDesc)
{
- super();
+ super(new FillLayout());
this.grid = new Grid(fieldDesc.length, 2);
grid.setStyleName("bpm-prop-grid");
this.fieldNames = fieldDesc;
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,12 +22,11 @@
package org.jboss.bpm.console.client.engine;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.PushButton;
+import com.google.gwt.user.client.ui.*;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.ListBox;
@@ -81,7 +80,7 @@
super();
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
setTitle("Deployments");
- setIcon(icons.deploymentIcon());
+ setIcon(AbstractImagePrototype.create(icons.deploymentIcon()));
listBox = createListBox();
@@ -166,8 +165,9 @@
final ToolBar toolBar = new ToolBar();
toolBar.add(
- new PushButton("Refresh", new ClickListener() {
- public void onClick(Widget sender) {
+ new Button("Refresh", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
+ {
// force loading
controller.handleEvent(
new Event(UpdateDeploymentsAction.ID, null)
@@ -179,9 +179,9 @@
toolBar.add(
- new PushButton("Delete", new ClickListener() {
- public void onClick(Widget sender) {
-
+ new Button("Delete", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
+ {
DeploymentRef deploymentRef = getSelection();
if(deploymentRef!=null)
{
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/EngineEditor.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,6 +22,7 @@
package org.jboss.bpm.console.client.engine;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.SourcesTabEvents;
import com.google.gwt.user.client.ui.TabListener;
import com.mvc4g.client.Event;
@@ -149,7 +150,7 @@
return new MenuSection(
getTitle(),
- icons.runtimeIcon(),
+ AbstractImagePrototype.create(icons.runtimeIcon()),
new EngineEditorNavigation(appContext)
);
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/JobListView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,12 +22,11 @@
package org.jboss.bpm.console.client.engine;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwt.user.client.ui.PushButton;
+import com.google.gwt.user.client.ui.*;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.ListBox;
@@ -83,7 +82,7 @@
this.appContext = appContext;
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- setIcon(icons.jobsIcon());
+ setIcon(AbstractImagePrototype.create(icons.jobsIcon()));
this.listBox = createListBox();
}
@@ -169,8 +168,9 @@
// toolbar
final ToolBar toolBar = new ToolBar();
toolBar.add(
- new PushButton("Refresh", new ClickListener() {
- public void onClick(Widget sender) {
+ new Button("Refresh", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
+ {
// force loading
controller.handleEvent(
new Event(UpdateJobsAction.ID, null)
@@ -181,8 +181,10 @@
);
toolBar.add(
- new PushButton("Execute", new ClickListener() {
- public void onClick(Widget sender) {
+ new Button("Execute", new ClickHandler() {
+
+ public void onClick(ClickEvent clickEvent)
+ {
JobRef selection = getSelection();
if(null==selection)
{
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -21,131 +21,74 @@
*/
package org.jboss.bpm.console.client.icons;
-import com.google.gwt.user.client.ui.AbstractImagePrototype;
-import com.google.gwt.user.client.ui.ImageBundle;
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.ImageResource;
-public interface ConsoleIconBundle extends ImageBundle
+public interface ConsoleIconBundle extends ClientBundle
{
- /**
- * @gwt.resource processIcon.png
- */
- AbstractImagePrototype processIcon();
+ @ClientBundle.Source("processIcon.png")
+ ImageResource processIcon();
- /**
- * @gwt.resource play.png
- */
- AbstractImagePrototype instanceIcon();
+ @ClientBundle.Source("play.png")
+ ImageResource instanceIcon();
- /**
- * Would bundle the file 'open-file-icon.gif' residing in the same package as this type.
- * @gwt.resource open-file-icon.gif
+ @ClientBundle.Source("toolsIcon.png")
+ ImageResource settingsIcon();
- AbstractImagePrototype openFileIcon();
+ @ClientBundle.Source("taskIcon.png")
+ ImageResource taskIcon();
- /**
- * Would bundle the file 'savefile.gif' residing in the package 'org.example.icons'.
- * @gwt.resource org/example/icons/savefile.gif
+ @ClientBundle.Source("userIcon.png")
+ ImageResource userIcon();
- AbstractImagePrototype saveFileIcon();
- */
+ @ClientBundle.Source("tool-button-collapse-down.png")
+ ImageResource collapseDownIcon();
- /**
- * @gwt.resource toolsIcon.png
- */
- AbstractImagePrototype settingsIcon();
+ @ClientBundle.Source("tool-button-collapse-left.png")
+ ImageResource collapseLeftIcon();
- /**
- * @gwt.resource taskIcon.png
- */
- AbstractImagePrototype taskIcon();
+ @ClientBundle.Source("errorIcon.png")
+ ImageResource errorIcon();
- /**
- * @gwt.resource userIcon.png
- */
- AbstractImagePrototype userIcon();
+ @ClientBundle.Source("dialog-information.png")
+ ImageResource infoIcon();
- /**
- * @gwt.resource tool-button-collapse-down.png
- */
- AbstractImagePrototype collapseDownIcon();
+ @ClientBundle.Source("dialog-warning.png")
+ ImageResource warnIcon();
- /**
- * @gwt.resource tool-button-collapse-left.png
- */
- AbstractImagePrototype collapseLeftIcon();
+ @ClientBundle.Source("dialog-question.png")
+ ImageResource questionIcon();
- /**
- * @gwt.resource errorIcon.png
- */
- AbstractImagePrototype errorIcon();
+ @ClientBundle.Source("loading.gif")
+ ImageResource loadingIcon();
- /**
- * @gwt.resource dialog-information.png
- */
- AbstractImagePrototype infoIcon();
+ @ClientBundle.Source("reload.png")
+ ImageResource reloadIcon();
- /**
- * @gwt.resource dialog-warning.png
- */
- AbstractImagePrototype warnIcon();
+ @ClientBundle.Source("reload_small.png")
+ ImageResource reloadSmallIcon();
- /**
- * @gwt.resource dialog-question.png
- */
- AbstractImagePrototype questionIcon();
+ @ClientBundle.Source("report.png")
+ ImageResource reportIcon();
- /**
- * @gwt.resource loading.gif
- */
- AbstractImagePrototype loadingIcon();
+ @ClientBundle.Source("runtime.png")
+ ImageResource runtimeIcon();
- /**
- * @gwt.resource reload.png
- */
- AbstractImagePrototype reloadIcon();
+ @ClientBundle.Source("deployment.png")
+ ImageResource deploymentIcon();
- /**
- * @gwt.resource reload_small.png
- */
- AbstractImagePrototype reloadSmallIcon();
+ @ClientBundle.Source("jobs.png")
+ ImageResource jobsIcon();
- /**
- * @gwt.resource report.png
- */
- AbstractImagePrototype reportIcon();
+ @ClientBundle.Source("ws.png")
+ ImageResource webserviceIcon();
- /**
- * @gwt.resource runtime.png
- */
- AbstractImagePrototype runtimeIcon();
+ @ClientBundle.Source("arrow_blue.png")
+ ImageResource arrowIcon();
- /**
- * @gwt.resource deployment.png
- */
- AbstractImagePrototype deploymentIcon();
+ @ClientBundle.Source("piece.png")
+ ImageResource pieceIcon();
- /**
- * @gwt.resource jobs.png
- */
- AbstractImagePrototype jobsIcon();
-
- /**
- * @gwt.resource ws.png
- */
- AbstractImagePrototype webserviceIcon();
-
- /**
- * @gwt.resource arrow_blue.png
- */
- AbstractImagePrototype arrowIcon();
-
- /**
- * @gwt.resource piece.png
- */
- AbstractImagePrototype pieceIcon();
-
- /**
- * @gwt.resource reportInstance.png
- */
- AbstractImagePrototype reportInstanceIcon();
+ @ClientBundle.Source("reportInstance.png")
+ ImageResource reportInstanceIcon();
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,12 +22,11 @@
package org.jboss.bpm.console.client.process;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.PushButton;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.*;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.ListBox;
@@ -71,7 +70,7 @@
super();
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
setTitle("Process Definitions");
- setIcon(icons.processIcon());
+ setIcon(AbstractImagePrototype.create(icons.processIcon()));
listBox = createListBox();
@@ -101,8 +100,9 @@
// toolbar
final ToolBar toolBar = new ToolBar();
toolBar.add(
- new PushButton("Refresh", new ClickListener() {
- public void onClick(Widget sender) {
+ new Button("Refresh", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
+ {
// force loading
controller.handleEvent(
new Event(UpdateDefinitionsAction.ID, null)
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDataView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -54,7 +54,7 @@
public InstanceDataView()
{
super();
- this.setPadding(5);
+ this.setPadding(5);
}
public void initialize()
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -21,21 +21,26 @@
*/
package org.jboss.bpm.console.client.process;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.logical.shared.ResizeEvent;
+import com.google.gwt.event.logical.shared.ResizeHandler;
+import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.WindowCloseListener;
import com.google.gwt.user.client.WindowResizeListener;
-import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.Widget;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import com.mvc4g.client.ViewInterface;
-import org.gwt.mosaic.ui.client.*;
+import org.gwt.mosaic.core.client.Dimension;
+import org.gwt.mosaic.ui.client.Caption;
+import org.gwt.mosaic.ui.client.CaptionLayoutPanel;
+import org.gwt.mosaic.ui.client.MessageBox;
+import org.gwt.mosaic.ui.client.WindowPanel;
import org.gwt.mosaic.ui.client.layout.BoxLayout;
import org.gwt.mosaic.ui.client.layout.BoxLayoutData;
import org.gwt.mosaic.ui.client.layout.MosaicPanel;
-import org.gwt.mosaic.core.client.Dimension;
import org.jboss.bpm.console.client.ApplicationContext;
import org.jboss.bpm.console.client.ServerPlugins;
import org.jboss.bpm.console.client.common.PropertyGrid;
@@ -95,9 +100,9 @@
MosaicPanel buttonPanel = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL) );
diagramBtn = new Button("Diagram",
- new ClickListener()
+ new ClickHandler()
{
- public void onClick(Widget widget)
+ public void onClick(ClickEvent clickEvent)
{
String diagramUrl = getCurrentDefintion().getDiagramUrl();
if(diagramUrl !=null && !diagramUrl.equals(""))
@@ -115,7 +120,6 @@
{
MessageBox.alert("Incomplete deployment", "No diagram associated with process");
}
-
}
}
);
@@ -125,9 +129,9 @@
buttonPanel.add(diagramBtn);
instanceDataBtn = new Button("Instance Data",
- new ClickListener()
+ new ClickHandler()
{
- public void onClick(Widget widget)
+ public void onClick(ClickEvent clickEvent)
{
if(currentInstance!=null)
{
@@ -163,15 +167,12 @@
header.setStyleName("bpm-label-header");
layout.add(header, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
- diagramWindowPanel.addWindowCloseListener(new WindowCloseListener() {
- public void onWindowClosed() {
- diagramWindowPanel = null;
+ diagramWindowPanel.addWindowClosingHandler(new Window.ClosingHandler() {
+ public void onWindowClosing(Window.ClosingEvent closingEvent)
+ {
+ diagramWindowPanel = null;
}
-
- public String onWindowClosing() {
- return null;
- }
});
@@ -182,6 +183,7 @@
WindowUtil.addMinimizeButton(diagramWindowPanel, Caption.CaptionRegion.RIGHT);
// display
+ diagramWindowPanel.pack();
diagramWindowPanel.center();
}
@@ -190,24 +192,19 @@
{
instanceDataWindowPanel = new WindowPanel("Process Instance Data: "+inst.getId());
instanceDataWindowPanel.setAnimationEnabled(true);
- //instanceDataWindowPanel.setSize("320px", "240px");
+
+ instanceDataWindowPanel.addWindowClosingHandler(new Window.ClosingHandler() {
-
- instanceDataWindowPanel.addWindowCloseListener(new WindowCloseListener() {
- public void onWindowClosed() {
+ public void onWindowClosing(Window.ClosingEvent closingEvent)
+ {
instanceDataWindowPanel = null;
-
- }
-
- public String onWindowClosing() {
- return null;
- }
+ }
});
- instanceDataWindowPanel.addWindowResizeListener(
- new WindowResizeListener() {
+ instanceDataWindowPanel.addResizeHandler(
+ new ResizeHandler() {
- public void onWindowResized(int i, int i1)
+ public void onResize(ResizeEvent resizeEvent)
{
instanceDataView.invalidate();
}
@@ -220,13 +217,14 @@
WindowUtil.addMinimizeButton(instanceDataWindowPanel, Caption.CaptionRegion.RIGHT);
- final int width = Window.getClientWidth()-200;
+ /*final int width = Window.getClientWidth()-200;
final int height = Window.getClientHeight()-100;
instanceDataWindowPanel.setContentSize(
new Dimension(width,height)
- );
+ );*/
+ instanceDataWindowPanel.pack();
instanceDataWindowPanel.center();
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,6 +22,8 @@
package org.jboss.bpm.console.client.process;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
import com.google.gwt.user.client.ui.*;
@@ -79,7 +81,7 @@
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
setTitle("Process Instances");
- setIcon(icons.instanceIcon());
+ setIcon(AbstractImagePrototype.create(icons.instanceIcon()));
// riftsaw?
isRiftsawInstance = appContext.getConfig().getProfileName().equals("BPEL Console");
@@ -152,8 +154,10 @@
final ToolBar toolBar = new ToolBar();
toolBar.add(
- new PushButton("Refresh", new ClickListener() {
- public void onClick(Widget sender) {
+ new Button("Refresh", new ClickHandler() {
+
+ public void onClick(ClickEvent clickEvent)
+ {
controller.handleEvent(
new Event(
UpdateInstancesAction.ID,
@@ -168,9 +172,9 @@
toolBar.add(
- new PushButton("Start", new ClickListener()
+ new Button("Start", new ClickHandler()
{
- public void onClick(Widget sender)
+ public void onClick(ClickEvent clickEvent)
{
MessageBox.confirm("Start new execution",
"Do you want to start a new execution of this process?",
@@ -227,11 +231,10 @@
toolBar.add(
- new PushButton("Terminate", new ClickListener()
+ new Button("Terminate", new ClickHandler()
{
- public void onClick(Widget sender)
+ public void onClick(ClickEvent clickEvent)
{
-
if(getSelection()!=null)
{
@@ -267,11 +270,10 @@
toolBar.add(
- new PushButton("Delete", new ClickListener()
+ new Button("Delete", new ClickHandler()
{
- public void onClick(Widget sender)
+ public void onClick(ClickEvent clickEvent)
{
-
if(getSelection()!=null)
{
MessageBox.confirm("Delete instance",
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/ProcessEditor.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,6 +22,7 @@
package org.jboss.bpm.console.client.process;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.SourcesTabEvents;
import com.google.gwt.user.client.ui.TabListener;
import com.mvc4g.client.ActionInterface;
@@ -151,7 +152,7 @@
return new MenuSection(
getTitle(),
- icons.processIcon(),
+ AbstractImagePrototype.create(icons.processIcon()),
new ProcessEditorNavigation(appContext)
);
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportEditor.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -149,7 +149,7 @@
return new MenuSection(
getTitle(),
- icons.reportIcon(),
+ AbstractImagePrototype.create(icons.reportIcon()),
new ReportEditorNavigation(appContext)
);
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportLaunchPadView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,10 +22,7 @@
package org.jboss.bpm.console.client.report;
import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.HTML;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.*;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import com.mvc4g.client.ViewInterface;
@@ -87,7 +84,10 @@
MosaicPanel desc = new MosaicPanel(new BoxLayout(BoxLayout.Orientation.VERTICAL));
desc.setPadding(0);
- IconHeader header = new IconHeader(icons.reportInstanceIcon(), reportRef.getTitle());
+ IconHeader header = new IconHeader(
+ AbstractImagePrototype.create(icons.reportInstanceIcon()),
+ reportRef.getTitle()
+ );
header.setWidth("95%");
desc.add(header);
String description = reportRef.getDescription()!=null ? reportRef.getDescription() : "";
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/report/ReportView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,6 +22,7 @@
package org.jboss.bpm.console.client.report;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.mvc4g.client.Controller;
import org.gwt.mosaic.ui.client.DeckLayoutPanel;
import com.google.gwt.user.client.ui.Label;
@@ -51,7 +52,7 @@
super();
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
setTitle("Available Reports");
- setIcon(icons.reportIcon());
+ setIcon(AbstractImagePrototype.create(icons.reportIcon()));
}
public boolean isInitialized()
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,12 +22,12 @@
package org.jboss.bpm.console.client.task;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.PushButton;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
+import com.google.gwt.user.client.ui.Button;
import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.ListBox;
import org.gwt.mosaic.ui.client.MessageBox;
@@ -38,13 +38,10 @@
import org.jboss.bpm.console.client.ServerPlugins;
import org.jboss.bpm.console.client.common.IFrameWindowCallback;
import org.jboss.bpm.console.client.common.IFrameWindowPanel;
-import org.jboss.bpm.console.client.common.PagingPanel;
import org.jboss.bpm.console.client.common.PagingCallback;
+import org.jboss.bpm.console.client.common.PagingPanel;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
-import org.jboss.bpm.console.client.model.ProcessInstanceRef;
import org.jboss.bpm.console.client.model.TaskRef;
-import org.jboss.bpm.console.client.process.UpdateInstanceDetailAction;
-import org.jboss.bpm.console.client.process.events.InstanceEvent;
import org.jboss.bpm.console.client.task.events.DetailViewEvent;
import org.jboss.bpm.console.client.task.events.TaskIdentityEvent;
import org.jboss.bpm.console.client.util.SimpleDateFormat;
@@ -77,7 +74,7 @@
this.appContext = appContext;
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
setTitle("Personal Tasks");
- setIcon(icons.userIcon());
+ setIcon(AbstractImagePrototype.create(icons.userIcon()));
this.detailsView = detailsView;
}
@@ -146,8 +143,9 @@
final ToolBar toolBar = new ToolBar();
toolBar.add(
- new PushButton("Refresh", new ClickListener() {
- public void onClick(Widget sender) {
+ new Button("Refresh", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
+ {
// force loading
controller.handleEvent(
new Event(LoadTasksAction.ID, appContext.getAuthentication().getUsername())
@@ -158,11 +156,11 @@
);
- PushButton viewBtn = new PushButton("View", new ClickListener()
+ Button viewBtn = new Button("View", new ClickHandler()
{
- public void onClick(Widget sender)
- {
+ public void onClick(ClickEvent clickEvent)
+ {
TaskRef selection = getSelection();
if (selection != null)
@@ -202,9 +200,9 @@
toolBar.add(viewBtn);
toolBar.add(
- new PushButton("Release", new ClickListener() {
- public void onClick(Widget sender) {
-
+ new Button("Release", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
+ {
TaskRef selection = getSelection();
if(selection!=null)
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,12 +22,11 @@
package org.jboss.bpm.console.client.task;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
-import com.google.gwt.user.client.ui.ChangeListener;
-import com.google.gwt.user.client.ui.ClickListener;
-import com.google.gwt.user.client.ui.PushButton;
-import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.*;
import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.ListBox;
import org.gwt.mosaic.ui.client.MessageBox;
@@ -68,7 +67,7 @@
ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
setTitle("Group Tasks");
- setIcon(icons.taskIcon());
+ setIcon(AbstractImagePrototype.create(icons.taskIcon()));
this.detailsView = detailView;
}
@@ -138,20 +137,22 @@
final ToolBar toolBar = new ToolBar();
toolBar.add(
- new PushButton("Refresh", new ClickListener() {
- public void onClick(Widget sender) {
- // force loading
- controller.handleEvent(
- new Event(LoadTasksParticipationAction.ID, getAssignedIdentity())
- );
+ new Button("Refresh", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
+ {
+ // force loading
+ controller.handleEvent(
+ new Event(LoadTasksParticipationAction.ID, getAssignedIdentity())
+ );
+
}
}
)
);
toolBar.add(
- new PushButton("Claim", new ClickListener() {
- public void onClick(Widget sender)
+ new Button("Claim", new ClickHandler() {
+ public void onClick(ClickEvent clickEvent)
{
TaskRef selection = getSelection();
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskEditor.java 2010-01-21 08:17:55 UTC (rev 920)
@@ -22,6 +22,7 @@
package org.jboss.bpm.console.client.task;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.user.client.ui.AbstractImagePrototype;
import com.google.gwt.user.client.ui.SourcesTabEvents;
import com.google.gwt.user.client.ui.TabListener;
import com.mvc4g.client.ActionInterface;
@@ -146,7 +147,7 @@
return new MenuSection(
getTitle(),
- icons.taskIcon(),
+ AbstractImagePrototype.create(icons.taskIcon()),
new TaskEditorNavigation(appContext)
);
}
Modified: bpm-console/trunk/gui/war/war/WEB-INF/web.xml
===================================================================
--- bpm-console/trunk/gui/war/war/WEB-INF/web.xml 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/war/WEB-INF/web.xml 2010-01-21 08:17:55 UTC (rev 920)
@@ -3,16 +3,17 @@
"http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
- <display-name>Archetype Created Web Application</display-name>
+ <display-name>BPM Console UI</display-name>
<servlet>
- <servlet-name>jmaki.xhp.XmlHttpProxyServlet/org.jboss.bpm.console.Application/xhp</servlet-name>
+ <servlet-name>xmlProxy</servlet-name>
<servlet-class>jmaki.xhp.XmlHttpProxyServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
- <servlet-name>jmaki.xhp.XmlHttpProxyServlet/org.jboss.bpm.console.Application/xhp</servlet-name>
- <url-pattern>/org.jboss.bpm.console.Application/xhp</url-pattern>
+ <servlet-name>xmlProxy</servlet-name>
+ <url-pattern>/app/xhp/*</url-pattern>
</servlet-mapping>
</web-app>
\ No newline at end of file
Modified: bpm-console/trunk/gui/war/war/app.html
===================================================================
--- bpm-console/trunk/gui/war/war/app.html 2010-01-20 10:48:09 UTC (rev 919)
+++ bpm-console/trunk/gui/war/war/app.html 2010-01-21 08:17:55 UTC (rev 920)
@@ -12,7 +12,7 @@
<!-- -->
<script type="text/javascript" language="javascript" src="app/app.nocache.js"></script>
- <link rel="stylesheet" href="console.css" type="text/css">
+ <link rel="stylesheet" href="/console.css" type="text/css">
<style type="text/css">
html, body { height: 100%; overflow: hidden; margin: 0; padding: 0; }
More information about the overlord-commits
mailing list