February 2013 - Tutti-commits - mailman.cloud.codelutin.com

r496 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: content/operation/catches/accidental content/operation/catches/benthos content/operation/catches/macrowaste content/operation/catches/plankton content/operation/catches/species content/operation/catches/species/frequency content/operation/catches/species/split content/operation/fishing/environment content/operation/fishing/gearshooting content/operation/fishing/hydrology content/protocol util/table
by tchemit＠users.forge.codelutin.com 28 Feb '13

28 Feb '13

Author: tchemit Date: 2013-02-28 09:55:41 +0100 (Thu, 28 Feb 2013) New Revision: 496 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/496 Log: refs #2025: [CAPTURE] - Tableau Esp?\195?\168ce - Probl?\195?\168me lorsqu'on masque une colonne (utilisation directe du column model, mais non fini:( Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -27,9 +27,8 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; -import javax.swing.table.TableColumnModel; - import static org.nuiton.i18n.I18n.n_; /** @@ -66,7 +65,7 @@ n_("tutti.table.accidental.batch.header.file")); - public AccidentalBatchTableModel(TableColumnModel columnModel) { + public AccidentalBatchTableModel(TableColumnModelExt columnModel) { super(columnModel, true, true); setNoneEditableCols(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -27,6 +27,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; @@ -81,7 +82,7 @@ n_("tutti.table.benthos.batch.header.toConfirm"), n_("tutti.table.benthos.batch.header.toConfirm")); - public BenthosBatchTableModel(TableColumnModel columnModel) { + public BenthosBatchTableModel(TableColumnModelExt columnModel) { super(columnModel, true, true); setNoneEditableCols(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/macrowaste/MacroWasteBatchTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; @@ -69,7 +70,7 @@ n_("tutti.table.macrowaste.batch.header.file"), n_("tutti.table.macrowaste.batch.header.file")); - public MacroWasteBatchTableModel(TableColumnModel columnModel) { + public MacroWasteBatchTableModel(TableColumnModelExt columnModel) { super(columnModel, true, true); setNoneEditableCols(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/plankton/PlanktonBatchTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; @@ -74,7 +75,7 @@ n_("tutti.table.plankton.batch.header.file"), n_("tutti.table.plankton.batch.header.file")); - public PlanktonBatchTableModel(TableColumnModel columnModel) { + public PlanktonBatchTableModel(TableColumnModelExt columnModel) { super(columnModel, true, true); setNoneEditableCols(); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -30,8 +30,8 @@ import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; -import javax.swing.table.TableColumnModel; import java.util.Set; import static org.nuiton.i18n.I18n.n_; @@ -170,7 +170,7 @@ */ protected final Multimap<Species, SampleCategoryType> speciesSampleCategories; - public SpeciesBatchTableModel(TableColumnModel columnModel, + public SpeciesBatchTableModel(TableColumnModelExt columnModel, Multimap<Species, SampleCategoryType> speciesSampleCategories) { super(columnModel, false, false); this.speciesSampleCategories = speciesSampleCategories; @@ -257,15 +257,15 @@ if (species == null) { - // no species, can not edit + // no species, can not edit result = false; } else { // Is protocol authorize it ? - result = !speciesSampleCategories.containsKey(species) - || speciesSampleCategories.containsEntry(species, - samplePropertyName.getSampleCategoryType()); + result = !speciesSampleCategories.containsKey(species) + || speciesSampleCategories.containsEntry(species, + samplePropertyName.getSampleCategoryType()); if (result) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -28,6 +28,7 @@ import com.google.common.collect.Maps; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; import java.util.List; @@ -64,7 +65,7 @@ private final Map<Float, SpeciesFrequencyRowModel> rowCache; - public SpeciesFrequencyTableModel(TableColumnModel columnModel, + public SpeciesFrequencyTableModel(TableColumnModelExt columnModel, SpeciesFrequencyUIModel uiModel) { super(columnModel, true, true); this.uiModel = uiModel; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; @@ -64,7 +65,7 @@ private final SplitSpeciesBatchUIModel uiModel; - public SplitSpeciesBatchTableModel(TableColumnModel columnModel, + public SplitSpeciesBatchTableModel(TableColumnModelExt columnModel, SplitSpeciesBatchUIModel uiModel, boolean createEmptyRowIsEmpty) { super(columnModel, createEmptyRowIsEmpty, createEmptyRowIsEmpty); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/environment/EnvironmentTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; @@ -49,7 +50,7 @@ n_("tutti.table.fishing.environment.header.value"), n_("tutti.table.fishing.environment.header.value")); - public EnvironmentTableModel(TableColumnModel columnModel) { + public EnvironmentTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); setNoneEditableCols(KEY); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/gearshooting/GearShootingTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; @@ -49,7 +50,7 @@ n_("tutti.table.fishing.gearShooting.header.value"), n_("tutti.table.fishing.gearShooting.header.value")); - public GearShootingTableModel(TableColumnModel columnModel) { + public GearShootingTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); setNoneEditableCols(KEY); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/hydrology/HydrologyTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; @@ -64,7 +65,7 @@ // n_("tutti.table.fishing.hydrology.header.averageValue"), // n_("tutti.table.fishing.hydrology.header.averageValue")); - public HydrologyTableModel(TableColumnModel columnModel) { + public HydrologyTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); setNoneEditableCols(KEY); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableModel; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; +import org.jdesktop.swingx.table.TableColumnModelExt; import javax.swing.table.TableColumnModel; @@ -91,7 +92,7 @@ private static final long serialVersionUID = 1L; - public EditProtocolSpeciesTableModel(TableColumnModel columnModel) { + public EditProtocolSpeciesTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); setNoneEditableCols(SPECIES_ID); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java 2013-02-28 05:36:18 UTC (rev 495) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/table/AbstractTuttiTableModel.java 2013-02-28 08:55:41 UTC (rev 496) @@ -25,15 +25,20 @@ */ import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jdesktop.swingx.event.TableColumnModelExtListener; +import org.jdesktop.swingx.table.TableColumnExt; +import org.jdesktop.swingx.table.TableColumnModelExt; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.TableColumnModelEvent; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableColumn; -import javax.swing.table.TableColumnModel; +import java.beans.PropertyChangeEvent; import java.io.Serializable; import java.util.List; import java.util.Set; @@ -52,20 +57,13 @@ LogFactory.getLog(AbstractTuttiTableModel.class); /** - * Column definition. + * Column model. * - * @since 0.2 + * @since 1.0.2 */ - protected final TableColumn[] columns; + protected final TableColumnModelExt columnModel; /** - * Column identifiers. - * - * @since 0.2 - */ - protected final List<ColumnIdentifier<R>> columnIdentifiers; - - /** * Data in the model. * * @since 0.2 @@ -95,19 +93,47 @@ public abstract R createNewRow(); - protected AbstractTuttiTableModel(TableColumnModel columnModel, + protected AbstractTuttiTableModel(TableColumnModelExt columnModel, boolean createNewRow, boolean createEmptyRowIsEmpty) { + this.columnModel = columnModel; this.createNewRow = createNewRow; this.createEmptyRowIsEmpty = createEmptyRowIsEmpty; - int nbcols = columnModel.getColumnCount(); - columns = new TableColumn[nbcols]; - columnIdentifiers = Lists.newArrayList(); - for (int i = 0; i < nbcols; i++) { - TableColumn column = columnModel.getColumn(i); - columns[i] = column; - columnIdentifiers.add((ColumnIdentifier<R>) column.getIdentifier()); - } + columnModel.addColumnModelListener(new TableColumnModelExtListener() { + @Override + public void columnPropertyChange(PropertyChangeEvent event) { + TableColumnExt column = (TableColumnExt) event.getSource(); + if (log.isInfoEnabled()) { + log.info("Property [" + event.getPropertyName() + "] changed on coloumn [" + column.getTitle() + "] :: " + event.getNewValue()); + } + } + + @Override + public void columnAdded(TableColumnModelEvent e) { + if (log.isInfoEnabled()) { + log.info("Column added [" + e.getFromIndex() + "] :: " + e.getToIndex()); + } + } + + @Override + public void columnRemoved(TableColumnModelEvent e) { + if (log.isInfoEnabled()) { + log.info("Column removed [" + e.getFromIndex() + "] :: " + e.getToIndex()); + } + } + + @Override + public void columnMoved(TableColumnModelEvent e) { + } + + @Override + public void columnMarginChanged(ChangeEvent e) { + } + + @Override + public void columnSelectionChanged(ListSelectionEvent e) { + } + }); } public final List<R> getRows() { @@ -225,13 +251,17 @@ @Override public final int getColumnCount() { - return columns.length; +// return columns.length; + return columnModel.getColumnCount(); } @Override public final Object getValueAt(int rowIndex, int columnIndex) { R entry = getEntry(rowIndex); ColumnIdentifier<R> propertyName = getPropertyName(columnIndex); + if (log.isInfoEnabled()) { + log.info("columnIndex: " + columnIndex + " :: " + propertyName.getPropertyName()); + } Object result = getValueAt(rowIndex, columnIndex, propertyName, entry); return result; } @@ -288,12 +318,13 @@ } protected final TableColumn getColumn(int columnIndex) { - SwingUtil.ensureColumnIndex(this, columnIndex); - return columns[columnIndex]; +// SwingUtil.ensureColumnIndex(this, columnIndex); +// return columns[columnIndex]; + return columnModel.getColumns(true).get(columnIndex); } protected final int getColumnIndex(ColumnIdentifier<?> property) { - int result = columnIdentifiers.indexOf(property); + int result = columnModel.getColumnIndex(property); return result; } }

