branch develop updated (242dea7 -> d49e9c6)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 242dea7 fixes #6374 Test sur l'import du protocole qui ne fonctionne pas new eab1503 can save jdbc url new d49e9c6 fixes #6573: [CAPUTRE] Ajout de la colonne Id The 2 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 d49e9c6351c205eeec69017645f81148f99d76dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 28 18:03:57 2015 +0100 fixes #6573: [CAPUTRE] Ajout de la colonne Id commit eab15035d9843276aba1a08be5ee9ba1b036fb35 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 28 17:55:56 2015 +0100 can save jdbc url Summary of changes: startLocalDbAsServer.sh | 6 ++++++ .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 3 ++- .../operation/catches/SpeciesAbleBatchRowHelper.java | 2 +- .../catches/accidental/AccidentalBatchTableModel.java | 13 +++++++++---- .../catches/accidental/AccidentalBatchUIHandler.java | 9 ++++++++- .../operation/catches/benthos/BenthosBatchTableModel.java | 10 +++++++--- .../operation/catches/benthos/BenthosBatchUIHandler.java | 15 +++++++++++++-- .../IndividualObservationBatchTableModel.java | 9 +++++++-- .../IndividualObservationBatchUIHandler.java | 13 ++++++++++--- .../catches/marinelitter/MarineLitterBatchTableModel.java | 11 ++++++++--- .../catches/marinelitter/MarineLitterBatchUIHandler.java | 7 +++++++ .../operation/catches/species/SpeciesBatchTableModel.java | 10 +++++++--- .../operation/catches/species/SpeciesBatchUIHandler.java | 15 +++++++++++++-- .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++++++++++ .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++++++++++ 15 files changed, 118 insertions(+), 25 deletions(-) create mode 100755 startLocalDbAsServer.sh -- 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 http://git.codelutin.com/tutti.git commit eab15035d9843276aba1a08be5ee9ba1b036fb35 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 28 17:55:56 2015 +0100 can save jdbc url --- startLocalDbAsServer.sh | 6 ++++++ .../src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/startLocalDbAsServer.sh b/startLocalDbAsServer.sh new file mode 100755 index 0000000..3bc8d0e --- /dev/null +++ b/startLocalDbAsServer.sh @@ -0,0 +1,6 @@ +#! /bin/sh + +# To add in ~/.config/tutti.config +# tutti.persistence.jdbc.url=jdbc:hsqldb:hsql://localhost/allegro + +( cd ~/.tutti/data ; java -classpath ~/.m2/repository/hsqldb/hsqldb/1.8.1.3/hsqldb-1.8.1.3.jar org.hsqldb.Server -database.0 file:db/allegro -dbname.0 allegro ) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 2649825..4dafae8 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -149,7 +149,8 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { "tutti.persistence.jdbc.url", n("tutti.config.option.persistence.jdbc.url.description"), "jdbc:hsqldb:file:${tutti.persistence.db.directory}/${tutti.persistence.db.name}", - String.class), + String.class, + false), JDBC_DRIVER( "tutti.persistence.jdbc.driver", -- 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 http://git.codelutin.com/tutti.git commit d49e9c6351c205eeec69017645f81148f99d76dd Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 28 18:03:57 2015 +0100 fixes #6573: [CAPUTRE] Ajout de la colonne Id --- .../operation/catches/SpeciesAbleBatchRowHelper.java | 2 +- .../catches/accidental/AccidentalBatchTableModel.java | 13 +++++++++---- .../catches/accidental/AccidentalBatchUIHandler.java | 9 ++++++++- .../operation/catches/benthos/BenthosBatchTableModel.java | 10 +++++++--- .../operation/catches/benthos/BenthosBatchUIHandler.java | 15 +++++++++++++-- .../IndividualObservationBatchTableModel.java | 9 +++++++-- .../IndividualObservationBatchUIHandler.java | 13 ++++++++++--- .../catches/marinelitter/MarineLitterBatchTableModel.java | 11 ++++++++--- .../catches/marinelitter/MarineLitterBatchUIHandler.java | 7 +++++++ .../operation/catches/species/SpeciesBatchTableModel.java | 10 +++++++--- .../operation/catches/species/SpeciesBatchUIHandler.java | 15 +++++++++++++-- .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 10 ++++++++++ .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++++++++++ 13 files changed, 110 insertions(+), 24 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java index 871b08a..fc641e8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SpeciesAbleBatchRowHelper.java @@ -214,7 +214,7 @@ public class SpeciesAbleBatchRowHelper { } public static TableColumnExt getSpeciesColumn(JXTable table) { - return (TableColumnExt) table.getColumns().get(1); + return (TableColumnExt) table.getColumns().get(2); } /** diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java index 00d0636..9c43563 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java @@ -22,11 +22,11 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.accidental; * #L% */ -import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; -import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchRowModel; import fr.ifremer.tutti.type.WeightUnit; -import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; +import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchRowModel; import org.jdesktop.swingx.table.TableColumnModelExt; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import static org.nuiton.i18n.I18n.n; @@ -38,6 +38,11 @@ public class AccidentalBatchTableModel extends AbstractApplicationTableModel<Acc private static final long serialVersionUID = 1L; + public static final ColumnIdentifier<AccidentalBatchRowModel> ID = ColumnIdentifier.newId( + AccidentalBatchRowModel.PROPERTY_ID, + n("tutti.editAccidentalBatch.table.header.id"), + n("tutti.editAccidentalBatch.table.header.id.tip")); + public static final ColumnIdentifier<AccidentalBatchRowModel> SPECIES = ColumnIdentifier.newId( AccidentalBatchRowModel.PROPERTY_SPECIES, n("tutti.editAccidentalBatch.table.header.species"), @@ -94,7 +99,7 @@ public class AccidentalBatchTableModel extends AbstractApplicationTableModel<Acc TableColumnModelExt columnModel) { super(columnModel, false, false); this.weightUnit = weightUnit; - setNoneEditableCols(); + setNoneEditableCols(ID); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java index 1badc5f..e1a751c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java @@ -59,7 +59,7 @@ import org.nuiton.decorator.Decorator; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.NuitonValidatorResult; -import javax.swing.*; +import javax.swing.JComponent; import java.util.List; /** @@ -252,6 +252,13 @@ public class AccidentalBatchUIHandler getDecorator(CaracteristicQualitativeValue.class, null); { + // Id column + + addIntegerColumnToModel(columnModel, AccidentalBatchTableModel.ID, TuttiUI.INT_10_DIGITS_PATTERN, table); + + } + + { // Species column Decorator<Species> speciesDecorator = getDecorator( 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 db9ea67..bcb388e 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 @@ -53,8 +53,12 @@ public class BenthosBatchTableModel extends AbstractApplicationTableModel<Bentho private static final long serialVersionUID = 1L; /** Logger. */ - private static final Log log = - LogFactory.getLog(BenthosBatchTableModel.class); + private static final Log log = LogFactory.getLog(BenthosBatchTableModel.class); + + public static final ColumnIdentifier<BenthosBatchRowModel> ID = ColumnIdentifier.newId( + BenthosBatchRowModel.PROPERTY_ID, + n("tutti.editBenthosBatch.table.header.id"), + n("tutti.editBenthosBatch.table.header.id.tip")); public static final ColumnIdentifier<BenthosBatchRowModel> SPECIES = ColumnIdentifier.newId( BenthosBatchRowModel.PROPERTY_SPECIES_ROW, @@ -120,7 +124,7 @@ public class BenthosBatchTableModel extends AbstractApplicationTableModel<Bentho super(columnModel, false, false); this.weightUnit = weightUnit; this.sampleCategoryModel = sampleCategoryModel; - setNoneEditableCols(SPECIES); + setNoneEditableCols(ID, SPECIES); frequencyCols = Sets.newHashSet(); frequencyCols.add(COMPUTED_NUMBER); 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 8099423..c909e59 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 @@ -87,12 +87,16 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.jaxx.widgets.number.NumberEditor; import org.nuiton.validator.NuitonValidatorResult; -import javax.swing.*; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.RowFilter; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -705,6 +709,13 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent getTable()); } + { + // Id column + + addIntegerColumnToModel(columnModel, BenthosBatchTableModel.ID, TuttiUI.INT_10_DIGITS_PATTERN, table); + + } + { // Species column TableColumnExt speciesColumn = addColumnToModel( diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java index c5d0aa1..5287e1f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchTableModel.java @@ -23,9 +23,9 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservatio */ import fr.ifremer.tutti.type.WeightUnit; +import org.jdesktop.swingx.table.TableColumnModelExt; import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import org.jdesktop.swingx.table.TableColumnModelExt; import static org.nuiton.i18n.I18n.n; @@ -37,6 +37,11 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab private static final long serialVersionUID = 1L; + public static final ColumnIdentifier<IndividualObservationBatchRowModel> ID = ColumnIdentifier.newId( + IndividualObservationBatchRowModel.PROPERTY_ID, + n("tutti.editIndividualObservationBatch.table.header.id"), + n("tutti.editIndividualObservationBatch.table.header.id.tip")); + public static final ColumnIdentifier<IndividualObservationBatchRowModel> SPECIES = ColumnIdentifier.newId( IndividualObservationBatchRowModel.PROPERTY_SPECIES, n("tutti.editIndividualObservationBatch.table.header.species"), @@ -84,7 +89,7 @@ public class IndividualObservationBatchTableModel extends AbstractApplicationTab super(columnModel, false, false); this.weightUnit = weightUnit; - setNoneEditableCols(); + setNoneEditableCols(ID); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java index 0236bdb..3d89b52 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java @@ -24,9 +24,6 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservatio import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import fr.ifremer.tutti.util.Numbers; -import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; -import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.Attachment; @@ -38,6 +35,7 @@ import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.service.PersistenceService; +import fr.ifremer.tutti.type.WeightUnit; import fr.ifremer.tutti.ui.swing.content.operation.catches.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -58,6 +56,7 @@ import fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellEditor; import fr.ifremer.tutti.ui.swing.util.comment.CommentCellRenderer; import fr.ifremer.tutti.ui.swing.util.table.CaracteristicColumnIdentifier; +import fr.ifremer.tutti.util.Numbers; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -65,6 +64,7 @@ import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.table.DefaultTableColumnModelExt; import org.nuiton.decorator.Decorator; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.validator.NuitonValidatorResult; import javax.swing.JComponent; @@ -288,6 +288,13 @@ public class IndividualObservationBatchUIHandler Decorator<CaracteristicQualitativeValue> caracteristicQualitativeDecorator = getDecorator(CaracteristicQualitativeValue.class, null); + { + // Id column + + addIntegerColumnToModel(columnModel, IndividualObservationBatchTableModel.ID, TuttiUI.INT_10_DIGITS_PATTERN, table); + + } + { // Species column Decorator<Species> speciesDecorator = getDecorator( diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java index 797783f..3669d65 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java @@ -22,10 +22,10 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter; * #L% */ -import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; import fr.ifremer.tutti.type.WeightUnit; -import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.jdesktop.swingx.table.TableColumnModelExt; +import org.nuiton.jaxx.application.swing.table.AbstractApplicationTableModel; +import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import static org.nuiton.i18n.I18n.n; @@ -37,6 +37,11 @@ public class MarineLitterBatchTableModel extends AbstractApplicationTableModel<M private static final long serialVersionUID = 1L; + public static final ColumnIdentifier<MarineLitterBatchRowModel> ID = ColumnIdentifier.newId( + MarineLitterBatchRowModel.PROPERTY_ID, + n("tutti.editMarineLitterBatch.table.header.id"), + n("tutti.editMarineLitterBatch.table.header.id.tip")); + public static final ColumnIdentifier<MarineLitterBatchRowModel> MACRO_WASTE_CATEGORY = ColumnIdentifier.newId( MarineLitterBatchRowModel.PROPERTY_MARINE_LITTER_CATEGORY, n("tutti.editMarineLitterBatch.table.header.marineLitterCategory"), @@ -79,7 +84,7 @@ public class MarineLitterBatchTableModel extends AbstractApplicationTableModel<M super(columnModel, false, false); this.weightUnit = weightUnit; - setNoneEditableCols(MACRO_WASTE_CATEGORY, MACRO_WASTE_SIZE_CATEGORY); + setNoneEditableCols(ID, MACRO_WASTE_CATEGORY, MACRO_WASTE_SIZE_CATEGORY); } @Override diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java index b19c1ce..4bd5c3b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java @@ -237,6 +237,13 @@ public class MarineLitterBatchUIHandler extends AbstractTuttiBatchTableUIHandler new DefaultTableColumnModelExt(); { + // Id column + + addIntegerColumnToModel(columnModel, MarineLitterBatchTableModel.ID, TuttiUI.INT_10_DIGITS_PATTERN, table); + + } + + { // MarineLitter Category column addColumnToModel(columnModel, 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 9bfcb04..790c320 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 @@ -53,8 +53,12 @@ public class SpeciesBatchTableModel extends AbstractApplicationTableModel<Specie private static final long serialVersionUID = 1L; /** Logger. */ - private static final Log log = - LogFactory.getLog(SpeciesBatchTableModel.class); + private static final Log log = LogFactory.getLog(SpeciesBatchTableModel.class); + + public static final ColumnIdentifier<SpeciesBatchRowModel> ID = ColumnIdentifier.newId( + SpeciesBatchRowModel.PROPERTY_ID, + n("tutti.editSpeciesBatch.table.header.id"), + n("tutti.editSpeciesBatch.table.header.id.tip")); public static final ColumnIdentifier<SpeciesBatchRowModel> SPECIES = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_SPECIES_ROW, @@ -120,7 +124,7 @@ public class SpeciesBatchTableModel extends AbstractApplicationTableModel<Specie super(columnModel, false, false); this.weightUnit = weightUnit; this.sampleCategoryModel = sampleCategoryModel; - setNoneEditableCols(SPECIES); + setNoneEditableCols(ID, SPECIES); frequencyCols = Sets.newHashSet(); frequencyCols.add(COMPUTED_NUMBER); 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 648d8da..97cc68c 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 @@ -87,12 +87,16 @@ import org.nuiton.jaxx.application.swing.table.ColumnIdentifier; import org.nuiton.jaxx.widgets.number.NumberEditor; import org.nuiton.validator.NuitonValidatorResult; -import javax.swing.*; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.RowFilter; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; -import java.awt.*; +import java.awt.Color; +import java.awt.Component; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.Serializable; @@ -708,6 +712,13 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec getTable()); } + { + // Id column + + addIntegerColumnToModel(columnModel, SpeciesBatchTableModel.ID, TuttiUI.INT_10_DIGITS_PATTERN, table); + + } + { // Species column TableColumnExt speciesColumn = addColumnToModel( 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 cdbc4f4..d9182b5 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 @@ -398,6 +398,8 @@ tutti.editAccidentalBatch.table.header.file= tutti.editAccidentalBatch.table.header.file.tip= tutti.editAccidentalBatch.table.header.gender= tutti.editAccidentalBatch.table.header.gender.tip= +tutti.editAccidentalBatch.table.header.id= +tutti.editAccidentalBatch.table.header.id.tip= tutti.editAccidentalBatch.table.header.lengthStepCaracteristic= tutti.editAccidentalBatch.table.header.lengthStepCaracteristic.tip= tutti.editAccidentalBatch.table.header.otherCaracteristics= @@ -490,6 +492,8 @@ tutti.editBenthosBatch.table.header.computedNumber= tutti.editBenthosBatch.table.header.computedNumber.tip= tutti.editBenthosBatch.table.header.file= tutti.editBenthosBatch.table.header.file.tip= +tutti.editBenthosBatch.table.header.id= +tutti.editBenthosBatch.table.header.id.tip= tutti.editBenthosBatch.table.header.species= tutti.editBenthosBatch.table.header.species.tip= tutti.editBenthosBatch.table.header.toConfirm= @@ -853,6 +857,8 @@ tutti.editIndividualObservationBatch.table.header.comment= tutti.editIndividualObservationBatch.table.header.comment.tip= tutti.editIndividualObservationBatch.table.header.file= tutti.editIndividualObservationBatch.table.header.file.tip= +tutti.editIndividualObservationBatch.table.header.id= +tutti.editIndividualObservationBatch.table.header.id.tip= tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic= tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic.tip= tutti.editIndividualObservationBatch.table.header.otherCaracteristics= @@ -899,6 +905,8 @@ tutti.editMarineLitterBatch.table.header.comment= tutti.editMarineLitterBatch.table.header.comment.tip= tutti.editMarineLitterBatch.table.header.file= tutti.editMarineLitterBatch.table.header.file.tip= +tutti.editMarineLitterBatch.table.header.id= +tutti.editMarineLitterBatch.table.header.id.tip= tutti.editMarineLitterBatch.table.header.marineLitterCategory= tutti.editMarineLitterBatch.table.header.marineLitterCategory.tip= tutti.editMarineLitterBatch.table.header.marineLitterSizeCategory= @@ -1205,6 +1213,8 @@ 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.id= +tutti.editSpeciesBatch.table.header.id.tip= tutti.editSpeciesBatch.table.header.species= tutti.editSpeciesBatch.table.header.species.tip= tutti.editSpeciesBatch.table.header.toConfirm= 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 6d2082e..5e5c4b7 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 @@ -380,6 +380,8 @@ tutti.editAccidentalBatch.table.header.file=Pièces-jointes tutti.editAccidentalBatch.table.header.file.tip=Pièces-jointes tutti.editAccidentalBatch.table.header.gender=Sexe tutti.editAccidentalBatch.table.header.gender.tip=Sexe (mâle, femelle, autre...) +tutti.editAccidentalBatch.table.header.id=Id +tutti.editAccidentalBatch.table.header.id.tip=Identifiant du lot tutti.editAccidentalBatch.table.header.lengthStepCaracteristic=Classe de taille tutti.editAccidentalBatch.table.header.lengthStepCaracteristic.tip=Classe de taille tutti.editAccidentalBatch.table.header.otherCaracteristics=Autres caractéristiques @@ -472,6 +474,8 @@ tutti.editBenthosBatch.table.header.computedNumber=Tailles/Poids ou Nombre tutti.editBenthosBatch.table.header.computedNumber.tip=Tailles/Poids ou Nombre d'individus dans le lot 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.id=Id +tutti.editBenthosBatch.table.header.id.tip=Identifiant du lot 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.tip=Case à cocher pour marquer le lot @@ -829,6 +833,8 @@ tutti.editIndividualObservationBatch.table.header.comment=Commentaire tutti.editIndividualObservationBatch.table.header.comment.tip=Commentaire tutti.editIndividualObservationBatch.table.header.file=Pièces jointes tutti.editIndividualObservationBatch.table.header.file.tip=Pièces jointes +tutti.editIndividualObservationBatch.table.header.id=Id +tutti.editIndividualObservationBatch.table.header.id.tip=Identifiant du lot tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic=Classe de taille tutti.editIndividualObservationBatch.table.header.lengthStepCaracteristic.tip=Classe de taille tutti.editIndividualObservationBatch.table.header.otherCaracteristics=Autres caractéristiques @@ -875,6 +881,8 @@ tutti.editMarineLitterBatch.table.header.comment=Commentaire tutti.editMarineLitterBatch.table.header.comment.tip=Commentaire tutti.editMarineLitterBatch.table.header.file=Pièces jointes tutti.editMarineLitterBatch.table.header.file.tip=Pièces jointes +tutti.editMarineLitterBatch.table.header.id=Id +tutti.editMarineLitterBatch.table.header.id.tip=Identifiant du lot tutti.editMarineLitterBatch.table.header.marineLitterCategory=Catégorie tutti.editMarineLitterBatch.table.header.marineLitterCategory.tip=Catégorie de déchets tutti.editMarineLitterBatch.table.header.marineLitterSizeCategory=Catégorie de taille @@ -1169,6 +1177,8 @@ 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.id=Id +tutti.editSpeciesBatch.table.header.id.tip=Identifiant du lot tutti.editSpeciesBatch.table.header.species=Espèce 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm