Author: heiko.braun(a)jboss.com
Date: 2010-06-03 13:46:11 -0400 (Thu, 03 Jun 2010)
New Revision: 1054
Modified:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.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/process/DefinitionListView.java
Log:
Fix BPMC-70: reflect ODE terminology active/retired
Modified:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java
===================================================================
---
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java 2010-06-03
16:13:02 UTC (rev 1053)
+++
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/ErraiApplication.java 2010-06-03
17:46:11 UTC (rev 1054)
@@ -30,8 +30,13 @@
import com.mvc4g.client.Controller;
import com.mvc4g.client.Event;
import org.gwt.mosaic.ui.client.MessageBox;
+import org.jboss.bpm.console.client.common.Model;
+import org.jboss.bpm.console.client.common.ModelCommands;
+import org.jboss.bpm.console.client.common.ModelParts;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.util.ConsoleLog;
+import org.jboss.errai.bus.client.api.Message;
+import org.jboss.errai.bus.client.api.MessageCallback;
import org.jboss.errai.bus.client.framework.ClientMessageBus;
import org.jboss.errai.bus.client.ErraiBus;
import org.jboss.errai.bus.client.security.SecurityService;
@@ -60,6 +65,15 @@
onModuleLoad2();
}
});
+
+ ErraiBus.get().subscribe(Model.SUBJECT,
+ new MessageCallback()
+ {
+ public void callback(Message message)
+ {
+ Log.debug("Data model: " + message.getCommandType());
+ }
+ });
}
public void onModuleLoad2()
Modified:
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java
===================================================================
---
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java 2010-06-03
16:13:02 UTC (rev 1053)
+++
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentDetailView.java 2010-06-03
17:46:11 UTC (rev 1054)
@@ -66,7 +66,7 @@
propLayout.add(grid, new BoxLayoutData(BoxLayoutData.FillStyle.BOTH));
- suspendBtn = new Button("Suspend", new ClickHandler() {
+ suspendBtn = new Button("Retire", new ClickHandler() {
public void onClick(ClickEvent clickEvent)
{
@@ -74,8 +74,8 @@
DeploymentRef deploymentRef = getSelection();
if(deploymentRef!=null)
{
- MessageBox.confirm("Suspend deployment",
- "Do you want to suspend this deployment? Any associated process will
be suspended aswell.",
+ MessageBox.confirm("Retire deployment",
+ "Do you want to retire this deployment? Any associated process will be
suspended.",
new MessageBox.ConfirmationCallback() {
public void onResult(boolean doIt)
{
@@ -99,13 +99,13 @@
}
);
- resumeBtn = new Button("Resume", new ClickHandler() {
+ resumeBtn = new Button("Activate", new ClickHandler() {
public void onClick(ClickEvent clickEvent)
{
DeploymentRef deploymentRef = getSelection();
if(deploymentRef!=null)
{
- MessageBox.confirm("Resume deployment",
+ MessageBox.confirm("Activate deployment",
"Do you want to resume this deployment?",
new MessageBox.ConfirmationCallback() {
public void onResult(boolean doIt)
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-06-03
16:13:02 UTC (rev 1053)
+++
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/engine/DeploymentListView.java 2010-06-03
17:46:11 UTC (rev 1054)
@@ -115,22 +115,25 @@
final ListBox<DeploymentRef> listBox =
new ListBox<DeploymentRef>(
new String[] {
- "Name", "Suspended"}
+ "Deployment", "Status"}
);
listBox.setCellRenderer(new ListBox.CellRenderer<DeploymentRef>() {
public void renderCell(ListBox<DeploymentRef> listBox, int row, int column,
DeploymentRef item) {
+
+ String color= item.isSuspended() ? "#CCCCCC" : "#000000";
+
switch (column) {
case 0:
- String color= item.isSuspended() ? "#CCCCCC" :
"#000000";
String text = "<div
style=\"color:"+color+"\">"+ item.getName()
+"</div>";
-
listBox.setWidget(row, column, new HTML(text));
break;
case 1:
- listBox.setText(row, column, String.valueOf(item.isSuspended()));
+ String status = item.isSuspended() ? "retired" :
"active";
+ String s = "<div
style=\"color:"+color+"\">"+ status
+"</div>";
+ listBox.setWidget(row, column, new HTML(status));
break;
default:
throw new RuntimeException("Unexpected column size");
@@ -243,7 +246,7 @@
dropBox.setStyleName("bpm-operation-ui");
dropBox.addItem("All");
dropBox.addItem("Active");
- dropBox.addItem("Suspended");
+ dropBox.addItem("Retired");
dropBox.addChangeListener(new ChangeListener() {
public void onChange(Widget sender) {
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-06-03
16:13:02 UTC (rev 1053)
+++
bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2010-06-03
17:46:11 UTC (rev 1054)
@@ -160,7 +160,7 @@
dropBox.setStyleName("bpm-operation-ui");
dropBox.addItem("All");
dropBox.addItem("Active");
- dropBox.addItem("Suspended");
+ dropBox.addItem("Retired");
dropBox.addChangeHandler(new ChangeHandler() {
Show replies by date