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%2Feditors%2FBundleDetailsPage.java;h=d3e15f92a189856ab0adc9d6ed10f5a8e326a99e;hb=09ecb6cc38db59088879e7f0704318b832b7dc63;hp=052301a00a109ba6f208f5126cd466727ef6c977;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/editors/BundleDetailsPage.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDetailsPage.java
index 052301a00..d3e15f92a 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDetailsPage.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/BundleDetailsPage.java
@@ -26,6 +26,7 @@ import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
+import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
@@ -117,6 +118,25 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 
 	}
 
+	// Workaround to add an artificial level to the export package browser
+	private class LevelElem {
+		private String label;
+		private Object parent;
+
+		public LevelElem(String label, Object parent) {
+			this.label = label;
+			this.parent = parent;
+		}
+
+		public String toString() {
+			return label;
+		}
+
+		public Object getParent() {
+			return parent;
+		}
+	}
+
 	/** Export Package Section */
 	private void createExportPackageSection(Composite parent)
 			throws RepositoryException {
@@ -141,11 +161,24 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 		col.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
-				return JcrUtils.get((Node) element, SlcNames.SLC_NAME);
+				if (element instanceof Node)
+					return JcrUtils.get((Node) element, SlcNames.SLC_NAME);
+				else
+					return element.toString();
 			}
 
 			@Override
 			public Image getImage(Object element) {
+				if (element instanceof Node) {
+					try {
+						Node node = (Node) element;
+						if (node.isNodeType(SlcTypes.SLC_EXPORTED_PACKAGE))
+							return DistImages.IMG_PACKAGE;
+					} catch (RepositoryException e) {
+						throw new SlcException("Error retriving "
+								+ "image for the labelProvider", e);
+					}
+				}
 				return null;
 			}
 		});
@@ -173,15 +206,25 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 			public Object[] getChildren(Object parentElement) {
 				// Only 2 levels for the time being
 				try {
-					Node pNode = (Node) parentElement;
-					if (pNode.isNodeType(SlcTypes.SLC_EXPORTED_PACKAGE)) {
+					if (parentElement instanceof LevelElem) {
+						Node node = (Node) ((LevelElem) parentElement)
+								.getParent();
 						List<Node> nodes = JcrUtils
-								.nodeIteratorToList(listNodes(pNode,
+								.nodeIteratorToList(listNodes(node,
 										SlcTypes.SLC_JAVA_PACKAGE,
 										SlcNames.SLC_NAME));
 						return nodes.toArray();
-					} else
-						return null;
+					} else if (parentElement instanceof Node) {
+						Node pNode = (Node) parentElement;
+						if (pNode.isNodeType(SlcTypes.SLC_EXPORTED_PACKAGE)) {
+							if (listNodes(pNode, SlcTypes.SLC_JAVA_PACKAGE,
+									SlcNames.SLC_NAME).getSize() > 0) {
+								Object[] result = { new LevelElem("uses", pNode) };
+								return result;
+							}
+						}
+					}
+					return null;
 				} catch (RepositoryException e) {
 					throw new SlcException("Cannot list children Nodes", e);
 				}
@@ -194,12 +237,16 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 
 			public boolean hasChildren(Object element) {
 				try {
-					Node pNode = (Node) element;
-					if (pNode.isNodeType(SlcTypes.SLC_EXPORTED_PACKAGE)) {
-						// might return true even if there is no "valid" child
-						return pNode.hasNodes();
-					} else
-						return false;
+					if (element instanceof LevelElem)
+						return true;
+					else {
+						Node pNode = (Node) element;
+						if (pNode.isNodeType(SlcTypes.SLC_EXPORTED_PACKAGE)) {
+							return listNodes(pNode, SlcTypes.SLC_JAVA_PACKAGE,
+									SlcNames.SLC_NAME).getSize() > 0;
+						}
+					}
+					return false;
 				} catch (RepositoryException e) {
 					throw new SlcException("Cannot check children Nodes", e);
 				}
@@ -210,7 +257,7 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 		viewer.setInput("Initialize");
 		// work around a display problem : the tree table has only a few lines
 		// when the tree is not expended
-		viewer.expandToLevel(2);
+		viewer.expandToLevel(3);
 	}
 
 	/** Import Package Section */
@@ -231,6 +278,11 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 			public String getText(Object element) {
 				return JcrUtils.get((Node) element, SLC_NAME);
 			}
+
+			public Image getImage(Object element) {
+				return DistImages.IMG_PACKAGE;
+			}
+
 		});
 
 		// Version
@@ -287,11 +339,16 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 			public String getText(Object element) {
 				return JcrUtils.get((Node) element, SLC_SYMBOLIC_NAME);
 			}
+
+			@Override
+			public Image getImage(Object element) {
+				return DistImages.IMG_BUNDLE;
+			}
 		});
 
 		// Version
 		col = new TableViewerColumn(viewer, SWT.NONE);
-		col.getColumn().setWidth(100);
+		col.getColumn().setWidth(140);
 		col.getColumn().setText("Version");
 		col.setLabelProvider(new ColumnLabelProvider() {
 			@Override