Stabilize JCR explorer

[lgpl/argeo-commons.git] / server / plugins / org.argeo.jcr.ui.explorer / src / main / java / org / argeo / jcr / ui / explorer / browser / NodeLabelProvider.java

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 adbd56d68f3b08a7c5a0787373d3fc00a923480a..ce679dd96b28b636095fea94ecca62a01b1ffe73 100644 (file)
--- 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
@@ -58,20 +58,20 @@ public class NodeLabelProvider extends DefaultNodeLabelProvider {
        @Override
        public Image getImage(Object element) {
                if (element instanceof RemoteRepositoryNode) {
-                       if (((RemoteRepositoryNode) element).getDefaultSession() == null)
-                               return JcrImages.REMOTE_DISCONNECTED;
-                       else
+                       if (((RemoteRepositoryNode) element).isConnected())
                                return JcrImages.REMOTE_CONNECTED;
-               } else if (element instanceof RepositoryNode) {
-                       if (((RepositoryNode) element).getDefaultSession() == null)
-                               return JcrImages.REPOSITORY_DISCONNECTED;
                        else
+                               return JcrImages.REMOTE_DISCONNECTED;
+               } else if (element instanceof RepositoryNode) {
+                       if (((RepositoryNode) element).isConnected())
                                return JcrImages.REPOSITORY_CONNECTED;
-               } else if (element instanceof WorkspaceNode) {
-                       if (((WorkspaceNode) element).getSession() == null)
-                               return JcrImages.WORKSPACE_DISCONNECTED;
                        else
+                               return JcrImages.REPOSITORY_DISCONNECTED;
+               } else if (element instanceof WorkspaceNode) {
+                       if (((WorkspaceNode) element).isConnected())
                                return JcrImages.WORKSPACE_CONNECTED;
+                       else
+                               return JcrImages.WORKSPACE_DISCONNECTED;
                } else if (element instanceof RepositoriesNode) {
                        return JcrImages.REPOSITORIES;
                } else if (element instanceof SingleJcrNode)