From bcae15107800a412107ee0536c0583d84774ed65 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 18 Nov 2010 16:37:47 +0000
Subject: [PATCH] some UI enhancements before the first Test Release

git-svn-id: https://svn.argeo.org/slc/trunk@3911 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../ApplicationWorkbenchWindowAdvisor.java    |  2 +-
 .../META-INF/spring/commands.xml              |  4 +++
 .../org.argeo.slc.client.ui/plugin.xml        | 26 ++++++++++++-------
 .../ExecutionModulesViewRefreshHandler.java   | 19 ++++++++++++++
 .../client/ui/views/ExecutionModulesView.java |  8 ++++--
 .../slc/client/ui/views/ResultListView.java   |  5 +++-
 6 files changed, 51 insertions(+), 13 deletions(-)
 create mode 100644 eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/ExecutionModulesViewRefreshHandler.java

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/ApplicationWorkbenchWindowAdvisor.java b/eclipse/plugins/runtime/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/ApplicationWorkbenchWindowAdvisor.java
index f19e20272..8022f4041 100644
--- a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/ApplicationWorkbenchWindowAdvisor.java
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/ApplicationWorkbenchWindowAdvisor.java
@@ -42,7 +42,7 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 		configurer.getWorkbenchConfigurer().restoreState();
 		// set default window size
 		configurer.setInitialSize(new Point(1200, 900));
-		configurer.setShowCoolBar(true);
+		configurer.setShowCoolBar(false);
 		configurer.setShowStatusLine(true);
 		configurer.setShowPerspectiveBar(true);
 
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/spring/commands.xml b/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/spring/commands.xml
index 5321691ee..484094cf9 100644
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/spring/commands.xml
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/spring/commands.xml
@@ -8,6 +8,10 @@
 		class="org.argeo.slc.client.ui.commands.ResultListViewRefreshHandler"
 		scope="prototype">
 	</bean>
+	<bean id="org.argeo.slc.client.ui.refreshExecutionModulesView"
+		class="org.argeo.slc.client.ui.commands.ExecutionModulesViewRefreshHandler"
+		scope="prototype">
+	</bean>
 	<bean id="org.argeo.slc.client.ui.refreshProcessList"
 		class="org.argeo.slc.client.ui.commands.ProcessListViewRefreshHandler"
 		scope="prototype">
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/plugin.xml b/eclipse/plugins/runtime/org.argeo.slc.client.ui/plugin.xml
index fb1ea90e3..f2a665d5b 100644
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/plugin.xml
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/plugin.xml
@@ -73,6 +73,11 @@
             id="org.argeo.slc.client.ui.refreshResultList"
             name="RefreshResultList">
       </command>
+      <command
+            defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+            id="org.argeo.slc.client.ui.refreshExecutionModulesView"
+            name="refreshExecutionModulesView">
+      </command>
       <command
             defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
             id="org.argeo.slc.client.ui.launchBatch"
@@ -139,15 +144,13 @@
                   commandId="org.argeo.slc.client.ui.refreshResultList"
                   label="Refresh"
                   style="push"
-                  tooltip="Refresh  the result list">
+                  tooltip="Refresh the result list">
             </command>
          </menu>
       </menuContribution>
       -->
       <menuContribution
-            locationURI="toolbar:org.eclipse.ui.main.toolbar">
-         <toolbar
-               id="org.argeo.slc.client.ui.ResultViewToolbar">
+            locationURI="toolbar:org.argeo.slc.client.ui.resultListView">
             <command
                   commandId="org.argeo.slc.client.ui.refreshResultList"
                   icon="icons/refresh.png"
@@ -155,11 +158,16 @@
                   style="toggle"
                   tooltip="Refresh the result list">
             </command>
-            <separator
-                  name="resultListViewGroup">
-            </separator>
-         </toolbar>
-      </menuContribution>
+        </menuContribution>
+      <menuContribution
+            locationURI="toolbar:org.argeo.slc.client.ui.executionModulesView">
+         <command
+               commandId="org.argeo.slc.client.ui.refreshExecutionModulesView"
+               icon="icons/refresh.png"
+               label="Refresh"
+               tooltip="Refresh the execution modules view.">
+         </command>
+	</menuContribution>   
       <menuContribution
             locationURI="toolbar:org.argeo.slc.client.ui.processBuilderView">
          <command
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/ExecutionModulesViewRefreshHandler.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/ExecutionModulesViewRefreshHandler.java
new file mode 100644
index 000000000..849be5e8e
--- /dev/null
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/ExecutionModulesViewRefreshHandler.java
@@ -0,0 +1,19 @@
+package org.argeo.slc.client.ui.commands;
+
+import org.argeo.slc.client.ui.views.ExecutionModulesView;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+public class ExecutionModulesViewRefreshHandler extends AbstractHandler {
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ExecutionModulesView eView = (ExecutionModulesView) HandlerUtil
+				.getActiveWorkbenchWindow(event).getActivePage()
+				.findView(ExecutionModulesView.ID);
+		eView.refreshView();
+		return null;
+	}
+
+}
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
index 07df89af6..325257ff7 100644
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ExecutionModulesView.java
@@ -68,6 +68,10 @@ public class ExecutionModulesView extends ViewPart {
 		return viewer;
 	}
 
+	public void refreshView() {
+		viewer.setInput(getViewSite());
+	}
+
 	class ViewLabelProvider extends LabelProvider implements
 			ITableLabelProvider {
 		public String getColumnText(Object obj, int index) {
@@ -157,8 +161,8 @@ public class ExecutionModulesView extends ViewPart {
 					props.setProperty("agentId", flowNode
 							.getExecutionModuleNode().getAgentNode().getAgent()
 							.getAgentUuid());
-					props.setProperty("host", flowNode.getExecutionModuleNode().getAgentNode()
-							.getAgent().toString());
+					props.setProperty("host", flowNode.getExecutionModuleNode()
+							.getAgentNode().getAgent().toString());
 
 					ByteArrayOutputStream out = new ByteArrayOutputStream();
 					try {
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java
index 3d26c7d0d..25855b1fc 100644
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/ResultListView.java
@@ -228,7 +228,10 @@ public class ResultListView extends ViewPart {
 				return (ra.getAttributes().get("testCase") == null) ? null : ra
 						.getAttributes().get("testCase");
 			case 1:
-				return dateFormatter.format(ra.getCloseDate());
+				// otherwise we get null pointer exception when the test is not
+				// closed yet.
+				return (ra.getCloseDate() == null) ? null : dateFormatter
+						.format(ra.getCloseDate());
 			case 2:
 				return ra.getUuid();
 			}
-- 
2.39.2