1 0

r495 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 28 Feb '13

28 Feb '13

Author: tchemit Date: 2013-02-28 06:36:18 +0100 (Thu, 28 Feb 2013) New Revision: 495 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/495 Log: fixes #2064: [CAMPAGNE] - S?\195?\169rie de Campagne : Rendre obligatoire le commentaire d'une s?\195?\169rie de campagne Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-02-27 17:07:15 UTC (rev 494) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ProgramPersistenceServiceImpl.java 2013-02-28 05:36:18 UTC (rev 495) @@ -119,6 +119,7 @@ public Program createProgram(Program bean) { Preconditions.checkNotNull(bean); Preconditions.checkNotNull(bean.getName()); + Preconditions.checkNotNull(bean.getComment()); Preconditions.checkArgument(bean.getId() == null); if (log.isDebugEnabled()) { @@ -137,6 +138,7 @@ Preconditions.checkNotNull(bean); Preconditions.checkNotNull(bean.getName()); Preconditions.checkNotNull(bean.getId()); + Preconditions.checkNotNull(bean.getComment()); if (log.isDebugEnabled()) { @@ -157,20 +159,10 @@ // -- Internal methods --// // ------------------------------------------------------------------------// - /** - * Sentinel value when comment is null (but database can't accept tis. - * - * @since 1.0 - */ - public static final String EMPTY_COMMENT = "$$EMPTY_COMMENT$$"; - protected void loadProgram(Program result, Object[] source) { result.setId((String) source[0]); result.setName((String) source[1]); result.setComment((String) source[2]); - if (EMPTY_COMMENT.equals(result.getComment())) { - result.setComment(null); - } if (source[3] != null) { Zone zone = new Zone(); zone.setId(String.valueOf(source[3])); @@ -183,11 +175,6 @@ protected void beanToEntity(Program source, fr.ifremer.adagio.core.dao.administration.programStrategy.Program target, boolean copyIfNull) { - // If target.description is a fake value (see bottom in this method), restore the null value - if (target.getDescription() != null && target.getDescription().equals(target.getName())) { - target.setDescription(null); - } - // Code : compute with : <prefixe><name> if (target.getCode() == null && source.getName() != null) { // Compute a program code (remove spaces, and capitalize the name) @@ -226,13 +213,7 @@ } // Description (mandatory in database) - // If empty, use name (will be replace in the next save() - see upper in this method) - // If empty, use a guard value - if (source.getComment() == null) { - target.setDescription(EMPTY_COMMENT); - } else { - target.setDescription(source.getComment()); - } + target.setDescription(source.getComment()); // Zone if (copyIfNull && source.getZone() == null) { Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml 2013-02-27 17:07:15 UTC (rev 494) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIModel-error-validation.xml 2013-02-28 05:36:18 UTC (rev 495) @@ -60,6 +60,9 @@ </field> <field name="comment"> + <field-validator type="requiredstring" short-circuit="true"> + <message>tutti.validator.error.program.comment.required</message> + </field-validator> <field-validator type="stringlength" short-circuit="true"> <param name="maxLength">2000</param> <message>tutti.validator.error.comment.too.long##${maxLength}</message> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-27 17:07:15 UTC (rev 494) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-28 05:36:18 UTC (rev 495) @@ -545,6 +545,7 @@ tutti.validator.error.fishingOperation.vessel.required=Le navire est obligatoire tutti.validator.error.program.existingKey=Le couple nom/zone existe déjà tutti.validator.error.program.name.required=Le nom de la série est obligatoire +tutti.validator.error.program.comment.required=Le commentaire de la série est obligatoire tutti.validator.error.program.zone.required=La zone de la série est obligatoire tutti.validator.error.protocol.name.alreadyUsed=Le nom du protocol est déjà utilisé tutti.validator.error.protocol.name.required=Le nom du protocol est obligatoire

