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

r837 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin＠users.forge.codelutin.com 20 Apr '13

20 Apr '13

Author: kmorin Date: 2013-04-20 14:52:37 +0200 (Sat, 20 Apr 2013) New Revision: 837 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/837 Log: debug npe Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-04-20 12:17:16 UTC (rev 836) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/BenthosBatchPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) @@ -137,7 +137,13 @@ entityToBenthosBatch((SortingBatch) batch, target); result.addChildren(target); if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Hors Vrac > Benthos > " + target.getSpecies().getReferenceTaxonId() + " : " + target.getId()); + String species; + if (target.getSpecies() != null) { + species = String.valueOf(target.getSpecies().getReferenceTaxonId()); + } else { + species = "no species"; + } + log.info("Loaded CatchBatch Hors Vrac > Benthos > " + species + " : " + target.getId()); } } } Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-04-20 12:17:16 UTC (rev 836) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/SpeciesBatchPersistenceServiceImpl.java 2013-04-20 12:52:37 UTC (rev 837) @@ -484,7 +484,13 @@ SpeciesBatch targetChild = TuttiBeanFactory.newSpeciesBatch(); entityToSpeciesBatch(sourceChild, targetChild); if (log.isInfoEnabled()) { - log.info("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + target.getSpecies().getReferenceTaxonId() + " : " + target.getId()); + String species; + if (target.getSpecies() != null) { + species = String.valueOf(target.getSpecies().getReferenceTaxonId()); + } else { + species = "no species"; + } + log.info("Loaded CatchBatch Hors Vrac > (Species|Benthos) > " + species + " : " + target.getId()); } if (targetChild.getSampleCategoryValue() != null) { targetChilds.add(targetChild);

1 0

r836 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: benthos species
by kmorin＠users.forge.codelutin.com 20 Apr '13

20 Apr '13

Author: kmorin Date: 2013-04-20 14:17:16 +0200 (Sat, 20 Apr 2013) New Revision: 836 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/836 Log: fixes #1987 [PROTOCOLE] - Gestion des contr?\195?\180les/infos obligatoires en validation 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/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 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-04-20 11:38:50 UTC (rev 835) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchTableModel.java 2013-04-20 12:17:16 UTC (rev 836) @@ -230,7 +230,7 @@ // must have filled a species to edit this column BenthosBatchRowModel entry = getEntry(rowIndex); - result = entry.isValid() && entry.isBatchLeaf(); + result = entry.isBatchLeaf(); } else if (sampleCols.contains(propertyName)) { 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-04-20 11:38:50 UTC (rev 835) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-04-20 12:17:16 UTC (rev 836) @@ -35,9 +35,12 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.persistence.entities.data.SampleCategoryEnum; +import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; +import fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.service.DecoratorService; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -275,7 +278,30 @@ // a row is valid if species category is not empty and valid // then if any of none empty category is valid - boolean result = row.getSpecies() != null; + Species species = row.getSpecies(); + boolean result = species != null; + if (result && row.isBatchLeaf()) { + if (TuttiUIContext.VALIDATION_CONTEXT_VALIDATE.equals(getContext().getValidationContext())) { + TuttiProtocol protocol = getDataContext().getProtocol(); + if (protocol != null) { + List<SpeciesProtocol> speciesProtocols = protocol.getBenthos(); + for (SpeciesProtocol speciesProtocol : speciesProtocols) { + if (species.getReferenceTaxonId().equals( + speciesProtocol.getSpeciesReferenceTaxonId())) { + + result = (!speciesProtocol.isSizeEnabled() || row.getSizeCategoryValue() != null) + && (!speciesProtocol.isSexEnabled() || row.getSexCategoryValue() != null) + && (!speciesProtocol.isMaturityEnabled() || row.getMaturityCategoryValue() != null) + && (!speciesProtocol.isAgeEnabled() || row.getAgeCategoryValue() != null) + && (!speciesProtocol.isCountIfNoFrequencyEnabled() + || !CollectionUtils.isEmpty(row.getFrequency()) + || row.getNumber() != null); + } + } + } + } + } + return result; } @@ -286,13 +312,13 @@ Object oldValue, Object newValue) { + recomputeRowValidState(row); + if (SAMPLING_WEIGHT_PROPERTIES.contains(propertyName)) { // sampling category weight has changed, must then save the top // ancestor row - recomputeRowValidState(row); - BenthosBatchTableModel tableModel = getTableModel(); SampleCategoryColumnIdentifier<BenthosBatchRowModel> sampleCategoryColumnIdentifier = tableModel.getCategoryIdentifierForWeightProperty(propertyName); @@ -322,11 +348,6 @@ // modified sample weight is a leaf // will save it after - - } else if (SAMPLING_PROPERTIES.contains(propertyName)) { - - // species has changed, recompute valid property - recomputeRowValidState(row); } saveSelectedRowIfNeeded(); @@ -335,54 +356,27 @@ recomputeBatchActionEnable(); } -// @Override -// protected void onRowModified(int rowIndex, -// BenthosBatchRowModel row, -// String propertyName, -// Object oldValue, -// Object newValue) { -// -// if (SAMPLING_PROPERTIES.contains(propertyName)) { -// -// // species has changed, recompute valid property -// recomputeRowValidState(row); -// } -// -// saveSelectedRowIfNeeded(); -// -// // when row valid state has changed, recompute action enabled states -// recomputeBatchActionEnable(); -// } - @Override protected void saveSelectedRowIfRequired(TuttiBeanMonitor<BenthosBatchRowModel> rowMonitor, BenthosBatchRowModel row) { - if (row.isValid()) { - // there is a valid bean attached to the monitor - if (rowMonitor.wasModified()) { + // there is a valid bean attached to the monitor + if (rowMonitor.wasModified()) { - // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + row + " was modified, will save it"); - } + // monitored bean was modified, save it + if (log.isInfoEnabled()) { + log.info("Row " + row + " was modified, will save it"); + } - showInformationMessage( - "[ Captures - Benthos ] " + - "Sauvegarde des modifications de " + row + '.'); + showInformationMessage( + "[ Captures - Benthos ] " + + "Sauvegarde des modifications de " + row + '.'); - rowMonitor.setBean(null); - saveRow(row); - rowMonitor.setBean(row); + rowMonitor.setBean(null); + saveRow(row); + rowMonitor.setBean(row); - // clear modified flag on the monitor - rowMonitor.clearModified(); - } - } else { - - //FIXME See how to delete rows ? Or moreover how to save tehem... - if (log.isWarnEnabled()) { - log.warn("Will not remove not valid speciesBatch: " + row.getId()); - } + // clear modified flag on the monitor + rowMonitor.clearModified(); } } 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-04-20 11:38:50 UTC (rev 835) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchTableModel.java 2013-04-20 12:17:16 UTC (rev 836) @@ -236,7 +236,7 @@ // must have filled a species to edit this column SpeciesBatchRowModel entry = getEntry(rowIndex); - result = entry.isValid() && entry.isBatchLeaf(); + result = entry.isBatchLeaf(); } else if (sampleCols.contains(propertyName)) { 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-04-20 11:38:50 UTC (rev 835) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-04-20 12:17:16 UTC (rev 836) @@ -278,7 +278,7 @@ // then if any of none empty category is valid Species species = row.getSpecies(); boolean result = species != null; - if (result) { + if (result && row.isBatchLeaf()) { if (TuttiUIContext.VALIDATION_CONTEXT_VALIDATE.equals(getContext().getValidationContext())) { TuttiProtocol protocol = getDataContext().getProtocol(); if (protocol != null) { @@ -310,13 +310,13 @@ Object oldValue, Object newValue) { + recomputeRowValidState(row); + if (SAMPLING_WEIGHT_PROPERTIES.contains(propertyName)) { // sampling category weight has changed, must then save the top // ancestor row - recomputeRowValidState(row); - SpeciesBatchTableModel tableModel = getTableModel(); SampleCategoryColumnIdentifier<SpeciesBatchRowModel> sampleCategoryColumnIdentifier = tableModel.getCategoryIdentifierForWeightProperty(propertyName); @@ -346,11 +346,6 @@ // modified sample weight is a leaf // will save it after - - } else if (SAMPLING_PROPERTIES.contains(propertyName)) { - - // species has changed, recompute valid property - recomputeRowValidState(row); } saveSelectedRowIfNeeded(); @@ -381,32 +376,24 @@ @Override protected void saveSelectedRowIfRequired(TuttiBeanMonitor<SpeciesBatchRowModel> rowMonitor, SpeciesBatchRowModel row) { - if (row.isValid()) { - // there is a valid bean attached to the monitor - if (rowMonitor.wasModified()) { + // there is a valid bean attached to the monitor + if (rowMonitor.wasModified()) { - // monitored bean was modified, save it - if (log.isInfoEnabled()) { - log.info("Row " + row + " was modified, will save it"); - } + // monitored bean was modified, save it + if (log.isInfoEnabled()) { + log.info("Row " + row + " was modified, will save it"); + } - showInformationMessage( - "[ Captures - Espèces ] " + - "Sauvegarde des modifications de " + row + '.'); + showInformationMessage( + "[ Captures - Espèces ] " + + "Sauvegarde des modifications de " + row + '.'); - rowMonitor.setBean(null); - saveRow(row); - rowMonitor.setBean(row); + rowMonitor.setBean(null); + saveRow(row); + rowMonitor.setBean(row); - // clear modified flag on the monitor - rowMonitor.clearModified(); - } - } else { - - //FIXME See how to delete rows ? Or moreover how to save them... - if (log.isWarnEnabled()) { - log.warn("Will not remove not valid speciesBatch: " + row.getId()); - } + // clear modified flag on the monitor + rowMonitor.clearModified(); } }

1 0

r835 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos
by kmorin＠users.forge.codelutin.com 20 Apr '13

20 Apr '13

Author: kmorin Date: 2013-04-20 13:38:50 +0200 (Sat, 20 Apr 2013) New Revision: 835 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/835 Log: debug menu id Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-04-20 11:25:26 UTC (rev 834) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx 2013-04-20 11:38:50 UTC (rev 835) @@ -79,7 +79,7 @@ <JMenuItem id='splitBenthosBatchMenu' onActionPerformed='handler.splitBatch()'/> <JMenuItem id='removeBenthosBatchMenu'/> - <JMenuItem id='removeSpeciesSubBatchMenu'/> + <JMenuItem id='removeBenthosSubBatchMenu'/> <JMenuItem id='renameBenthosBatchMenu'/> <JMenuItem id='createSpeciesMelagMenu'/> </JPopupMenu>

1 0

r834 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos
by kmorin＠users.forge.codelutin.com 20 Apr '13

20 Apr '13

Author: kmorin Date: 2013-04-20 13:25:26 +0200 (Sat, 20 Apr 2013) New Revision: 834 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/834 Log: do not remove the species from the species used if we remove only the subbatches Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-04-20 11:24:59 UTC (rev 833) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/RemoveBenthosSubBatchAction.java 2013-04-20 11:25:26 UTC (rev 834) @@ -67,12 +67,6 @@ // save parent batch (will destroy all his childs from db) persistenceService.deleteSpeciesSubBatch(parentBatch.getId()); - if (parentBatch.isBatchRoot()) { - - // update speciesUsed - handler.removeFromSpeciesUsed(parentBatch); - } - // collect of rows to remove from model Set<BenthosBatchRowModel> rowToRemove = Sets.newHashSet();

1 0

r833 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species
by kmorin＠users.forge.codelutin.com 20 Apr '13

20 Apr '13

Author: kmorin Date: 2013-04-20 13:24:59 +0200 (Sat, 20 Apr 2013) New Revision: 833 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/833 Log: do not remove the species from the species used if we remove only the subbatches Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-04-19 17:16:10 UTC (rev 832) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/RemoveSpeciesSubBatchAction.java 2013-04-20 11:24:59 UTC (rev 833) @@ -67,12 +67,6 @@ // save parent batch (will destroy all his childs from db) persistenceService.deleteSpeciesSubBatch(parentBatch.getId()); - if (parentBatch.isBatchRoot()) { - - // update speciesUsed - handler.removeFromSpeciesUsed(parentBatch); - } - // collect of rows to remove from model Set<SpeciesBatchRowModel> rowToRemove = Sets.newHashSet();

1 0

r832 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/home java/fr/ifremer/tutti/ui/swing/content/operation java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter java/fr/ifremer/tutti/ui/swing/content/referential resources/i18n
by kmorin＠users.forge.codelutin.com 19 Apr '13

19 Apr '13

Author: kmorin Date: 2013-04-19 19:16:10 +0200 (Fri, 19 Apr 2013) New Revision: 832 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/832 Log: fixes #1848 [ERGO] - Touches de raccourcis Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 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/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 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/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-04-19 12:34:41 UTC (rev 831) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-04-19 17:16:10 UTC (rev 832) @@ -61,7 +61,6 @@ #editProgramButton { actionIcon: edit; text: "tutti.selectCruise.action.editProgram"; - i18nMnemonic: "tutti.selectCruise.action.editProgram.mnemonic"; enabled: {model.isProgramFound()}; _tuttiAction: {EditProgramAction.class}; toolTipText: "tutti.selectCruise.action.editProgram.tip"; @@ -71,7 +70,6 @@ #newProgramButton { actionIcon: add; text: "tutti.selectCruise.action.newProgram"; - i18nMnemonic: "tutti.selectCruise.action.newProgram.mnemonic"; _tuttiAction: {NewProgramAction.class}; toolTipText: "tutti.selectCruise.action.newProgram.tip"; _help: {"tutti.selectCruise.action.newProgram.help"}; @@ -101,7 +99,6 @@ #editCruiseButton { actionIcon: edit; text: "tutti.selectCruise.action.editCruise"; - i18nMnemonic: "tutti.selectCruise.action.editCruise.mnemonic"; _tuttiAction: {EditCruiseAction.class}; toolTipText: "tutti.selectCruise.action.editCruise.tip"; _help: {"tutti.selectCruise.action.editCruise.help"}; @@ -111,7 +108,6 @@ actionIcon: email; text: "tutti.selectCruise.action.sendCruiseReport"; toolTipText: "tutti.selectCruise.action.sendCruiseReport.tip"; - i18nMnemonic: "tutti.selectCruise.action.sendCruiseReport.mnemonic"; _tuttiAction: {SendCruiseReportAction.class}; _help: {"tutti.selectCruise.action.sendCruiseReport.help"}; } @@ -119,7 +115,6 @@ #newCruiseButton { actionIcon: add; text: "tutti.selectCruise.action.newCruise"; - i18nMnemonic: "tutti.selectCruise.action.newCruise.mnemonic"; enabled: {model.isProgramFound()}; _tuttiAction: {NewCruiseAction.class}; toolTipText: "tutti.selectCruise.action.newCruise.tip"; @@ -155,7 +150,6 @@ #newProtocolButton { actionIcon: add; text: "tutti.selectCruise.action.newProtocol"; - i18nMnemonic: "tutti.selectCruise.action.newProtocol.mnemonic"; _tuttiAction: {NewProtocolAction.class}; toolTipText: "tutti.selectCruise.action.newProtocol.tip"; _help: {"tutti.selectCruise.action.newProtocol.help"}; @@ -164,7 +158,6 @@ #importProtocolButton { actionIcon: import; text: "tutti.selectCruise.action.importProtocol"; - i18nMnemonic: "tutti.selectCruise.action.importProtocol.mnemonic"; _tuttiAction: {ImportProtocolAction.class}; toolTipText: "tutti.selectCruise.action.importProtocol.tip"; _help: {"tutti.selectCruise.action.importProtocol.help"}; @@ -173,7 +166,6 @@ #editProtocolButton { actionIcon: edit; text: "tutti.selectCruise.action.editProtocol"; - i18nMnemonic: "tutti.selectCruise.action.editProtocol.mnemonic"; _tuttiAction: {EditProtocolAction.class}; toolTipText: "tutti.selectCruise.action.editProtocol.tip"; _help: {"tutti.selectCruise.action.editProtocol.help"}; @@ -182,7 +174,6 @@ #cloneProtocolButton { actionIcon: copy; text: "tutti.selectCruise.action.cloneProtocol"; - i18nMnemonic: "tutti.selectCruise.action.cloneProtocol.mnemonic"; _tuttiAction: {CloneProtocolAction.class}; toolTipText: "tutti.selectCruise.action.cloneProtocol.tip"; _help: {"tutti.selectCruise.action.cloneProtocol.help"}; @@ -191,7 +182,6 @@ #exportProtocolButton { actionIcon: export; text: "tutti.selectCruise.action.exportProtocol"; - i18nMnemonic: "tutti.selectCruise.action.exportProtocol.mnemonic"; _tuttiAction: {ExportProtocolAction.class}; toolTipText: "tutti.selectCruise.action.exportProtocol.tip"; _help: {"tutti.selectCruise.action.exportProtocol.help"}; @@ -200,7 +190,6 @@ #deleteProtocolButton { actionIcon: delete; text: "tutti.selectCruise.action.deleteProtocol"; - i18nMnemonic: "tutti.selectCruise.action.deleteProtocol.mnemonic"; _tuttiAction: {DeleteProtocolAction.class}; toolTipText: "tutti.selectCruise.action.deleteProtocol.tip"; _help: {"tutti.selectCruise.action.deleteProtocol.help"}; 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-04-19 12:34:41 UTC (rev 831) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-19 17:16:10 UTC (rev 832) @@ -140,14 +140,26 @@ SelectCruiseUIModel model = getModel(); + List<Program> programs = Lists.newArrayList(); + if (model.getPrograms() != null) { + programs.addAll(model.getPrograms()); + } initBeanFilterableComboBox(ui.getProgramCombobox(), - Lists.newArrayList(model.getPrograms()), + programs, model.getProgram()); + List<Cruise> cruises = Lists.newArrayList(); + if (model.getCruises() != null) { + cruises.addAll(model.getCruises()); + } initBeanFilterableComboBox(ui.getCruiseCombobox(), - Lists.newArrayList(model.getCruises()), + cruises, model.getCruise()); + List<TuttiProtocol> protocols = Lists.newArrayList(); + if (model.getProtocols() != null) { + protocols.addAll(model.getProtocols()); + } initBeanFilterableComboBox(ui.getProtocolCombobox(), Lists.newArrayList(model.getProtocols()), model.getProtocol()); 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-04-19 12:34:41 UTC (rev 831) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-04-19 17:16:10 UTC (rev 832) @@ -334,11 +334,13 @@ if (evt.getNewValue() == null) { button.setText(_("tutti.editFishingOperation.action.cancelEditFishingOperation")); button.setToolTipText(_("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); + button.setMnemonic(_("tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic").charAt(0)); action.setActionDescription(_("tutti.editFishingOperation.action.cancelEditFishingOperation.tip")); } else { button.setText(_("tutti.editFishingOperation.action.resetEditFishingOperation")); button.setToolTipText(_("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); + button.setMnemonic(_("tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic").charAt(0)); action.setActionDescription(_("tutti.editFishingOperation.action.resetEditFishingOperation.tip")); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2013-04-19 12:34:41 UTC (rev 831) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchTableModel.java 2013-04-19 17:16:10 UTC (rev 832) @@ -71,7 +71,7 @@ public MarineLitterBatchTableModel(TableColumnModelExt columnModel) { super(columnModel, false, false); - setNoneEditableCols(); + setNoneEditableCols(MACRO_WASTE_CATEGORY, MACRO_WASTE_SIZE_CATEGORY); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-04-19 12:34:41 UTC (rev 831) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-04-19 17:16:10 UTC (rev 832) @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; +import fr.ifremer.tutti.service.DecoratorService; import fr.ifremer.tutti.ui.swing.content.operation.AbstractTuttiBatchTableUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -320,23 +321,19 @@ { // MarineLitter Category column - Decorator<CaracteristicQualitativeValue> decorator = getDecorator( - CaracteristicQualitativeValue.class, null); - - addComboDataColumnToModel(columnModel, - MarineLitterBatchTableModel.MACRO_WASTE_CATEGORY, - decorator, persistenceService.getMarineLitterCategoryCaracteristic().getQualitativeValue()); + addColumnToModel(columnModel, + null, + newTableCellRender(CaracteristicQualitativeValue.class, null), + MarineLitterBatchTableModel.MACRO_WASTE_CATEGORY); } { // MarineLitter Size Category column - Decorator<CaracteristicQualitativeValue> decorator = getDecorator( - CaracteristicQualitativeValue.class, null); - - addComboDataColumnToModel(columnModel, - MarineLitterBatchTableModel.MACRO_WASTE_SIZE_CATEGORY, - decorator, persistenceService.getMarineLitterSizeCategoryCaracteristic().getQualitativeValue()); + addColumnToModel(columnModel, + null, + newTableCellRender(CaracteristicQualitativeValue.class, null), + MarineLitterBatchTableModel.MACRO_WASTE_SIZE_CATEGORY); } { // Number column Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css 2013-04-19 12:34:41 UTC (rev 831) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css 2013-04-19 17:16:10 UTC (rev 832) @@ -40,7 +40,6 @@ #exportSpeciesExampleButton { actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample"; - i18nMnemonic: "tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.mnemonic"; _tuttiAction: {ExportTemporarySpeciesExampleAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help"}; @@ -49,7 +48,6 @@ #importSpeciesButton { actionIcon: import; text: "tutti.manageTemporaryReferential.action.importTemporarySpecies"; - i18nMnemonic: "tutti.manageTemporaryReferential.action.importTemporarySpecies.mnemonic"; _tuttiAction: {ImportTemporarySpeciesAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.importTemporarySpecies.tip"; _help: {"tutti.manageTemporaryReferential.action.importTemporarySpecies.help"}; @@ -64,7 +62,6 @@ #exportVesselExampleButton { actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporaryVesselExample"; - i18nMnemonic: "tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.mnemonic"; _tuttiAction: {ExportTemporaryVesselExampleAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help"}; @@ -73,7 +70,6 @@ #importVesselButton { actionIcon: import; text: "tutti.manageTemporaryReferential.action.importTemporaryVessel"; - i18nMnemonic: "tutti.manageTemporaryReferential.action.importTemporaryVessel.mnemonic"; _tuttiAction: {ImportTemporaryVesselAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryVessel.tip"; _help: {"tutti.manageTemporaryReferential.action.importTemporaryVessel.help"}; @@ -88,7 +84,6 @@ #exportGearExampleButton { actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporaryGearExample"; - i18nMnemonic: "tutti.manageTemporaryReferential.action.exportTemporaryGearExample.mnemonic"; _tuttiAction: {ExportTemporaryGearExampleAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help"}; @@ -97,7 +92,6 @@ #importGearButton { actionIcon: import; text: "tutti.manageTemporaryReferential.action.importTemporaryGear"; - i18nMnemonic: "tutti.manageTemporaryReferential.action.importTemporaryGear.mnemonic"; _tuttiAction: {ImportTemporaryGearAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryGear.tip"; _help: {"tutti.manageTemporaryReferential.action.importTemporaryGear.help"}; @@ -112,7 +106,6 @@ #exportPersonExampleButton { actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample"; - i18nMnemonic: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.mnemonic"; _tuttiAction: {ExportTemporaryPersonExampleAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help"}; @@ -121,7 +114,6 @@ #importPersonButton { actionIcon: import; text: "tutti.manageTemporaryReferential.action.importTemporaryPerson"; - i18nMnemonic: "tutti.manageTemporaryReferential.action.importTemporaryPerson.mnemonic"; _tuttiAction: {ImportTemporaryPersonAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryPerson.tip"; _help: {"tutti.manageTemporaryReferential.action.importTemporaryPerson.help"}; Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-19 12:34:41 UTC (rev 831) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-19 17:16:10 UTC (rev 832) @@ -478,6 +478,7 @@ tutti.editFishingOperation.action.importCasino.mnemonic= tutti.editFishingOperation.action.importCasino.tip= tutti.editFishingOperation.action.resetEditFishingOperation= +tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic= tutti.editFishingOperation.action.resetEditFishingOperation.tip= tutti.editFishingOperation.action.resetFishingOperationValidState= tutti.editFishingOperation.action.resetFishingOperationValidState.mnemonic= 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-04-19 12:34:41 UTC (rev 831) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-19 17:16:10 UTC (rev 832) @@ -205,13 +205,13 @@ tutti.dbManager.action.chooseDbExportFile=Exporter la base de données tutti.dbManager.action.chooseDbFile=Choisir la base à importer tutti.dbManager.action.closeDb=Fermer -tutti.dbManager.action.closeDb.mnemonic=e +tutti.dbManager.action.closeDb.mnemonic=F tutti.dbManager.action.closeDb.tip=Fermer la base de données en cours d'utilisation tutti.dbManager.action.exportAndCleanDb=Exporter et supprimer tutti.dbManager.action.exportAndCleanDb.mnemonic=s tutti.dbManager.action.exportAndCleanDb.tip=Exporter la base de données au format zip puis supprimer les fichiers de Tutti tutti.dbManager.action.exportDb=Exporter -tutti.dbManager.action.exportDb.mnemonic=x +tutti.dbManager.action.exportDb.mnemonic=E tutti.dbManager.action.exportDb.tip=Exporter la base de données au format zip tutti.dbManager.action.importDb=Importer une base tutti.dbManager.action.importDb.mnemonic=i @@ -425,7 +425,7 @@ tutti.editCatchBatch.legend.species=Espèces tutti.editCatchBatch.legend.total=Capture tutti.editCruise.action.closeEditCruise=Fermer -tutti.editCruise.action.closeEditCruise.mnemonic=com +tutti.editCruise.action.closeEditCruise.mnemonic=F tutti.editCruise.action.closeEditCruise.tip=Fermer l'écran d'édition de campagne tutti.editCruise.action.generateCampaignName=Générer le nom tutti.editCruise.action.generateCampaignName.mnemonic=G @@ -480,6 +480,7 @@ tutti.editFishingOperation.action.importCasino.mnemonic=I tutti.editFishingOperation.action.importCasino.tip=Import Casino tutti.editFishingOperation.action.resetEditFishingOperation=Réinitialiser +tutti.editFishingOperation.action.resetEditFishingOperation.mnemonic=R tutti.editFishingOperation.action.resetEditFishingOperation.tip=Réinitialiser l'édition du trait tutti.editFishingOperation.action.resetFishingOperationValidState=Réinitialiser tutti.editFishingOperation.action.resetFishingOperationValidState.mnemonic=é @@ -628,7 +629,7 @@ tutti.editPlanktonBatch.table.header.weight=Poids tutti.editPlanktonBatch.table.header.weight.tip= tutti.editProgram.action.closeEditProgram=Fermer -tutti.editProgram.action.closeEditProgram.mnemonic=r +tutti.editProgram.action.closeEditProgram.mnemonic=F tutti.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne tutti.editProgram.action.saveProgram=Enregistrer tutti.editProgram.action.saveProgram.mnemonic=E @@ -657,13 +658,13 @@ tutti.editProtocol.action.exportProtocolAllCaracteristic.mnemonic=t tutti.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) tutti.editProtocol.action.exportProtocolBenthos=Exporter les benthos -tutti.editProtocol.action.exportProtocolBenthos.mnemonic=b +tutti.editProtocol.action.exportProtocolBenthos.mnemonic=x tutti.editProtocol.action.exportProtocolBenthos.tip=Exporter les benthos du protocole tutti.editProtocol.action.exportProtocolCaracteristic=Exporter les caractéristiques -tutti.editProtocol.action.exportProtocolCaracteristic.mnemonic=c +tutti.editProtocol.action.exportProtocolCaracteristic.mnemonic=x tutti.editProtocol.action.exportProtocolCaracteristic.tip=Exporter les caractéristiques du protocole tutti.editProtocol.action.exportProtocolSpecies=Exporter les espèces -tutti.editProtocol.action.exportProtocolSpecies.mnemonic=è +tutti.editProtocol.action.exportProtocolSpecies.mnemonic=x tutti.editProtocol.action.exportProtocolSpecies.tip=Exporter les espèces du protocole tutti.editProtocol.action.exportPupitri=Export pupitri tutti.editProtocol.action.exportPupitri.mnemonic=p @@ -675,7 +676,7 @@ tutti.editProtocol.action.importProtocolCaracteristic.mnemonic=i tutti.editProtocol.action.importProtocolCaracteristic.tip=Importer les caractéristiques dans le protocole tutti.editProtocol.action.importProtocolSpecies=Importer les espèces -tutti.editProtocol.action.importProtocolSpecies.mnemonic=é +tutti.editProtocol.action.importProtocolSpecies.mnemonic=i tutti.editProtocol.action.importProtocolSpecies.tip=Importer les espèces dans le protocole tutti.editProtocol.action.removeBenthosProtocol=Supprimer le benthos tutti.editProtocol.action.removeBenthosProtocol.mnemonic=S @@ -899,7 +900,7 @@ tutti.legend.splitBenthosBatchConfiguration= tutti.legend.splitSpeciesBatchConfiguration=Configuration tutti.main.action.about=À propos -tutti.main.action.about.mnemonic=À +tutti.main.action.about.mnemonic=p tutti.main.action.about.tip=À Propos tutti.main.action.changeLocale.mnemonic=l tutti.main.action.changeLocale.tip=Changer de langue @@ -955,14 +956,14 @@ tutti.main.menu.actions.mnemonic=c tutti.main.menu.actions.tip=Actions tutti.main.menu.administration=Administration -tutti.main.menu.administration.mnemonic=d +tutti.main.menu.administration.mnemonic=m tutti.main.menu.administration.tip=Administrer Tutti tutti.main.menu.changeLocale=Langue tutti.main.menu.file=Fichier tutti.main.menu.file.mnemonic=h tutti.main.menu.file.tip=Fichier tutti.main.menu.help=Aide -tutti.main.menu.help.mnemonic=A +tutti.main.menu.help.mnemonic=d tutti.main.menu.help.tip=Aide tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise=Pas de campagne sélectionné @@ -985,28 +986,20 @@ tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.export.success=Exemple de référentiel temporaire de navires exporté dans le fichier %s tutti.manageTemporaryReferential.action.chooseReferentialVesselFile.import.success=Référentiel temporaire de navires importé depuis le fichier %s tutti.manageTemporaryReferential.action.exportTemporaryGearExample=Exporter -tutti.manageTemporaryReferential.action.exportTemporaryGearExample.mnemonic=E tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip=Exporter un exemple de référentiel Engin tutti.manageTemporaryReferential.action.exportTemporaryPersonExample=Exporter -tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.mnemonic=P tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip=Exporter un exemple de référentiel Personne tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample=Exporter -tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.mnemonic=s tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip=Exporter un exemple de référentiel Espèces tutti.manageTemporaryReferential.action.exportTemporaryVesselExample=Exporter -tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.mnemonic=N tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip=Exporter un exemple de référentiel Navire tutti.manageTemporaryReferential.action.importTemporaryGear=Importer -tutti.manageTemporaryReferential.action.importTemporaryGear.mnemonic=a tutti.manageTemporaryReferential.action.importTemporaryGear.tip=Importer un référentiel temporaire d'engins tutti.manageTemporaryReferential.action.importTemporaryPerson=Importer -tutti.manageTemporaryReferential.action.importTemporaryPerson.mnemonic=n tutti.manageTemporaryReferential.action.importTemporaryPerson.tip=Importer un référentiel temporaire de personnes tutti.manageTemporaryReferential.action.importTemporarySpecies=Importer -tutti.manageTemporaryReferential.action.importTemporarySpecies.mnemonic=e tutti.manageTemporaryReferential.action.importTemporarySpecies.tip=Importer un référentiel temporaire d'espèces tutti.manageTemporaryReferential.action.importTemporaryVessel=Importer -tutti.manageTemporaryReferential.action.importTemporaryVessel.mnemonic=c tutti.manageTemporaryReferential.action.importTemporaryVessel.tip=Importer un référentiel temporaire de navires tutti.manageTemporaryReferential.field.gear=Référentiel Engin tutti.manageTemporaryReferential.field.gear.tip= @@ -1038,49 +1031,35 @@ tutti.selectBenthos.title=Choisissez un benthos tutti.selectCruise.action.chooseProtocolFile=Choisir le fichier de protocole tutti.selectCruise.action.cloneProtocol=Cloner -tutti.selectCruise.action.cloneProtocol.mnemonic=o tutti.selectCruise.action.cloneProtocol.tip=Dupliquer le protocole sélectionné tutti.selectCruise.action.deleteProtocol=Supprimer tutti.selectCruise.action.deleteProtocol.message=Vous êtes sur le point de supprimer le protocol %s -tutti.selectCruise.action.deleteProtocol.mnemonic=S tutti.selectCruise.action.deleteProtocol.tip=Supprimer le protocole sélectioné tutti.selectCruise.action.deleteProtocol.title=Supprimer le protocole sélectioné tutti.selectCruise.action.editCatches=Saisir les captures tutti.selectCruise.action.editCatches.mnemonic=S tutti.selectCruise.action.editCatches.tip=Saisir des captures tutti.selectCruise.action.editCruise=Éditer -tutti.selectCruise.action.editCruise.mnemonic=c tutti.selectCruise.action.editCruise.tip=Éditer la campagne sélectionnée tutti.selectCruise.action.editProgram=Éditer -tutti.selectCruise.action.editProgram.mnemonic=p tutti.selectCruise.action.editProgram.tip=Éditer le programme sélectionné tutti.selectCruise.action.editProtocol=Éditer -tutti.selectCruise.action.editProtocol.mnemonic=r tutti.selectCruise.action.editProtocol.tip=Éditer le protocol sélectionné tutti.selectCruise.action.exportProtocol=Exporter -tutti.selectCruise.action.exportProtocol.mnemonic=x tutti.selectCruise.action.exportProtocol.tip=Exporter le protocole sélectionné tutti.selectCruise.action.importProtocol=Importer -tutti.selectCruise.action.importProtocol.mnemonic=i tutti.selectCruise.action.importProtocol.tip=Importer un protocole tutti.selectCruise.action.newCruise=Nouveau -tutti.selectCruise.action.newCruise.mnemonic=n tutti.selectCruise.action.newCruise.tip=Créer une nouvelle campagne tutti.selectCruise.action.newProgram=Nouveau -tutti.selectCruise.action.newProgram.mnemonic=a tutti.selectCruise.action.newProgram.tip=Créer une nouvelle série de campagne tutti.selectCruise.action.newProtocol=Nouveau -tutti.selectCruise.action.newProtocol.mnemonic=t tutti.selectCruise.action.newProtocol.tip=Créer un nouveau protocole tutti.selectCruise.action.sendCruiseReport=Envoyer -tutti.selectCruise.action.sendCruiseReport.mnemonic=E tutti.selectCruise.action.sendCruiseReport.tip=Envoyer le rapport de la campagne tutti.selectCruise.action.validateCatches=Valider les captures tutti.selectCruise.action.validateCatches.mnemonic=V tutti.selectCruise.action.validateCatches.tip=Valider les captures -tutti.selectCruise.action.validateCruise=Valider la campagne -tutti.selectCruise.action.validateCruise.mnemonic=d -tutti.selectCruise.action.validateCruise.tip=Valider la campagne tutti.selectCruise.field.cruise=Campagne tutti.selectCruise.field.cruise.tip= tutti.selectCruise.field.program=Série de campagne

1 0

r831 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation
by kmorin＠users.forge.codelutin.com 19 Apr '13

19 Apr '13

Author: kmorin Date: 2013-04-19 14:34:41 +0200 (Fri, 19 Apr 2013) New Revision: 831 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/831 Log: debug Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-19 12:34:41 UTC (rev 831) @@ -116,12 +116,14 @@ } rows = Lists.newArrayList(); - List<IndividualObservationBatch> batches = - persistenceService.getAllIndividualObservationBatch(bean.getId()); + if (!TuttiEntities.isNew(bean)) { + List<IndividualObservationBatch> batches = + persistenceService.getAllIndividualObservationBatch(bean.getId()); - for (IndividualObservationBatch aBatch : batches) { - IndividualObservationBatchRowModel entry = loadBatch(aBatch); - rows.add(entry); + for (IndividualObservationBatch aBatch : batches) { + IndividualObservationBatchRowModel entry = loadBatch(aBatch); + rows.add(entry); + } } } model.setRows(rows);

