Full refactoring of the UI distribution view:

[gpl/argeo-slc.git] / plugins / org.argeo.slc.client.ui.dist / src / main / java / org / argeo / slc / client / ui / dist / controllers / DistTreeLabelProvider.java

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 b504ae6f3bb022ecee61370b056ee9432e1c842f..b2ca9f2907d68389dad658dba45e339554afc46c 100644 (file)
--- 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,46 @@
 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.WkspGroupElem;
+import org.argeo.slc.client.ui.dist.model.GroupBaseElem;
 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 WkspGroupElem)
-                               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 JcrImages.WORKSPACE_CONNECTED;
+               else if (element instanceof GroupBaseElem)
+                       return DistImages.IMG_GROUP_BASE;
+               return super.getImage(element);
        }
 }
\ No newline at end of file