Make module operations interruptible

[gpl/argeo-slc.git] / eclipse / plugins / org.argeo.slc.client.ui / src / main / java / org / argeo / slc / client / ui / views / JcrExecutionModulesView.java

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 dd3c4593c933f414593d819af1944f8847ecd287..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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.slc.client.ui.views;
 
 import java.util.ArrayList;
@@ -25,6 +40,7 @@ import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
 import org.argeo.eclipse.ui.jcr.NodeElementComparer;
 import org.argeo.eclipse.ui.jcr.SimpleNodeContentProvider;
+import org.argeo.eclipse.ui.specific.EclipseUiSpecificUtils;
 import org.argeo.slc.BasicNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
@@ -39,7 +55,6 @@ 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.ColumnViewerToolTipSupport;
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -74,17 +89,13 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
        public void createPartControl(Composite parent) {
                viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-
-               // FIXME : does not work in RAP, find a way to have it for RCP only
-               // ColumnViewerToolTipSupport.enableFor(viewer);
+               EclipseUiSpecificUtils.enableToolTipSupport(viewer);
 
                ViewContentProvider contentProvider = new ViewContentProvider(session);
-
                viewer.setContentProvider(contentProvider);
                viewer.setComparer(new NodeElementComparer());
                final ViewLabelProvider viewLabelProvider = new ViewLabelProvider();
                viewer.setLabelProvider(viewLabelProvider);
-               //ColumnViewerToolTipSupport.enableFor(viewer);
                viewer.setInput(getViewSite());
                viewer.addDoubleClickListener(new ViewDoubleClickListener());
                getViewSite().setSelectionProvider(viewer);
@@ -253,8 +264,8 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 
                                        if (session.itemExists(path)) {
                                                Node parentNode = session.getNode(path);// .getParent();
-                                               if (log.isDebugEnabled())
-                                                       log.debug("Refresh " + parentNode + " after event "
+                                               if (log.isTraceEnabled())
+                                                       log.trace("Refresh " + parentNode + " after event "
                                                                        + event);
                                                viewer.refresh(parentNode);
                                        }
@@ -360,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) {
@@ -369,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);