1 0

r830 - in trunk: . tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio
by kmorin＠users.forge.codelutin.com 19 Apr '13

19 Apr '13

Author: kmorin Date: 2013-04-19 14:22:49 +0200 (Fri, 19 Apr 2013) New Revision: 830 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/830 Log: fixes #2339 [ERGONOMIE] - Listes d?\195?\169roulantes - Certaines listes filtrables n'?\195?\169taient pas triables Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 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/operation/EditFishingOperationUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/pom.xml 2013-04-19 12:22:49 UTC (rev 830) @@ -132,7 +132,7 @@ <eugenePluginVersion>2.6.2</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.17</jaxxVersion> + <jaxxVersion>2.5.18-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -182,16 +182,16 @@ }); initBeanFilterableComboBox(ui.getProgramComboBox(), - persistenceService.getAllProgram(), + Lists.newArrayList(persistenceService.getAllProgram()), model.getProgram(), DecoratorService.ONLY_NAME); initBeanFilterableComboBox(ui.getDepartureLocationComboBox(), - persistenceService.getAllHarbour(), + Lists.newArrayList(persistenceService.getAllHarbour()), model.getDepartureLocation()); initBeanFilterableComboBox(ui.getReturnLocationComboBox(), - persistenceService.getAllHarbour(), + Lists.newArrayList(persistenceService.getAllHarbour()), model.getReturnLocation()); initBeanFilterableComboBox(ui.getVesselComboBox(), 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-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -141,15 +141,15 @@ SelectCruiseUIModel model = getModel(); initBeanFilterableComboBox(ui.getProgramCombobox(), - model.getPrograms(), + Lists.newArrayList(model.getPrograms()), model.getProgram()); initBeanFilterableComboBox(ui.getCruiseCombobox(), - model.getCruises(), + Lists.newArrayList(model.getCruises()), model.getCruise()); initBeanFilterableComboBox(ui.getProtocolCombobox(), - model.getProtocols(), + Lists.newArrayList(model.getProtocols()), model.getProtocol()); ui.getEditCruiseComboBox().putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); 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-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -278,13 +278,13 @@ String zoneId = zone.getId(); List<TuttiLocation> stratas = - persistenceService.getAllFishingOperationStrata(zoneId); + Lists.newArrayList(persistenceService.getAllFishingOperationStrata(zoneId)); List<TuttiLocation> subStratas = - persistenceService.getAllFishingOperationSubStrata(zoneId, strataId); + Lists.newArrayList(persistenceService.getAllFishingOperationSubStrata(zoneId, strataId)); List<TuttiLocation> locations = - persistenceService.getAllFishingOperationLocation(zoneId, strataId, substrataId); + Lists.newArrayList(persistenceService.getAllFishingOperationLocation(zoneId, strataId, substrataId)); initBeanFilterableComboBox(ui.getStrataComboBox(), stratas, strata); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -22,6 +22,7 @@ * #L% */ +import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.referential.Species; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; @@ -71,19 +72,19 @@ initUI(ui); initBeanFilterableComboBox(ui.getAccidentalSpeciesComboBox(), - getDataContext().getReferentSpecies(), + Lists.newArrayList(getDataContext().getReferentSpecies()), null); initBeanFilterableComboBox(ui.getAccidentalGenderComboBox(), - getDataContext().getGenderValues(), + Lists.newArrayList(getDataContext().getGenderValues()), null); initBeanFilterableComboBox(ui.getAccidentalLengthStepCaracteristicComboBox(), - getDataContext().getLengthStepCaracteristics(), + Lists.newArrayList(getDataContext().getLengthStepCaracteristics()), null); initBeanFilterableComboBox(ui.getAccidentalDeadOrAliveComboBox(), - getDataContext().getDeadOrAliveValues(), + Lists.newArrayList(getDataContext().getDeadOrAliveValues()), null); listenValidatorValid(ui.getValidator(), getModel()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -102,7 +102,7 @@ persistenceService.getSortedUnsortedCaracteristic(); initBeanFilterableComboBox(ui.getSortedUnsortedCategoryComboBox(), - caracteristic.getQualitativeValue(), + Lists.newArrayList(caracteristic.getQualitativeValue()), null); getModel().addPropertyChangeListener(CreateBenthosBatchUIModel.PROPERTY_SPECIES, new PropertyChangeListener() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -23,6 +23,7 @@ */ import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; @@ -82,12 +83,12 @@ initUI(ui); initBeanFilterableComboBox(ui.getIndividualObservationSpeciesComboBox(), - getDataContext().getReferentSpeciesWithSurveyCode(), + Lists.newArrayList(getDataContext().getReferentSpeciesWithSurveyCode()), null); List<Caracteristic> lengthStepCaracteristics = getDataContext().getLengthStepCaracteristics(); initBeanFilterableComboBox(ui.getIndividualObservationLengthStepCaracteristicComboBox(), - lengthStepCaracteristics, + Lists.newArrayList(lengthStepCaracteristics), null); if (context.isProtocolFilled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; @@ -83,14 +84,14 @@ Caracteristic marineLitterCategoryCaracteristic = persistenceService.getMarineLitterCategoryCaracteristic(); initBeanFilterableComboBox(ui.getMarineLitterCategoryComboBox(), - marineLitterCategoryCaracteristic.getQualitativeValue(), + Lists.newArrayList(marineLitterCategoryCaracteristic.getQualitativeValue()), null); Caracteristic marineLitterSizeCategoryCaracteristic = persistenceService.getMarineLitterSizeCategoryCaracteristic(); initBeanFilterableComboBox(ui.getMarineLitterSizeCategoryComboBox(), - marineLitterSizeCategoryCaracteristic.getQualitativeValue(), + Lists.newArrayList(marineLitterSizeCategoryCaracteristic.getQualitativeValue()), null); listenValidatorValid(ui.getValidator(), getModel()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUIHandler.java 2013-04-19 12:22:49 UTC (rev 830) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.data.Program; import fr.ifremer.tutti.service.PersistenceService; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiUIHandler; @@ -108,7 +109,7 @@ EditProgramUIModel model = getModel(); initBeanFilterableComboBox(ui.getZoneComboBox(), - persistenceService.getAllProgramZone(), + Lists.newArrayList(persistenceService.getAllProgramZone()), model.getZone()); SwingValidator validator = ui.getValidator();

