X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fcontrollers%2FDistTreeLabelProvider.java;h=3fc3aca081b1be2d4cd77fa40505ac7687ec12c7;hb=dfe3fcaa16195d0fff84839e86546d753e588253;hp=fe45871f7c02ad123c1f1b41654155168bf5f72d;hpb=0d236262a853a1286b317c30d64d4692bc21c7a4;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java
index fe45871f7..3fc3aca08 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/controllers/DistTreeLabelProvider.java
@@ -1,44 +1,51 @@
 package org.argeo.slc.client.ui.dist.controllers;
 
+import org.argeo.eclipse.ui.jcr.JcrImages;
 import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.model.DistParentElem;
-import org.argeo.slc.client.ui.dist.model.GroupElem;
+import org.argeo.slc.client.ui.dist.model.ModularDistBaseElem;
+import org.argeo.slc.client.ui.dist.model.ModularDistVersionElem;
 import org.argeo.slc.client.ui.dist.model.RepoElem;
+import org.argeo.slc.client.ui.dist.model.WkspGroupElem;
 import org.argeo.slc.client.ui.dist.model.WorkspaceElem;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.swt.graphics.Image;
 
 /**
- * Manages icons and labels for the distributions browser
+ * Manages icons and labels for the Distributions tree browser
  */
 public class DistTreeLabelProvider extends ColumnLabelProvider {
 	@Override
 	public String getText(Object element) {
 		if (element instanceof DistParentElem)
-			return ((DistParentElem) element).getLabel();
+			return ((DistParentElem) element).getName();
 		else
 			return element.toString();
 	}
 
 	@Override
 	public Image getImage(Object element) {
-		if (element instanceof DistParentElem) {
-			DistParentElem bElement = (DistParentElem) element;
-			if (bElement instanceof RepoElem)
-				if (bElement.inHome())
-					return DistImages.IMG_HOME_REPO;
-				else if (bElement.isReadOnly())
-					return DistImages.IMG_REPO_READONLY;
-				else
-					return DistImages.IMG_REPO;
-			else if (bElement instanceof GroupElem)
-				return DistImages.IMG_WKSP;
-			else if (element instanceof WorkspaceElem)
-				if (((WorkspaceElem) element).isReadOnly())
-					return DistImages.IMG_DISTGRP_READONLY;
-				else
-					return DistImages.IMG_DISTGRP;
-		}
-		return null;
+		if (element instanceof RepoElem) {
+			RepoElem re = ((RepoElem) element);
+			if (re.inHome())
+				return DistImages.IMG_HOME_REPO;
+			else if (re.isConnected())
+				return JcrImages.REPOSITORY_CONNECTED;
+			else
+				return JcrImages.REPOSITORY_DISCONNECTED;
+		} else if (element instanceof WorkspaceElem) {
+			if (((WorkspaceElem) element).isConnected())
+				return JcrImages.WORKSPACE_CONNECTED;
+			else
+				return JcrImages.WORKSPACE_DISCONNECTED;
+		} else if (element instanceof WkspGroupElem)
+			return DistImages.IMG_WKSP_GROUP;
+		// else if (element instanceof GroupBaseElem)
+		// return DistImages.IMG_GROUP_BASE;
+		else if (element instanceof ModularDistBaseElem)
+			return DistImages.IMG_MODULAR_DIST_BASE;
+		else if (element instanceof ModularDistVersionElem)
+			return DistImages.IMG_MODULAR_DIST_VERSION;
+		return super.getImage(element);
 	}
 }
\ No newline at end of file