From: Mathieu Baudier <mbaudier@argeo.org>
Date: Mon, 2 May 2011 17:28:56 +0000 (+0000)
Subject: Update bundles
X-Git-Tag: argeo-slc-2.1.7~956
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=0b7eb0b64c545d0362d126581816138b609a2026;hp=9760d81bd6eab3df9eeee48e8e82841d9cb694e5;p=gpl%2Fargeo-slc.git

Update bundles

git-svn-id: https://svn.argeo.org/slc/trunk@4498 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/commands.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/commands.xml
index 45f090326..fbbd20729 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/commands.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/commands.xml
@@ -4,6 +4,12 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans.xsd">
 
+	<bean id="updateModule"
+		class="org.argeo.slc.client.ui.commands.UpdateModule"
+		scope="prototype">
+		<property name="modulesManager" ref="modulesManager"/>
+	</bean>
+
 	<!-- Result list view commands-->
 <!-- 	<bean id="org.argeo.slc.client.ui.refreshResultList" -->
 <!-- 		class="org.argeo.slc.client.ui.commands.ResultListViewRefreshHandler" -->
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
index 311b9bd2e..657cf6ccd 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
@@ -18,6 +18,8 @@
 		<osgi:listener ref="processController" bind-method="register"
 			unbind-method="unregister" />
 	</list>
+	<reference id="modulesManager"
+		interface="org.argeo.slc.execution.ExecutionModulesManager" />
 
 
 	<!-- Services exposed by the current bundle -->
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml b/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml
index d066fe2d2..c82f32d55 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml
+++ b/eclipse/plugins/org.argeo.slc.client.ui/plugin.xml
@@ -84,6 +84,11 @@
 	<!-- Commands definitions --> 
    	<extension
     	point="org.eclipse.ui.commands">
+		<command
+	        defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
+	        id="org.argeo.slc.client.ui.updateModule"
+	    	name="Update Module">
+	    </command>
 	    <!-- Result List
 		<command
 	        defaultHandler="org.argeo.eclipse.spring.SpringCommandHandler"
@@ -152,6 +157,15 @@
 	<extension
     	id="menu:org.eclipse.ui.main.menu"
         point="org.eclipse.ui.menus">
+		<menuContribution
+        	locationURI="toolbar:org.argeo.slc.client.ui.jcrExecutionModulesView">
+			<command
+				commandId="org.argeo.slc.client.ui.updateModule"
+				icon="icons/refresh.png"
+				label="Update module"
+				tooltip="Update module">
+			</command>
+		</menuContribution>   
         <!--
 		<menuContribution
         	locationURI="menu:fileMenu">
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/UpdateModule.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/UpdateModule.java
new file mode 100644
index 000000000..341ac6d24
--- /dev/null
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/UpdateModule.java
@@ -0,0 +1,60 @@
+package org.argeo.slc.client.ui.commands;
+
+import java.util.Iterator;
+
+import javax.jcr.Node;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.eclipse.ui.Error;
+import org.argeo.slc.BasicNameVersion;
+import org.argeo.slc.NameVersion;
+import org.argeo.slc.deploy.ModulesManager;
+import org.argeo.slc.jcr.SlcNames;
+import org.argeo.slc.jcr.SlcTypes;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/** Deletes one or many results */
+public class UpdateModule extends AbstractHandler {
+	private final static Log log = LogFactory.getLog(UpdateModule.class);
+
+	private ModulesManager modulesManager;
+
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+		ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event)
+				.getActivePage().getSelection();
+		if (selection != null && selection instanceof IStructuredSelection) {
+			Iterator<?> it = ((IStructuredSelection) selection).iterator();
+			Object obj = null;
+			try {
+				while (it.hasNext()) {
+					obj = it.next();
+					if (obj instanceof Node) {
+						Node node = (Node) obj;
+						if (node.isNodeType(SlcTypes.SLC_EXECUTION_MODULE)) {
+							NameVersion nameVersion = new BasicNameVersion(
+									node.getProperty(SlcNames.SLC_NAME)
+											.getString(), node.getProperty(
+											SlcNames.SLC_VERSION).getString());
+							modulesManager.upgrade(nameVersion);
+							log.info("Module " + nameVersion + " updated");
+						}
+					}
+				}
+			} catch (Exception e) {
+				Error.show("Cannot update " + obj, e);
+			}
+		}
+		return null;
+	}
+
+	public void setModulesManager(ModulesManager modulesManager) {
+		this.modulesManager = modulesManager;
+	}
+
+}
diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index d87be4f29..00e517c53 100644
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -66,6 +66,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 		viewer.setLabelProvider(viewLabelProvider);
 		viewer.setInput(getViewSite());
 		viewer.addDoubleClickListener(new ViewDoubleClickListener());
+		getViewSite().setSelectionProvider(viewer);
 
 		Transfer[] tt = new Transfer[] { TextTransfer.getInstance() };
 		// Transfer[] tt = new Transfer[] { EditorInputTransfer.getInstance() };
@@ -199,6 +200,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
 	class VmAgentObserver extends AsyncUiEventListener {
 		protected void onEventInUiThread(EventIterator events) {
+			// TODO: optimize based on event
 			viewer.refresh();
 		}
 	}