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=052301a00a109ba6f208f5126cd466727ef6c977;hb=0d236262a853a1286b317c30d64d4692bc21c7a4;hp=269466083b12240c64b6d559d859d506d3b11edb;hpb=60fc68b90de1f65a0d64fe385033e1a9e6de5eef;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 269466083..052301a00 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
@@ -20,13 +20,6 @@ import java.util.List;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
-import javax.jcr.query.QueryManager;
-import javax.jcr.query.QueryResult;
-import javax.jcr.query.qom.Constraint;
-import javax.jcr.query.qom.Ordering;
-import javax.jcr.query.qom.QueryObjectModel;
-import javax.jcr.query.qom.QueryObjectModelFactory;
-import javax.jcr.query.qom.Selector;
 
 import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.ErrorFeedback;
@@ -115,12 +108,16 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 		createField(details, "Symbolic name", SlcNames.SLC_SYMBOLIC_NAME);
 		createField(details, "Version", SlcNames.SLC_BUNDLE_VERSION);
 		createField(details, "Group Id", SlcNames.SLC_GROUP_ID);
-		//createHyperlink(details, "Licence", DistConstants.SLC_BUNDLE_LICENCE);
+		// Single sourcing issue: this does not works with rap
+		// createHyperlink(details, "Licence",
+		// DistConstants.SLC_BUNDLE_LICENCE);
+		createField(details, "Licence", DistConstants.SLC_BUNDLE_LICENCE);
+
 		createField(details, "Vendor", DistConstants.SLC_BUNDLE_VENDOR);
 
 	}
 
-	/** Import Package Section */
+	/** Export Package Section */
 	private void createExportPackageSection(Composite parent)
 			throws RepositoryException {
 
@@ -139,7 +136,7 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 		tree.setLayoutData(gd);
 
 		TreeViewerColumn col = new TreeViewerColumn(viewer, SWT.FILL);
-		col.getColumn().setWidth(200);
+		col.getColumn().setWidth(400);
 
 		col.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -211,6 +208,9 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 
 		headerSection.setClient(tree);
 		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);
 	}
 
 	/** Import Package Section */
@@ -224,7 +224,7 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 
 		// Name
 		TableViewerColumn col = new TableViewerColumn(viewer, SWT.NONE);
-		col.getColumn().setWidth(300);
+		col.getColumn().setWidth(350);
 		col.getColumn().setText("Name");
 		col.setLabelProvider(new ColumnLabelProvider() {
 			@Override
@@ -322,28 +322,49 @@ public class BundleDetailsPage extends FormPage implements SlcNames, SlcTypes {
 		viewer.setInput("Initialize");
 	}
 
-	/** Build repository request */
+	/**
+	 * Build repository request
+	 * 
+	 * FIXME Workaround for remote repository, the path to bundleartifact (for
+	 * instance
+	 * .../org/argeo/slc/org.argeo.slc.client.ui.dist/1.1.12/org.argeo.slc
+	 * .client.ui.dist-1.1.12/ ) is not valid for method factory.childNode(); it
+	 * fails parsing the "1.1.12" part, trying to cast it as a BigDecimal
+	 * 
+	 * */
 	private NodeIterator listNodes(Node parent, String nodeType, String orderBy)
 			throws RepositoryException {
-		QueryManager queryManager = currBundle.getSession().getWorkspace()
-				.getQueryManager();
-		QueryObjectModelFactory factory = queryManager.getQOMFactory();
-
-		final String nodeSelector = "nodes";
-		Selector source = factory.selector(nodeType, nodeSelector);
-
-		Constraint childOf = factory.childNode(nodeSelector, parent.getPath());
-
-		Ordering order = factory.ascending(factory.propertyValue(nodeSelector,
-				orderBy));
-		Ordering[] orderings = { order };
-
-		QueryObjectModel query = factory.createQuery(source, childOf,
-				orderings, null);
-
-		QueryResult result = query.execute();
-		return result.getNodes();
-
+		// QueryManager queryManager = currBundle.getSession().getWorkspace()
+		// .getQueryManager();
+		// QueryObjectModelFactory factory = queryManager.getQOMFactory();
+		//
+		// final String nodeSelector = "nodes";
+		// Selector source = factory.selector(nodeType, nodeSelector);
+		//
+		// Constraint childOf = factory.childNode(nodeSelector,
+		// parent.getPath());
+		//
+		// Ordering order =
+		// factory.ascending(factory.propertyValue(nodeSelector,
+		// orderBy));
+		// Ordering[] orderings = { order };
+		//
+		// QueryObjectModel query = factory.createQuery(source, childOf,
+		// orderings, null);
+		//
+		// QueryResult result = query.execute();
+
+		String pattern = null;
+		if (SlcTypes.SLC_EXPORTED_PACKAGE.equals(nodeType))
+			pattern = "slc:Export-Package*";
+		else if (SlcTypes.SLC_JAVA_PACKAGE.equals(nodeType))
+			pattern = "slc:uses*";
+		else if (SlcTypes.SLC_IMPORTED_PACKAGE.equals(nodeType))
+			pattern = "slc:Import-Package*";
+		else if (SlcTypes.SLC_REQUIRED_BUNDLE.equals(nodeType))
+			pattern = "slc:Require-Bundle*";
+
+		return parent.getNodes(pattern);
 	}
 
 	private class TableContentProvider implements IStructuredContentProvider {