Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3db9e63c by Tony CHEMIT at 2017-08-15T17:07:00+02:00 Dans les écrans de sélections de marées (export, backup, ...) il faudrait supprimer les programmes sans marée (See #847) - - - - - 5 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss - client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java @@ -74,9 +74,7 @@ public class SelectDataModel extends AdminActionModel { ObserveSwingDataSource dataSource = uiModel.getConfigModel().getSafeLocalSource(true); - if (dataSource.isLocal()) { - selectionDataModel.setShowEmptyTrips(false); - } + selectionDataModel.setShowEmptyTrips(false); boolean selectAllTrips = true; if (uiModel.containsOperation(AdminStep.REPORT)) { ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUI.jcss @@ -25,7 +25,6 @@ } #selectTree { - minimumSize:{UIHelper.newMinDimension()}; font-size:11; } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java @@ -25,11 +25,11 @@ import fr.ird.observe.client.I18nEnumHelper; import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.ObserveSwingTechnicalException; import fr.ird.observe.client.configuration.ClientConfig; +import fr.ird.observe.client.constants.ConnexionStatus; import fr.ird.observe.client.constants.CreationMode; import fr.ird.observe.client.constants.DbMode; import fr.ird.observe.client.db.ObserveDataSourcesManager; import fr.ird.observe.client.db.ObserveSwingDataSource; -import fr.ird.observe.client.constants.ConnexionStatus; import fr.ird.observe.client.ui.storage.tabs.SecurityModel; import fr.ird.observe.client.ui.tree.selection.SelectionTreeModel; import fr.ird.observe.client.ui.util.ProgressModel; @@ -1106,14 +1106,19 @@ public class StorageUIModel extends WizardModel<StorageStep> { public String getLabelWithUrl() { String txt; - if (DbMode.USE_LOCAL == dbMode) { - txt = h2Config.getDatabaseFile().getAbsolutePath(); - } else { - if (isRemote()) { + switch (dbMode) { + + case USE_LOCAL: + txt = h2Config.getDatabaseFile().getAbsolutePath(); + break; + case USE_SERVER: + txt = restConfig.getServerUrl() == null ? "" : restConfig.getServerUrl().toString(); + break; + case USE_REMOTE: txt = pgConfig.getJdbcUrl(); - } else { - txt = restConfig.getServerUrl().toString(); - } + break; + default: + throw new IllegalStateException(String.format("Can't have a such mode: %s", dbMode)); } return String.format("%s (%s)", getLabel(), txt); } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/SelectDataUI.jcss @@ -30,8 +30,6 @@ #selectTree { rootVisible:false; - largeModel:true; font-size:11; - toggleClickCount:100; } ===================================== client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTree.java +++ b/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; */ import fr.ird.observe.client.ui.ObserveKeyStrokes; +import fr.ird.observe.client.ui.UIHelper; import fr.ird.observe.client.ui.tree.selection.nodes.SelectionTreeNodeSupport; import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import javax.swing.AbstractAction; import javax.swing.ActionMap; import javax.swing.InputMap; @@ -46,7 +49,8 @@ public class SelectionTree extends JXTree { setRootVisible(false); setRowHeight(30); getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); - + setMinimumSize(UIHelper.newMinDimension()); + setToggleClickCount(100); } public void installUI() { @@ -57,13 +61,16 @@ public class SelectionTree extends JXTree { actionMap.put("select/unselect", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { - Object selectedRow = getLastSelectedPathComponent(); - if (selectedRow == null) { - return; - } + selectUnSelect(SelectionTree.this); + } + }); - SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow; - getTreeModel().setValueAt(node, !node.isSelected()); + addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + selectUnSelect(SelectionTree.this); + } } }); } @@ -78,27 +85,38 @@ public class SelectionTree extends JXTree { @Override public void actionPerformed(ActionEvent e) { - if (isFocusOwner()) { - forTree(SelectionTree.this); - } else { - forTree(oppositeTree); - } + selectUnSelectWithOpposite(oppositeTree); } - - private void forTree(SelectionTree tree) { - Object selectedRow = tree.getLastSelectedPathComponent(); - if (selectedRow == null) { - return; + }); + addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + if (e.getClickCount() == 2) { + selectUnSelectWithOpposite(oppositeTree); } - - SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow; - tree.getTreeModel().setValueAt(node, !node.isSelected()); } }); } + private void selectUnSelectWithOpposite(SelectionTree oppositeTree) { + if (isFocusOwner()) { + selectUnSelect(SelectionTree.this); + } else { + selectUnSelect(oppositeTree); + } + } + public SelectionTreeModel getTreeModel() { return (SelectionTreeModel) getModel(); } + private void selectUnSelect(SelectionTree tree) { + Object selectedRow = tree.getLastSelectedPathComponent(); + if (selectedRow == null) { + return; + } + + SelectionTreeNodeSupport node = (SelectionTreeNodeSupport) selectedRow; + tree.getTreeModel().setValueAt(node, !node.isSelected()); + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3db9e63c852da18d700a344cc33f... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3db9e63c852da18d700a344cc33f... You're receiving this email because of your account on gitlab.com.