X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrExecutionModulesView.java;h=37c8dc570d33b6f80f5a8d26528a3d42b44bbbd9;hb=d172f924a8524ff1e5a2d68db054103ca461ee1e;hp=7e97d35e7325a9aac56e32b52827f70fed21a5a0;hpb=743b0b26b4c073fdd62ce3831d9e23247316fdab;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 7e97d35e7..37c8dc570 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 @@ -33,13 +33,11 @@ import org.argeo.slc.execution.ExecutionModulesManager; import org.argeo.slc.jcr.SlcJcrConstants; import org.argeo.slc.jcr.SlcNames; import org.argeo.slc.jcr.SlcTypes; -import org.eclipse.jface.viewers.ColumnViewerToolTipSupport; import org.eclipse.jface.viewers.DoubleClickEvent; import org.eclipse.jface.viewers.IDoubleClickListener; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.TreeViewer; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; import org.eclipse.swt.dnd.DND; import org.eclipse.swt.dnd.DragSourceAdapter; @@ -48,6 +46,7 @@ import org.eclipse.swt.dnd.TextTransfer; import org.eclipse.swt.dnd.Transfer; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Display; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; @@ -68,9 +67,9 @@ 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); + // ColumnViewerToolTipSupport.enableFor(viewer); ViewContentProvider contentProvider = new ViewContentProvider(session); @@ -90,7 +89,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, session.getWorkspace() .getObservationManager() .addEventListener( - new VmAgentObserver(), + new VmAgentObserver(viewer.getTree().getDisplay()), Event.NODE_ADDED | Event.NODE_REMOVED | Event.NODE_MOVED, SlcJcrConstants.VM_AGENT_FACTORY_PATH, true, null, @@ -99,7 +98,7 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, throw new SlcException("Cannot add observer", e); } } - + public void setFocus() { viewer.getControl().setFocus(); } @@ -231,7 +230,12 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes, // } class VmAgentObserver extends AsyncUiEventListener { - protected void onEventInUiThread(EventIterator events) { + + public VmAgentObserver(Display display) { + super(display); + } + + protected void onEventInUiThread(List events) { // List baseNodes = ((SimpleNodeContentProvider) viewer // .getContentProvider()).getBaseNodes(); // Node baseNode = baseNodes.get(0);