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%2Fviews%2FDistributionsView.java;h=cbed6adac450d89998c715a0bcba9ede6f79ebd0;hb=7e3da04a2593e3949edce627bd945bbaacc3480b;hp=458df44a997138540511226b0e375c005a0502d4;hpb=e16ffe33ad6c4e01ada23bc5c5e03423c4fb3926;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
index 458df44a9..cbed6adac 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/DistributionsView.java
@@ -97,8 +97,8 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.ViewPart;
 
 /**
- * Browse and manipulate distributions (like merge, rename, etc.). Only support
- * one single repository currently.
+ * Browse, manipulate and manage distributions accross multiple repositories
+ * (like fetch, merge, publish, etc.).
  */
 public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames {
 	private final static Log log = LogFactory.getLog(DistributionsView.class);
@@ -118,38 +118,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 
 		TreeViewerColumn col = new TreeViewerColumn(viewer, SWT.NONE);
 		col.getColumn().setWidth(400);
-		col.setLabelProvider(new ColumnLabelProvider() {
-			@Override
-			public String getText(Object element) {
-				if (element instanceof BrowserElem)
-					return ((BrowserElem) element).getLabel();
-				else
-					return element.toString();
-			}
-
-			@Override
-			public Image getImage(Object element) {
-				if (element instanceof BrowserElem) {
-					BrowserElem bElement = (BrowserElem) element;
-					if (bElement instanceof RepoElem) {
-						if (bElement.isHomeRepo())
-							return DistImages.IMG_HOME_REPO;
-						else if (bElement.isReadOnly)
-							return DistImages.IMG_REPO_READONLY;
-						else
-							return DistImages.IMG_REPO;
-
-					} else if (bElement instanceof DistribGroupElem) {
-						if (bElement.isReadOnly)
-							return DistImages.IMG_DISTGRP_READONLY;
-						else
-							return DistImages.IMG_DISTGRP;
-					}
-				} else if (element instanceof DistributionElem)
-					return DistImages.IMG_WKSP;
-				return null;
-			}
-		});
+		col.setLabelProvider(new DistributionLabelProvider());
 
 		final Tree tree = viewer.getTree();
 		tree.setHeaderVisible(false);
@@ -198,8 +167,8 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 							ArgeoTypes.ARGEO_REMOTE_REPOSITORY);
 					repoNode.setProperty(ARGEO_URI, "vm:///" + alias);
 					repoNode.addMixin(NodeType.MIX_TITLE);
-					repoNode.setProperty(Property.JCR_TITLE, "Internal "
-							+ alias + " repository");
+					repoNode.setProperty(Property.JCR_TITLE,
+							RepoConstants.DEFAULT_JAVA_REPOSITORY_LABEL);
 					nodeSession.save();
 				}
 			}
@@ -210,6 +179,7 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 		}
 
 		viewer.setInput(nodeRepository);
+		viewer.expandToLevel(2);
 	}
 
 	/** Programatically configure the context menu */
@@ -406,8 +376,42 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 	}
 
 	/*
-	 * INTERNAL CLASSES
+	 * UI MODEL
 	 */
+	private class DistributionLabelProvider extends ColumnLabelProvider {
+		@Override
+		public String getText(Object element) {
+			if (element instanceof BrowserElem)
+				return ((BrowserElem) element).getLabel();
+			else
+				return element.toString();
+		}
+
+		@Override
+		public Image getImage(Object element) {
+			if (element instanceof BrowserElem) {
+				BrowserElem bElement = (BrowserElem) element;
+				if (bElement instanceof RepoElem) {
+					if (bElement.isHomeRepo())
+						return DistImages.IMG_HOME_REPO;
+					else if (bElement.isReadOnly())
+						return DistImages.IMG_REPO_READONLY;
+					else
+						return DistImages.IMG_REPO;
+
+				} else if (bElement instanceof DistribGroupElem) {
+					return DistImages.IMG_WKSP;
+				}
+			} else if (element instanceof DistributionElem)
+				if (((DistributionElem) element).isReadOnly())
+					return DistImages.IMG_DISTGRP_READONLY;
+				else
+					return DistImages.IMG_DISTGRP;
+
+			return null;
+		}
+	}	
+	
 	/** Content provider */
 	private class DistributionsContentProvider implements ITreeContentProvider {
 		Session nodeSession;
@@ -444,7 +448,6 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 		}
 
 		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-
 		}
 
 		public Object[] getChildren(Object parentElement) {
@@ -676,6 +679,10 @@ public class DistributionsView extends ViewPart implements SlcNames, ArgeoNames
 			return name;
 		}
 
+		public String toString() {
+			return getLabel();
+		}
+
 		public void dispose() {
 		}