From 0ddd1e8df3d2d5e5ee19912934c6d88757cd4f39 Mon Sep 17 00:00:00 2001
From: Bruno Sinou <bsinou@argeo.org>
Date: Mon, 18 Mar 2013 17:15:00 +0000
Subject: [PATCH] + Add refresh command to anonymous distribution browser + Add
 a source available check box to the bundle details page + fix an hard coded
 reference in JcrExecutionModulesView

git-svn-id: https://svn.argeo.org/slc/trunk@6157 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../org.argeo.slc.client.ui.dist/plugin.xml   |  9 ++++++++
 .../ui/dist/commands/PublishWorkspace.java    |  1 +
 .../commands/RefreshDistributionsView.java    |  3 +++
 .../ui/dist/editors/BundleDetailsPage.java    | 23 ++++++++++++++++---
 .../views/AnonymousDistributionsView.java     |  7 ++++--
 .../client/ui/editors/ProcessBuilderPage.java |  6 ++---
 .../ui/views/JcrExecutionModulesView.java     |  3 ++-
 7 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/plugins/org.argeo.slc.client.ui.dist/plugin.xml b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
index f4626e4b5..618e62263 100644
--- a/plugins/org.argeo.slc.client.ui.dist/plugin.xml
+++ b/plugins/org.argeo.slc.client.ui.dist/plugin.xml
@@ -308,6 +308,15 @@
             </command>
             -->
         </menuContribution>
+        <menuContribution
+        	locationURI="toolbar:org.argeo.slc.client.ui.dist.anonymousDistributionsView">
+            <command
+            	commandId="org.argeo.slc.client.ui.dist.refreshDistributionsView"
+                icon="icons/refresh.png"
+                label="Refresh"
+                tooltip="Refresh distributions view">
+            </command>
+        </menuContribution>
         <!-- Queries --> 
 		<!-- <menuContribution
                 allPopups="false"
diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
index 6ce124310..db2d4ebc0 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/PublishWorkspace.java
@@ -79,6 +79,7 @@ public class PublishWorkspace extends AbstractHandler {
 				JcrUtils.addPrivilege(session, "/", publicRole,
 						Privilege.JCR_READ);
 				session.save();
+
 				JcrUtils.logoutQuietly(session);
 				// CommandHelpers.callCommand(RefreshDistributionsView.ID);
 			}
diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java
index 12bd61409..11e8a7b7d 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/commands/RefreshDistributionsView.java
@@ -16,6 +16,7 @@
 package org.argeo.slc.client.ui.dist.commands;
 
 import org.argeo.slc.client.ui.dist.DistPlugin;
+import org.argeo.slc.client.ui.dist.views.AnonymousDistributionsView;
 import org.argeo.slc.client.ui.dist.views.DistributionsView;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
@@ -36,6 +37,8 @@ public class RefreshDistributionsView extends AbstractHandler {
 				.getActiveWorkbenchWindow().getActivePage().getActivePart();
 		if (activePart instanceof DistributionsView)
 			((DistributionsView) activePart).refresh();
+		else if (activePart instanceof AnonymousDistributionsView)
+			((AnonymousDistributionsView) activePart).refresh();
 		return null;
 	}
 }
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 38f537941..01824b943 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
@@ -31,6 +31,8 @@ import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.utils.AbstractHyperlinkListener;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.repo.RepoConstants;
+import org.argeo.slc.repo.RepoUtils;
 import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.ITreeContentProvider;
@@ -44,6 +46,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
@@ -116,12 +119,26 @@ 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);
-		// 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);
+		addSourceAvailableLabel(details);
+
+	}
+
+	// helper to check if sources are available
+	private void addSourceAvailableLabel(Composite parent) {
+		Button srcChk = toolkit.createButton(parent, "Sources available",
+				SWT.CHECK);
+		srcChk.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1));
 
+		try {
+			String srcPath = RepoUtils.relatedPdeSourcePath(
+					RepoConstants.DEFAULT_ARTIFACTS_BASE_PATH, currBundle);
+			srcChk.setSelection(currBundle.getSession().nodeExists(srcPath));
+		} catch (RepositoryException e) {
+			throw new SlcException("Unable to check sources", e);
+		}
+		srcChk.setEnabled(false);
 	}
 
 	// Workaround to add an artificial level to the export package browser
diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
index 004e06957..ed57feccd 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/AnonymousDistributionsView.java
@@ -38,7 +38,8 @@ public class AnonymousDistributionsView extends ViewPart implements SlcNames,
 		ArgeoNames {
 	// private final static Log log = LogFactory
 	// .getLog(AnonymousDistributionsView.class);
-	public final static String ID = DistPlugin.ID + ".anonymousDistributionsView";
+	public final static String ID = DistPlugin.ID
+			+ ".anonymousDistributionsView";
 
 	/* DEPENDENCY INJECTION */
 	private ITreeContentProvider treeContentProvider;
@@ -73,8 +74,10 @@ public class AnonymousDistributionsView extends ViewPart implements SlcNames,
 	 * Force refresh of the whole view
 	 */
 	public void refresh() {
+		Object[] ee = viewer.getExpandedElements();
 		viewer.setInput(DistConstants.DEFAULT_PUBLIC_REPOSITORY_URI);
-		viewer.expandToLevel(2);
+		// viewer.expandToLevel(2);
+		viewer.setExpandedElements(ee);
 	}
 
 	@Override
diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
index c3e07153c..520945977 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/editors/ProcessBuilderPage.java
@@ -33,11 +33,9 @@ import javax.jcr.query.Query;
 import javax.jcr.query.QueryManager;
 
 import org.argeo.ArgeoException;
-import org.argeo.eclipse.ui.ErrorFeedback;
 import org.argeo.eclipse.ui.jcr.AsyncUiEventListener;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.client.ui.ClientUiPlugin;
 import org.argeo.slc.client.ui.SlcImages;
 import org.argeo.slc.core.execution.PrimitiveAccessor;
 import org.argeo.slc.core.execution.PrimitiveUtils;
@@ -251,6 +249,8 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
 		GridData valuedGd = new GridData(SWT.FILL, SWT.FILL, true, true);
 		// valuedGd.widthHint = 200;
 		valuesViewer.getTable().setLayoutData(valuedGd);
+		valuesViewer.getTable().setHeaderVisible(true);
+
 		valuesViewer.setContentProvider(new ValuesContentProvider());
 		initializeValuesViewer(valuesViewer);
 		sashForm.setWeights(getWeights());
@@ -724,7 +724,7 @@ public class ProcessBuilderPage extends FormPage implements SlcNames {
 				}
 				return null;
 			} catch (RepositoryException e) {
-				throw new SlcException("Cannot get celle editor", e);
+				throw new SlcException("Cannot get cell editor", e);
 			}
 		}
 
diff --git a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
index 38336f467..3aa59d693 100644
--- a/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
+++ b/plugins/org.argeo.slc.client.ui/src/main/java/org/argeo/slc/client/ui/views/JcrExecutionModulesView.java
@@ -74,7 +74,8 @@ public class JcrExecutionModulesView extends ViewPart implements SlcTypes,
 	private final static Log log = LogFactory
 			.getLog(JcrExecutionModulesView.class);
 
-	public static final String ID = "org.argeo.slc.client.ui.jcrExecutionModulesView";
+	public static final String ID = ClientUiPlugin.ID
+			+ ".jcrExecutionModulesView";
 
 	private TreeViewer viewer;
 
-- 
2.39.2