Author: tchemit Date: 2013-01-14 10:50:27 +0100 (Mon, 14 Jan 2013) New Revision: 187 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/187 Log: remove some columns + optimize import Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.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/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/CaracteristicValueEditor.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/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-01-14 09:39:05 UTC (rev 186) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-01-14 09:50:27 UTC (rev 187) @@ -34,7 +34,6 @@ import fr.ifremer.tutti.ui.swing.TuttiUI; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; -import fr.ifremer.tutti.ui.swing.content.operation.fishing.environment.EnvironmentRowModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.editor.AttachmentCellComponent; import fr.ifremer.tutti.ui.swing.util.editor.LongTextCellComponent; 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-01-14 09:39:05 UTC (rev 186) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-01-14 09:50:27 UTC (rev 187) @@ -129,10 +129,10 @@ n_("tutti.table.species.batch.header.weight"), n_("tutti.table.species.batch.header.weight")); - public static final ColumnIdentifier<SpeciesBatchRowModel> COMPUTED_WEIGHT = ColumnIdentifier.newId( - SpeciesBatchRowModel.PROPERTY_COMPUTED_WEIGHT, - n_("tutti.table.species.batch.header.computedWeight"), - n_("tutti.table.species.batch.header.computedWeight")); +// public static final ColumnIdentifier<SpeciesBatchRowModel> COMPUTED_WEIGHT = ColumnIdentifier.newId( +// SpeciesBatchRowModel.PROPERTY_COMPUTED_WEIGHT, +// n_("tutti.table.species.batch.header.computedWeight"), +// n_("tutti.table.species.batch.header.computedWeight")); public static final ColumnIdentifier<SpeciesBatchRowModel> COMPUTED_NUMBER = ColumnIdentifier.newId( SpeciesBatchRowModel.PROPERTY_COMPUTED_NUMBER, @@ -188,7 +188,7 @@ frequencyCols = Sets.newHashSet(); frequencyCols.add(COMPUTED_NUMBER); - frequencyCols.add(COMPUTED_WEIGHT); +// frequencyCols.add(COMPUTED_WEIGHT); sampleCols = Sets.newHashSet(); sampleCols.add(SORTED_UNSORTED_CATEGORY); @@ -220,16 +220,16 @@ super.setValueAt(aValue, rowIndex, columnIndex, propertyName, entry); } - if (propertyName == COMPUTED_NUMBER) { - - // update also other columns - fireTableCellUpdated(rowIndex, COMPUTED_WEIGHT); - - } else if (propertyName == COMPUTED_WEIGHT) { - - // update also other columns - fireTableCellUpdated(rowIndex, COMPUTED_NUMBER); - } +// if (propertyName == COMPUTED_NUMBER) { +// +// // update also other columns +// fireTableCellUpdated(rowIndex, COMPUTED_WEIGHT); +// +// } else if (propertyName == COMPUTED_WEIGHT) { +// +// // update also other columns +// fireTableCellUpdated(rowIndex, COMPUTED_NUMBER); +// } } public void updateSamplingRatio(Set<SpeciesBatchRowModel> rows) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-14 09:39:05 UTC (rev 186) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-01-14 09:50:27 UTC (rev 187) @@ -385,19 +385,10 @@ protocolSpecy.getSpeciesId()); allSpecies.add(species); speciesSampleCategories.put(species, SampleCategoryType.sortedUnsorted); - - if (protocolSpecy.isSizeEnabled()) { - speciesSampleCategories.put(species, SampleCategoryType.size); - } - if (protocolSpecy.isSexEnabled()) { - speciesSampleCategories.put(species, SampleCategoryType.sex); - } - if (protocolSpecy.isMaturityEnabled()) { - speciesSampleCategories.put(species, SampleCategoryType.maturity); - } - if (protocolSpecy.isAgeEnabled()) { - speciesSampleCategories.put(species, SampleCategoryType.age); - } + speciesSampleCategories.put(species, SampleCategoryType.size); + speciesSampleCategories.put(species, SampleCategoryType.sex); + speciesSampleCategories.put(species, SampleCategoryType.maturity); + speciesSampleCategories.put(species, SampleCategoryType.age); } } else { @@ -433,6 +424,7 @@ JXTable table = getTable(); + table.setColumnControlVisible(true); // create table column model TableCellRenderer defaultRenderer = table.getDefaultRenderer(Object.class); @@ -498,16 +490,16 @@ TuttiUI.DECIMAL3_PATTERN); } - { // Computed weight column (from frequencies) +// { // Computed weight column (from frequencies) +// +// addColumnToModel(columnModel, +// FrequencyCellComponent.newEditor(ui), +// FrequencyCellComponent.newRender(), +// SpeciesBatchTableModel.COMPUTED_WEIGHT); +// } - addColumnToModel(columnModel, - FrequencyCellComponent.newEditor(ui), - FrequencyCellComponent.newRender(), - SpeciesBatchTableModel.COMPUTED_WEIGHT); - } + { // Number column (from frequencies) - { // Computed number column (from frequencies) - addColumnToModel(columnModel, FrequencyCellComponent.newEditor(ui), FrequencyCellComponent.newRender(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/CaracteristicValueEditor.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/CaracteristicValueEditor.java 2013-01-14 09:39:05 UTC (rev 186) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/CaracteristicValueEditor.java 2013-01-14 09:50:27 UTC (rev 187) @@ -46,8 +46,6 @@ import java.awt.Color; import java.awt.Component; import java.util.List; -import javax.swing.event.CellEditorListener; -import javax.swing.event.ChangeEvent; /** * Editor for the values of the caracteristics of the fishing operations. 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-01-14 09:39:05 UTC (rev 186) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-14 09:50:27 UTC (rev 187) @@ -232,7 +232,7 @@ tutti.table.protocol.species.header.speciesId=Espèce tutti.table.species.batch.header.ageCategory=Age tutti.table.species.batch.header.comment=Commentaire -tutti.table.species.batch.header.computedNumber=Nombre calculé +tutti.table.species.batch.header.computedNumber=Nombre tutti.table.species.batch.header.computedWeight=Poids calculé tutti.table.species.batch.header.file=Pièces jointes tutti.table.species.batch.header.maturityCategory=Maturité @@ -240,10 +240,9 @@ tutti.table.species.batch.header.sexCategory=Sexe tutti.table.species.batch.header.sizeCategory=Class. Tri tutti.table.species.batch.header.sortedUnsortedCategory=V/HV -tutti.table.species.batch.header.species= -tutti.table.species.batch.header.speciesCategory=Espèce +tutti.table.species.batch.header.species=Espèce tutti.table.species.batch.header.toConfirm=A Confirmer -tutti.table.species.batch.header.weight=Poids +tutti.table.species.batch.header.weight=Poids sous-échantillonné tutti.table.species.frequency.header.computedWeight=Poids calculé tutti.table.species.frequency.header.lengthStep=Classe de taille tutti.table.species.frequency.header.number=Nombre