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%2Fbrowser%2FNodeLabelProvider.java;h=cee1370ecbe7a003e7d1217e1a1880cd00ae4953;hb=c0b7b3f9d1781d074ab35d24017042fa9415e1e4;hp=6b9af8f75b70e5cdf0825281fdc9ec3e710fe647;hpb=ed36fb56ac5aff2d606b35be175eb32657d6ec56;p=lgpl%2Fargeo-commons.git

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java
index 6b9af8f75..cee1370ec 100644
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeLabelProvider.java
@@ -4,9 +4,13 @@ import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;
 
+import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
 import org.argeo.eclipse.ui.jcr.JcrUiPlugin;
-import org.argeo.jcr.RepositoryRegister;
+import org.argeo.jcr.ui.explorer.model.RepositoriesNode;
+import org.argeo.jcr.ui.explorer.model.RepositoryNode;
+import org.argeo.jcr.ui.explorer.model.SingleJcrNode;
+import org.argeo.jcr.ui.explorer.model.WorkspaceNode;
 import org.eclipse.swt.graphics.Image;
 
 public class NodeLabelProvider extends DefaultNodeLabelProvider {
@@ -15,10 +19,16 @@ public class NodeLabelProvider extends DefaultNodeLabelProvider {
 			"icons/repositories.gif").createImage();
 
 	public String getText(Object element) {
-		if (element instanceof RepositoryRegister) {
-			return "Repositories";
+		try {
+			if (element instanceof SingleJcrNode) {
+				SingleJcrNode sjn = (SingleJcrNode) element;
+				return getText(sjn.getNode());
+			} else
+				return super.getText(element);
+		} catch (RepositoryException e) {
+			throw new ArgeoException(
+					"Unexpected JCR error while getting node name.");
 		}
-		return super.getText(element);
 	}
 
 	protected String getText(Node node) throws RepositoryException {
@@ -43,9 +53,14 @@ public class NodeLabelProvider extends DefaultNodeLabelProvider {
 				return WorkspaceNode.WORKSPACE_DISCONNECTED;
 			else
 				return WorkspaceNode.WORKSPACE_CONNECTED;
-		} else if (element instanceof RepositoryRegister) {
+		} else if (element instanceof RepositoriesNode) {
 			return REPOSITORIES;
-		}
+		} else if (element instanceof SingleJcrNode)
+			try {
+				return super.getImage(((SingleJcrNode) element).getNode());
+			} catch (RepositoryException e) {
+				return null;
+			}
 		return super.getImage(element);
 	}