This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4b7efb2105e9a90667277c15ad8e2d5fc904fddc Author: Kevin Morin <morin@codelutin.com> Date: Tue Dec 9 12:21:12 2014 +0100 correction de la suppression --- .../persistence/entities/protocol/TuttiProtocols.java | 3 +-- .../ui/swing/action/RemoveCaracteristicMappingAction.java | 14 +++++++++++++- .../tutti/ui/swing/content/protocol/EditProtocolUI.css | 1 - 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index eaeae66..bad4ce2 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -147,9 +147,8 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } protected static TuttiProtocol migrateProtocol(File file) { - //try to load a v2 try { - // try to load a v1 + //try to load a v2 TuttiProtocol2 tuttiProtocol2 = fromFileV2(file); TuttiProtocol result = fromTuttiProtocol2(tuttiProtocol2); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java index ce0732d..bc7eb03 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/RemoveCaracteristicMappingAction.java @@ -9,8 +9,12 @@ import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUI; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIHandler; import fr.ifremer.tutti.ui.swing.content.protocol.EditProtocolUIModel; import jaxx.runtime.SwingUtil; +import org.apache.commons.collections4.ComparatorUtils; import javax.swing.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -32,6 +36,8 @@ public class RemoveCaracteristicMappingAction extends AbstractTuttiAction<EditPr */ protected Set<EditProtocolCaracteristicsRowModel> removedRows; + protected List<Integer> removedRowIndexes; + public RemoveCaracteristicMappingAction(EditProtocolUIHandler handler) { super(handler, false); @@ -50,9 +56,12 @@ public class RemoveCaracteristicMappingAction extends AbstractTuttiAction<EditPr removedCarateristics = Sets.newHashSet(); removedRows = Sets.newHashSet(); + removedRowIndexes = new ArrayList<Integer>(); for (Integer rowIndex : SwingUtil.getSelectedModelRows(table)) { + removedRowIndexes.add(rowIndex); + // get row to remove EditProtocolCaracteristicsRowModel selectedRow = tableModel.getEntry(rowIndex); @@ -64,6 +73,8 @@ public class RemoveCaracteristicMappingAction extends AbstractTuttiAction<EditPr // mark row to be removed at the very last moment removedRows.add(selectedRow); } + + Collections.sort(removedRowIndexes, Collections.reverseOrder()); } @Override @@ -80,7 +91,8 @@ public class RemoveCaracteristicMappingAction extends AbstractTuttiAction<EditPr JTable table = handler.getCaracteristicsMappingTable(); EditProtocolCaracteristicsTableModel tableModel = (EditProtocolCaracteristicsTableModel) table.getModel(); - for (Integer rowIndex : SwingUtil.getSelectedModelRows(table)) { + + for (Integer rowIndex : removedRowIndexes) { tableModel.removeRow(rowIndex); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css index 5bd6f32..022ca7c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css @@ -97,7 +97,6 @@ JTextField { } #caracteristicsMappingTable { - selectionMode: {ListSelectionModel.SINGLE_SELECTION}; selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.