Improve refreshing and module update

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

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
index 341ac6d24536387eb623f55eb56ac0b21261cb17..2fe21da1111f16feb71e85d2407d7cffc99696c6 100644 (file)
--- 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
@@ -1,6 +1,8 @@
 package org.argeo.slc.client.ui.commands;\r
 \r
+import java.util.HashMap;\r
 import java.util.Iterator;\r
+import java.util.Map;\r
 \r
 import javax.jcr.Node;\r
 \r
@@ -15,6 +17,10 @@ import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.core.commands.AbstractHandler;\r
 import org.eclipse.core.commands.ExecutionEvent;\r
 import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.core.runtime.IProgressMonitor;\r
+import org.eclipse.core.runtime.IStatus;\r
+import org.eclipse.core.runtime.Status;\r
+import org.eclipse.core.runtime.jobs.Job;\r
 import org.eclipse.jface.viewers.ISelection;\r
 import org.eclipse.jface.viewers.IStructuredSelection;\r
 import org.eclipse.ui.handlers.HandlerUtil;\r
@@ -26,29 +32,62 @@ public class UpdateModule extends AbstractHandler {
        private ModulesManager modulesManager;\r
 \r
        public Object execute(ExecutionEvent event) throws ExecutionException {\r
-               ISelection selection = HandlerUtil.getActiveWorkbenchWindow(event)\r
-                               .getActivePage().getSelection();\r
+               final ISelection selection = HandlerUtil\r
+                               .getActiveWorkbenchWindow(event).getActivePage().getSelection();\r
                if (selection != null && selection instanceof IStructuredSelection) {\r
-                       Iterator<?> it = ((IStructuredSelection) selection).iterator();\r
-                       Object obj = null;\r
-                       try {\r
-                               while (it.hasNext()) {\r
-                                       obj = it.next();\r
-                                       if (obj instanceof Node) {\r
-                                               Node node = (Node) obj;\r
-                                               if (node.isNodeType(SlcTypes.SLC_EXECUTION_MODULE)) {\r
+\r
+                       Job job = new Job("Update modules") {\r
+\r
+                               @Override\r
+                               protected IStatus run(IProgressMonitor monitor) {\r
+                                       Iterator<?> it = ((IStructuredSelection) selection)\r
+                                                       .iterator();\r
+                                       Object obj = null;\r
+                                       try {\r
+                                               Map<String, Node> nodes = new HashMap<String, Node>();\r
+                                               nodes: while (it.hasNext()) {\r
+                                                       obj = it.next();\r
+                                                       if (obj instanceof Node) {\r
+                                                               Node node = (Node) obj;\r
+                                                               Node executionModuleNode = null;\r
+                                                               while (executionModuleNode == null) {\r
+                                                                       if (node.isNodeType(SlcTypes.SLC_EXECUTION_MODULE)) {\r
+                                                                               executionModuleNode = node;\r
+                                                                       }\r
+                                                                       node = node.getParent();\r
+                                                                       if (node.getPath().equals("/"))// root\r
+                                                                               continue nodes;\r
+                                                               }\r
+\r
+                                                               if (!nodes.containsKey(executionModuleNode\r
+                                                                               .getPath()))\r
+                                                                       nodes.put(executionModuleNode.getPath(),\r
+                                                                                       executionModuleNode);\r
+                                                       }\r
+                                               }\r
+\r
+                                               monitor.beginTask("Update modules", nodes.size());\r
+                                               for (Node executionModuleNode : nodes.values()) {\r
+                                                       monitor.subTask("Update "\r
+                                                                       + executionModuleNode.getName());\r
                                                        NameVersion nameVersion = new BasicNameVersion(\r
-                                                                       node.getProperty(SlcNames.SLC_NAME)\r
-                                                                                       .getString(), node.getProperty(\r
+                                                                       executionModuleNode.getProperty(\r
+                                                                                       SlcNames.SLC_NAME).getString(),\r
+                                                                       executionModuleNode.getProperty(\r
                                                                                        SlcNames.SLC_VERSION).getString());\r
                                                        modulesManager.upgrade(nameVersion);\r
+                                                       monitor.worked(1);\r
                                                        log.info("Module " + nameVersion + " updated");\r
                                                }\r
+                                               return Status.OK_STATUS;\r
+                                       } catch (Exception e) {\r
+                                               Error.show("Cannot update " + obj, e);\r
+                                               return Status.CANCEL_STATUS;\r
                                        }\r
                                }\r
-                       } catch (Exception e) {\r
-                               Error.show("Cannot update " + obj, e);\r
-                       }\r
+                       };\r
+                       job.setUser(true);\r
+                       job.schedule();\r
                }\r
                return null;\r
        }\r

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 db5490391ad0bfaa3dad504078359286bdb21f0b..f373a1672e3cbfe3bcb3e6db7119c55b0d462074 100644 (file)
--- 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
@@ -35,6 +35,10 @@ import org.argeo.slc.execution.ExecutionModulesManager;
 import org.argeo.slc.jcr.SlcJcrConstants;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -336,15 +340,33 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
                                                String name = node.getProperty(SLC_NAME).getString();
                                                String version = node.getProperty(SLC_VERSION)
                                                                .getString();
-                                               NameVersion nameVersion = new BasicNameVersion(name,
-                                                               version);
+                                               final NameVersion nameVersion = new BasicNameVersion(
+                                                               name, version);
                                                Boolean started = node.getProperty(SLC_STARTED)
                                                                .getBoolean();
+
+                                               Job job;
                                                if (started) {
-                                                       modulesManager.stop(nameVersion);
+                                                       job = new Job("Stop " + nameVersion) {
+                                                               protected IStatus run(IProgressMonitor monitor) {
+                                                                       monitor.beginTask("Stop " + nameVersion, 1);
+                                                                       modulesManager.stop(nameVersion);
+                                                                       monitor.worked(1);
+                                                                       return Status.OK_STATUS;
+                                                               }
+                                                       };
                                                } else {
-                                                       modulesManager.start(nameVersion);
+                                                       job = new Job("Start " + nameVersion) {
+                                                               protected IStatus run(IProgressMonitor monitor) {
+                                                                       monitor.beginTask("Start " + nameVersion, 1);
+                                                                       modulesManager.start(nameVersion);
+                                                                       monitor.worked(1);
+                                                                       return Status.OK_STATUS;
+                                                               }
+                                                       };
                                                }
+                                               job.setUser(true);
+                                               job.schedule();
                                        } else {
                                                String path = node.getPath();
                                                // TODO factorize with editor