Provide Display to ui event listener

git-svn-id: https://svn.argeo.org/slc/trunk@4611 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 565848515df00e1bee43aa351683b236c75697ac..20bec609dc0af274af3d118788ea26a1c709cd64 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -61,6 +61,11 @@
                        <artifactId>org.argeo.slc.agent.jcr</artifactId>
                        <version>${version.slc}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.modules</groupId>
+                       <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
+                       <version>${version.slc}</version>
+               </dependency>
 
                <!-- SLC Server -->
                <dependency>

diff --git a/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
index 3f5db65e8ad4daa3c3e9fd807cf92be6920ce0fd..1b10bb50f2929d259a4185630a3e392de804f335 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Import-Package: javax.servlet;version="2.4.0",
  javax.servlet.http;version="2.4.0",
  org.argeo.security.ui.rap
+Export-Package: org.argeo.slc.client.rap

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
index 2978e118960476e3ffac486f15f957c06a4096be..f5e8708aed17483f9a984a1d73bb9ebefca3b317 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
@@ -114,7 +114,7 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
                        getManagedForm().addPart(formPart);
 
                        // observation
-                       statusObserver = new AsyncUiEventListener() {
+                       statusObserver = new AsyncUiEventListener(form.getDisplay()) {
                                protected void onEventInUiThread(EventIterator events) {
                                        statusChanged();
                                }

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 7e97d35e7325a9aac56e32b52827f70fed21a5a0..75864680e0a8970efac4567b90dbdc1994d49c45 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
@@ -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,6 +230,11 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
        // }
 
        class VmAgentObserver extends AsyncUiEventListener {
+
+               public VmAgentObserver(Display display) {
+                       super(display);
+               }
+
                protected void onEventInUiThread(EventIterator events) {
                        // List<Node> baseNodes = ((SimpleNodeContentProvider) viewer
                        // .getContentProvider()).getBaseNodes();

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java
index 7fe300dcd6cc56c7c10d436c17ea4168da9e2f99..b849aa4bfb890e8185e99f9e78998176c2ad209a 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrProcessListView.java
@@ -65,7 +65,8 @@ public class JcrProcessListView extends ViewPart {
                viewer.setInput(getViewSite());
                viewer.addDoubleClickListener(new ViewDoubleClickListener());
 
-               processesObserver = new AsyncUiEventListener() {
+               processesObserver = new AsyncUiEventListener(viewer.getTable()
+                               .getDisplay()) {
                        protected void onEventInUiThread(EventIterator events) {
                                // TODO optimize by updating only the changed process
                                viewer.refresh();

diff --git a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
index 78ef5910b827d727f9802f82bdffea7743da4b89..11eb02fd07c9722dadbdff89b0ca5175a40af313 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
@@ -67,7 +67,8 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 
                getViewSite().setSelectionProvider(viewer);
 
-               resultsObserver = new AsyncUiEventListener() {
+               resultsObserver = new AsyncUiEventListener(viewer.getTable()
+                               .getDisplay()) {
                        protected void onEventInUiThread(EventIterator events) {
                                // TODO optimize by updating only the changed result
                                viewer.refresh();