branch develop updated (3227fb7 -> c21a13e)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from 3227fb7 Livrable #8234 Merge branch 'feature/8234' into develop new 0c1b909 Ajout toString to Caracteristic new 26cc892 Bien conserver l'ordre sur les caractéristiques (see #8233) new a700d11 Mettre à jour l'ordre des caractéristiques sur les actions ↑ et ↓ (See #8233) new c21a13e Livrable #8233 Merge branch 'feature/8233' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c21a13e40fb695d51536548f825b2b3f46c78f01 Merge: 0c1b909 a700d11 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:47:42 2016 +0200 Livrable #8233 Merge branch 'feature/8233' into develop 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) commit 26cc892d33c31d67ff3f1da2c2cbe3f7e571abc3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:47:10 2016 +0200 Bien conserver l'ordre sur les caractéristiques (see #8233) commit 0c1b909be415f90f156d46a09f31e6c6d361a10a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:45:58 2016 +0200 Ajout toString to Caracteristic Summary of changes: .../entities/referential/CaracteristicBean.java | 21 +++++++++++++++++++++ .../content/protocol/EditProtocolUIHandler.java | 11 +++++++++++ .../swing/content/protocol/EditProtocolUIModel.java | 6 +++--- .../actions/MoveDownCaracteristicMappingAction.java | 8 +++++--- .../actions/MoveUpCaracteristicMappingAction.java | 8 +++++--- 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 0c1b909be415f90f156d46a09f31e6c6d361a10a Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:45:58 2016 +0200 Ajout toString to Caracteristic --- .../entities/referential/CaracteristicBean.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java new file mode 100644 index 0000000..b87e179 --- /dev/null +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/CaracteristicBean.java @@ -0,0 +1,21 @@ +package fr.ifremer.tutti.persistence.entities.referential; + +import com.google.common.base.MoreObjects; + +public class CaracteristicBean extends AbstractCaracteristicBean { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return MoreObjects.toStringHelper(Caracteristic.class) + .add(PROPERTY_ID, getId()) + .add(PROPERTY_PARAMETER_NAME, getParameterName()) + .add(PROPERTY_METHOD_NAME, getMethodName()) + .add(PROPERTY_FRACTION_NAME, getFractionName()) + .add(PROPERTY_MATRIX_NAME, getMatrixName()) + .add(PROPERTY_CARACTERISTIC_TYPE, getCaracteristicType()) + .toString(); + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 26cc892d33c31d67ff3f1da2c2cbe3f7e571abc3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:47:10 2016 +0200 Bien conserver l'ordre sur les caractéristiques (see #8233) --- .../tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java index ef00278..45de970 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUIModel.java @@ -177,8 +177,8 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, */ protected final LinkedHashMap<String, MaturityCaracteristic> maturityCaracteristicsById = new LinkedHashMap<>(); - protected Map<Caracteristic, EditProtocolCaracteristicsRowModel> caracteristicMappingRows = - new HashMap<>(); + protected LinkedHashMap<Caracteristic, EditProtocolCaracteristicsRowModel> caracteristicMappingRows = + new LinkedHashMap<>(); protected List<EditProtocolOperationFieldsRowModel> operationFieldMappingRows = new ArrayList<>(); @@ -372,7 +372,7 @@ public class EditProtocolUIModel extends AbstractTuttiBeanUIModel<TuttiProtocol, } public void setCaracteristicMappingRows(List<EditProtocolCaracteristicsRowModel> caracteristicMappingRows) { - this.caracteristicMappingRows = new HashMap<>( + this.caracteristicMappingRows = new LinkedHashMap<>( Maps.uniqueIndex(caracteristicMappingRows, EditProtocolCaracteristicsRowModel::getPsfm) ); firePropertyChange(PROPERTY_CARACTERISTIC_MAPPING_ROWS, null, caracteristicMappingRows); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
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 c21a13e40fb695d51536548f825b2b3f46c78f01 Merge: 0c1b909 a700d11 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 04:47:42 2016 +0200 Livrable #8233 Merge branch 'feature/8233' into develop .../ui/swing/content/protocol/EditProtocolUIHandler.java | 11 +++++++++++ .../tutti/ui/swing/content/protocol/EditProtocolUIModel.java | 6 +++--- .../protocol/actions/MoveDownCaracteristicMappingAction.java | 8 +++++--- .../protocol/actions/MoveUpCaracteristicMappingAction.java | 8 +++++--- 4 files changed, 24 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm