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=72aa3c2772c79c43e6af630c0ee8a2c9fa452d68;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=a54f63e69a9fdfc70442e755f454354610a7c6c1;hpb=d6379d95e2007f27762131de7b61d6fb530cb41e;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 a54f63e69..72aa3c277 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,20 +1,99 @@
+/*
+ * 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.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.ui.PlatformUI;
+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);
-
-	public void onEvent(final EventIterator events) {
-		PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-			public void run() {
-				onEventInUiThread(events);
-			}
-		});
+	protected abstract void onEventInUiThread(List<Event> events)
+			throws RepositoryException;
+
+	/**
+	 * 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() {
+						try {
+							onEventInUiThread(events);
+						} catch (RepositoryException e) {
+							throw new ArgeoException("Cannot process events "
+									+ events, e);
+						}
+					}
+				});
+
+//				return Status.OK_STATUS;
+//			}
+//		};
+//		job.schedule();
 	}
 }