X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fplugins%2Forg.argeo.jcr.ui.explorer%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fjcr%2Fui%2Fexplorer%2Fviews%2FGenericJcrBrowser.java;h=ae07a5b5eceda112e6f9072ead37ce380cbaabe7;hb=d24fe8d5ee68544ce3d6300ac31a0c3cb8193aba;hp=292fc816e00ffdc8ce2f3f89576b3fa699e49767;hpb=8b8ee149b20e2578a55e17413fa5f7399ff7ba14;p=lgpl%2Fargeo-commons.git

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java
index 292fc816e..ae07a5b5e 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/views/GenericJcrBrowser.java
@@ -5,7 +5,6 @@ import java.util.List;
 import javax.jcr.Property;
 import javax.jcr.PropertyType;
 import javax.jcr.RepositoryException;
-import javax.jcr.Session;
 import javax.jcr.Value;
 import javax.jcr.observation.Event;
 import javax.jcr.observation.EventListener;
@@ -73,8 +72,8 @@ public class GenericJcrBrowser extends AbstractJcrBrowser {
 	public void createPartControl(Composite parent) {
 
 		// look for session
-		Session nodeSession = jcrKeyring != null ? jcrKeyring.getSession()
-				: null;
+		// Session nodeSession = jcrKeyring != null ? jcrKeyring.getSession()
+		// : null;
 		// if (nodeSession == null) {
 		// Repository nodeRepository = JcrUtils.getRepositoryByAlias(
 		// repositoryRegister, ArgeoJcrConstants.ALIAS_NODE);
@@ -82,7 +81,6 @@ public class GenericJcrBrowser extends AbstractJcrBrowser {
 		// try {
 		// nodeSession = nodeRepository.login();
 		// // TODO : enhance that to enable multirepository listener.
-		// session = nodeSession;
 		// } catch (RepositoryException e1) {
 		// throw new ArgeoException("Cannot login to node repository");
 		// }
@@ -106,7 +104,7 @@ public class GenericJcrBrowser extends AbstractJcrBrowser {
 		top.setLayout(gl);
 
 		nodeContentProvider = new NodeContentProvider(jcrKeyring,
-				repositoryRegister);
+				repositoryRegister, sortChildNodes);
 
 		// nodes viewer
 		nodesViewer = createNodeViewer(top, nodeContentProvider);
@@ -124,7 +122,66 @@ public class GenericJcrBrowser extends AbstractJcrBrowser {
 		// Create the property viewer on the bottom
 		Composite bottom = new Composite(sashForm, SWT.NONE);
 		bottom.setLayout(new GridLayout(1, false));
-		propertiesViewer = new TableViewer(bottom);
+		propertiesViewer = createPropertiesViewer(bottom);
+
+		sashForm.setWeights(getWeights());
+		nodesViewer.setComparer(new NodeViewerComparer());
+	}
+
+	/**
+	 * To be overridden to adapt size of form and result frames.
+	 */
+	protected int[] getWeights() {
+		return new int[] { 70, 30 };
+	}
+
+	protected TreeViewer createNodeViewer(Composite parent,
+			final ITreeContentProvider nodeContentProvider) {
+
+		final TreeViewer tmpNodeViewer = new TreeViewer(parent, SWT.MULTI);
+
+		tmpNodeViewer.getTree().setLayoutData(
+				new GridData(SWT.FILL, SWT.FILL, true, true));
+
+		tmpNodeViewer.setContentProvider(nodeContentProvider);
+		tmpNodeViewer.setLabelProvider(new NodeLabelProvider());
+		tmpNodeViewer
+				.addSelectionChangedListener(new ISelectionChangedListener() {
+					public void selectionChanged(SelectionChangedEvent event) {
+						if (!event.getSelection().isEmpty()) {
+							IStructuredSelection sel = (IStructuredSelection) event
+									.getSelection();
+							Object firstItem = sel.getFirstElement();
+							if (firstItem instanceof SingleJcrNode)
+								propertiesViewer
+										.setInput(((SingleJcrNode) firstItem)
+												.getNode());
+						} else {
+							propertiesViewer.setInput(getViewSite());
+						}
+					}
+				});
+
+		resultsObserver = new TreeObserver(tmpNodeViewer.getTree().getDisplay());
+		if (jcrKeyring != null)
+			try {
+				ObservationManager observationManager = jcrKeyring.getSession()
+						.getWorkspace().getObservationManager();
+				observationManager.addEventListener(resultsObserver,
+						Event.PROPERTY_ADDED | Event.PROPERTY_CHANGED, "/",
+						true, null, null, false);
+			} catch (RepositoryException e) {
+				throw new ArgeoException("Cannot register listeners", e);
+			}
+
+		tmpNodeViewer
+				.addDoubleClickListener(new GenericNodeDoubleClickListener(
+						tmpNodeViewer));
+		return tmpNodeViewer;
+	}
+
+	protected TableViewer createPropertiesViewer(Composite parent) {
+		propertiesViewer = new TableViewer(parent);
 		propertiesViewer.getTable().setLayoutData(
 				new GridData(SWT.FILL, SWT.FILL, true, true));
 		propertiesViewer.getTable().setHeaderVisible(true);
@@ -185,61 +242,12 @@ public class GenericJcrBrowser extends AbstractJcrBrowser {
 			}
 		});
 		propertiesViewer.setInput(getViewSite());
-
-		sashForm.setWeights(getWeights());
-		nodesViewer.setComparer(new NodeViewerComparer());
-	}
-
-	/**
-	 * To be overridden to adapt size of form and result frames.
-	 */
-	protected int[] getWeights() {
-		return new int[] { 70, 30 };
+		return propertiesViewer;
 	}
 
-	protected TreeViewer createNodeViewer(Composite parent,
-			final ITreeContentProvider nodeContentProvider) {
-
-		final TreeViewer tmpNodeViewer = new TreeViewer(parent, SWT.MULTI);
-
-		tmpNodeViewer.getTree().setLayoutData(
-				new GridData(SWT.FILL, SWT.FILL, true, true));
-
-		tmpNodeViewer.setContentProvider(nodeContentProvider);
-		tmpNodeViewer.setLabelProvider(new NodeLabelProvider());
-		tmpNodeViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						if (!event.getSelection().isEmpty()) {
-							IStructuredSelection sel = (IStructuredSelection) event
-									.getSelection();
-							Object firstItem = sel.getFirstElement();
-							if (firstItem instanceof SingleJcrNode)
-								propertiesViewer
-										.setInput(((SingleJcrNode) firstItem)
-												.getNode());
-						} else {
-							propertiesViewer.setInput(getViewSite());
-						}
-					}
-				});
-
-		resultsObserver = new TreeObserver(tmpNodeViewer.getTree().getDisplay());
-		if (jcrKeyring != null)
-			try {
-				ObservationManager observationManager = jcrKeyring.getSession()
-						.getWorkspace().getObservationManager();
-				observationManager.addEventListener(resultsObserver,
-						Event.PROPERTY_ADDED | Event.PROPERTY_CHANGED, "/",
-						true, null, null, false);
-			} catch (RepositoryException e) {
-				throw new ArgeoException("Cannot register listeners", e);
-			}
-
-		tmpNodeViewer
-				.addDoubleClickListener(new GenericNodeDoubleClickListener(
-						tmpNodeViewer));
-		return tmpNodeViewer;
+	@Override
+	public void dispose() {
+		super.dispose();
 	}
 
 	@Override