1 0

r494 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by kmorin＠users.forge.codelutin.com 27 Feb '13

27 Feb '13

Author: kmorin Date: 2013-02-27 18:07:15 +0100 (Wed, 27 Feb 2013) New Revision: 494 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/494 Log: fixes #2052 [CAPTURE] - Information affich?\195?\169e pour les poids pour le navire "Thalassa" Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-02-27 16:53:09 UTC (rev 493) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-02-27 17:07:15 UTC (rev 494) @@ -162,11 +162,11 @@ constructorParams='this'/> </cell> </row> - <row> + </Table> </cell> </row>

1 0

r493 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home
by kmorin＠users.forge.codelutin.com 27 Feb '13

27 Feb '13

Author: kmorin Date: 2013-02-27 17:53:09 +0100 (Wed, 27 Feb 2013) New Revision: 493 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/493 Log: fixes #2031 [ERGO] - Ergonomie des listes d?\195?\169roulantes comportant des actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-02-27 15:56:12 UTC (rev 492) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.jaxx 2013-02-27 16:53:09 UTC (rev 493) @@ -120,9 +120,11 @@ <JPanel layout='{new GridLayout(1,0)}'> <JComboBox id='editProtocolComboBox' onMouseEntered='if (editProtocolComboBox.isEnabled()) { editProtocolComboBox.showPopup(); }' + onMouseClicked='if (editProtocolComboBox.isEnabled()) { handler.startExistingProtocolAction(event); }' onActionPerformed='handler.startExistingProtocolAction(event)'/> <JComboBox id='newProtocolComboBox' onMouseEntered='newProtocolComboBox.showPopup()' + onMouseClicked='handler.startNewProtocolAction(event)' onActionPerformed='handler.startNewProtocolAction(event)'/> </JPanel> </cell> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-27 15:56:12 UTC (rev 492) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-27 16:53:09 UTC (rev 493) @@ -36,12 +36,16 @@ import java.awt.Event; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.util.List; +import java.util.Timer; +import java.util.TimerTask; import javax.swing.Action; import javax.swing.JComboBox; +import javax.swing.SwingUtilities; import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; import javax.swing.event.PopupMenuEvent; @@ -256,20 +260,32 @@ clearValidators(); } + public void startExistingProtocolAction(MouseEvent event) { + JComboBox existingProtocolCombo = (JComboBox) event.getSource(); + Action selectedAction = (Action) existingProtocolCombo.getItemAt(0); + selectedAction.actionPerformed(null); + } + public void startExistingProtocolAction(ActionEvent event) { if (!resetEditProtolAction) { - JComboBox newProtocolCombo = (JComboBox) event.getSource(); - Action selectedAction = (Action) newProtocolCombo.getSelectedItem(); + JComboBox existingProtocolCombo = (JComboBox) event.getSource(); + Action selectedAction = (Action) existingProtocolCombo.getSelectedItem(); // hide popup before performing the action, otherwise, if the action // opens a popup, the user must click a first time to hide the combobox // popup to then interact with the popup opened by the action // (see http://forge.codelutin.com/issues/2032) - newProtocolCombo.setSelectedIndex(0); - newProtocolCombo.hidePopup(); + existingProtocolCombo.setSelectedIndex(0); + existingProtocolCombo.hidePopup(); selectedAction.actionPerformed(event); } } + public void startNewProtocolAction(MouseEvent event) { + JComboBox newProtocolCombo = (JComboBox) event.getSource(); + Action selectedAction = (Action) newProtocolCombo.getItemAt(0); + selectedAction.actionPerformed(null); + } + public void startNewProtocolAction(ActionEvent event) { JComboBox newProtocolCombo = (JComboBox) event.getSource(); Action selectedAction = (Action) newProtocolCombo.getSelectedItem();

