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