X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2Fjcr%2FDefaultNodeLabelProvider.java;h=e8157b2fbee605ca9d058b0b4ce37bc0f145adc1;hb=5e5546ae33d363f1fab83f10f98c32eec6bfc3ca;hp=76fac12568403afa23892afa0e5a7df584b728c4;hpb=e61dd9dda88354091625cca85aa7c96d196688b3;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
index 76fac1256..e8157b2fb 100644
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/jcr/DefaultNodeLabelProvider.java
@@ -20,34 +20,16 @@ import javax.jcr.Property;
 import javax.jcr.RepositoryException;
 import javax.jcr.nodetype.NodeType;
 
-import org.argeo.ArgeoException;
-import org.argeo.jcr.ArgeoTypes;
+import org.argeo.eclipse.ui.EclipseUiException;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;
 
-/** Provides reasonable overridable defaults for know JCR types. */
+/**
+ * Default label provider to manage node and corresponding UI objects. It
+ * provides reasonable overwrite-able default for known JCR types.
+ */
 public class DefaultNodeLabelProvider extends ColumnLabelProvider {
-	// Images
-	/**
-	 * @deprecated Use {@link JcrImages#NODE} instead
-	 */
-	public final static Image NODE = JcrImages.NODE;
-	/**
-	 * @deprecated Use {@link JcrImages#FOLDER} instead
-	 */
-	public final static Image FOLDER = JcrImages.FOLDER;
-	/**
-	 * @deprecated Use {@link JcrImages#FILE} instead
-	 */
-	public final static Image FILE = JcrImages.FILE;
-	/**
-	 * @deprecated Use {@link JcrImages#BINARY} instead
-	 */
-	public final static Image BINARY = JcrImages.BINARY;
-	/**
-	 * @deprecated Use {@link JcrImages#HOME} instead
-	 */
-	public final static Image HOME = JcrImages.HOME;
+	private static final long serialVersionUID = 1216182332792151235L;
 
 	public String getText(Object element) {
 		try {
@@ -60,7 +42,7 @@ public class DefaultNodeLabelProvider extends ColumnLabelProvider {
 			}
 			return super.getText(element);
 		} catch (RepositoryException e) {
-			throw new ArgeoException("Cannot get text for of " + element, e);
+			throw new EclipseUiException("Cannot get text for of " + element, e);
 		}
 	}
 
@@ -83,23 +65,14 @@ public class DefaultNodeLabelProvider extends ColumnLabelProvider {
 				return getImage(((NodesWrapper) element).getNode());
 			}
 		} catch (RepositoryException e) {
-			throw new ArgeoException("Cannot retrieve image for " + element, e);
+			throw new EclipseUiException("Cannot retrieve image for " + element, e);
 		}
 		return super.getImage(element);
 	}
 
 	protected Image getImage(Node node) throws RepositoryException {
-		// optimized order
-		if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FILE))
-			return JcrImages.FILE;
-		else if (node.getPrimaryNodeType().isNodeType(NodeType.NT_FOLDER))
-			return JcrImages.FOLDER;
-		else if (node.getPrimaryNodeType().isNodeType(NodeType.NT_RESOURCE))
-			return JcrImages.BINARY;
-		else if (node.isNodeType(ArgeoTypes.ARGEO_USER_HOME))
-			return JcrImages.HOME;
-		else
-			return JcrImages.NODE;
+		// FIXME who uses that?
+		return null;
 	}
 
 	@Override
@@ -113,7 +86,7 @@ public class DefaultNodeLabelProvider extends ColumnLabelProvider {
 				return getToolTipText(((NodesWrapper) element).getNode());
 			}
 		} catch (RepositoryException e) {
-			throw new ArgeoException("Cannot get tooltip for " + element, e);
+			throw new EclipseUiException("Cannot get tooltip for " + element, e);
 		}
 		return super.getToolTipText(element);
 	}
@@ -121,5 +94,4 @@ public class DefaultNodeLabelProvider extends ColumnLabelProvider {
 	protected String getToolTipText(Node node) throws RepositoryException {
 		return null;
 	}
-
-}
+}
\ No newline at end of file