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=3af60844c907be7d5be60de784f354f30b5dfbce;hpb=ae696952b94054d3b9ec8ab05c02fc82d11607bf;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 3af60844c..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
@@ -1,12 +1,11 @@
 package org.argeo.jcr.ui.explorer.views;
 
-import java.util.Arrays;
 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;
 import javax.jcr.observation.ObservationManager;
@@ -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,59 +122,7 @@ 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.getTable().setLayoutData(
-				new GridData(SWT.FILL, SWT.FILL, true, true));
-		propertiesViewer.getTable().setHeaderVisible(true);
-		propertiesViewer.setContentProvider(new PropertiesContentProvider());
-		TableViewerColumn col = new TableViewerColumn(propertiesViewer,
-				SWT.NONE);
-		col.getColumn().setText("Name");
-		col.getColumn().setWidth(200);
-		col.setLabelProvider(new ColumnLabelProvider() {
-			public String getText(Object element) {
-				try {
-					return ((Property) element).getName();
-				} catch (RepositoryException e) {
-					throw new ArgeoException(
-							"Unexpected exception in label provider", e);
-				}
-			}
-		});
-		col = new TableViewerColumn(propertiesViewer, SWT.NONE);
-		col.getColumn().setText("Value");
-		col.getColumn().setWidth(400);
-		col.setLabelProvider(new ColumnLabelProvider() {
-			public String getText(Object element) {
-				try {
-					Property property = (Property) element;
-					if (property.getType() == PropertyType.BINARY)
-						return "<binary>";
-					else if (property.isMultiple())
-						return Arrays.asList(property.getValues()).toString();
-					else
-						return property.getValue().getString();
-				} catch (RepositoryException e) {
-					throw new ArgeoException(
-							"Unexpected exception in label provider", e);
-				}
-			}
-		});
-		col = new TableViewerColumn(propertiesViewer, SWT.NONE);
-		col.getColumn().setText("Type");
-		col.getColumn().setWidth(200);
-		col.setLabelProvider(new ColumnLabelProvider() {
-			public String getText(Object element) {
-				try {
-					return PropertyType.nameFromValue(((Property) element)
-							.getType());
-				} catch (RepositoryException e) {
-					throw new ArgeoException(
-							"Unexpected exception in label provider", e);
-				}
-			}
-		});
-		propertiesViewer.setInput(getViewSite());
+		propertiesViewer = createPropertiesViewer(bottom);
 
 		sashForm.setWeights(getWeights());
 		nodesViewer.setComparer(new NodeViewerComparer());
@@ -234,6 +180,76 @@ public class GenericJcrBrowser extends AbstractJcrBrowser {
 		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);
+		propertiesViewer.setContentProvider(new PropertiesContentProvider());
+		TableViewerColumn col = new TableViewerColumn(propertiesViewer,
+				SWT.NONE);
+		col.getColumn().setText("Name");
+		col.getColumn().setWidth(200);
+		col.setLabelProvider(new ColumnLabelProvider() {
+			public String getText(Object element) {
+				try {
+					return ((Property) element).getName();
+				} catch (RepositoryException e) {
+					throw new ArgeoException(
+							"Unexpected exception in label provider", e);
+				}
+			}
+		});
+		col = new TableViewerColumn(propertiesViewer, SWT.NONE);
+		col.getColumn().setText("Value");
+		col.getColumn().setWidth(400);
+		col.setLabelProvider(new ColumnLabelProvider() {
+			public String getText(Object element) {
+				try {
+					Property property = (Property) element;
+					if (property.getType() == PropertyType.BINARY)
+						return "<binary>";
+					else if (property.isMultiple()) {
+						StringBuffer buf = new StringBuffer("[");
+						Value[] values = property.getValues();
+						for (int i = 0; i < values.length; i++) {
+							if (i != 0)
+								buf.append(", ");
+							buf.append(values[i].getString());
+						}
+						buf.append(']');
+						return buf.toString();
+					} else
+						return property.getValue().getString();
+				} catch (RepositoryException e) {
+					throw new ArgeoException(
+							"Unexpected exception in label provider", e);
+				}
+			}
+		});
+		col = new TableViewerColumn(propertiesViewer, SWT.NONE);
+		col.getColumn().setText("Type");
+		col.getColumn().setWidth(200);
+		col.setLabelProvider(new ColumnLabelProvider() {
+			public String getText(Object element) {
+				try {
+					return PropertyType.nameFromValue(((Property) element)
+							.getType());
+				} catch (RepositoryException e) {
+					throw new ArgeoException(
+							"Unexpected exception in label provider", e);
+				}
+			}
+		});
+		propertiesViewer.setInput(getViewSite());
+		return propertiesViewer;
+	}
+
+	@Override
+	public void dispose() {
+		super.dispose();
+	}
+
 	@Override
 	protected TreeViewer getNodeViewer() {
 		return nodesViewer;