X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Fjcr%2FNodeLabelProvider.java;h=a5751c083817375f9a131c425a7f39f68dfb4d47;hb=633a8acd189cc22f06944d278879601189be1bc8;hp=765f3201a9612bf067966e76212a83232b29dca4;hpb=2d5dd10f58c42aab9351c76801c57034cbe87f8e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeLabelProvider.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeLabelProvider.java
index 765f3201a..a5751c083 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeLabelProvider.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/jcr/NodeLabelProvider.java
@@ -1,35 +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.cms.ui.jcr;
 
 import javax.jcr.NamespaceException;
 import javax.jcr.Node;
+import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 import org.argeo.cms.ui.jcr.model.RemoteRepositoryElem;
 import org.argeo.cms.ui.jcr.model.RepositoriesElem;
 import org.argeo.cms.ui.jcr.model.RepositoryElem;
 import org.argeo.cms.ui.jcr.model.SingleJcrNodeElem;
 import org.argeo.cms.ui.jcr.model.WorkspaceElem;
 import org.argeo.eclipse.ui.EclipseUiException;
-import org.argeo.naming.LdapAttrs;
-import org.argeo.node.NodeTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;
 
@@ -37,7 +20,7 @@ import org.eclipse.swt.graphics.Image;
 public class NodeLabelProvider extends ColumnLabelProvider {
 	private static final long serialVersionUID = -3662051696443321843L;
 
-	private final static Log log = LogFactory.getLog(NodeLabelProvider.class);
+	private final static CmsLog log = CmsLog.getLog(NodeLabelProvider.class);
 
 	public String getText(Object element) {
 		try {
@@ -110,9 +93,13 @@ public class NodeLabelProvider extends ColumnLabelProvider {
 			else if (node.getPrimaryNodeType().isNodeType(NodeType.NT_RESOURCE))
 				return JcrImages.BINARY;
 			try {
-				// optimizes
-				if (node.hasProperty(LdapAttrs.uid.property()) && node.isNodeType(NodeTypes.NODE_USER_HOME))
+				// TODO check workspace type?
+				if (node.getDepth() == 1 && node.hasProperty(Property.JCR_ID))
 					return JcrImages.HOME;
+
+				// optimizes
+//				if (node.hasProperty(LdapAttrs.uid.property()) && node.isNodeType(NodeTypes.NODE_USER_HOME))
+//					return JcrImages.HOME;
 			} catch (NamespaceException e) {
 				// node namespace is not registered in this repo
 			}