[jbpm-commits] JBoss JBPM SVN: r4851 - in projects/gwt-console/trunk/gui/war: src/main/java/org/jboss/bpm/console/client/process and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue May 19 11:48:44 EDT 2009
Author: heiko.braun at jboss.com
Date: 2009-05-19 11:48:44 -0400 (Tue, 19 May 2009)
New Revision: 4851
Modified:
projects/gwt-console/trunk/gui/war/gui-war.iml
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java
projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java
projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Fix date format NPE
Modified: projects/gwt-console/trunk/gui/war/gui-war.iml
===================================================================
--- projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/gui-war.iml 2009-05-19 15:48:44 UTC (rev 4851)
@@ -208,6 +208,7 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="gwt-rpc" />
<orderEntryProperties />
</component>
</module>
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/DefinitionListView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -213,7 +213,10 @@
model.add(def);
}
-
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateProcessDetailAction.ID, null)
+ );
}
public ProcessDefinitionRef getSelection()
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/InstanceListView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -37,9 +37,9 @@
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.model.ProcessDefinitionRef;
import org.jboss.bpm.console.client.model.ProcessInstanceRef;
+import org.jboss.bpm.console.client.model.util.SimpleDateFormat;
import java.util.List;
-import java.text.SimpleDateFormat;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
@@ -99,8 +99,9 @@
case 1:
listBox.setText(row, column, item.getState().toString());
break;
- case 2:
- listBox.setText(row, column, dateFormat.format(item.getStartDate()));
+ case 2:
+ String d = item.getStartDate() != null ? dateFormat.format(item.getStartDate()) : "";
+ listBox.setText(row, column, d);
break;
default:
throw new RuntimeException("Unexpected column size");
@@ -121,9 +122,10 @@
controller.handleEvent(
new Event(UpdateInstanceDetailAction.ID, item)
);
- }
+ }
}
});
+
// toolbar
final LayoutPanel toolBox = new LayoutPanel();
toolBox.setPadding(0);
@@ -308,6 +310,12 @@
if(isInitialized())
{
bindData(instances);
+
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateInstanceDetailAction.ID, null)
+ );
+
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadDefinitionsAction.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -73,11 +73,6 @@
DefinitionListView view = (DefinitionListView) controller.getView(DefinitionListView.ID);
view.update(definitions);
- // clear details
- controller.handleEvent(
- new Event(UpdateProcessDetailAction.ID, null)
- );
-
ConsoleLog.info("Loaded " + definitions.size() + " process definitions");
}
else
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/process/LoadInstancesAction.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -76,13 +76,8 @@
InstanceListView view = (InstanceListView) controller.getView(InstanceListView.ID);
view.update(def, instances);
- // clear details
- controller.handleEvent(
- new Event(UpdateInstanceDetailAction.ID, null)
- );
+ ConsoleLog.info("Loaded " + instances.size() + " process instance(s)");
- ConsoleLog.info("Loaded " + instances.size() + " process instances");
-
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -269,6 +269,11 @@
model.add(task);
}
+ // clear details
+ controller.handleEvent(
+ new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null))
+ );
+
this.invalidate();
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksAction.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -74,12 +74,9 @@
List<TaskRef> tasks = DTOParser.parseTaskReferenceList(response.getText());
AssignedTasksView view = (AssignedTasksView)controller.getView(AssignedTasksView.ID);
- ConsoleLog.info("Loaded " + tasks.size() + " tasks");
view.update(identity, tasks);
+
+ ConsoleLog.info("Loaded " + tasks.size() + " tasks");
- // clear details
- controller.handleEvent(
- new Event(UpdateDetailsAction.ID, new DetailViewEvent("AssignedDetailView", null))
- );
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/LoadTasksParticipationAction.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -77,9 +77,5 @@
ConsoleLog.info("Loaded " + tasks.size() + " tasks");
view.update(identity, tasks);
- // details
- controller.handleEvent(
- new Event(UpdateDetailsAction.ID, new DetailViewEvent("OpenDetailView", null))
- );
}
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/OpenTasksView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -30,12 +30,12 @@
import org.gwt.mosaic.ui.client.list.DefaultListModel;
import org.jboss.bpm.console.client.icons.ConsoleIconBundle;
import org.jboss.bpm.console.client.model.TaskRef;
+import org.jboss.bpm.console.client.model.util.SimpleDateFormat;
import org.jboss.bpm.console.client.task.events.TaskIdentityEvent;
import org.jboss.bpm.console.client.task.events.DetailViewEvent;
import org.jboss.bpm.console.client.ApplicationContext;
import java.util.List;
-import java.text.SimpleDateFormat;
/**
* @author Heiko.Braun <heiko.braun at jboss.com>
@@ -92,7 +92,8 @@
listBox.setText(row, column, String.valueOf(item.getCurrentState()));
break;
case 3:
- listBox.setText(row, column, dateFormat.format(item.getDueDate()));
+ String d = item.getDueDate() != null ? dateFormat.format(item.getDueDate()):"";
+ listBox.setText(row, column, d);
break;
default:
throw new RuntimeException("Unexpected column size");
@@ -195,6 +196,10 @@
model.add(task);
}
+ // details
+ controller.handleEvent(
+ new Event(UpdateDetailsAction.ID, new DetailViewEvent("OpenDetailView", null))
+ );
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/ParticipantPanel.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -109,7 +109,8 @@
}
}
);
-
+
+ assignmentBtn.setStyleName("bpm-operation-ui");
assignmentBtn.setEnabled(false);
add(assignmentBtn);
}
Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/TaskDetailView.java 2009-05-19 15:48:44 UTC (rev 4851)
@@ -92,6 +92,7 @@
// selection
final com.google.gwt.user.client.ui.ListBox dropBox = new com.google.gwt.user.client.ui.ListBox(false);
+ dropBox.setStyleName("bpm-operation-ui");
dropBox.addItem("Properties");
dropBox.addItem("Participants");
dropBox.addChangeListener(new ChangeListener() {
Modified: projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-19 14:39:28 UTC (rev 4850)
+++ projects/gwt-console/trunk/gui/war/src/main/resources/org/jboss/bpm/console/public/console.css 2009-05-19 15:48:44 UTC (rev 4851)
@@ -123,6 +123,10 @@
}
+.bpm-operation-ui {
+ font-size: 10px;
+}
+
.bpm-tools-icon {
background-image: url( images/icons/36.png)
}
More information about the jbpm-commits
mailing list