[overlord-commits] Overlord SVN: r960 - in bpm-console/trunk/gui/war/src/main/java/org: jboss/bpm/console/client/common and 3 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Feb 10 14:48:26 EST 2010
Author: heiko.braun at jboss.com
Date: 2010-02-10 14:48:25 -0500 (Wed, 10 Feb 2010)
New Revision: 960
Added:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/ListBoxToolbar.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/filter.png
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/header_background.png
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/jboss/bpm/console/client/common/LoadingOverlay.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/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/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/MergedProcessView.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/console.css
Log:
begin cleanup css
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-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/gwt/mosaic/ui/client/layout/MosaicPanel.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -31,7 +31,8 @@
{
public MosaicPanel()
{
- super();
+ super();
+ setPadding(5);
}
protected MosaicPanel(Element elem)
@@ -46,7 +47,8 @@
public MosaicPanel(LayoutManager layout)
{
- super(layout);
+ super(layout);
+ setPadding(5);
}
}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/ListBoxToolbar.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/ListBoxToolbar.java (rev 0)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/ListBoxToolbar.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.common;
+
+import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import org.gwt.mosaic.ui.client.layout.ColumnLayout;
+import org.gwt.mosaic.ui.client.layout.ColumnLayoutData;
+import org.gwt.mosaic.ui.client.layout.MosaicPanel;
+
+public class ListBoxToolbar extends MosaicPanel
+{
+ private HorizontalPanel toolPanel;
+
+ public ListBoxToolbar(String title)
+ {
+ super(new ColumnLayout());
+
+ setStyleName("bpm-toolbar-panel");
+
+ toolPanel = new HorizontalPanel();
+
+ this.add(new HTML("<b>"+title+"</b>"), new ColumnLayoutData("80%"));
+ this.add(toolPanel, new ColumnLayoutData("20%"));
+ }
+
+ public HorizontalPanel getToolPanel()
+ {
+ return toolPanel;
+ }
+}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/LoadingOverlay.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/LoadingOverlay.java 2010-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/LoadingOverlay.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -43,7 +43,7 @@
if(width>100 & height>100) // workaround hidden panels
{
p = new InfoPanel();
- p.setStylePrimaryName("bpm-loading-overy");
+ p.setStylePrimaryName("bpm-loading-overlay");
p.setWidget(new Image("images/loading_lite.gif"));
p.setPopupPosition(left+(width/2)-15, top+(height/2)-15);
p.show();
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-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/common/PagingPanel.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -57,36 +57,39 @@
this.callback = callback;
+ ClickHandler clickHandler = new ClickHandler()
+ {
+ public void onClick(ClickEvent clickEvent)
+ {
+ page--;
+ rightBounds = false;
+ callback.rev();
+ }
+ };
revBtn = new Button(
ButtonHelper.createButtonLabel(
Caption.IMAGES.toolCollapseLeft(),"",
ButtonHelper.ButtonLabelType.NO_TEXT),
- new ClickHandler()
- {
- public void onClick(ClickEvent clickEvent)
- {
- page--;
- rightBounds=false;
- callback.rev();
- }
- }
+ clickHandler
);
this.add(revBtn);
+ ClickHandler clickHandler2 = new ClickHandler()
+ {
+ public void onClick(ClickEvent clickEvent)
+ {
+ page++;
+ leftBounds = false;
+ callback.ffw();
+ }
+ };
+
ffwBtn = new Button(
ButtonHelper.createButtonLabel(
Caption.IMAGES.toolCollapseRight(),"",
ButtonHelper.ButtonLabelType.NO_TEXT),
- new ClickHandler()
- {
- public void onClick(ClickEvent clickEvent)
- {
- page++;
- leftBounds = false;
- callback.ffw();
- }
- }
+ clickHandler2
);
this.add(ffwBtn);
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-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/ConsoleIconBundle.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -65,9 +65,6 @@
@ClientBundle.Source("reload.png")
ImageResource reloadIcon();
- @ClientBundle.Source("reload_small.png")
- ImageResource reloadSmallIcon();
-
@ClientBundle.Source("report.png")
ImageResource reportIcon();
@@ -95,4 +92,7 @@
@ClientBundle.Source("docIcon.png")
ImageResource docIcon();
+ @ClientBundle.Source("filter.png")
+ ImageResource filterIcon();
+
}
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/filter.png
===================================================================
(Binary files differ)
Property changes on: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/icons/filter.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
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-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -21,10 +21,8 @@
*/
package org.jboss.bpm.console.client.process;
-import com.google.gwt.event.dom.client.ChangeEvent;
-import com.google.gwt.event.dom.client.ChangeHandler;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.event.dom.client.*;
+import com.google.gwt.gen2.table.client.AbstractScrollTable;
import com.google.gwt.gen2.table.event.client.RowSelectionEvent;
import com.google.gwt.gen2.table.event.client.RowSelectionHandler;
import com.google.gwt.user.client.Command;
@@ -32,10 +30,14 @@
import com.google.gwt.user.client.Timer;
import com.google.gwt.user.client.ui.Button;
import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.ScrollPanel;
+import com.google.gwt.widgetideas.client.FastTree;
+import com.google.gwt.widgetideas.client.FastTreeItem;
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import com.mvc4g.client.ViewInterface;
import org.gwt.mosaic.ui.client.ListBox;
+import org.gwt.mosaic.ui.client.ScrollLayoutPanel;
import org.gwt.mosaic.ui.client.ToolBar;
import org.gwt.mosaic.ui.client.layout.*;
import org.gwt.mosaic.ui.client.list.DefaultListModel;
@@ -80,6 +82,9 @@
{
panel = new MosaicPanel();
+ panel.setWidgetSpacing(0);
+ panel.setPadding(0);
+
listBox = createListBox();
final Controller controller = Registry.get(Controller.class);
controller.addView(ID, this);
@@ -132,15 +137,19 @@
// toolbar
final ToolBar toolBar = new ToolBar();
+ ClickHandler clickHandler = new ClickHandler()
+ {
+ public void onClick(ClickEvent clickEvent)
+ {
+ reload();
+ }
+ };
+
toolBar.add(
- new Button("Refresh", new ClickHandler() {
- public void onClick(ClickEvent clickEvent)
- {
- reload();
- }
- }
+ new Button("Refresh", clickHandler
)
);
+
toolBox.add(toolBar, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
// filter
@@ -197,17 +206,19 @@
definitionList.add(pagingPanel,new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
// layout
- MosaicPanel layout = new MosaicPanel(new BorderLayout());
- layout.add(definitionList, new BorderLayoutData(BorderLayout.Region.CENTER));
+ //MosaicPanel layout = new MosaicPanel(new BorderLayout());
+ //layout.add(definitionList, new BorderLayoutData(BorderLayout.Region.CENTER));
// details
- ProcessDetailView detailsView = new ProcessDetailView();
+ /*ProcessDetailView detailsView = new ProcessDetailView();
controller.addView(ProcessDetailView.ID, detailsView);
controller.addAction(UpdateProcessDetailAction.ID, new UpdateProcessDetailAction());
- //layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10,200));
+ layout.add(detailsView, new BorderLayoutData(BorderLayout.Region.SOUTH, 10,200));*/
- panel.add(layout);
+ //panel.add(layout);
+ panel.add(definitionList);
+
// deployments model listener
ErraiBus.get().subscribe(Model.SUBJECT,
new MessageCallback()
@@ -253,21 +264,25 @@
final ListBox<ProcessDefinitionRef> listBox =
new ListBox<ProcessDefinitionRef>(
new String[] {
- "<b>Process Name</b>", "v."//, "Version", "Suspended"
+ "<b>Process</b>", "v."//, "Version", "Suspended"
}
);
+
+ listBox.setFocus(true);
listBox.setCellRenderer(new ListBox.CellRenderer<ProcessDefinitionRef>() {
public void renderCell(ListBox<ProcessDefinitionRef> 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 = "<div style=\"color:"+color+"\">"+ s +"</div>";
+ String text = "<div style=\"color:"+color+"\">"+ s +"</div>";
+
listBox.setWidget(row, column, new HTML(text));
break;
case 1:
@@ -283,7 +298,8 @@
});
listBox.setMinimumColumnWidth(0, 190);
-
+ listBox.setColumnResizePolicy(AbstractScrollTable.ColumnResizePolicy.MULTI_CELL);
+
listBox.addRowSelectionHandler(
new RowSelectionHandler()
{
@@ -297,9 +313,9 @@
if(!item.isSuspended())
{
// update details
- controller.handleEvent(
+ /*controller.handleEvent(
new Event(UpdateProcessDetailAction.ID, item)
- );
+ );*/
// load instances
controller.handleEvent(
@@ -313,7 +329,7 @@
}
}
);
-
+
return listBox;
}
@@ -334,9 +350,9 @@
controller.handleEvent(new Event(ClearInstancesAction.ID, null));
// clear details
- controller.handleEvent(
+ /*controller.handleEvent(
new Event(UpdateProcessDetailAction.ID, null)
- );
+ );*/
}
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-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceDetailView.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -78,7 +78,8 @@
public InstanceDetailView()
{
- super("Instance details");
+ super("Execution details");
+
this.appContext = Registry.get(ApplicationContext.class);
isRiftsawInstance = appContext.getConfig().getProfileName().equals("BPEL Console");
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-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -74,7 +74,7 @@
private boolean isRiftsawInstance;
- private PagingPanel pagingPanel;
+ //private PagingPanel pagingPanel;
MosaicPanel panel;
@@ -86,12 +86,11 @@
this.appContext = Registry.get(ApplicationContext.class);
panel = new MosaicPanel();
+ panel.setPadding(0);
+
Registry.get(Controller.class).addView(ID, this);
initialize();
- //ConsoleIconBundle icons = GWT.create(ConsoleIconBundle.class);
- //setTitle("Process Instances");
- //setIcon(AbstractImagePrototype.create(icons.instanceIcon()));
-
+
// riftsaw?
isRiftsawInstance = appContext.getConfig().getProfileName().equals("BPEL Console");
@@ -114,7 +113,7 @@
listBox =
new ListBox<ProcessInstanceRef>(
new String[] {
- "<b>Instance ID</b>", "State", "Start Date"}
+ "<b>Instance</b>", "State", "Start Date"}
);
listBox.setCellRenderer(new ListBox.CellRenderer<ProcessInstanceRef>() {
@@ -335,7 +334,7 @@
instanceList.add(toolBox, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
instanceList.add(listBox, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
- pagingPanel = new PagingPanel(
+ /*pagingPanel = new PagingPanel(
new PagingCallback()
{
public void rev()
@@ -349,7 +348,7 @@
}
}
);
- //instanceList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));
+ instanceList.add(pagingPanel, new BoxLayoutData(BoxLayoutData.FillStyle.HORIZONTAL));*/
// cached data?
if(this.cachedInstances!=null)
@@ -357,6 +356,7 @@
// layout
MosaicPanel layout = new MosaicPanel(new BorderLayout());
+ layout.setPadding(0);
layout.add(instanceList, new BorderLayoutData(BorderLayout.Region.CENTER));
// details
@@ -407,7 +407,7 @@
this.currentDefinition = (ProcessDefinitionRef)data[0];
this.cachedInstances = (List<ProcessInstanceRef>)data[1];
- if(isInitialized()) pagingPanel.reset();
+ //if(isInitialized()) pagingPanel.reset();
renderUpdate();
}
@@ -441,7 +441,7 @@
(DefaultListModel<ProcessInstanceRef>) listBox.getModel();
model.clear();
- List<ProcessInstanceRef> list = pagingPanel.trim(instances);
+ List<ProcessInstanceRef> list = instances;//pagingPanel.trim(instances);
for(ProcessInstanceRef inst : list)
{
model.add(inst);
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java 2010-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/MergedProcessView.java 2010-02-10 19:48:25 UTC (rev 960)
@@ -22,10 +22,12 @@
package org.jboss.bpm.console.client.process;
import com.google.gwt.user.client.ui.Widget;
+import com.mvc4g.client.Controller;
import org.gwt.mosaic.ui.client.layout.*;
import org.jboss.bpm.console.client.util.ConsoleLog;
import org.jboss.errai.common.client.framework.WSComponent;
import org.jboss.errai.common.client.framework.WidgetCallback;
+import org.jboss.errai.workspaces.client.Registry;
/**
* Combined view of process and instance data in a single screen
@@ -39,8 +41,11 @@
public void getWidget(WidgetCallback callback)
{
- panel = new MosaicPanel(new BorderLayout());
- panel.setPadding(0);
+ Controller controller = Registry.get(Controller.class);
+
+ panel = new MosaicPanel();
+ panel.setPadding(0);
+
definitionView = new DefinitionListView();
instanceView = new InstanceListView();
@@ -75,8 +80,8 @@
}
);
- panel.add(splitPanel, new BorderLayoutData(BorderLayout.Region.CENTER, false));
-
+ panel.add(splitPanel);
+
callback.onSuccess(panel);
}
}
Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/console.css
===================================================================
--- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/console.css 2010-02-09 14:40:50 UTC (rev 959)
+++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/console.css 2010-02-10 19:48:25 UTC (rev 960)
@@ -2,7 +2,7 @@
height: 100%;
overflow: hidden;
margin: 0;
- padding: 0;
+ padding: 0;
}
.bpm-layout {
@@ -10,28 +10,12 @@
margin: 10px;
}
-.bpm-header{
- background-color:#ffffff;
-}
-
.bpm-lazy-header {
height:35px;
margin-bottom:5px;
border:1px solid black;
}
-.bpm-header-left {
- background-color:#ffffff;
- vertical-align:bottom;
- margin-left:15px;
-}
-
-.bpm-header-right {
- background-color:#ffffff;
- vertical-align:bottom;
- margin-right:15px;
-}
-
.bpm-label-header {
background-color:#F8F8F8;
font-weight:BOLD;
@@ -87,9 +71,15 @@
padding-top:10px;
}
+.bpm-toolbar-panel {
+ padding:5px;
+ background-color:#dfe8f6;
+ border-bottom: 1px solid #bbbbbb;
+
+}
+
.bpm-filter-panel {
- padding-top:5px;
- padding-right:2px;
+ padding:5px;
background-color:#dfe8f6;
border-bottom: 1px solid #bbbbbb;
}
@@ -216,34 +206,6 @@
text-align: center;
}
-.bpm-examine-icon {
- background-image: url( images/icons/examine.png)
-}
-
-.bpm-add-icon {
- background-image: url( images/icons/add.png)
-}
-
-.bpm-lock-icon-small {
- background-image: url( images/icons/lock_small.png)
-}
-
-.bpm-remove-icon {
- background-image: url( images/icons/remove.png)
-}
-
-.bpm-play-icon {
- background-image: url( images/icons/play.png)
-}
-
-.bpm-stop-icon {
- background-image: url( images/icons/stop.png)
-}
-
-.bpm-pause-icon {
- background-image: url( images/icons/pause.png)
-}
-
div.activeNode {
position:absolute;
border-width:1px;
@@ -354,12 +316,11 @@
padding:2px;
font-size:8px;
background-color:#dfe8f6;
- border-bottom: 1px solid #bbbbbb;
}
-
/* mosaic overrides */
+
.mosaic-Label {
font-weight:bold;
}
@@ -370,7 +331,8 @@
-webkit-border-radius: 3px;
}
-.bpm-loading-overy {
+
+.bpm-loading-overlay {
font-size: 10px;
-moz-border-radius: 2px;
-webkit-border-radius: 2px;
Added: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/header_background.png
===================================================================
(Binary files differ)
Property changes on: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/public/header_background.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the overlord-commits
mailing list