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 1ea908c5f39510427649a673aea7d7dda15c0e53 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 20 11:44:41 2014 +0100 fixes #6139: [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre --- ...wHelper.java => SpeciesAbleBatchRowHelper.java} | 13 +++-- .../catches/benthos/BenthosBatchTableModel.java | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 58 ++++++++++------------ .../catches/species/SpeciesBatchTableModel.java | 14 +++--- .../catches/species/SpeciesBatchUIHandler.java | 47 ++++++++---------- .../content/protocol/EditProtocolUIHandler.java | 10 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++-- 8 files changed, 84 insertions(+), 76 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java similarity index 96% rename from tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java rename to tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java index 35a9d06..49228d7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesBatchRowHelper.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java @@ -62,10 +62,10 @@ import static org.nuiton.i18n.I18n.t; * @author Tony Chemit <chemit@codelutin.com> * @since 3.0 */ -public class SpeciesBatchRowHelper { +public class SpeciesAbleBatchRowHelper { /** Logger. */ - private static final Log log = LogFactory.getLog(SpeciesBatchRowHelper.class); + private static final Log log = LogFactory.getLog(SpeciesAbleBatchRowHelper.class); public static final String SPECIES_DECORATOR = "decorator"; @@ -156,7 +156,7 @@ public class SpeciesBatchRowHelper { ButtonGroup buttonGroup = new ButtonGroup(); SpeciesDecoratorListener<R, T> speciesDecoratorListener = - new SpeciesDecoratorListener<R, T>(table, buttonGroup, optionalModel); + new SpeciesDecoratorListener<R, T>(table, buttonGroup, speciesColumn, optionalModel); TuttiDecorator<Species> decorator = getSpeciesColumnDecorator(speciesColumn); @@ -210,6 +210,10 @@ public class SpeciesBatchRowHelper { } } + public static TableColumnExt getSpeciesColumn(JXTable table) { + return (TableColumnExt) table.getColumns().get(1); + } + protected static class SpeciesDecoratorListener<R extends Serializable, T extends AbstractApplicationTableModel<R>> implements ActionListener { protected final JXTable table; @@ -224,11 +228,12 @@ public class SpeciesBatchRowHelper { public SpeciesDecoratorListener(JXTable table, ButtonGroup buttonGroup, + TableColumnExt speciesColumn, SpeciesSortableRowModel optionalModel) { this.table = table; this.buttonGroup = buttonGroup; this.optionalModel = optionalModel; - this.column = (TableColumnExt) table.getColumn(0); + this.column = speciesColumn; this.decorator = getSpeciesColumnDecorator(column); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java index 300023a..db9ea67 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java @@ -83,7 +83,7 @@ public class BenthosBatchTableModel extends AbstractApplicationTableModel<Bentho public static final ColumnIdentifier<BenthosBatchRowModel> SPECIES_TO_CONFIRM = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, - n("tutti.editBenthosBatch.table.header.toConfirm"), + "", /* I18n n'est pas capable de rendre une traduction vide et on le veut (voir https://forge.codelutin.com/issues/6067) */ n("tutti.editBenthosBatch.table.header.toConfirm.tip")); /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index 07e9b0f..dfcfa80 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -48,9 +48,9 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryColumnIdentifier; import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryComponent; +import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesAbleBatchRowHelper; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesBatchDecorator; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesBatchDecoratorComparator; -import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesBatchRowHelper; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.CreateBenthosBatchUI; @@ -59,7 +59,6 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.Ben import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUI; -import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -144,14 +143,14 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent public BenthosBatchUIHandler() { super( - SpeciesBatchRowModel.PROPERTY_SPECIES, - SpeciesBatchRowModel.PROPERTY_WEIGHT, - SpeciesBatchRowModel.PROPERTY_NUMBER, - SpeciesBatchRowModel.PROPERTY_SAMPLE_CATEGORY_WEIGHT, - SpeciesBatchRowModel.PROPERTY_COMMENT, - SpeciesBatchRowModel.PROPERTY_ATTACHMENT, - SpeciesBatchRowModel.PROPERTY_FREQUENCY, - SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM); + BenthosBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, + BenthosBatchRowModel.PROPERTY_SPECIES, + BenthosBatchRowModel.PROPERTY_WEIGHT, + BenthosBatchRowModel.PROPERTY_NUMBER, + BenthosBatchRowModel.PROPERTY_SAMPLE_CATEGORY_WEIGHT, + BenthosBatchRowModel.PROPERTY_COMMENT, + BenthosBatchRowModel.PROPERTY_ATTACHMENT, + BenthosBatchRowModel.PROPERTY_FREQUENCY); // qualitative_unsorted_id = // getContext().getPersistenceService().getEnumerationFile().QUALITATIVE_UNSORTED_ID; @@ -269,10 +268,10 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent SpeciesSortMode speciesSortMode = model.getSpeciesSortMode(); SpeciesBatchDecoratorComparator comparator = getSpeciesRowComparator(); - SpeciesBatchRowHelper.sortSpeciesRows(comparator, - decorator, - rows, - speciesSortMode); + SpeciesAbleBatchRowHelper.sortSpeciesRows(comparator, + decorator, + rows, + speciesSortMode); } model.setRows(rows); @@ -762,6 +761,13 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent Color computedDataColor = getConfig().getColorComputedWeights(); + { // Species to confirm column + + addBooleanColumnToModel(columnModel, + BenthosBatchTableModel.SPECIES_TO_CONFIRM, + getTable()); + } + { // Species column TableColumnExt speciesColumn = addColumnToModel( @@ -772,7 +778,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent speciesColumn.setSortable(true); SpeciesBatchDecorator<BenthosBatchRowModel> speciesDecorator = SpeciesBatchDecorator.newDecorator(); - speciesColumn.putClientProperty(SpeciesBatchRowHelper.SPECIES_DECORATOR, speciesDecorator); + speciesColumn.putClientProperty(SpeciesAbleBatchRowHelper.SPECIES_DECORATOR, speciesDecorator); speciesColumn.setCellRenderer(newTableCellRender(speciesDecorator)); } @@ -831,13 +837,6 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent BenthosBatchTableModel.ATTACHMENT); } - { // Species to confirm column - - addBooleanColumnToModel(columnModel, - BenthosBatchTableModel.SPECIES_TO_CONFIRM, - getTable()); - } - // create table model BenthosBatchTableModel tableModel = new BenthosBatchTableModel(weightUnit, @@ -912,8 +911,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent table.getTableHeader().setReorderingAllowed(false); // get species column - final TableColumnExt speciesColumn = - (TableColumnExt) table.getColumns().get(0); + final TableColumnExt speciesColumn = SpeciesAbleBatchRowHelper.getSpeciesColumn(table); // when model change, then rebuild the species comparator + set model as modified tableModel.addTableModelListener(new TableModelListener() { @@ -940,7 +938,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent }); // create popup to change species decorator - SpeciesBatchRowHelper.installSpeciesColumnComparatorPopup( + SpeciesAbleBatchRowHelper.installSpeciesColumnComparatorPopup( table, speciesColumn, getModel(), @@ -994,7 +992,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent saveRow(newRow); - int insertIndex = SpeciesBatchRowHelper.getIndexToInsert( + int insertIndex = SpeciesAbleBatchRowHelper.getIndexToInsert( tableModel.getRows(), newRow, getModel().getSpeciesSortMode(), @@ -1708,8 +1706,7 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent } protected SpeciesBatchDecoratorComparator<BenthosBatchRowModel> getSpeciesRowComparator() { - TableColumnExt speciesColumn = - (TableColumnExt) getTable().getColumns().get(0); + TableColumnExt speciesColumn = SpeciesAbleBatchRowHelper.getSpeciesColumn(getTable()); SpeciesBatchDecoratorComparator<BenthosBatchRowModel> comparator = (SpeciesBatchDecoratorComparator<BenthosBatchRowModel>) speciesColumn.getComparator(); @@ -1732,10 +1729,9 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent } protected SpeciesBatchDecorator<BenthosBatchRowModel> getSpeciesColumnDecorator() { - TableColumnExt speciesColumn = - (TableColumnExt) getTable().getColumns().get(0); + TableColumnExt speciesColumn = SpeciesAbleBatchRowHelper.getSpeciesColumn(getTable()); SpeciesBatchDecorator<BenthosBatchRowModel> decorator = - (SpeciesBatchDecorator<BenthosBatchRowModel>) SpeciesBatchRowHelper.getSpeciesColumnDecorator(speciesColumn); + (SpeciesBatchDecorator<BenthosBatchRowModel>) SpeciesAbleBatchRowHelper.getSpeciesColumnDecorator(speciesColumn); return decorator; } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java index 1ed02e4..9bfcb04 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java @@ -59,32 +59,32 @@ public class SpeciesBatchTableModel extends AbstractApplicationTableModel<Specie public static final ColumnIdentifier<SpeciesBatchRowModel> SPECIES = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SPECIES_ROW, n("tutti.editSpeciesBatch.table.header.species"), - n("tutti.editSpeciesBatch.table.header.species")); + n("tutti.editSpeciesBatch.table.header.species.tip")); public static final ColumnIdentifier<SpeciesBatchRowModel> WEIGHT = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMPUTED_WEIGHT, n("tutti.editSpeciesBatch.table.header.weight"), - n("tutti.editSpeciesBatch.table.header.weight")); + n("tutti.editSpeciesBatch.table.header.weight.tip")); public static final ColumnIdentifier<SpeciesBatchRowModel> COMPUTED_NUMBER = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMPUTED_NUMBER, n("tutti.editSpeciesBatch.table.header.computedNumber"), - n("tutti.editSpeciesBatch.table.header.computedNumber")); + n("tutti.editSpeciesBatch.table.header.computedNumber.tip")); public static final ColumnIdentifier<SpeciesBatchRowModel> COMMENT = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMMENT, n("tutti.editSpeciesBatch.table.header.comment"), - n("tutti.editSpeciesBatch.table.header.comment")); + n("tutti.editSpeciesBatch.table.header.comment.tip")); public static final ColumnIdentifier<SpeciesBatchRowModel> ATTACHMENT = ColumnIdentifier.newReadOnlyId( SpeciesBatchRowModel.PROPERTY_ATTACHMENT, n("tutti.editSpeciesBatch.table.header.file"), - n("tutti.editSpeciesBatch.table.header.file")); + n("tutti.editSpeciesBatch.table.header.file.tip")); public static final ColumnIdentifier<SpeciesBatchRowModel> SPECIES_TO_CONFIRM = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, - n("tutti.editSpeciesBatch.table.header.toConfirm"), - n("tutti.editSpeciesBatch.table.header.toConfirm")); + "", /* I18n n'est pas capable de rendre une traduction vide et on le veut (voir https://forge.codelutin.com/issues/6067) */ + n("tutti.editSpeciesBatch.table.header.toConfirm.tip")); /** * Columns for the frequency edition. diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 469b18e..0145b78 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -50,7 +50,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryColumnI import fr.ifremer.tutti.ui.swing.content.operation.catches.SampleCategoryComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesBatchDecorator; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesBatchDecoratorComparator; -import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesBatchRowHelper; +import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesAbleBatchRowHelper; import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.TableViewMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI; @@ -142,14 +142,14 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec protected Integer qualitative_unsorted_id; public SpeciesBatchUIHandler() { - super(SpeciesBatchRowModel.PROPERTY_SPECIES, + super(SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM, + SpeciesBatchRowModel.PROPERTY_SPECIES, SpeciesBatchRowModel.PROPERTY_WEIGHT, SpeciesBatchRowModel.PROPERTY_NUMBER, SpeciesBatchRowModel.PROPERTY_COMMENT, SpeciesBatchRowModel.PROPERTY_ATTACHMENT, SpeciesBatchRowModel.PROPERTY_SAMPLE_CATEGORY_WEIGHT, - SpeciesBatchRowModel.PROPERTY_FREQUENCY, - SpeciesBatchRowModel.PROPERTY_SPECIES_TO_CONFIRM); + SpeciesBatchRowModel.PROPERTY_FREQUENCY); } //------------------------------------------------------------------------// @@ -223,10 +223,10 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec SpeciesSortMode speciesSortMode = model.getSpeciesSortMode(); SpeciesBatchDecoratorComparator comparator = getSpeciesRowComparator(); - SpeciesBatchRowHelper.sortSpeciesRows(comparator, - decorator, - rows, - speciesSortMode); + SpeciesAbleBatchRowHelper.sortSpeciesRows(comparator, + decorator, + rows, + speciesSortMode); } model.setRows(rows); @@ -718,6 +718,13 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec Color computedDataColor = getConfig().getColorComputedWeights(); + { // Species to confirm column + + addBooleanColumnToModel(columnModel, + SpeciesBatchTableModel.SPECIES_TO_CONFIRM, + getTable()); + } + { // Species column TableColumnExt speciesColumn = addColumnToModel( @@ -728,7 +735,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec speciesColumn.setSortable(true); SpeciesBatchDecorator<SpeciesBatchRowModel> speciesDecorator = SpeciesBatchDecorator.newDecorator(); - speciesColumn.putClientProperty(SpeciesBatchRowHelper.SPECIES_DECORATOR, speciesDecorator); + speciesColumn.putClientProperty(SpeciesAbleBatchRowHelper.SPECIES_DECORATOR, speciesDecorator); speciesColumn.setCellRenderer(newTableCellRender(speciesDecorator)); } @@ -788,13 +795,6 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec SpeciesBatchTableModel.ATTACHMENT); } - { // Species to confirm column - - addBooleanColumnToModel(columnModel, - SpeciesBatchTableModel.SPECIES_TO_CONFIRM, - getTable()); - } - // create table model SpeciesBatchTableModel tableModel = new SpeciesBatchTableModel(weightUnit, @@ -869,8 +869,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec table.getTableHeader().setReorderingAllowed(false); // get the species column - final TableColumnExt speciesColumn = - (TableColumnExt) table.getColumns().get(0); + final TableColumnExt speciesColumn = SpeciesAbleBatchRowHelper.getSpeciesColumn(table); // when model change, then rebuild the species comparator + set model as modified @@ -901,7 +900,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec }); // create popup to change species decorator - SpeciesBatchRowHelper.installSpeciesColumnComparatorPopup( + SpeciesAbleBatchRowHelper.installSpeciesColumnComparatorPopup( table, speciesColumn, getModel(), @@ -954,7 +953,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec saveRow(newRow); - int insertIndex = SpeciesBatchRowHelper.getIndexToInsert( + int insertIndex = SpeciesAbleBatchRowHelper.getIndexToInsert( tableModel.getRows(), newRow, getModel().getSpeciesSortMode(), @@ -1673,8 +1672,7 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec } protected SpeciesBatchDecoratorComparator<SpeciesBatchRowModel> getSpeciesRowComparator() { - TableColumnExt speciesColumn = - (TableColumnExt) getTable().getColumns().get(0); + TableColumnExt speciesColumn = SpeciesAbleBatchRowHelper.getSpeciesColumn(getTable()); SpeciesBatchDecoratorComparator<SpeciesBatchRowModel> comparator = (SpeciesBatchDecoratorComparator<SpeciesBatchRowModel>) speciesColumn.getComparator(); @@ -1697,10 +1695,9 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec } protected SpeciesBatchDecorator<SpeciesBatchRowModel> getSpeciesColumnDecorator() { - TableColumnExt speciesColumn = - (TableColumnExt) getTable().getColumns().get(0); + TableColumnExt speciesColumn = SpeciesAbleBatchRowHelper.getSpeciesColumn(getTable()); SpeciesBatchDecorator<SpeciesBatchRowModel> decorator = - (SpeciesBatchDecorator<SpeciesBatchRowModel>) SpeciesBatchRowHelper.getSpeciesColumnDecorator(speciesColumn); + (SpeciesBatchDecorator<SpeciesBatchRowModel>) SpeciesAbleBatchRowHelper.getSpeciesColumnDecorator(speciesColumn); return decorator; } 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 00a6950..d14a898 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 @@ -40,7 +40,7 @@ import fr.ifremer.tutti.service.TuttiDecorator; import fr.ifremer.tutti.ui.swing.action.CloneProtocolAction; import fr.ifremer.tutti.ui.swing.action.EditProtocolAction; import fr.ifremer.tutti.ui.swing.action.ImportProtocolAction; -import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesBatchRowHelper; +import fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesAbleBatchRowHelper; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; @@ -302,7 +302,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel.SPECIES_ID); speciesColumn.setSortable(true); DecoratorService.SpeciesDecorator speciesDecorator = new DecoratorService.SpeciesDecorator(); - speciesColumn.putClientProperty(SpeciesBatchRowHelper.SPECIES_DECORATOR, speciesDecorator); + speciesColumn.putClientProperty(SpeciesAbleBatchRowHelper.SPECIES_DECORATOR, speciesDecorator); speciesColumn.setCellRenderer(newTableCellRender(speciesDecorator)); TableColumnExt speciesSurveyCodeColumn = addColumnToModel(columnModel, @@ -361,7 +361,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI EditProtocolSpeciesTableModel.SPECIES_ID); speciesColumn.setSortable(true); DecoratorService.SpeciesDecorator speciesDecorator = new DecoratorService.SpeciesDecorator(); - speciesColumn.putClientProperty(SpeciesBatchRowHelper.SPECIES_DECORATOR, speciesDecorator); + speciesColumn.putClientProperty(SpeciesAbleBatchRowHelper.SPECIES_DECORATOR, speciesDecorator); speciesColumn.setCellRenderer(newTableCellRender(speciesDecorator)); TableColumnExt speciesSurveyCodeColumn = addColumnToModel(columnModel, @@ -728,7 +728,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI // get column comparator TuttiDecorator<Species> decorator = - SpeciesBatchRowHelper.getSpeciesColumnDecorator(tableColumn); + SpeciesAbleBatchRowHelper.getSpeciesColumnDecorator(tableColumn); boolean comparatorNull = comparator == null; if (comparatorNull) { @@ -751,7 +751,7 @@ public class EditProtocolUIHandler extends AbstractTuttiUIHandler<EditProtocolUI // create popup to change species decorator - SpeciesBatchRowHelper.installSpeciesColumnComparatorPopup( + SpeciesAbleBatchRowHelper.installSpeciesColumnComparatorPopup( table, speciesColumn, null, diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index f8de42f..19c52a5 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1120,11 +1120,17 @@ tutti.editSpeciesBatch.split.weightNotNull.help= tutti.editSpeciesBatch.split.weightNotNull.message= tutti.editSpeciesBatch.split.weightNotNull.title= tutti.editSpeciesBatch.table.header.comment= +tutti.editSpeciesBatch.table.header.comment.tip= tutti.editSpeciesBatch.table.header.computedNumber= +tutti.editSpeciesBatch.table.header.computedNumber.tip= tutti.editSpeciesBatch.table.header.file= +tutti.editSpeciesBatch.table.header.file.tip= tutti.editSpeciesBatch.table.header.species= +tutti.editSpeciesBatch.table.header.species.tip= tutti.editSpeciesBatch.table.header.toConfirm= +tutti.editSpeciesBatch.table.header.toConfirm.tip= tutti.editSpeciesBatch.table.header.weight= +tutti.editSpeciesBatch.table.header.weight.tip= tutti.editSpeciesBatch.title.changeSampleCategoryValue= tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic= tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index b9c2f76..6733bda 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -469,8 +469,7 @@ tutti.editBenthosBatch.table.header.file=Pièces jointes tutti.editBenthosBatch.table.header.file.tip=Pièces jointes associées à la ligne tutti.editBenthosBatch.table.header.species=Espèce tutti.editBenthosBatch.table.header.species.tip=Code campagne ou code Rubin – Nom scientifique -tutti.editBenthosBatch.table.header.toConfirm=A Confirmer -tutti.editBenthosBatch.table.header.toConfirm.tip=Case à cocher si il y a un doute sur l'identification de l'espèce +tutti.editBenthosBatch.table.header.toConfirm.tip=Case à cocher pour marquer le lot tutti.editBenthosBatch.table.header.weight=Poids sous-échantillonné tutti.editBenthosBatch.table.header.weight.tip=Poids du lot mesuré ou dénombré tutti.editBenthosBatch.title.changeSampleCategoryValue=Changer la valeur de la catégorie %s @@ -1093,11 +1092,16 @@ tutti.editSpeciesBatch.split.weightNotNull.help=Que voulez-vous faire ? <ul><li> tutti.editSpeciesBatch.split.weightNotNull.message=Pour catégoriser un lot, il ne doit pas avoir de poids sous-échantillonné tutti.editSpeciesBatch.split.weightNotNull.title=Poids sous-échantillonné non nul tutti.editSpeciesBatch.table.header.comment=Commentaire +tutti.editSpeciesBatch.table.header.comment.tip=Commentaire sur la ligne tutti.editSpeciesBatch.table.header.computedNumber=Tailles/Poids ou Nombre +tutti.editSpeciesBatch.table.header.computedNumber.tip=Tailles/Poids ou Nombre d'individus dans le lot tutti.editSpeciesBatch.table.header.file=Pièces jointes +tutti.editSpeciesBatch.table.header.file.tip=Pièces jointes associées à la ligne tutti.editSpeciesBatch.table.header.species=Espèce -tutti.editSpeciesBatch.table.header.toConfirm=A Confirmer +tutti.editSpeciesBatch.table.header.species.tip=Code campagne ou code Rubin – Nom scientifique +tutti.editSpeciesBatch.table.header.toConfirm.tip=Case à cocher pour marquer le lot tutti.editSpeciesBatch.table.header.weight=Poids sous-échantillonné +tutti.editSpeciesBatch.table.header.weight.tip=Poids du lot mesuré ou dénombré tutti.editSpeciesBatch.title.changeSampleCategoryValue=Changer la valeur de la catégorie %s tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic=... tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic=. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.