X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrExecutionModulesView.java;h=1f87c98fdeb32a1c614bde722c0ab877595c989e;hb=8908d07cc1fd6ac0a274c460bbd40652816ca054;hp=b33238e3cc4ea32b9f14f23931b3f8f6b30b5b54;hpb=83996361545b06f97a85d20f3b5824af0a2c4904;p=gpl%2Fargeo-slc.git

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 b33238e3c..1f87c98fd 100644
--- 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,18 +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);
-		// FIXME fail on RAP put it in specific
-		ColumnViewerToolTipSupport.enableFor(viewer);
 		viewer.setInput(getViewSite());
 		viewer.addDoubleClickListener(new ViewDoubleClickListener());
 		getViewSite().setSelectionProvider(viewer);
@@ -361,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) {
@@ -370,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);