X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.client.ui%2Fsrc%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fviews%2FJcrResultTreeView.java;h=ecf7adeb9ed571bf5c4c56108d4dd50e9d579bd0;hb=b911d584b6a193fd2aa0171a32a759810d205e5a;hp=97f78e4bd6a05eb40e452898389669345da05522;hpb=2db415932b071525adb52c6374e021174512a924;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
index 97f78e4bd..ecf7adeb9 100644
--- a/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
+++ b/org.argeo.slc.client.ui/src/org/argeo/slc/client/ui/views/JcrResultTreeView.java
@@ -33,11 +33,12 @@ import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;
 import javax.jcr.observation.ObservationManager;
 
-import org.argeo.ArgeoException;
+import org.argeo.cms.ui.workbench.util.CommandUtils;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
-import org.argeo.eclipse.ui.workbench.CommandUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.SlcUiConstants;
 import org.argeo.slc.client.ui.commands.AddResultFolder;
@@ -58,8 +59,6 @@ import org.argeo.slc.client.ui.model.VirtualFolder;
 import org.argeo.slc.client.ui.providers.ResultTreeContentProvider;
 import org.argeo.slc.client.ui.providers.ResultTreeLabelProvider;
 import org.argeo.slc.jcr.SlcJcrResultUtils;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.MenuManager;
@@ -110,6 +109,7 @@ public class JcrResultTreeView extends ViewPart {
 	// LogFactory.getLog(JcrResultTreeView.class);
 
 	/* DEPENDENCY INJECTION */
+	private Repository repository;
 	private Session session;
 
 	// This page widgets
@@ -138,6 +138,12 @@ public class JcrResultTreeView extends ViewPart {
 
 	@Override
 	public void createPartControl(Composite parent) {
+		try {
+			session = repository.login();
+		} catch (RepositoryException e1) {
+			throw new SlcException("Cannot log in to repository");
+		}
+
 		parent.setLayout(new FillLayout());
 		// Main layout
 		SashForm sashForm = new SashForm(parent, SWT.VERTICAL);
@@ -274,7 +280,7 @@ public class JcrResultTreeView extends ViewPart {
 						value = "Error";
 					return value;
 				} catch (RepositoryException e) {
-					throw new ArgeoException(
+					throw new SlcException(
 							"Unexpected exception in label provider", e);
 				}
 			}
@@ -309,7 +315,7 @@ public class JcrResultTreeView extends ViewPart {
 					}
 					return value;
 				} catch (RepositoryException e) {
-					throw new ArgeoException(
+					throw new SlcException(
 							"Unexpected exception in label provider", e);
 				}
 			}
@@ -468,7 +474,7 @@ public class JcrResultTreeView extends ViewPart {
 					"All results");
 			return roots;
 		} catch (RepositoryException re) {
-			throw new ArgeoException(
+			throw new SlcException(
 					"Unexpected error while initializing ResultTree.", re);
 		}
 	}
@@ -896,7 +902,7 @@ public class JcrResultTreeView extends ViewPart {
 				return new Object[] {};
 
 			} catch (RepositoryException e) {
-				throw new ArgeoException("Cannot get element for "
+				throw new SlcException("Cannot get element for "
 						+ inputElement, e);
 			}
 		}
@@ -949,11 +955,6 @@ public class JcrResultTreeView extends ViewPart {
 	}
 
 	/* DEPENDENCY INJECTION */
-	@Deprecated
-	public void setSession(Session session) {
-		this.session = session;
-	}
-
 	public void dispose() {
 		// JcrUtils.unregisterQuietly(session.getWorkspace(), resultsObserver);
 		JcrUtils.logoutQuietly(session);
@@ -961,11 +962,6 @@ public class JcrResultTreeView extends ViewPart {
 	}
 
 	public void setRepository(Repository repository) {
-		try {
-			session = repository.login();
-		} catch (RepositoryException re) {
-			throw new SlcException("Unable to log in Repository " + repository,
-					re);
-		}
+		this.repository = repository;
 	}
 }
\ No newline at end of file