X-Git-Url: http://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=d6d593ce824421626325a8f70865e53e3d0761a9;hb=3a3d316af102ba410d1d9e6de349d0c8f7ac044f;hp=0521383a1838a8cc479bd96ddd9006e7c6b1540d;hpb=82e079d95c38d7136944d79394b9efd82a2864dd;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 0521383a1..d6d593ce8 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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;
@@ -7,11 +22,11 @@ import javax.jcr.nodetype.NodeType;
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.jcr.DefaultNodeLabelProvider;
 import org.argeo.eclipse.ui.jcr.JcrImages;
-import org.argeo.jcr.ui.explorer.model.RemoteRepositoryNode;
-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.argeo.jcr.ui.explorer.model.RemoteRepositoryElem;
+import org.argeo.jcr.ui.explorer.model.RepositoriesElem;
+import org.argeo.jcr.ui.explorer.model.RepositoryElem;
+import org.argeo.jcr.ui.explorer.model.SingleJcrNodeElem;
+import org.argeo.jcr.ui.explorer.model.WorkspaceElem;
 import org.eclipse.swt.graphics.Image;
 
 public class NodeLabelProvider extends DefaultNodeLabelProvider {
@@ -19,8 +34,8 @@ public class NodeLabelProvider extends DefaultNodeLabelProvider {
 
 	public String getText(Object element) {
 		try {
-			if (element instanceof SingleJcrNode) {
-				SingleJcrNode sjn = (SingleJcrNode) element;
+			if (element instanceof SingleJcrNodeElem) {
+				SingleJcrNodeElem sjn = (SingleJcrNodeElem) element;
 				return getText(sjn.getNode());
 			} else
 				return super.getText(element);
@@ -42,26 +57,26 @@ 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 (element instanceof RemoteRepositoryElem) {
+			if (((RemoteRepositoryElem) 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 RepositoryElem) {
+			if (((RepositoryElem) 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 WorkspaceElem) {
+			if (((WorkspaceElem) element).isConnected())
 				return JcrImages.WORKSPACE_CONNECTED;
-		} else if (element instanceof RepositoriesNode) {
+			else
+				return JcrImages.WORKSPACE_DISCONNECTED;
+		} else if (element instanceof RepositoriesElem) {
 			return JcrImages.REPOSITORIES;
-		} else if (element instanceof SingleJcrNode)
+		} else if (element instanceof SingleJcrNodeElem)
 			try {
-				return super.getImage(((SingleJcrNode) element).getNode());
+				return super.getImage(((SingleJcrNodeElem) element).getNode());
 			} catch (RepositoryException e) {
 				return null;
 			}