Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

5 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java
    ... ... @@ -74,9 +74,7 @@ public class SelectDataModel extends AdminActionModel {
    74 74
    75 75 
             ObserveSwingDataSource dataSource = uiModel.getConfigModel().getSafeLocalSource(true);
    76 76
    77 
    -        if (dataSource.isLocal()) {
    78 
    -            selectionDataModel.setShowEmptyTrips(false);
    79 
    -        }
    77 
    +        selectionDataModel.setShowEmptyTrips(false);
    80 78
    81 79 
             boolean selectAllTrips = true;
    82 80 
             if (uiModel.containsOperation(AdminStep.REPORT)) {

  • client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss
    ... ... @@ -25,7 +25,6 @@
    25 25 
     }
    26 26
    27 27 
     #selectTree {
    28 
    -  minimumSize:{UIHelper.newMinDimension()};
    29 28 
       font-size:11;
    30 29 
     }
    31 30

  • client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java
    ... ... @@ -25,11 +25,11 @@ import fr.ird.observe.client.I18nEnumHelper;
    25 25 
     import fr.ird.observe.client.ObserveSwingApplicationContext;
    26 26 
     import fr.ird.observe.client.ObserveSwingTechnicalException;
    27 27 
     import fr.ird.observe.client.configuration.ClientConfig;
    28 
    +import fr.ird.observe.client.constants.ConnexionStatus;
    28 29 
     import fr.ird.observe.client.constants.CreationMode;
    29 30 
     import fr.ird.observe.client.constants.DbMode;
    30 31 
     import fr.ird.observe.client.db.ObserveDataSourcesManager;
    31 32 
     import fr.ird.observe.client.db.ObserveSwingDataSource;
    32 
    -import fr.ird.observe.client.constants.ConnexionStatus;
    33 33 
     import fr.ird.observe.client.ui.storage.tabs.SecurityModel;
    34 34 
     import fr.ird.observe.client.ui.tree.selection.SelectionTreeModel;
    35 35 
     import fr.ird.observe.client.ui.util.ProgressModel;
    ... ... @@ -1106,14 +1106,19 @@ public class StorageUIModel extends WizardModel<StorageStep> {
    1106 1106
    1107 1107 
         public String getLabelWithUrl() {
    1108 1108 
             String txt;
    1109 
    -        if (DbMode.USE_LOCAL == dbMode) {
    1110 
    -            txt = h2Config.getDatabaseFile().getAbsolutePath();
    1111 
    -        } else {
    1112 
    -            if (isRemote()) {
    1109 
    +        switch (dbMode) {
    1110 
    +
    1111 
    +            case USE_LOCAL:
    1112 
    +                txt = h2Config.getDatabaseFile().getAbsolutePath();
    1113 
    +                break;
    1114 
    +            case USE_SERVER:
    1115 
    +                txt = restConfig.getServerUrl() == null ? "" : restConfig.getServerUrl().toString();
    1116 
    +                break;
    1117 
    +            case USE_REMOTE:
    1113 1118 
                     txt = pgConfig.getJdbcUrl();
    1114 
    -            } else {
    1115 
    -                txt = restConfig.getServerUrl().toString();
    1116 
    -            }
    1119 
    +                break;
    1120 
    +            default:
    1121 
    +                throw new IllegalStateException(String.format("Can't have a such mode: %s", dbMode));
    1117 1122 
             }
    1118 1123 
             return String.format("%s (%s)", getLabel(), txt);
    1119 1124 
         }

  • client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss
    ... ... @@ -30,8 +30,6 @@
    30 30
    31 31 
     #selectTree {
    32 32 
       rootVisible:false;
    33 
    -  largeModel:true;
    34 33 
       font-size:11;
    35 
    -  toggleClickCount:100;
    36 34 
     }
    37 35

  • client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java
    ... ... @@ -23,8 +23,11 @@ package fr.ird.observe.client.ui.tree.selection;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.ui.ObserveKeyStrokes;
    26 
    +import fr.ird.observe.client.ui.UIHelper;
    26 27 
     import fr.ird.observe.client.ui.tree.selection.nodes.SelectionTreeNodeSupport;
    27 28 
     import java.awt.event.ActionEvent;
    29 
    +import java.awt.event.MouseAdapter;
    30 
    +import java.awt.event.MouseEvent;
    28 31 
     import javax.swing.AbstractAction;
    29 32 
     import javax.swing.ActionMap;
    30 33 
     import javax.swing.InputMap;
    ... ... @@ -46,7 +49,8 @@ public class SelectionTree extends JXTree {
    46 49 
             setRootVisible(false);
    47 50 
             setRowHeight(30);
    48 51 
             getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
    49 
    -
    52 
    +        setMinimumSize(UIHelper.newMinDimension());
    53 
    +        setToggleClickCount(100);
    50 54 
         }
    51 55
    52 56 
         public void installUI() {
    ... ... @@ -57,13 +61,16 @@ public class SelectionTree extends JXTree {
    57 61 
             actionMap.put("select/unselect", new AbstractAction() {
    58 62 
                 @Override
    59 63 
                 public void actionPerformed(ActionEvent e) {
    60 
    -                Object selectedRow = getLastSelectedPathComponent();
    61 
    -                if (selectedRow == null) {
    62 
    -                    return;
    63 
    -                }
    64 
    +                selectUnSelect(SelectionTree.this);
    65 
    +            }
    66 
    +        });
    64 67
    65 
    -                SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow;
    66 
    -                getTreeModel().setValueAt(node, !node.isSelected());
    68 
    +        addMouseListener(new MouseAdapter() {
    69 
    +            @Override
    70 
    +            public void mouseClicked(MouseEvent e) {
    71 
    +                if (e.getClickCount() == 2) {
    72 
    +                    selectUnSelect(SelectionTree.this);
    73 
    +                }
    67 74 
                 }
    68 75 
             });
    69 76 
         }
    ... ... @@ -78,27 +85,38 @@ public class SelectionTree extends JXTree {
    78 85
    79 86 
                 @Override
    80 87 
                 public void actionPerformed(ActionEvent e) {
    81 
    -                if (isFocusOwner()) {
    82 
    -                    forTree(SelectionTree.this);
    83 
    -                } else {
    84 
    -                    forTree(oppositeTree);
    85 
    -                }
    88 
    +                selectUnSelectWithOpposite(oppositeTree);
    86 89 
                 }
    87 
    -
    88 
    -            private void forTree(SelectionTree tree) {
    89 
    -                Object selectedRow = tree.getLastSelectedPathComponent();
    90 
    -                if (selectedRow == null) {
    91 
    -                    return;
    90 
    +        });
    91 
    +        addMouseListener(new MouseAdapter() {
    92 
    +            @Override
    93 
    +            public void mouseClicked(MouseEvent e) {
    94 
    +                if (e.getClickCount() == 2) {
    95 
    +                    selectUnSelectWithOpposite(oppositeTree);
    92 96 
                     }
    93 
    -
    94 
    -                SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow;
    95 
    -                tree.getTreeModel().setValueAt(node, !node.isSelected());
    96 97 
                 }
    97 98 
             });
    98 99 
         }
    99 100
    101 
    +    private void selectUnSelectWithOpposite(SelectionTree oppositeTree) {
    102 
    +        if (isFocusOwner()) {
    103 
    +            selectUnSelect(SelectionTree.this);
    104 
    +        } else {
    105 
    +            selectUnSelect(oppositeTree);
    106 
    +        }
    107 
    +    }
    108 
    +
    100 109 
         public SelectionTreeModel getTreeModel() {
    101 110 
             return (SelectionTreeModel) getModel();
    102 111 
         }
    103 112
    113 
    +    private void selectUnSelect(SelectionTree tree) {
    114 
    +        Object selectedRow = tree.getLastSelectedPathComponent();
    115 
    +        if (selectedRow == null) {
    116 
    +            return;
    117 
    +        }
    118 
    +
    119 
    +        SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow;
    120 
    +        tree.getTreeModel().setValueAt(node, !node.isSelected());
    121 
    +    }
    104 122 
     }

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.