Refactor monitor and exceptions

[lgpl/argeo-commons.git] / org.argeo.eclipse.ui / src / org / argeo / eclipse / ui / parts / LdifUsersTable.java

diff --git a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java
index 96f03bb8ab2fd86ad929df69b259d0bf7e6d195a..91e01d07a63b5f2cb4cb2e1f977a5184040b4c74 100644 (file)
--- a/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java
+++ b/org.argeo.eclipse.ui/src/org/argeo/eclipse/ui/parts/LdifUsersTable.java
@@ -3,8 +3,8 @@ package org.argeo.eclipse.ui.parts;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.argeo.ArgeoException;
 import org.argeo.eclipse.ui.ColumnDefinition;
+import org.argeo.eclipse.ui.EclipseUiException;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.eclipse.ui.utils.ViewerUtils;
 import org.eclipse.jface.layout.TableColumnLayout;
@@ -143,7 +143,7 @@ public abstract class LdifUsersTable extends Composite {
                        }
                        return result;
                } else
-                       throw new ArgeoException("Unvalid request: no selection column "
+                       throw new EclipseUiException("Unvalid request: no selection column "
                                        + "has been created for the current table");
        }
 
@@ -157,8 +157,8 @@ public abstract class LdifUsersTable extends Composite {
         * if relevant
         */
        public void refresh() {
-               String filter = hasFilter ? filterTxt.getText() : null;
-               if ("".equals(filter.trim()))
+               String filter = hasFilter ? filterTxt.getText().trim() : null;
+               if ("".equals(filter))
                        filter = null;
                refreshFilteredList(filter);
        }
@@ -174,7 +174,7 @@ public abstract class LdifUsersTable extends Composite {
        // for (Role role : roles)
        // users.add((User) role);
        // } catch (InvalidSyntaxException e) {
-       // throw new ArgeoException("Unable to get roles with filter: "
+       // throw new EclipseUiException("Unable to get roles with filter: "
        // + filter, e);
        // }
        // return users;
@@ -259,7 +259,6 @@ public abstract class LdifUsersTable extends Composite {
                // initialise the layout
                listener.refresh();
                moreLk.addSelectionListener(listener);
-
        }
 
        /** Overwrite to add static filters */
@@ -330,7 +329,7 @@ public abstract class LdifUsersTable extends Composite {
                table.setHeaderVisible(true);
 
                TableViewerColumn column;
-//             int offset = 0;
+               // int offset = 0;
                if (hasSelectionColumn) {
                        // offset = 1;
                        column = ViewerUtils.createTableViewerColumn(viewer, "", SWT.NONE,
@@ -343,6 +342,9 @@ public abstract class LdifUsersTable extends Composite {
                                        return null;
                                }
                        });
+                       layout.setColumnData(column.getColumn(), new ColumnWeightData(25,
+                                       25, false));
+
                        SelectionAdapter selectionAdapter = new SelectionAdapter() {
                                private static final long serialVersionUID = 1L;
 
@@ -360,7 +362,7 @@ public abstract class LdifUsersTable extends Composite {
 
                // NodeViewerComparator comparator = new NodeViewerComparator();
                // TODO enable the sort by click on the header
-//             int i = offset;
+               // int i = offset;
                for (ColumnDefinition colDef : columnDefs)
                        createTableColumn(viewer, layout, colDef);