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%2FDistributionOverviewPage.java;h=3c27a960728b9135ba98f994b8a7fce9dc13a75e;hb=7af5edc4d006d39174dba9665b0f78ccc2f9dfe6;hp=4401f7da9b2574442e296eeeb28d07c61e9eabdc;hpb=b7ad99f6fc4414eeb82b9a4ae65aa20e02af66ce;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/DistributionOverviewPage.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistributionOverviewPage.java
index 4401f7da9..3c27a9607 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistributionOverviewPage.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/editors/DistributionOverviewPage.java
@@ -36,6 +36,7 @@ import javax.jcr.query.qom.StaticOperand;
 import org.argeo.ArgeoException;
 import org.argeo.ArgeoMonitor;
 import org.argeo.eclipse.ui.EclipseArgeoMonitor;
+import org.argeo.eclipse.ui.utils.CommandUtils;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.client.ui.dist.DistConstants;
@@ -43,7 +44,6 @@ import org.argeo.slc.client.ui.dist.DistImages;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.argeo.slc.client.ui.dist.PrivilegedJob;
 import org.argeo.slc.client.ui.dist.commands.DeleteArtifacts;
-import org.argeo.slc.client.ui.dist.utils.CommandHelpers;
 import org.argeo.slc.client.ui.dist.utils.NodeViewerComparator;
 import org.argeo.slc.jcr.SlcNames;
 import org.argeo.slc.jcr.SlcTypes;
@@ -163,7 +163,7 @@ public class DistributionOverviewPage extends FormPage implements SlcNames {
 		createFilterPart(body);
 		// Add the table
 		createTableViewer(body);
-		viewer.setInput(null);
+		// viewer.setInput(null);
 		// Add a listener to enable custom resize process
 		form.addControlListener(new ControlListener() {
 			// form.addListener(SWT.RESIZE, new Listener() does not work
@@ -239,6 +239,8 @@ public class DistributionOverviewPage extends FormPage implements SlcNames {
 	private void createFilterPart(Composite parent) {
 		header = tk.createComposite(parent);
 		GridLayout layout = new GridLayout(2, false);
+		layout.marginWidth = layout.marginHeight = layout.verticalSpacing = 0;
+		layout.horizontalSpacing = 5;
 		header.setLayout(layout);
 		GridData gd = new GridData(SWT.FILL, SWT.FILL, false, false);
 		header.setLayoutData(gd);
@@ -253,7 +255,8 @@ public class DistributionOverviewPage extends FormPage implements SlcNames {
 		lbl.setLayoutData(gd);
 
 		// Text Area to filter
-		artifactTxt = tk.createText(header, "", SWT.BORDER | SWT.SINGLE);
+		artifactTxt = tk.createText(header, "", SWT.BORDER | SWT.SINGLE
+				| SWT.SEARCH | SWT.CANCEL);
 		artifactTxt.setMessage(FILTER_HELP_MSG);
 		gd = new GridData(SWT.FILL, SWT.FILL, false, false);
 		gd.grabExcessHorizontalSpace = true;
@@ -324,7 +327,7 @@ public class DistributionOverviewPage extends FormPage implements SlcNames {
 		// Symbolic name
 		col = new TableViewerColumn(viewer, SWT.V_SCROLL);
 		col.getColumn().setWidth(300);
-		col.getColumn().setText("Symbolic name");
+		col.getColumn().setText("Symbolic Name");
 		col.setLabelProvider(new ColumnLabelProvider() {
 			@Override
 			public String getText(Object element) {
@@ -392,9 +395,9 @@ public class DistributionOverviewPage extends FormPage implements SlcNames {
 				.getActiveWorkbenchWindow();
 		// Build conditions
 		// Delete selected artifacts
-		CommandHelpers.refreshCommand(menuManager, window, DeleteArtifacts.ID,
-				DeleteArtifacts.DEFAULT_LABEL,
-				DeleteArtifacts.DEFAULT_ICON_PATH, true);
+		CommandUtils.refreshCommand(menuManager, window, DeleteArtifacts.ID,
+				DeleteArtifacts.DEFAULT_LABEL, DeleteArtifacts.DEFAULT_ICON,
+				true);
 	}
 
 	private SelectionAdapter getSelectionAdapter(final int index) {
@@ -478,7 +481,7 @@ public class DistributionOverviewPage extends FormPage implements SlcNames {
 
 		// when table height is less than 200 px, we let the scroll bar on the
 		// scrollForm
-		// FIXME substract some spare space. Here is room for optimization
+		// FIXME substract some spare space. There is room here for optimization
 		gd.heightHint = Math.max(maxH - 35, 200);
 		gd.widthHint = Math.max(maxW - 35, 200);