Improve JCR UI

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

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
index 6a83ef3749d3e89d4d66f141fe439fb0732499e4..c152a328acf3ecae9b9ff2d196edbe07384969a5 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/AsyncUiEventListener.java
@@ -1,8 +1,16 @@
 package org.argeo.eclipse.ui.jcr;
 
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.observation.Event;
 import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.ArgeoException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
@@ -11,36 +19,70 @@ import org.eclipse.swt.widgets.Display;
 
 /** {@link EventListener} which simplifies running actions within the UI thread. */
 public abstract class AsyncUiEventListener implements EventListener {
+       private final static Log logSuper = LogFactory
+                       .getLog(AsyncUiEventListener.class);
+       private final Log logThis = LogFactory.getLog(getClass());
+
        private final Display display;
-       
+
        public AsyncUiEventListener(Display display) {
                super();
                this.display = display;
        }
 
        /** Called asynchronously in the UI thread. */
-       protected abstract void onEventInUiThread(EventIterator events);
+       protected abstract void onEventInUiThread(List<Event> events)
+                       throws RepositoryException;
 
-       public void onEvent(final EventIterator events) {
-               Job job = new Job("JCR Events") {
-                       protected IStatus run(IProgressMonitor monitor) {
-                               //Display display = Display.getCurrent();
-                               //Display display = PlatformUI.getWorkbench().getDisplay();
+       /**
+        * Whether these events should be processed in the UI or skipped with no UI
+        * job created.
+        */
+       protected Boolean willProcessInUiThread(List<Event> events)
+                       throws RepositoryException {
+               return true;
+       }
+
+       protected Log getLog() {
+               return logThis;
+       }
+
+       public final void onEvent(final EventIterator eventIterator) {
+               final List<Event> events = new ArrayList<Event>();
+               while (eventIterator.hasNext())
+                       events.add(eventIterator.nextEvent());
+
+               if (logThis.isDebugEnabled())
+                       logThis.debug("Received " + events.size() + " events");
+
+               try {
+                       if (!willProcessInUiThread(events))
+                               return;
+               } catch (RepositoryException e) {
+                       throw new ArgeoException("Cannot test skip events " + events, e);
+               }
+
+//             Job job = new Job("JCR Events") {
+//                     protected IStatus run(IProgressMonitor monitor) {
+//                             if (display.isDisposed()) {
+//                                     logSuper.warn("Display is disposed cannot update UI");
+//                                     return Status.CANCEL_STATUS;
+//                             }
 
                                display.asyncExec(new Runnable() {
                                        public void run() {
-                                               onEventInUiThread(events);
+                                               try {
+                                                       onEventInUiThread(events);
+                                               } catch (RepositoryException e) {
+                                                       throw new ArgeoException("Cannot process events "
+                                                                       + events, e);
+                                               }
                                        }
                                });
-                               return Status.OK_STATUS;
-                       }
-               };
-               job.schedule();
-
-               // PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-               // public void run() {
-               // onEventInUiThread(events);
-               // }
-               // });
+
+//                             return Status.OK_STATUS;
+//                     }
+//             };
+//             job.schedule();
        }
 }

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java
new file mode 100644 (file)
index 0000000..fc18965
--- /dev/null
+++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/src/main/java/org/argeo/eclipse/ui/jcr/NodeElementComparer.java
@@ -0,0 +1,36 @@
+package org.argeo.eclipse.ui.jcr;\r
+\r
+import javax.jcr.Node;\r
+import javax.jcr.RepositoryException;\r
+\r
+import org.argeo.ArgeoException;\r
+import org.eclipse.jface.viewers.IElementComparer;\r
+\r
+/** Element comparer for JCR node, to be used in JFace viewers. */\r
+public class NodeElementComparer implements IElementComparer {\r
+\r
+       public boolean equals(Object a, Object b) {\r
+               try {\r
+                       if ((a instanceof Node) && (b instanceof Node)) {\r
+                               Node nodeA = (Node) a;\r
+                               Node nodeB = (Node) b;\r
+                               return nodeA.getIdentifier().equals(nodeB.getIdentifier());\r
+                       } else {\r
+                               return a.equals(b);\r
+                       }\r
+               } catch (RepositoryException e) {\r
+                       throw new ArgeoException("Cannot compare nodes", e);\r
+               }\r
+       }\r
+\r
+       public int hashCode(Object element) {\r
+               try {\r
+                       if (element instanceof Node)\r
+                               return ((Node) element).getIdentifier().hashCode();\r
+                       return element.hashCode();\r
+               } catch (RepositoryException e) {\r
+                       throw new ArgeoException("Cannot get hash code", e);\r
+               }\r
+       }\r
+\r
+}\r

diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java
index 4847bcfdd60b15bea9eee61b9d2f7160522311e6..d85c17c1a7ffbcecf40c3afd0d62e5922809950f 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java
+++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/SecureWorkbenchWindowAdvisor.java
@@ -25,7 +25,8 @@ public class SecureWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
                configurer.setInitialSize(new Point(1200, 900));
                configurer.setShowCoolBar(true);
                configurer.setShowMenuBar(true);
-               configurer.setShowStatusLine(false);
+               configurer.setShowStatusLine(true);
+               configurer.setShowProgressIndicator(true);
 
                configurer.setShowPerspectiveBar(true);
                configurer.setTitle("Argeo UI - " + username); //$NON-NLS-1$