Author: kmorin Date: 2013-04-30 11:11:34 +0200 (Tue, 30 Apr 2013) New Revision: 893 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/893 Log: remove plankton Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 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.jaxx 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/protocol/EditProtocolUI.jaxx 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/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-30 09:11:34 UTC (rev 893) @@ -570,7 +570,6 @@ ui.getMarineLitterTabFishingOperationReminderLabel().setTitle(fishingOperationText); ui.getAccidentalTabFishingOperationReminderLabel().setTitle(fishingOperationText); ui.getIndividualObservationTabFishingOperationReminderLabel().setTitle(fishingOperationText); -// ui.getPlanktonTabFishingOperationReminderLabel().setTitle(fishingOperationText); if (loadOtherTabs) { @@ -581,7 +580,6 @@ ui.getMarineLitterTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); ui.getAccidentalTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); ui.getIndividualObservationTabContent().getHandler().selectFishingOperation(batch == null ? null : bean); -// ui.getPlanktonTabContent().getHandler().selectFishingOperation(bean); } catchesUIModel.setLoadingData(false); 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-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-04-30 09:11:34 UTC (rev 893) @@ -292,10 +292,6 @@ model: {model.getMarineLitterTotalWeight()}; } -#planktonTab { - enabled: {false}; -} - #accidentalTabPanel { layout:{accidentalTabPanelLayout}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx 2013-04-30 09:11:34 UTC (rev 893) @@ -40,7 +40,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.IndividualObservationBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.individualobservation.create.CreateIndividualObservationBatchUI fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI - fr.ifremer.tutti.ui.swing.content.operation.catches.plankton.PlanktonBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.CreateSpeciesBatchUI 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-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-04-30 09:11:34 UTC (rev 893) @@ -143,7 +143,6 @@ closeUI(ui.getSpeciesTabContent()); closeUI(ui.getBenthosTabContent()); closeUI(ui.getMarineLitterTabContent()); -// closeUI(ui.getPlanktonTabContent()); closeUI(ui.getAccidentalTabContent()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-04-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.jaxx 2013-04-30 09:11:34 UTC (rev 893) @@ -207,12 +207,6 @@ </Table> </JPanel> </tab> - <!--<tab title='tutti.editProtocol.tab.plankton' enabled='false'>--> - <!--<JLabel text='tutti.to.be.done' horizontalAlignment="{JLabel.CENTER}"/>--> - <!--</tab>--> - <!--<tab title='tutti.editProtocol.tab.accidental' enabled='false'>--> - <!--<JLabel text='tutti.to.be.done' horizontalAlignment="{JLabel.CENTER}"/>--> - <!--</tab>--> </JTabbedPane> <JPanel id='saveWarningContainer' layout='{new BorderLayout(10, 10)}' 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-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-04-30 09:11:34 UTC (rev 893) @@ -877,6 +877,7 @@ tutti.gearUseFeatureTable.table.header.value= tutti.gearUseFeatureTable.title= tutti.help.mkDir.error= +tutti.i18n.deleteCache.error= tutti.i18n.mkDir.error= tutti.importProtocol.action.success= tutti.importPupitri.carrouselFile.extension= @@ -888,6 +889,7 @@ tutti.importPupitri.title= tutti.importPupitri.trunkFile.extension= tutti.importPupitri.trunkFile.extension.description= +tutti.io.directory.delete.error= tutti.label.catches.planktonTotalSampleWeight= tutti.label.catches.planktonTotalWeight= tutti.label.tab.accidental= @@ -1027,6 +1029,7 @@ tutti.manageTemporaryReferential.title.choose.importTemporaryVesselFile= tutti.message.action.running= tutti.property.get.error= +tutti.property.set.error= tutti.sampleOrder.caracteristicNotFound= tutti.selectBenthos.title= tutti.selectCruise.action.chooseCruiseExportFile= 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-30 08:56:13 UTC (rev 892) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-04-30 09:11:34 UTC (rev 893) @@ -599,20 +599,6 @@ tutti.editMarineLitterBatch.table.header.number.tip=Nombre d'objets tutti.editMarineLitterBatch.table.header.weight=Poids tutti.editMarineLitterBatch.table.header.weight.tip=Poids (kg) -tutti.editPlanktonBatch.table.header.comment=Commentaire -tutti.editPlanktonBatch.table.header.comment.tip=Commentaire -tutti.editPlanktonBatch.table.header.file=Pièces jointes -tutti.editPlanktonBatch.table.header.file.tip=Pièces jointes -tutti.editPlanktonBatch.table.header.sampleWeight=Poids échantillonné -tutti.editPlanktonBatch.table.header.sampleWeight.tip=Poids échantillonné -tutti.editPlanktonBatch.table.header.speciesByCode=Espèce -tutti.editPlanktonBatch.table.header.speciesByCode.tip=Espèce -tutti.editPlanktonBatch.table.header.speciesByGenusCode=Espèce -tutti.editPlanktonBatch.table.header.speciesByGenusCode.tip=Espèce -tutti.editPlanktonBatch.table.header.toConfirm=A Confirmer -tutti.editPlanktonBatch.table.header.toConfirm.tip=A Confirmer -tutti.editPlanktonBatch.table.header.weight=Poids -tutti.editPlanktonBatch.table.header.weight.tip=Poids tutti.editProgram.action.closeEditProgram=Fermer tutti.editProgram.action.closeEditProgram.mnemonic=r tutti.editProgram.action.closeEditProgram.tip=Annuler l'édition (ou la création) de la série de campagne, ou fermer l'éditeur suite à un enregistrement @@ -862,6 +848,7 @@ tutti.gearUseFeatureTable.table.header.value=Valeur tutti.gearUseFeatureTable.title=Mise en œuvre de l'engin tutti.help.mkDir.error=Erreur à la création du dossier d'aide +tutti.i18n.deleteCache.error= tutti.i18n.mkDir.error=Erreur à la création du dossier d'internationalisation tutti.importProtocol.action.success=Protocole [%s] lu depuis le fichier. tutti.importPupitri.carrouselFile.extension=car @@ -873,6 +860,7 @@ tutti.importPupitri.title=Import Pupitri tutti.importPupitri.trunkFile.extension=tnk tutti.importPupitri.trunkFile.extension.description=Fichier du trémie (.tnk) +tutti.io.directory.delete.error= tutti.label.catches.planktonTotalSampleWeight=Poids total échantillonné tutti.label.catches.planktonTotalWeight=Poids total tutti.label.tab.accidental=Captures accidentelles