1 0

r492 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing: . content/home
by kmorin＠users.forge.codelutin.com 27 Feb '13

27 Feb '13

Author: kmorin Date: 2013-02-27 16:56:12 +0100 (Wed, 27 Feb 2013) New Revision: 492 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/492 Log: refs #2031 [ERGO] - Ergonomie des listes d?\195?\169roulantes comportant des actions Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-27 10:26:29 UTC (rev 491) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/AbstractTuttiUIHandler.java 2013-02-27 15:56:12 UTC (rev 492) @@ -470,10 +470,6 @@ // add data list to combo box list.init((JXPathDecorator<E>) decorator, data, selectedData); -// OneClicListSelectionModel.installModel(listHeader.getList()); - -// updateIndices(listHeader.getList(), selectedData); - if (log.isDebugEnabled()) { log.debug("Jlist [" + beanType.getName() + "] : " + list.getUniverseList().getModel().getSize()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-27 10:26:29 UTC (rev 491) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-02-27 15:56:12 UTC (rev 492) @@ -32,19 +32,26 @@ import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.AbstractTuttiUIHandler; import fr.ifremer.tutti.ui.swing.TuttiUI; +import java.awt.AWTEvent; +import java.awt.Event; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.List; +import javax.swing.Action; +import javax.swing.JComboBox; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; import jaxx.runtime.swing.editor.bean.BeanComboBox; import jaxx.runtime.validator.swing.SwingValidator; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.Action; -import javax.swing.JComboBox; -import java.awt.event.ActionEvent; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.util.List; - /** * Main ui content to select cruise. * @@ -151,6 +158,9 @@ initBeanComboBox(ui.getProtocolCombobox(), model.getProtocols(), model.getProtocol()); + + ui.getEditProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); + ui.getNewProtocolComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); model.addPropertyChangeListener(SelectCruiseUIModel.PROPERTY_PROTOCOLS, new PropertyChangeListener() { @Override @@ -245,10 +255,10 @@ } clearValidators(); } - + public void startExistingProtocolAction(ActionEvent event) { if (!resetEditProtolAction) { - JComboBox newProtocolCombo = (JComboBox) event.getSource(); + JComboBox newProtocolCombo = (JComboBox) event.getSource(); Action selectedAction = (Action) newProtocolCombo.getSelectedItem(); // hide popup before performing the action, otherwise, if the action // opens a popup, the user must click a first time to hide the combobox

