Author: tchemit Date: 2013-09-18 07:20:33 +0200 (Wed, 18 Sep 2013) New Revision: 1184 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1184 Log: refs #3266: [MENSURATION] Ne pas conserver les id des cat?\195?\169gories dans la barre de rappel Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 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/split/SplitBenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -300,19 +300,11 @@ setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); // update title - StringBuilder title = new StringBuilder(ui.getSpeciesTabFishingOperationReminderLabel().getTitle()); - - title.append(" - ").append(decorate(editRow.getSpecies())); - - for (SampleCategory<?> sampleCategory : editRow) { - if (sampleCategory.getCategoryValue() != null) { - title.append(" - "); - title.append(decorate(sampleCategory.getCategoryValue())); - } - } - - title.append(" - ").append(_("tutti.editSpeciesFrequencies.title")); - ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title.toString()); + String title = buildReminderLabelTitle(editRow.getSpecies(), + editRow, + ui.getSpeciesTabFishingOperationReminderLabel().getTitle(), + _("tutti.editSpeciesFrequencies.title")); + ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title); } public void splitSpeciesBatch(SpeciesBatchRowModel editRow, @@ -324,19 +316,11 @@ setSpeciesSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); // update title - StringBuilder title = new StringBuilder(ui.getSpeciesTabFishingOperationReminderLabel().getTitle()); - - title.append(" - ").append(decorate(editRow.getSpecies())); - - for (SampleCategory<?> sampleCategory : editRow) { - if (sampleCategory.getCategoryValue() != null) { - title.append(" - "); - title.append(decorate(sampleCategory.getCategoryValue())); - } - } - - title.append(" - ").append(_("tutti.splitSpeciesBatch.title")); - ui.getSpeciesTabSplitBatchReminderLabel().setTitle(title.toString()); + String title = buildReminderLabelTitle(editRow.getSpecies(), + editRow, + ui.getSpeciesTabFishingOperationReminderLabel().getTitle(), + _("tutti.splitSpeciesBatch.title")); + ui.getSpeciesTabSplitBatchReminderLabel().setTitle(title); } public void setSpeciesSelectedCard(String card) { @@ -389,22 +373,14 @@ setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); // update title - StringBuilder title = new StringBuilder(ui.getBenthosTabFishingOperationReminderLabel().getTitle()); - - title.append(" - ").append(decorate(editRow.getSpecies())); - - for (SampleCategory<?> sampleCategory : editRow) { - if (sampleCategory.getCategoryValue() != null) { - title.append(" - "); - title.append(decorate(sampleCategory.getCategoryValue())); - } - } - - title.append(" - ").append(_("tutti.editBenthosFrequencies.title")); - ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title.toString()); + String title = buildReminderLabelTitle(editRow.getSpecies(), + editRow, + ui.getBenthosTabFishingOperationReminderLabel().getTitle(), + _("tutti.editBenthosFrequencies.title")); + ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title); } - public void splitBenthosBAtch(BenthosBatchRowModel editRow, + public void splitBenthosBatch(BenthosBatchRowModel editRow, SplitBenthosBatchUI splitBatchEditor) { @@ -414,19 +390,11 @@ setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); // update title - StringBuilder title = new StringBuilder(ui.getBenthosTabFishingOperationReminderLabel().getTitle()); - - title.append(" - ").append(decorate(editRow.getSpecies())); - - for (SampleCategory<?> sampleCategory : editRow) { - if (sampleCategory.getCategoryValue() != null) { - title.append(" - "); - title.append(decorate(sampleCategory.getCategoryValue())); - } - } - - title.append(" - ").append(_("tutti.splitBenthosBatch.title")); - ui.getBenthosTabSplitBatchReminderLabel().setTitle(title.toString()); + String title = buildReminderLabelTitle(editRow.getSpecies(), + editRow, + ui.getBenthosTabFishingOperationReminderLabel().getTitle(), + _("tutti.splitBenthosBatch.title")); + ui.getBenthosTabSplitBatchReminderLabel().setTitle(title); } public void setBenthosSelectedCard(String card) { @@ -456,7 +424,7 @@ } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getBenthosTabFrequencyEditor(); - + } if (tuttiUi != null) { @@ -585,4 +553,22 @@ } } + protected String buildReminderLabelTitle(Species species, + Iterable<SampleCategory<?>> categories, + String prefix, + String suffix) { + StringBuilder title = new StringBuilder(prefix); + + title.append(" - [").append(decorate(species)).append("]"); + + for (SampleCategory<?> sampleCategory : categories) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(suffix); + return title.toString(); + } } \ No newline at end of file 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-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -722,7 +722,7 @@ // splitBatchEditor.getHandler().editBatch(parentBatch); // parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); - parent.getHandler().splitBenthosBAtch(parentBatch, splitBatchEditor); + parent.getHandler().splitBenthosBatch(parentBatch, splitBatchEditor); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.css 2013-09-18 05:20:33 UTC (rev 1184) @@ -41,19 +41,6 @@ selectedItem: {model.getSelectedCategory()}; } -#speciesLabel { - text: "tutti.splitBenthosBatch.field.species"; - toolTipText: "tutti.splitBenthosBatch.field.speciesField.tip"; - labelFor: {speciesField}; - _help: {"tutti.splitBenthosBatch.field.speciesField.help"}; -} - -#speciesField { - editable: false; - enabled: false; - text: {handler.decorateSpecies(model.getSpecies())}; -} - #batchWeightLabel { text: "tutti.splitBenthosBatch.field.batchWeight"; toolTipText: "tutti.splitBenthosBatch.field.batchWeightField.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUI.jaxx 2013-09-18 05:20:33 UTC (rev 1184) @@ -88,16 +88,6 @@ </cell> </row> - <!-- Incoming Batch Species --> - <row> - <cell anchor='west'> - <JLabel id='speciesLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='speciesField'/> - </cell> - </row> - <!-- Incoming Batch Total weight --> <row> <cell anchor='west'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -245,11 +245,6 @@ //-- Public methods --// //------------------------------------------------------------------------// - public String decorateSpecies(Species object) { - String result = object == null ? "" : super.decorate(object); - return result; - } - public void editBatch(BenthosBatchRowModel batch) { // get possible the last used Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIModel.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -26,7 +26,6 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; -import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; @@ -45,8 +44,6 @@ public static final String PROPERTY_CATEGORY = "category"; - public static final String PROPERTY_SPECIES = "species"; - public static final String PROPERTY_SELECTED_CATEGORY = "selectedCategory"; public static final String PROPERTY_BATCH_WEIGHT = "batchWeight"; @@ -93,17 +90,12 @@ } public void setBatch(BenthosBatchRowModel batch) { - Object oldSpecies = getSpecies(); + Object oldWeight = getBatchWeight(); this.batch = batch; - firePropertyChange(PROPERTY_SPECIES, oldSpecies, getSpecies()); - firePropertyChange(PROPERTY_BATCH_WEIGHT, null, getBatchWeight()); + firePropertyChange(PROPERTY_BATCH_WEIGHT, oldWeight, getBatchWeight()); } - public Species getSpecies() { - return batch == null ? null : batch.getSpecies(); - } - public List<SampleCategoryModelEntry> getCategory() { return category; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-09-18 05:20:33 UTC (rev 1184) @@ -41,19 +41,6 @@ selectedItem: {model.getSelectedCategory()}; } -#speciesLabel { - text: "tutti.splitSpeciesBatch.field.species"; - toolTipText: "tutti.splitSpeciesBatch.field.speciesField.tip"; - labelFor: {speciesField}; - _help: {"tutti.splitSpeciesBatch.field.speciesField.help"}; -} - -#speciesField { - editable: false; - enabled: false; - text: {handler.decorateSpecies(model.getSpecies())}; -} - #batchWeightLabel { text: "tutti.splitSpeciesBatch.field.batchWeight"; toolTipText: "tutti.splitSpeciesBatch.field.batchWeightField.tip"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.jaxx 2013-09-18 05:20:33 UTC (rev 1184) @@ -88,16 +88,6 @@ </cell> </row> - <!-- Incoming Batch Species --> - <row> - <cell anchor='west'> - <JLabel id='speciesLabel'/> - </cell> - <cell weightx='1.0'> - <JTextField id='speciesField'/> - </cell> - </row> - <!-- Incoming Batch Total weight --> <row> <cell anchor='west'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-09-18 05:02:30 UTC (rev 1183) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-09-18 05:20:33 UTC (rev 1184) @@ -45,7 +45,7 @@ public static final String PROPERTY_CATEGORY = "category"; - public static final String PROPERTY_SPECIES = "species"; +// public static final String PROPERTY_SPECIES = "species"; public static final String PROPERTY_SELECTED_CATEGORY = "selectedCategory"; @@ -93,17 +93,17 @@ } public void setBatch(SpeciesBatchRowModel batch) { - Object oldSpecies = getSpecies(); +// Object oldSpecies = getSpecies(); Object oldWeight = getBatchWeight(); this.batch = batch; - firePropertyChange(PROPERTY_SPECIES, oldSpecies, getSpecies()); +// firePropertyChange(PROPERTY_SPECIES, oldSpecies, getSpecies()); firePropertyChange(PROPERTY_BATCH_WEIGHT, oldWeight, getBatchWeight()); } - public Species getSpecies() { - return batch == null ? null : batch.getSpecies(); - } +// public Species getSpecies() { +// return batch == null ? null : batch.getSpecies(); +// } public List<SampleCategoryModelEntry> getCategory() { return category;