Make module operations interruptible

git-svn-id: https://svn.argeo.org/slc/trunk@5266 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 960e2b941803f9185453d2eb8a8b5136782ebd55..225bd4177070b9c2e9670581862acb4478f1b34c 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
@@ -50,61 +50,74 @@ public class UpdateModule extends AbstractHandler {
                final ISelection selection = HandlerUtil\r
                                .getActiveWorkbenchWindow(event).getActivePage().getSelection();\r
                if (selection != null && selection instanceof IStructuredSelection) {\r
+                       UpdateJob job = new UpdateJob(selection);\r
+                       job.setUser(true);\r
+                       job.schedule();\r
+               }\r
+               return null;\r
+       }\r
 \r
-                       Job job = new Job("Update modules") {\r
+       private class UpdateJob extends Job {\r
+               private final IStructuredSelection selection;\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
+               public UpdateJob(ISelection selection) {\r
+                       super("Update modules");\r
+                       this.selection = ((IStructuredSelection) selection);\r
+               }\r
 \r
-                                                               if (!nodes.containsKey(executionModuleNode\r
-                                                                               .getPath()))\r
-                                                                       nodes.put(executionModuleNode.getPath(),\r
-                                                                                       executionModuleNode);\r
+               @Override\r
+               protected IStatus run(IProgressMonitor monitor) {\r
+                       Iterator<?> it = selection.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
-                                               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
-                                                                       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
-                                               throw new SlcException("Cannot update module " + obj, e);\r
-                                               // return Status.CANCEL_STATUS;\r
+                                               if (!nodes.containsKey(executionModuleNode.getPath()))\r
+                                                       nodes.put(executionModuleNode.getPath(),\r
+                                                                       executionModuleNode);\r
                                        }\r
                                }\r
-                       };\r
-                       job.setUser(true);\r
-                       job.schedule();\r
+\r
+                               monitor.beginTask("Update modules", nodes.size());\r
+                               for (Node executionModuleNode : nodes.values()) {\r
+                                       monitor.subTask("Update " + executionModuleNode.getName());\r
+                                       NameVersion nameVersion = new BasicNameVersion(\r
+                                                       executionModuleNode.getProperty(SlcNames.SLC_NAME)\r
+                                                                       .getString(), executionModuleNode\r
+                                                                       .getProperty(SlcNames.SLC_VERSION)\r
+                                                                       .getString());\r
+                                       modulesManager.upgrade(nameVersion);\r
+                                       monitor.worked(1);\r
+                                       log.info("Module " + nameVersion + " updated");\r
+                                       if (monitor.isCanceled())\r
+                                               return Status.CANCEL_STATUS;\r
+                               }\r
+                               return Status.OK_STATUS;\r
+                       } catch (Exception e) {\r
+                               throw new SlcException("Cannot update module " + obj, e);\r
+                               // return Status.CANCEL_STATUS;\r
+                       }\r
                }\r
-               return null;\r
+\r
+               @Override\r
+               protected void canceling() {\r
+                       getThread().interrupt();\r
+                       super.canceling();\r
+               }\r
+\r
        }\r
 \r
        public void setModulesManager(ModulesManager modulesManager) {\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 c5b4cbadcf8c4b60b8161456bd4644aca6a49a6a..1f87c98fdeb32a1c614bde722c0ab877595c989e 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
@@ -371,6 +371,11 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
                                                                        monitor.worked(1);
                                                                        return Status.OK_STATUS;
                                                                }
+
+                                                               protected void canceling() {
+                                                                       getThread().interrupt();
+                                                                       super.canceling();
+                                                               }
                                                        };
                                                } else {
                                                        job = new Job("Start " + nameVersion) {
@@ -380,6 +385,11 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
                                                                        monitor.worked(1);
                                                                        return Status.OK_STATUS;
                                                                }
+
+                                                               protected void canceling() {
+                                                                       getThread().interrupt();
+                                                                       super.canceling();
+                                                               }
                                                        };
                                                }
                                                job.setUser(true);