1 0

r491 - in trunk/tutti-ui-swing: . src/main/java/fr/ifremer/tutti/ui/swing/content/operation src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches src/main/resources/i18n
by kmorin＠users.forge.codelutin.com 27 Feb '13

27 Feb '13

Author: kmorin Date: 2013-02-27 11:26:29 +0100 (Wed, 27 Feb 2013) New Revision: 491 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/491 Log: fixes #2040 [TRAIT] - Comportement de l'annulation Added: trunk/tutti-ui-swing/tutti.config Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-27 09:25:47 UTC (rev 490) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/CancelEditFishingOperationAction.java 2013-02-27 10:26:29 UTC (rev 491) @@ -30,6 +30,8 @@ import org.apache.commons.logging.LogFactory; import java.awt.event.ActionEvent; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import static org.nuiton.i18n.I18n._; @@ -61,6 +63,21 @@ _("tutti.action.cancel.editFishingOperation.tip"), true ); + + getModel().addPropertyChangeListener(EditFishingOperationUIModel.PROPERTY_ID, + new PropertyChangeListener() { + + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getNewValue() == null) { + putValue(NAME, _("tutti.action.cancel.editFishingOperation")); + putValue(SHORT_DESCRIPTION, _("tutti.action.cancel.editFishingOperation.tip")); + + } else { + putValue(NAME, _("tutti.action.reset.editFishingOperation")); + putValue(SHORT_DESCRIPTION, _("tutti.action.reset.editFishingOperation.tip")); + } + } + }); } public EditFishingOperationAction getEditAction() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-02-27 09:25:47 UTC (rev 490) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/CancelEditCatchBatchAction.java 2013-02-27 10:26:29 UTC (rev 491) @@ -63,8 +63,8 @@ super(handler, "cancelEditCatchBatch", "cancel", - _("tutti.action.cancelEditCatchBatch"), - _("tutti.action.cancelEditCatchBatch.tip"), + _("tutti.action.reset.editCatchBatch"), + _("tutti.action.reset.editCatchBatch.tip"), true ); } Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-27 09:25:47 UTC (rev 490) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-02-27 10:26:29 UTC (rev 491) @@ -11,13 +11,11 @@ tutti.action.cancel.editCruise=Annuler tutti.action.cancel.editCruise.tip=Annuler l'édition (ou la création) de la campagne tutti.action.cancel.editFishingOperation=Annuler -tutti.action.cancel.editFishingOperation.tip=Annuler l'édition (ou la création) du trait +tutti.action.cancel.editFishingOperation.tip=Annuler la création du trait tutti.action.cancel.editProgram=Annuler tutti.action.cancel.editProgram.tip=Annuler l'édition (ou la création) de la série de campagne tutti.action.cancel.editProtocol=Annuler tutti.action.cancel.editProtocol.tip=Annuler l'édition (ou la création) du protocole -tutti.action.cancelEditCatchBatch=Annuler -tutti.action.cancelEditCatchBatch.tip=Annuler l'édition de la capture tutti.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques tutti.action.chooseProtocolFile=Choisir le fichier de protocole tutti.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces @@ -133,6 +131,10 @@ tutti.action.removeSpeciesSubBatch.tip=Supprimer tous les lots fils du lot sélectionné tutti.action.renameSpeciesBatch=Corriger l'espèce tutti.action.renameSpeciesBatch.tip=Corriger l'espèce sur tout le lot sélectionné +tutti.action.reset.editCatchBatch=Réinitialiser +tutti.action.reset.editCatchBatch.tip=Réinitialiser l'édition de la capture +tutti.action.reset.editFishingOperation=Réinitialiser +tutti.action.reset.editFishingOperation.tip=Réinitialiser l'édition du trait tutti.action.reset.fishingOperationValidState=Réinitialiser tutti.action.save=Enregistrer tutti.action.saveCatchBatch=Sauver Added: trunk/tutti-ui-swing/tutti.config =================================================================== --- trunk/tutti-ui-swing/tutti.config (rev 0) +++ trunk/tutti-ui-swing/tutti.config 2013-02-27 10:26:29 UTC (rev 491) @@ -0,0 +1,6 @@ +#Last saved Mon Feb 11 18:03:07 CET 2013 +#Mon Feb 11 18:03:07 CET 2013 +tutti.cruiseId=100001 +tutti.programId=CAM-PELGAS +tutti.protocolId=15cf939f-cf87-42d2-9999-25222d1d823f +tutti.ui.coordinateEditorType=DD

