This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit a700d112df57568d0bbd7decee5e4037c85a01d3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:47:39 2016 +0200 Mettre à jour l'ordre des caractéristiques sur les actions ↑ et ↓ (See #8233) --- .../ui/swing/content/protocol/EditProtocolUIHandler.java | 11 +++++++++++ .../protocol/actions/MoveDownCaracteristicMappingAction.java | 8 +++++--- .../protocol/actions/MoveUpCaracteristicMappingAction.java | 8 +++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java index 44f6503..bfeca14 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIHandler.java @@ -1531,6 +1531,17 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI col.setCellEditor(editor); } + public void permuteCaracteristics(int selectedRow, int newRow) { + + getCaracteristicMappingTableModel().permuteEntry(selectedRow, newRow); + getCaracteristicsMappingTable().getSelectionModel().setSelectionInterval(newRow, newRow); + + // Recompute + getModel().setCaracteristicMappingRows(getCaracteristicMappingTableModel().getRows()); + getModel().setModify(true); + + } + protected static class UpdateSelectedList implements PropertyChangeListener { private final BeanDoubleListModel<Caracteristic> model; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/MoveDownCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/MoveDownCaracteristicMappingAction.java index 94b82a8..9812d9e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/MoveDownCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/MoveDownCaracteristicMappingAction.java @@ -49,9 +49,11 @@ public class MoveDownCaracteristicMappingAction extends SimpleActionSupport<Edit Preconditions.checkState(selectedRow > -1); int newRow = selectedRow + 1; - ui.getHandler().getCaracteristicMappingTableModel().permuteEntry(selectedRow, newRow); - ui.getCaracteristicsMappingTable().getSelectionModel().setSelectionInterval(newRow, newRow); - ui.getModel().setModify(true); + ui.getHandler().permuteCaracteristics(selectedRow, newRow); + +// ui.getHandler().getCaracteristicMappingTableModel().permuteEntry(selectedRow, newRow); +// ui.getCaracteristicsMappingTable().getSelectionModel().setSelectionInterval(newRow, newRow); +// ui.getModel().setModify(true); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/MoveUpCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/MoveUpCaracteristicMappingAction.java index 730b556..9f7daaa 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/MoveUpCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/actions/MoveUpCaracteristicMappingAction.java @@ -50,9 +50,11 @@ public class MoveUpCaracteristicMappingAction extends SimpleActionSupport<EditPr int newRow = selectedRow - 1; - ui.getHandler().getCaracteristicMappingTableModel().permuteEntry(newRow, selectedRow); - ui.getCaracteristicsMappingTable().getSelectionModel().setSelectionInterval(newRow, newRow); - ui.getModel().setModify(true); + ui.getHandler().permuteCaracteristics(newRow, selectedRow); + +// ui.getHandler().getCaracteristicMappingTableModel().permuteEntry(newRow, selectedRow); +// ui.getCaracteristicsMappingTable().getSelectionModel().setSelectionInterval(newRow, newRow); +// ui.getModel().setModify(true); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.