X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.jcr%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fjcr%2FAsyncUiEventListener.java;h=0e8a12cbee7a5d6f4d0d01d210eac5a070d2ba98;hb=fa07ed47b3933a9b78b43530eae725b7a3effe2d;hp=6a83ef3749d3e89d4d66f141fe439fb0732499e4;hpb=2247846769e070a9005cab307e630de83e52c94e;p=lgpl%2Fargeo-commons.git

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 6a83ef374..0e8a12cbe 100644
--- 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,46 +1,84 @@
 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.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.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.ArgeoException;
 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.isTraceEnabled())
+			logThis.trace("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();
 	}
 }