1 0

r490 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation
by kmorin＠users.forge.codelutin.com 27 Feb '13

27 Feb '13

Author: kmorin Date: 2013-02-27 10:25:47 +0100 (Wed, 27 Feb 2013) New Revision: 490 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/490 Log: fixes #2060 [TRAIT] - Rapport de contr?\195?\180le - probl?\195?\168me de mise ?\195?\160 jour de l'affichage des contr?\195?\180les ?\195?\160 la saisie Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-27 07:34:32 UTC (rev 489) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-02-27 09:25:47 UTC (rev 490) @@ -438,7 +438,7 @@ @Override public void onShowTab(int currentIndex, int newIndex) { -// registerValidators(ui.getValidator()); + registerValidators(ui.getValidator()); } public void registerValidator() {

1 0

r489 - trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 27 Feb '13

27 Feb '13

Author: tchemit Date: 2013-02-27 08:34:32 +0100 (Wed, 27 Feb 2013) New Revision: 489 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/489 Log: refs #2058: [REFERENTIEL] Taxon referent doubl?\195?\169 (was fixed in our db) Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-02-27 07:12:48 UTC (rev 488) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceReadTest.java 2013-02-27 07:34:32 UTC (rev 489) @@ -211,13 +211,13 @@ Assert.assertEquals(fixtures.refSpeciesTaxonId(), species.getReferenceTaxonId()); } - @Test(expected = NonUniqueResultException.class) + @Test public void getBadSpeciesByReferenceTaxonId(/*String speciesReferenceTaxonId*/) { Integer taxonId = fixtures.refBadSpeciesTaxonId(); service.getSpeciesByReferenceTaxonId(taxonId); } - @Test(expected = NonUniqueResultException.class) + @Test public void getBad2SpeciesByReferenceTaxonId(/*String speciesReferenceTaxonId*/) { Integer taxonId = fixtures.refBad2SpeciesTaxonId(); service.getSpeciesByReferenceTaxonId(taxonId);

