Author: tchemit Date: 2013-01-11 15:19:36 +0100 (Fri, 11 Jan 2013) New Revision: 174 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/174 Log: fix build Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 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/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-01-11 14:13:28 UTC (rev 173) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-01-11 14:19:36 UTC (rev 174) @@ -81,7 +81,7 @@ #splitSpeciesBatchMenu { text: "tutti.action.splitSpeciesBatch"; - toolTipTexttext: "tutti.action.splitSpeciesBatch.tip"; + toolTipText: "tutti.action.splitSpeciesBatch.tip"; mnemonic: S; actionIcon: batch-split; enabled: {model.isTableViewModeAll() && model.isSplitSpeciesBatchEnabled()}; @@ -97,7 +97,7 @@ #removeSpeciesSubBatchMenu { text: "tutti.action.removeSpeciesSubBatch"; - tooltiptext: "tutti.action.removeSpeciesSubBatch.tip"; + toolTipText: "tutti.action.removeSpeciesSubBatch.tip"; mnemonic: R; actionIcon: batch-delete; enabled: {model.isTableViewModeAll() && model.isRemoveSpeciesSubBatchEnabled()}; 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-01-11 14:13:28 UTC (rev 173) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIModel.java 2013-01-11 14:19:36 UTC (rev 174) @@ -107,7 +107,7 @@ } public Species getSpecies() { - return batch == null ? null : batch.getSpeciesCategoryValue(); + return batch == null ? null : batch.getSpecies(); } public List<SampleCategoryType> getCategory() { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-11 14:13:28 UTC (rev 173) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-01-11 14:19:36 UTC (rev 174) @@ -24,10 +24,10 @@ tutti.action.reload.ui=Recharger l'interface graphique tutti.action.removeCaracteristic=Supprimer la caractéristique tutti.action.removeSpecies=Supprimer l'espèce +tutti.action.removeSpeciesBatch=Supprimer le lot +tutti.action.removeSpeciesBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils tutti.action.removeSpeciesSubBatch=Supprimer les lots fils tutti.action.removeSpeciesSubBatch.tip=Supprimer tous les lots fils du lot sélectionné -tutti.action.removeSpeciesBatch=Supprimer le lot -tutti.action.removeSpeciesBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils tutti.action.reset.fishingOperationValidState=Réinitialiser tutti.action.save=Enregistrer tutti.action.selectCampaign=Campagne @@ -237,6 +237,7 @@ tutti.table.species.batch.header.sexCategory=Sexe tutti.table.species.batch.header.sizeCategory=Class. Tri tutti.table.species.batch.header.sortedUnsortedCategory=V/HV +tutti.table.species.batch.header.species= tutti.table.species.batch.header.speciesCategory=Espèce tutti.table.species.batch.header.toConfirm=A Confirmer tutti.table.species.batch.header.weight=Poids