Various small enhancements

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditableMultiStringProperty.java b/org.argeo.cms.ui/src/org/argeo/cms/forms/EditableMultiStringProperty.java
index e02bdeb930823ce41b77c3e454d6c1c0092e17b5..859f64b281222e818d347a64beb0360f97c87320 100644 (file)
--- a/org.argeo.cms.ui/src/org/argeo/cms/forms/EditableMultiStringProperty.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/forms/EditableMultiStringProperty.java
@@ -24,14 +24,13 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 
 /** Display, add or remove values from a list in a CMS context */
-public class EditableMultiStringProperty extends StyledControl implements
-               EditablePart {
+public class EditableMultiStringProperty extends StyledControl implements EditablePart {
        private static final long serialVersionUID = -7044614381252178595L;
 
        private String propertyName;
        private String message;
-       // TODO implement the ability to provide a list of legal values
-//     private String[] possibleValues;
+       // TODO implement the ability to provide a list of possible values
+       private String[] possibleValues;
        private boolean canEdit;
        private SelectionListener removeValueSL;
        private List<String> values;
@@ -44,15 +43,14 @@ public class EditableMultiStringProperty extends StyledControl implements
        private int btnHeight = 16;
        private int btnHorizontalIndent = 3;
 
-       public EditableMultiStringProperty(Composite parent, int style, Node node,
-                       String propertyName, List<String> values, String[] possibleValues,
-                       String addValueMsg, SelectionListener removeValueSelectionListener)
+       public EditableMultiStringProperty(Composite parent, int style, Node node, String propertyName, List<String> values,
+                       String[] possibleValues, String addValueMsg, SelectionListener removeValueSelectionListener)
                        throws RepositoryException {
                super(parent, style, node, true);
 
                this.propertyName = propertyName;
                this.values = values;
-//             this.possibleValues = possibleValues;
+               this.possibleValues = new String[]{"Un", "Deux", "Trois"};
                this.message = addValueMsg;
                this.canEdit = removeValueSelectionListener != null;
                this.removeValueSL = removeValueSelectionListener;
@@ -122,11 +120,9 @@ public class EditableMultiStringProperty extends StyledControl implements
                return label;
        }
 
-       private Composite createRemovableValue(Composite parent, int style,
-                       String value) {
+       private Composite createRemovableValue(Composite parent, int style, String value) {
                Composite valCmp = new Composite(parent, SWT.NO_FOCUS);
-               GridLayout gl = EclipseUiUtils.noSpaceGridLayout(new GridLayout(2,
-                               false));
+               GridLayout gl = EclipseUiUtils.noSpaceGridLayout(new GridLayout(2, false));
                gl.marginRight = oneValueMargingRight;
                valCmp.setLayout(gl);
 
@@ -135,8 +131,7 @@ public class EditableMultiStringProperty extends StyledControl implements
                Button deleteBtn = new Button(valCmp, SWT.FLAT);
                deleteBtn.setData(FormConstants.LINKED_VALUE, value);
                deleteBtn.addSelectionListener(removeValueSL);
-               CmsUtils.style(deleteBtn, FormStyle.delete.style()
-                               + FormStyle.BUTTON_SUFFIX);
+               CmsUtils.style(deleteBtn, FormStyle.delete.style() + FormStyle.BUTTON_SUFFIX);
                GridData gd = new GridData();
                gd.heightHint = btnHeight;
                gd.widthHint = btnWidth;
@@ -200,15 +195,12 @@ public class EditableMultiStringProperty extends StyledControl implements
                        return;
 
                if (values.contains(value))
-                       errMsg = "Dupplicated value: " + value
-                                       + ", please correct and try again";
+                       errMsg = "Dupplicated value: " + value + ", please correct and try again";
                if (errMsg != null)
-                       MessageDialog.openError(this.getShell(), "Addition not allowed",
-                                       errMsg);
+                       MessageDialog.openError(this.getShell(), "Addition not allowed", errMsg);
                else {
                        values.add(value);
-                       Composite newCmp = createRemovableValue(text.getParent(),
-                                       SWT.SINGLE, value);
+                       Composite newCmp = createRemovableValue(text.getParent(), SWT.SINGLE, value);
                        newCmp.moveAbove(text);
                        text.setText("");
                        newCmp.getParent().layout();

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java
index 7e8e94fb608479048666e19b96d343cbbfb98db5..370d9b9bdf43f7d0ff51732a16efae1850333d6e 100644 (file)
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/FsTableViewer.java
@@ -33,16 +33,15 @@ public class FsTableViewer extends TableViewer {
        public Table configureDefaultSingleColumnTable(int tableWidthHint) {
                Table table = this.getTable();
                table.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
-               table.setLinesVisible(true);
+               table.setLinesVisible(false);
                table.setHeaderVisible(false);
-//             CmsUtils.markup(table);
-//             CmsUtils.style(table, MaintenanceStyles.BROWSER_COLUMN);
+               // CmsUtils.markup(table);
+               // CmsUtils.style(table, MaintenanceStyles.BROWSER_COLUMN);
 
                TableViewerColumn column = new TableViewerColumn(this, SWT.NONE);
                TableColumn tcol = column.getColumn();
                tcol.setWidth(tableWidthHint);
                column.setLabelProvider(new FileIconNameLabelProvider());
-
                this.setContentProvider(new MyLazyCP());
                return table;
        }

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java
index 391f250eb70fcff5cf6c94ab2b89a6534a18a85e..68fc70b77dae92714aedbd87ef0c14ff51991b55 100644 (file)
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/NioFileLabelProvider.java
@@ -22,7 +22,10 @@ public class NioFileLabelProvider extends ColumnLabelProvider {
                try {
                        switch (propName) {
                        case FsUiConstants.PROPERTY_SIZE:
-                               return FsUiUtils.humanReadableByteCount(Files.size(path), false);
+                               if (Files.isDirectory(path))
+                                       return "-";
+                               else
+                                       return FsUiUtils.humanReadableByteCount(Files.size(path), false);
                        case FsUiConstants.PROPERTY_LAST_MODIFIED:
                                return Files.getLastModifiedTime(path).toString();
                        case FsUiConstants.PROPERTY_TYPE:

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/fldr_obj.gif b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/fldr_obj.gif
index 51e703b1b9c671baa2be0f6525edb3b69403370d..42e027c933103acb0bc3a6889b1ee253bdfa4657 100644 (file)
Binary files a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/fldr_obj.gif and b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/fs/fldr_obj.gif differ