1 0

r488 - in trunk: tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch tutti-service/src/test/java/fr/ifremer/tutti/service/protocol
by tchemit＠users.forge.codelutin.com 27 Feb '13

27 Feb '13

Author: tchemit Date: 2013-02-27 08:12:48 +0100 (Wed, 27 Feb 2013) New Revision: 488 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/488 Log: ignore test (it really does not work :() + fix import Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch/CatchBatchValidatorReadTest.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java Modified: trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch/CatchBatchValidatorReadTest.java =================================================================== --- trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch/CatchBatchValidatorReadTest.java 2013-02-27 07:08:59 UTC (rev 487) +++ trunk/tutti-persistence/src/test/java/fr/ifremer/tutti/persistence/service/batch/CatchBatchValidatorReadTest.java 2013-02-27 07:12:48 UTC (rev 488) @@ -31,6 +31,7 @@ import fr.ifremer.tutti.persistence.service.ReferentialPersistenceService; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; +@Ignore public class CatchBatchValidatorReadTest { @ClassRule Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-27 07:08:59 UTC (rev 487) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/protocol/TuttiProtocolImportExportServiceTest.java 2013-02-27 07:12:48 UTC (rev 488) @@ -28,7 +28,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Files; -import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic;

1 0

r487 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-service/src/main/java/fr/ifremer/tutti/service
by tchemit＠users.forge.codelutin.com 27 Feb '13

27 Feb '13

Author: tchemit Date: 2013-02-27 08:08:59 +0100 (Wed, 27 Feb 2013) New Revision: 487 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/487 Log: fixes #2062: [ESPECE] Sauvegarge de mensuration impossible Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistence.java 2013-02-27 07:08:59 UTC (rev 487) @@ -44,8 +44,6 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.persistence.entities.referential.Vessel; import fr.ifremer.tutti.persistence.entities.referential.Zone; -import org.hibernate.event.EvictEvent; -import org.springframework.cache.annotation.CacheEvict; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -67,6 +65,7 @@ /** * To clear all caches. + * * @since 1.0.1 */ void clearAllCaches(); @@ -177,6 +176,12 @@ */ List<Caracteristic> getAllCaracteristic(); + /** + * @return all numeric caracteristics of the system. + * @since 1.0.2 + */ + List<Caracteristic> getAllNumericCaracteristic(); + Caracteristic getSizeCategoryCaracteristic(); Caracteristic getSexCaracteristic(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -251,6 +251,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + return referentialService.getAllNumericCaracteristic(); + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { return referentialService.getSizeCategoryCaracteristic(); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceNoDbImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -122,6 +122,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + throw new RuntimeException("method not implemented"); + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { throw new RuntimeException("method not implemented"); } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceService.java 2013-02-27 07:08:59 UTC (rev 487) @@ -163,6 +163,12 @@ */ List<Caracteristic> getAllCaracteristic(); + /** + * @return all numeric caracteristics of the system. + * @since 1.0.2 + */ + List<Caracteristic> getAllNumericCaracteristic(); + Caracteristic getSizeCategoryCaracteristic(); Caracteristic getSexCaracteristic(); Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-02-27 07:08:59 UTC (rev 487) @@ -450,6 +450,18 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + List<Caracteristic> result = Lists.newArrayList(); + + for (Caracteristic caracteristic : getAllCaracteristic()) { + if (caracteristic.isNumericType()) { + result.add(caracteristic); + } + } + return result; + } + + @Override public Caracteristic getSizeCategoryCaracteristic() { Integer pmfmId = enumeration.PMFM_ID_SIZE_CATEGORY; Caracteristic result = getCaracteristic(pmfmId); Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-26 17:54:09 UTC (rev 486) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/PersistenceService.java 2013-02-27 07:08:59 UTC (rev 487) @@ -177,6 +177,11 @@ } @Override + public List<Caracteristic> getAllNumericCaracteristic() { + return driver.getAllNumericCaracteristic(); + } + + @Override public List<Zone> getAllProgramZone() { return driver.getAllProgramZone(); }

1 0