X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrResultListView.java;h=b3faa178471bb7719b71d449e80e5f7c30631f43;hb=2fd714f3b2c3bf3168e8a2a9b9d8e5e999e0af65;hp=322256b7194caf56c8d68c5e7f82676618757151;hpb=651d33e13bfa9a7b46464be412023ee747e612e8;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
index 322256b71..b3faa1784 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrResultListView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,9 +33,10 @@ 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.ClientUiPlugin;
 import org.argeo.slc.client.ui.editors.ProcessEditor;
 import org.argeo.slc.client.ui.editors.ProcessEditorInput;
-import org.argeo.slc.jcr.SlcJcrConstants;
+import org.argeo.slc.jcr.SlcJcrResultUtils;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -59,7 +60,7 @@ import org.eclipse.ui.part.ViewPart;
 
 /** Displays results. */
 public class JcrResultListView extends ViewPart implements SlcNames {
-	public static final String ID = "org.argeo.slc.client.ui.jcrResultListView";
+	public static final String ID = ClientUiPlugin.ID + ".jcrResultListView";
 
 	private TableViewer viewer;
 
@@ -87,12 +88,12 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 		try {
 			ObservationManager observationManager = session.getWorkspace()
 					.getObservationManager();
-			String[] nodeTypes = { SlcTypes.SLC_RESULT };
+			String[] nodeTypes = { SlcTypes.SLC_TEST_RESULT };
 			// FIXME Will not be notified if empty result is deleted
 			observationManager.addEventListener(resultsObserver,
 					Event.PROPERTY_ADDED | Event.NODE_REMOVED,
-					SlcJcrConstants.RESULTS_BASE_PATH, true, null, nodeTypes,
-					false);
+					SlcJcrResultUtils.getSlcResultsBasePath(session), true,
+					null, nodeTypes, false);
 		} catch (RepositoryException e) {
 			throw new SlcException("Cannot register listeners", e);
 		}
@@ -167,7 +168,8 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 		public Object[] getElements(Object inputElement) {
 			try {
 				// TODO filter, optimize with virtual table, ...
-				String sql = "SELECT * from [slc:result] ORDER BY [jcr:lastModified] DESC";
+				String sql = "SELECT * from [" + SlcTypes.SLC_TEST_RESULT
+						+ "] ORDER BY [jcr:lastModified] DESC";
 				Query query = session.getWorkspace().getQueryManager()
 						.createQuery(sql, Query.JCR_SQL2);
 				// TODO paging
@@ -276,5 +278,4 @@ public class JcrResultListView extends ViewPart implements SlcNames {
 	public void setSession(Session session) {
 		this.session = session;
 	}
-
 }
\ No newline at end of file