Refactor JCR utils and home usage

[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 0521383a1838a8cc479bd96ddd9006e7c6b1540d..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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.jcr.ui.explorer.browser;
 
 import javax.jcr.Node;
@@ -43,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)