X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=eclipse%2Fplugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrResultListView.java;h=06a4289746df118d9dab892db7efe0e8d1855cd7;hb=5fcacdb600e4c9e765cb93b46132932662832c1b;hp=3a05f08637ed2474f6a092294401b2854e27040c;hpb=6a5737bbf4cd63e00e61a3fd81e6673b5ad9341f;p=gpl%2Fargeo-slc.git

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 3a05f0863..06a428974 100644
--- 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
@@ -7,16 +7,15 @@ import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
-import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.observation.Event;
-import javax.jcr.observation.EventIterator;
 import javax.jcr.observation.EventListener;
 import javax.jcr.observation.ObservationManager;
 import javax.jcr.query.Query;
 
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
+import org.argeo.eclipse.ui.jcr.NodeElementComparer;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.editors.ProcessEditor;
@@ -36,6 +35,7 @@ import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchPage;
@@ -54,29 +54,30 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 
 	private DateFormat dateFormat = new SimpleDateFormat(
 			"EEE, dd MMM yyyy HH:mm:ss");
-	private Integer queryLimit = 100;
+	private Integer queryLimit = 2000;
 
 	public void createPartControl(Composite parent) {
+
 		Table table = createTable(parent);
 		viewer = new TableViewer(table);
 		viewer.setLabelProvider(createLabelProvider());
 		viewer.setContentProvider(new ViewContentProvider());
 		viewer.setInput(getViewSite());
 		viewer.addDoubleClickListener(new ViewDoubleClickListener());
+		viewer.setComparer(new NodeElementComparer());
 
-		resultsObserver = new AsyncUiEventListener() {
-			protected void onEventInUiThread(EventIterator events) {
-				// TODO optimize by updating only the changed result
-				viewer.refresh();
-			}
-		};
+		getViewSite().setSelectionProvider(viewer);
+
+		resultsObserver = new ResultObserver(viewer.getTable().getDisplay());
 		try {
 			ObservationManager observationManager = session.getWorkspace()
 					.getObservationManager();
+			String[] nodeTypes = { SlcTypes.SLC_RESULT };
+			// FIXME Will not be notified if empty result is deleted
 			observationManager.addEventListener(resultsObserver,
-					Event.NODE_ADDED | Event.NODE_REMOVED
-							| Event.PROPERTY_CHANGED,
-					SlcJcrConstants.RESULTS_BASE_PATH, true, null, null, false);
+					Event.PROPERTY_ADDED | Event.NODE_REMOVED,
+					SlcJcrConstants.RESULTS_BASE_PATH, true, null, nodeTypes,
+					false);
 		} catch (RepositoryException e) {
 			throw new SlcException("Cannot register listeners", e);
 		}
@@ -84,8 +85,8 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 	}
 
 	protected Table createTable(Composite parent) {
-		int style = SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
-				| SWT.FULL_SELECTION;
+		int style = SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
+				| SWT.FULL_SELECTION | SWT.MULTI;
 		// does not work with RAP, commented for the time being
 		// | SWT.HIDE_SELECTION;
 
@@ -105,6 +106,10 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 		return table;
 	}
 
+	// public void refresh() {
+	// viewer.refresh();
+	// }
+
 	/*
 	 * METHODS TO BE OVERRIDDEN
 	 */
@@ -118,6 +123,7 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 		try {
 			if (obj instanceof Node) {
 				Node node = (Node) obj;
+				// FIXME: open a default result editor
 				if (node.isNodeType(SlcTypes.SLC_PROCESS)) {
 					IWorkbenchPage activePage = PlatformUI.getWorkbench()
 							.getActiveWorkbenchWindow().getActivePage();
@@ -193,9 +199,13 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 				switch (index) {
 
 				case 0:
-					return dateFormat.format(node
-							.getProperty(Property.JCR_LAST_MODIFIED).getDate()
-							.getTime());
+					if (node.hasProperty(SLC_COMPLETED)) {
+						return dateFormat
+								.format(node.getProperty(SLC_COMPLETED)
+										.getDate().getTime());
+					} else {
+						return "OPEN";
+					}
 				case 1:
 					return node.getProperty(SlcNames.SLC_UUID).getString();
 				}
@@ -214,6 +224,40 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 
 	}
 
+	class ResultObserver extends AsyncUiEventListener {
+
+		public ResultObserver(Display display) {
+			super(display);
+		}
+
+		@Override
+		protected Boolean willProcessInUiThread(List<Event> events)
+				throws RepositoryException {
+			for (Event event : events) {
+				// getLog().debug("Received event " + event);
+				int eventType = event.getType();
+				if (eventType == Event.NODE_REMOVED)
+					return true;
+				String path = event.getPath();
+				int index = path.lastIndexOf('/');
+				String propertyName = path.substring(index + 1);
+				if (propertyName.equals(SLC_COMPLETED)
+						|| propertyName.equals(SLC_UUID)) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		protected void onEventInUiThread(List<Event> events)
+				throws RepositoryException {
+			if (getLog().isTraceEnabled())
+				getLog().trace("Refresh result list");
+			viewer.refresh();
+		}
+
+	}
+
 	public void setSession(Session session) {
 		this.session = session;
 	}