]> git.argeo.org Git - gpl/argeo-slc.git/blobdiff - eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/commands/UpdateModule.java
Make module operations interruptible
[gpl/argeo-slc.git] / eclipse / plugins / org.argeo.slc.client.ui / src / main / java / org / argeo / slc / client / ui / commands / UpdateModule.java
index 2fe21da1111f16feb71e85d2407d7cffc99696c6..225bd4177070b9c2e9670581862acb4478f1b34c 100644 (file)
@@ -1,3 +1,18 @@
+/*\r
+ * Copyright (C) 2007-2012 Mathieu Baudier\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
 package org.argeo.slc.client.ui.commands;\r
 \r
 import java.util.HashMap;\r
@@ -8,9 +23,9 @@ import javax.jcr.Node;
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-import org.argeo.eclipse.ui.Error;\r
 import org.argeo.slc.BasicNameVersion;\r
 import org.argeo.slc.NameVersion;\r
+import org.argeo.slc.SlcException;\r
 import org.argeo.slc.deploy.ModulesManager;\r
 import org.argeo.slc.jcr.SlcNames;\r
 import org.argeo.slc.jcr.SlcTypes;\r
@@ -35,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
-                                               Error.show("Cannot update " + 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