1 0

r829 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . accidental individualobservation
by kmorin＠users.forge.codelutin.com 19 Apr '13

19 Apr '13

Author: kmorin Date: 2013-04-19 10:39:39 +0200 (Fri, 19 Apr 2013) New Revision: 829 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/829 Log: - refs #1866 [CAPTURE] - Captures accidentelles (validation) - refs #1867 [CAPTURE] - Observations individuelles (validation) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-04-19 08:39:39 UTC (rev 829) @@ -72,14 +72,6 @@ rightDecoration: {marineLitterTabContent.getMarineLitterBatchTabToolBar()}; } -#accidentalTabFishingOperationReminderLabel { - rightDecoration: {accidentalTabContent.getAccidentalBatchTabToolBar()}; -} - -#individualObservationTabFishingOperationReminderLabel { - rightDecoration: {individualObservationTabContent.getIndividualObservationBatchTabToolBar()}; -} - #catchTable { border: {BorderFactory.createTitledBorder(_("tutti.editCatchBatch.legend.total"))}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css 2013-04-19 08:39:39 UTC (rev 829) @@ -33,16 +33,6 @@ _help: {"tuttihelp.editAccidentalBatch.help"}; } -#accidentalBatchTabToolBar { - floatable: false; - opaque: false; - borderPainted: false; -} - -#accidentalBatchAttachmentsButton { - enabled: {model.getObjectId() != null}; -} - #tablePopup { label: "tutti.editAccidentalBatch.title.batchActions"; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx 2013-04-19 08:39:39 UTC (rev 829) @@ -68,11 +68,6 @@ <TuttiHelpBroker id='broker' constructorParams='"tuttihelp.editAccidentalBatch.help"'/> - <JToolBar id='accidentalBatchTabToolBar'> - <ButtonAttachment id='accidentalBatchAttachmentsButton' - constructorParams='getHandler().getContext(), getModel()'/> - </JToolBar> - <JPopupMenu id='tablePopup'> <JMenuItem id='removeAccidentalBatchMenu'/> </JPopupMenu> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) @@ -26,9 +26,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.persistence.entities.TuttiEntities; -import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; -import fr.ifremer.tutti.persistence.entities.data.Attachment; -import fr.ifremer.tutti.persistence.entities.data.FishingOperation; +import fr.ifremer.tutti.persistence.entities.data.*; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; @@ -40,6 +38,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.create.CreateAccidentalBatchUIModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchTableModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.marinelitter.MarineLitterBatchRowModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; @@ -118,12 +117,23 @@ } rows = Lists.newArrayList(); + if (!TuttiEntities.isNew(bean)) { + + // get all marine litter root + List<AccidentalBatch> batches = + persistenceService.getAllAccidentalBatch(bean.getId()); + + for (AccidentalBatch aBatch : batches) { + AccidentalBatchRowModel entry = loadBatch(aBatch); + rows.add(entry); + } + } } model.setRows(rows); recomputeBatchActionEnable(); } - protected AccidentalBatchRowModel loadBatch(AccidentalBatchRowModel aBatch) { + protected AccidentalBatchRowModel loadBatch(AccidentalBatch aBatch) { Integer id = aBatch.getIdAsInt(); @@ -391,7 +401,6 @@ if (log.isDebugEnabled()) { log.debug("closing: " + ui); } - ui.getAccidentalBatchAttachmentsButton().onCloseUI(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIModel.java 2013-04-19 08:39:39 UTC (rev 829) @@ -41,19 +41,15 @@ * @since 0.2 */ public class AccidentalBatchUIModel extends AbstractTuttiBatchUIModel<AccidentalBatchRowModel, AccidentalBatchUIModel> - implements AttachmentModelAware, TabContentModel { + implements TabContentModel { private static final long serialVersionUID = 1L; public static final String PROPERTY_REMOVE_BATCH_ENABLED = "removeBatchEnabled"; - protected final List<Attachment> attachment = Lists.newArrayList(); - /** Can user remove a selected batch? */ protected boolean removeBatchEnabled; - private String rootBatchId; - public AccidentalBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel); } @@ -68,67 +64,14 @@ firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled); } - public void setRootBatchId(String rootBatchId) { - String oldValue = getObjectId(); - this.rootBatchId = rootBatchId; - firePropertyChange(PROPERTY_OBJECT_ID, oldValue, getObjectId()); - } - - public String getRootBatchId() { - return rootBatchId; - } - //------------------------------------------------------------------------// - //-- AttachmentModelAware --// - //------------------------------------------------------------------------// - - @Override - public AttachementObjectTypeEnum getObjectType() { - return AttachementObjectTypeEnum.CATCH_BATCH; - } - - @Override - public String getObjectId() { - return rootBatchId; - } - - @Override - public List<Attachment> getAttachment() { - return attachment; - } - - @Override - public void addAllAttachment(Collection<Attachment> attachments) { - this.attachment.addAll(attachments); - firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); - } - - @Override - public void addAttachment(Attachment attachment) { - this.attachment.add(attachment); - firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); - } - - @Override - public void removeAllAttachment(Collection<Attachment> attachments) { - this.attachment.removeAll(attachments); - firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); - } - - @Override - public void removeAttachment(Attachment attachment) { - this.attachment.remove(attachment); - firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); - } - - //------------------------------------------------------------------------// //-- TabContentModel --// //------------------------------------------------------------------------// @Override public boolean isEmpty() { - boolean result = CollectionUtils.isEmpty(getAttachment()); - if (result && CollectionUtils.isNotEmpty(getRows())) { + boolean result = true; + if (CollectionUtils.isNotEmpty(getRows())) { // check if every line is not valid for (AccidentalBatchRowModel row : rows) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css 2013-04-19 08:39:39 UTC (rev 829) @@ -26,16 +26,6 @@ _help: {"tuttihelp.editIndividualObservationBatch.help"}; } -#individualObservationBatchTabToolBar { - floatable: false; - opaque: false; - borderPainted: false; -} - -#individualObservationBatchAttachmentsButton { - enabled: {model.getObjectId() != null}; -} - #tablePopup { label: "tutti.editIndividualObservationBatch.title.batchActions"; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx 2013-04-19 08:39:39 UTC (rev 829) @@ -67,11 +67,6 @@ <TuttiHelpBroker id='broker' constructorParams='"tuttihelp.editIndividualObservationBatch.help"'/> - <JToolBar id='individualObservationBatchTabToolBar'> - <ButtonAttachment id='individualObservationBatchAttachmentsButton' - constructorParams='getHandler().getContext(), getModel()'/> - </JToolBar> - <JPopupMenu id='tablePopup'> <JMenuItem id='removeIndividualObservationBatchMenu'/> </JPopupMenu> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-04-19 08:39:39 UTC (rev 829) @@ -25,6 +25,7 @@ import com.google.common.collect.Lists; import fr.ifremer.tutti.PropagatePropertyChangeListener; import fr.ifremer.tutti.persistence.entities.TuttiEntities; +import fr.ifremer.tutti.persistence.entities.data.AccidentalBatch; import fr.ifremer.tutti.persistence.entities.data.Attachment; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.persistence.entities.data.IndividualObservationBatch; @@ -35,6 +36,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIHandler; import fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel; +import fr.ifremer.tutti.ui.swing.content.operation.catches.accidental.AccidentalBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUIModel; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -114,9 +116,13 @@ } rows = Lists.newArrayList(); -// if (!TuttiEntities.isNew(bean)) { -// -// } + List<IndividualObservationBatch> batches = + persistenceService.getAllIndividualObservationBatch(bean.getId()); + + for (IndividualObservationBatch aBatch : batches) { + IndividualObservationBatchRowModel entry = loadBatch(aBatch); + rows.add(entry); + } } model.setRows(rows); recomputeBatchActionEnable(); @@ -390,7 +396,6 @@ if (log.isDebugEnabled()) { log.debug("closing: " + ui); } - ui.getIndividualObservationBatchAttachmentsButton().onCloseUI(); } @Override Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-04-19 07:29:27 UTC (rev 828) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIModel.java 2013-04-19 08:39:39 UTC (rev 829) @@ -40,19 +40,15 @@ * @since 1.4 */ public class IndividualObservationBatchUIModel extends AbstractTuttiBatchUIModel<IndividualObservationBatchRowModel, IndividualObservationBatchUIModel> - implements AttachmentModelAware, TabContentModel { + implements TabContentModel { private static final long serialVersionUID = 1L; public static final String PROPERTY_REMOVE_BATCH_ENABLED = "removeBatchEnabled"; - protected final List<Attachment> attachment = Lists.newArrayList(); - /** Can user remove a selected batch? */ protected boolean removeBatchEnabled; - private String rootBatchId; - public IndividualObservationBatchUIModel(EditCatchesUIModel catchesUIModel) { super(catchesUIModel); } @@ -67,16 +63,6 @@ firePropertyChange(PROPERTY_REMOVE_BATCH_ENABLED, oldValue, removeBatchEnabled); } - public void setRootBatchId(String rootBatchId) { - String oldValue = getObjectId(); - this.rootBatchId = rootBatchId; - firePropertyChange(PROPERTY_OBJECT_ID, oldValue, getObjectId()); - } - - public String getRootBatchId() { - return rootBatchId; - } - public Species getLastSpeciesUsed() { Species result = null; if (!rows.isEmpty()) { @@ -86,56 +72,13 @@ } //------------------------------------------------------------------------// - //-- AttachmentModelAware --// - //------------------------------------------------------------------------// - - @Override - public AttachementObjectTypeEnum getObjectType() { - return AttachementObjectTypeEnum.CATCH_BATCH; - } - - @Override - public String getObjectId() { - return rootBatchId; - } - - @Override - public List<Attachment> getAttachment() { - return attachment; - } - - @Override - public void addAllAttachment(Collection<Attachment> attachments) { - this.attachment.addAll(attachments); - firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); - } - - @Override - public void addAttachment(Attachment attachment) { - this.attachment.add(attachment); - firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); - } - - @Override - public void removeAllAttachment(Collection<Attachment> attachments) { - this.attachment.removeAll(attachments); - firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); - } - - @Override - public void removeAttachment(Attachment attachment) { - this.attachment.remove(attachment); - firePropertyChange(PROPERTY_ATTACHMENT, null, getAttachment()); - } - - //------------------------------------------------------------------------// //-- TabContentModel --// //------------------------------------------------------------------------// @Override public boolean isEmpty() { - boolean result = CollectionUtils.isEmpty(getAttachment()); - if (result && CollectionUtils.isNotEmpty(getRows())) { + boolean result = true; + if (CollectionUtils.isNotEmpty(getRows())) { // check if every line is not valid for (IndividualObservationBatchRowModel row : rows) {

1 0

r828 - trunk/tutti-ui-swing/src/main/resources/icons
by kmorin＠users.forge.codelutin.com 19 Apr '13

19 Apr '13

Author: kmorin Date: 2013-04-19 09:29:27 +0200 (Fri, 19 Apr 2013) New Revision: 828 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/828 Log: add missing icon Added: trunk/tutti-ui-swing/src/main/resources/icons/action-email.png Added: trunk/tutti-ui-swing/src/main/resources/icons/action-email.png =================================================================== (Binary files differ) Property changes on: trunk/tutti-ui-swing/src/main/resources/icons/action-email.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0