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

r641 - in trunk: . tutti-ui-swing
by tchemit＠users.forge.codelutin.com March 18, 2013

March 18, 2013

Author: tchemit Date: 2013-03-18 11:05:04 +0100 (Mon, 18 Mar 2013) New Revision: 641 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/641 Log: use last stable (prepare release) fix log config (on build time) Modified: trunk/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-18 09:13:40 UTC (rev 640) +++ trunk/pom.xml 2013-03-18 10:05:04 UTC (rev 641) @@ -120,7 +120,7 @@  - <nuitonUtilsVersion>2.6.11-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> <nuitonI18nVersion>2.5</nuitonI18nVersion> <eugenePluginVersion>2.6.1</eugenePluginVersion> @@ -129,7 +129,7 @@ <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <licensePluginVersion>1.4</licensePluginVersion> - <jaxxVersion>2.5.14-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.14</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.7</xworkVersion> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-03-18 09:13:40 UTC (rev 640) +++ trunk/tutti-ui-swing/pom.xml 2013-03-18 10:05:04 UTC (rev 641) @@ -84,7 +84,7 @@ <bundlePrefix>tutti-${project.version}</bundlePrefix> <tutti.log.file> - \$\{java.io.tmpdir\}\tutti-${project.version}.log + \$\{java.io.tmpdir\}tutti-${project.version}.log </tutti.log.file> </properties>

1 0

March 18, 2013

Author: tchemit Date: 2013-03-18 10:13:40 +0100 (Mon, 18 Mar 2013) New Revision: 640 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/640 Log: fixes #1848: [ERGO] - Touches de raccourcis (mise en place par langue + remplissage pour le fran?\195?\167ais) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 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/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 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/species/EnterMelagWeightDialog.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css 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/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 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/fishing/GearUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 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/util/attachment/AttachmentEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.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/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-03-18 09:13:40 UTC (rev 640) @@ -30,6 +30,7 @@ import fr.ifremer.tutti.ui.swing.content.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.util.TuttiExceptionHandler; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; +import fr.ifremer.tutti.ui.swing.util.action.TuttiUIAction; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -81,9 +82,13 @@ MainUIHandler handler = new MainUIHandler(context); - // try to update jre - i18n - application and exit if so - AbstractTuttiAction.runAction(new UpdateApplicationAction(handler)); + // try to update jre - i18n - application - help and exit if so + TuttiUIAction<UpdateApplicationAction> uiAction = + handler.createUIAction(null, UpdateApplicationAction.class); + uiAction.actionPerformed(null); +// AbstractTuttiAction.runAction(new UpdateApplicationAction(handler)); + // try to update db // new UpdateReferentialAction(handler).doAction(null); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -36,14 +36,14 @@ #menuFile { text: "tutti.main.menu.file"; toolTipText: "tutti.main.menu.file.tip"; - mnemonic: F; + i18nMnemonic: "tutti.main.menu.file.mnemonic"; } #menuFileConfiguration { actionIcon: config; text: "tutti.main.action.configuration"; toolTipText: "tutti.main.action.configuration.tip"; - mnemonic: C; + i18nMnemonic: "tutti.main.action.configuration.mnemonic"; enabled: {model.getScreen() != TuttiScreen.CONFIG}; _tuttiAction: {ShowConfigAction.class}; _help: {"tutti.main.menu.action.configuration.help"}; @@ -53,7 +53,7 @@ actionIcon: exit; text: "tutti.main.action.exit"; toolTipText: "tutti.main.action.exit.tip"; - mnemonic: Q; + i18nMnemonic: "tutti.main.action.exit.mnemonic"; _tuttiAction: {CloseApplicationAction.class}; _help: {"tutti.main.menu.action.exit.help"}; } @@ -62,7 +62,7 @@ actionIcon: update-application; text: "tutti.main.action.updateApplication"; toolTipText: "tutti.main.action.updateApplication.tip"; - mnemonic: M; + i18nMnemonic: "tutti.main.action.updateApplication.mnemonic"; _tuttiAction: {UpdateApplicationAction.class}; _help: {"tutti.main.menu.action.updateApplication.help"}; } @@ -71,7 +71,7 @@ actionIcon: manage-db; text: "tutti.main.action.manageDb"; toolTipText: "tutti.main.action.manageDb.tip"; - mnemonic: D; + i18nMnemonic: "tutti.main.action.manageDb.mnemonic"; enabled: {model.getScreen() != TuttiScreen.MANAGE_DB}; _tuttiAction: {ManageDbAction.class}; _help: {"tutti.main.menu.action.manageDb.help"}; @@ -81,7 +81,7 @@ actionIcon: translate; text: "tutti.main.menu.changeLocale"; toolTipText: "tutti.main.action.changeLocale.tip"; - mnemonic: A; + i18nMnemonic: "tutti.main.action.changeLocale.mnemonic"; _help: {"tutti.main.action.changeLocale.help"}; } @@ -89,7 +89,7 @@ actionIcon: i18n-fr; text: "tutti.main.action.changeLocaleFR"; toolTipText: "tutti.main.action.changeLocaleFR.tip"; - mnemonic: F; + i18nMnemonic: "tutti.main.action.changeLocaleFR.mnemonic"; enabled: {!handler.acceptLocale(model.getLocale(), "fr_FR")}; _tuttiAction: {ChangeToLocaleFRAction.class}; _help: {"tutti.main.action.changeLocaleFR.help"}; @@ -99,7 +99,7 @@ actionIcon: i18n-uk; text: "tutti.main.action.changeLocaleUK"; toolTipText: "tutti.main.action.changeLocaleUK.tip"; - mnemonic: n; + i18nMnemonic: "tutti.main.action.changeLocaleUK.mnemonic"; enabled: {!handler.acceptLocale(model.getLocale(), "en_GB")}; _tuttiAction: {ChangeToLocaleUKAction.class}; _help: {"tutti.main.action.changeLocaleUK.help"}; @@ -108,7 +108,7 @@ #menuActions { text: "tutti.main.menu.actions"; toolTipText: "tutti.main.menu.actions.tip"; - mnemonic: A; + i18nMnemonic: "tutti.main.menu.actions.mnemonic"; enabled: {model.isDbLoaded()}; } @@ -117,7 +117,7 @@ text: "tutti.main.action.selectCruise"; toolTipText: "tutti.main.action.selectCruise.tip"; enabled: {model.getScreen() != TuttiScreen.SELECT_CRUISE}; - mnemonic: S; + i18nMnemonic: "tutti.main.action.selectCruise.mnemonic"; _tuttiAction: {SelectCruiseAction.class}; _help: {"tutti.main.menu.action.selectCruise.help"}; } @@ -126,7 +126,7 @@ actionIcon: program; text: "tutti.main.action.editSelectedProgram"; toolTipText: "tutti.main.action.editProgram.tip"; - mnemonic: d; + i18nMnemonic: "tutti.main.action.editSelectedProgram.mnemonic"; enabled: {model.getScreen() != TuttiScreen.EDIT_PROGRAM && model.isProgramFilled()}; _tuttiAction: {EditSelectedProgramAction.class}; _help: {"tutti.main.menu.action.editProgram.help"}; @@ -136,7 +136,7 @@ actionIcon: cruise; text: "tutti.main.action.editSelectedCruise"; toolTipText: "tutti.main.action.editSelectedCruise.tip"; - mnemonic: C; + i18nMnemonic: "tutti.main.action.editSelectedCruise.mnemonic"; enabled: {model.getScreen() != TuttiScreen.EDIT_CRUISE && model.isCruiseFilled()}; _tuttiAction: {EditSelectedCruiseAction.class}; _help: {"tutti.main.menu.action.editCruise.help"}; @@ -146,7 +146,7 @@ actionIcon: protocol; text: "tutti.main.action.editSelectedProtocol"; toolTipText: "tutti.main.action.editSelectedProtocol.tip"; - mnemonic: P; + i18nMnemonic: "tutti.main.action.editSelectedProtocol.mnemonic"; enabled: {model.getScreen() != TuttiScreen.EDIT_PROTOCOL && model.isProtocolFilled()}; _tuttiAction: {EditSelectedProtocolAction.class}; _help: {"tutti.main.menu.action.editProtocol.help"}; @@ -156,7 +156,7 @@ actionIcon: edit; text: "tutti.main.action.editCatches"; toolTipText: "tutti.main.action.editCatches.tip"; - mnemonic: a; + i18nMnemonic: "tutti.main.action.editCatches.mnemonic"; enabled: {( !TuttiUIContext.VALIDATION_CONTEXT_EDIT.equals(model.getValidationContext()) || model.getScreen() != TuttiScreen.EDIT_FISHING_OPERATION @@ -169,7 +169,7 @@ actionIcon: validate; text: "tutti.main.action.validateCatches"; toolTipText: "tutti.main.action.validateCatches.tip"; - mnemonic: V; + i18nMnemonic: "tutti.main.action.validateCatches.mnemonic"; enabled: {( !TuttiUIContext.VALIDATION_CONTEXT_VALIDATE.equals(model.getValidationContext()) || model.getScreen() != TuttiScreen.EDIT_FISHING_OPERATION @@ -181,7 +181,7 @@ #menuAdministration { text: "tutti.main.menu.administration"; toolTipText: "tutti.main.menu.administration.tip"; - mnemonic: A; + i18nMnemonic: "tutti.main.menu.administration.mnemonic"; enabled: {model.isDbLoaded()}; } @@ -189,7 +189,7 @@ actionIcon: temporary-referential-import; text: "tutti.main.action.importTemporaryReferential"; toolTipText: "tutti.main.action.importTemporaryReferential.tip"; - mnemonic: I; + i18nMnemonic: "tutti.main.action.importTemporaryReferential.mnemonic"; enabled: {model.getScreen() != TuttiScreen.IMPORT_TEMPORARY_REFERENTIAL}; _tuttiAction: {ImportTemporaryReferentialAction.class}; _help: {"tutti.main.menu.action.importTemporaryReferential.help"}; @@ -198,14 +198,14 @@ #menuHelp { text: "tutti.main.menu.help"; toolTipText: "tutti.main.menu.help.tip"; - mnemonic: E; + i18nMnemonic: "tutti.main.menu.help.mnemonic"; } #menuShowHelp { actionIcon: help; text: "tutti.main.action.showHelp"; toolTipText: "tutti.main.action.showHelp.tip"; - mnemonic: e; + i18nMnemonic: "tutti.main.action.showHelp.mnemonic"; _help: {"tutti.main.action.showHelp.help"}; } @@ -213,7 +213,7 @@ actionIcon: site; text: "tutti.main.action.site"; toolTipText: "tutti.main.action.site.tip"; - mnemonic: S; + i18nMnemonic: "tutti.main.action.site.mnemonic"; _help: {"tutti.main.menu.action.site.help"}; } @@ -221,7 +221,7 @@ text: "tutti.main.action.about"; toolTipText: "tutti.main.action.about.tip"; actionIcon: about; - mnemonic: A; + i18nMnemonic: "tutti.main.action.about.mnemonic"; _help: {"tutti.main.menu.action.about.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/SampleOrderEditorUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -34,9 +34,3 @@ model: {listModel}; selectionMode: {ListSelectionModel.SINGLE_SELECTION}; } - -#closeButton { - actionIcon: close; - text: "tutti.action.close"; - mnemonic: F; -} \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -228,7 +228,7 @@ actionIcon: save; text: "tutti.editCruise.action.saveCruise"; toolTipText: "tutti.editCruise.action.saveCruise.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editCruise.action.saveCruise.mnemonic"; _tuttiAction: {SaveCruiseAction.class}; enabled: {model.isModify() && model.isValid()}; _help: {"tutti.editCruise.action.save.help"}; @@ -238,7 +238,7 @@ actionIcon: cancel; text: "tutti.editCruise.action.closeEditCruise"; toolTipText: "tutti.editCruise.action.closeEditCruise.tip"; - mnemonic: A; + i18nMnemonic: "tutti.editCruise.action.closeEditCruise.mnemonic"; _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; _help: {"tutti.editCruise.action.close.help"}; } @@ -247,7 +247,7 @@ actionIcon: generate; text: "tutti.editCruise.action.generateCampaignName"; toolTipText: "tutti.editCruise.action.generateName.tip"; - mnemonic: G; + i18nMnemonic: "tutti.editCruise.action.generateCampaignName.mnemonic"; enabled: {model.isCanGenerateName()}; _help: {"tutti.editCruise.action.generateName.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/DbManagerUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -39,7 +39,7 @@ #installDbButton { actionIcon: install-db; text: "tutti.dbManager.action.installDb"; - mnemonic: n; + i18nMnemonic: "tutti.dbManager.action.installDb.mnemonic"; _tuttiAction: {InstallDbAction.class}; toolTipText: "tutti.dbManager.action.installDb.tip"; _help: {"tutti.dbManager.action.installDb.help"}; @@ -48,7 +48,7 @@ #importDbButton { actionIcon: import-db; text: "tutti.dbManager.action.importDb"; - mnemonic: I; + i18nMnemonic: "tutti.dbManager.action.importDb.mnemonic"; _tuttiAction: {ImportDbAction.class}; toolTipText: "tutti.dbManager.action.importDb.tip"; _help: {"tutti.dbManager.action.importDb.help"}; @@ -61,7 +61,7 @@ #openDbButton { actionIcon: open-db; text: "tutti.dbManager.action.openDb"; - mnemonic: O; + i18nMnemonic: "tutti.dbManager.action.openDb.mnemonic"; enabled: {!model.isDbLoaded()}; _tuttiAction: {OpenDbAction.class}; toolTipText: "tutti.dbManager.action.openDb.tip"; @@ -71,7 +71,7 @@ #upgradeDbButton { actionIcon: update-referential; text: "tutti.dbManager.action.upgradeDb"; - mnemonic: U; + i18nMnemonic: "tutti.dbManager.action.upgradeDb.mnemonic"; enabled: {model.isDbLoaded()}; _tuttiAction: {UpdateReferentialAction.class}; toolTipText: "tutti.dbManager.action.upgradeDb.tip"; @@ -81,7 +81,7 @@ #closeDbButton { actionIcon: close-db; text: "tutti.dbManager.action.closeDb"; - mnemonic: F; + i18nMnemonic: "tutti.dbManager.action.closeDb.mnemonic"; enabled: {model.isDbLoaded()}; _tuttiAction: {CloseDbAction.class}; toolTipText: "tutti.dbManager.action.closeDb.tip"; @@ -91,7 +91,7 @@ #exportDbButton { actionIcon: export-db; text: "tutti.dbManager.action.exportDb"; - mnemonic: E; + i18nMnemonic: "tutti.dbManager.action.exportDb.mnemonic"; enabled: {model.isDbLoaded()}; _tuttiAction: {ExportDbAction.class}; toolTipText: "tutti.dbManager.action.exportDb.tip"; @@ -101,7 +101,7 @@ #exportAndCleanDbButton { actionIcon: export-db; text: "tutti.dbManager.action.exportAndCleanDb"; - mnemonic: E; + i18nMnemonic: "tutti.dbManager.action.exportAndCleanDb.mnemonic"; enabled: {model.isDbLoaded()}; _tuttiAction: {ExportAndCleanDbAction.class}; toolTipText: "tutti.dbManager.action.exportAndCleanDb.tip"; 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-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -61,7 +61,7 @@ #editProgramButton { actionIcon: edit; text: "tutti.selectCruise.action.editProgram"; - mnemonic: E; + i18nMnemonic: "tutti.selectCruise.action.editProgram.mnemonic"; enabled: {model.isProgramFound()}; _tuttiAction: {EditProgramAction.class}; toolTipText: "tutti.selectCruise.action.editProgram.tip"; @@ -71,7 +71,7 @@ #newProgramButton { actionIcon: add; text: "tutti.selectCruise.action.newProgram"; - mnemonic: N; + i18nMnemonic: "tutti.selectCruise.action.newProgram.mnemonic"; _tuttiAction: {NewProgramAction.class}; toolTipText: "tutti.selectCruise.action.newProgram.tip"; _help: {"tutti.selectCruise.action.newProgram.help"}; @@ -95,7 +95,7 @@ #editCruiseButton { actionIcon: edit; text: "tutti.selectCruise.action.editCruise"; - mnemonic: E; + i18nMnemonic: "tutti.selectCruise.action.editCruise.mnemonic"; enabled: {model.isProgramFound() && model.isCruiseFound()}; _tuttiAction: {EditCruiseAction.class}; toolTipText: "tutti.selectCruise.action.editCruise.tip"; @@ -105,7 +105,7 @@ #newCruiseButton { actionIcon: add; text: "tutti.selectCruise.action.newCruise"; - mnemonic: N; + i18nMnemonic: "tutti.selectCruise.action.newCruise.mnemonic"; enabled: {model.isProgramFound()}; _tuttiAction: {NewCruiseAction.class}; toolTipText: "tutti.selectCruise.action.newCruise.tip"; @@ -141,7 +141,7 @@ #newProtocolButton { actionIcon: add; text: "tutti.selectCruise.action.newProtocol"; - mnemonic: N; + i18nMnemonic: "tutti.selectCruise.action.newProtocol.mnemonic"; _tuttiAction: {NewProtocolAction.class}; toolTipText: "tutti.selectCruise.action.newProtocol.tip"; _help: {"tutti.selectCruise.action.newProtocol.help"}; @@ -150,7 +150,7 @@ #importProtocolButton { actionIcon: import; text: "tutti.selectCruise.action.importProtocol"; - mnemonic: I; + i18nMnemonic: "tutti.selectCruise.action.importProtocol.mnemonic"; _tuttiAction: {ImportProtocolAction.class}; toolTipText: "tutti.selectCruise.action.importProtocol.tip"; _help: {"tutti.selectCruise.action.importProtocol.help"}; @@ -159,7 +159,7 @@ #editProtocolButton { actionIcon: edit; text: "tutti.selectCruise.action.editProtocol"; - mnemonic: E; + i18nMnemonic: "tutti.selectCruise.action.editProtocol.mnemonic"; _tuttiAction: {EditProtocolAction.class}; toolTipText: "tutti.selectCruise.action.editProtocol.tip"; _help: {"tutti.selectCruise.action.editProtocol.help"}; @@ -168,7 +168,7 @@ #cloneProtocolButton { actionIcon: copy; text: "tutti.selectCruise.action.cloneProtocol"; - mnemonic: C; + i18nMnemonic: "tutti.selectCruise.action.cloneProtocol.mnemonic"; _tuttiAction: {CloneProtocolAction.class}; toolTipText: "tutti.selectCruise.action.cloneProtocol.tip"; _help: {"tutti.selectCruise.action.cloneProtocol.help"}; @@ -177,7 +177,7 @@ #exportProtocolButton { actionIcon: export; text: "tutti.selectCruise.action.exportProtocol"; - mnemonic: E; + i18nMnemonic: "tutti.selectCruise.action.exportProtocol.mnemonic"; _tuttiAction: {ExportProtocolAction.class}; toolTipText: "tutti.selectCruise.action.exportProtocol.tip"; _help: {"tutti.selectCruise.action.exportProtocol.help"}; @@ -186,7 +186,7 @@ #deleteProtocolButton { actionIcon: delete; text: "tutti.selectCruise.action.deleteProtocol"; - mnemonic: D; + i18nMnemonic: "tutti.selectCruise.action.deleteProtocol.mnemonic"; _tuttiAction: {DeleteProtocolAction.class}; toolTipText: "tutti.selectCruise.action.deleteProtocol.tip"; _help: {"tutti.selectCruise.action.deleteProtocol.help"}; @@ -195,7 +195,7 @@ #editCatchesButton { actionIcon: edit; text: "tutti.selectCruise.action.editCatches"; - mnemonic: E; + i18nMnemonic: "tutti.selectCruise.action.editCatches.mnemonic"; _tuttiAction: {EditCatchesAction.class}; enabled: {model.isValid() && uiContext.isCruiseFilled()}; toolTipText: "tutti.selectCruise.action.editCatches.tip"; @@ -206,7 +206,7 @@ actionIcon: validate; text: "tutti.selectCruise.action.validateCatches"; toolTipText: "tutti.selectCruise.action.validateCatches.tip"; - mnemonic: V; + i18nMnemonic: "tutti.selectCruise.action.validateCatches.mnemonic"; _tuttiAction: {ValidateCatchesAction.class}; enabled: {model.isValid() && uiContext.isCruiseFilled()}; _help: {"tutti.selectCruise.action.validateCatches.help"}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -471,13 +471,6 @@ _help: {"tutti.editFishingOperation.field.fishingOperationValid.help"}; } -#resetValidStateButton { - actionIcon: reset; - text: "tutti.editFishingOperation.action.resetFishingOperationValidState"; - toolTipText: "tutti.editFishingOperation.action.resetFishingOperationValidState.tip"; - _help: {"tutti.editFishingOperation.action.resetFishingOperationValidState.help"}; -} - #fishingOperationValidRadio { text: "tutti.editFishingOperation.field.fishingOperationValid"; selected: {model.getFishingOperationValid() == Boolean.TRUE}; @@ -551,11 +544,19 @@ _validatorLabel : {_("tutti.editFishingOperation.field.comment")}; } +#resetValidStateButton { + actionIcon: reset; + text: "tutti.editFishingOperation.action.resetFishingOperationValidState"; + toolTipText: "tutti.editFishingOperation.action.resetFishingOperationValidState.tip"; + i18nMnemonic: "tutti.editFishingOperation.action.resetFishingOperationValidState.mnemonic"; + _help: {"tutti.editFishingOperation.action.resetFishingOperationValidState.help"}; +} + #saveButton { actionIcon: save; text: "tutti.editFishingOperation.action.saveFishingOperation"; toolTipText: "tutti.editFishingOperation.action.saveEditFishingOperation.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editFishingOperation.action.saveEditFishingOperation.mnemonic"; _tuttiAction: {SaveFishingOperationAction.class}; _help: {"tutti.editFishingOperation.action.saveEditFishingOperation.help"}; } @@ -564,7 +565,7 @@ actionIcon: cancel; text: "tutti.editFishingOperation.action.cancelEditFishingOperation"; toolTipText: "tutti.editFishingOperation.action.cancelEditFishingOperation.tip"; - mnemonic: A; + i18nMnemonic: "tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic"; _tuttiAction: {CancelEditFishingOperationAction.class}; _help: {"tutti.editFishingOperation.action.cancelEditFishingOperation.help"}; } @@ -573,7 +574,7 @@ actionIcon: casino-import; text: "tutti.editFishingOperation.action.importCasino"; toolTipText: "tutti.editFishingOperation.action.importCasino.tip"; - mnemonic: I; + i18nMnemonic: "tutti.editFishingOperation.action.importCasino.mnemonic"; _tuttiAction: {ImportCasinoAction.class}; enabled: {model.getId() != null}; _help: {"tutti.editFishingOperation.action.importCasino.help"}; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -41,7 +41,7 @@ #newFishingOperationButton { actionIcon: add; toolTipText: "tutti.fishingOperations.action.newFishingOperation.tip"; - mnemonic: N; + i18nMnemonic: "tutti.fishingOperations.action.newFishingOperation.mnemonic"; _tuttiAction: {NewFishingOperationAction.class}; _help: {"tutti.fishingOperations.action.newFishingOperation.help"}; } 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-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -292,7 +292,7 @@ actionIcon: pupitri-import; text: "tutti.editCatchBatch.action.importPupitri"; toolTipText: "tutti.editCatchBatch.action.importPupitri.tip"; - mnemonic: I; + i18nMnemonic: "tutti.editCatchBatch.action.importPupitri.mnemonic"; _tuttiAction: {ImportPupitriAction.class}; _help: {"tutti.editCatchBatch.action.importPupitri.help"}; } @@ -301,7 +301,7 @@ actionIcon: save; text: "tutti.editCatchBatch.action.saveCatchBatch"; toolTipText: "tutti.editCatchBatch.action.saveCatchBatch.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editCatchBatch.action.saveCatchBatch.mnemonic"; _tuttiAction: {SaveCatchBatchAction.class}; _help: {"tutti.editCatchBatch.action.saveCatchBatch.help"}; } @@ -310,7 +310,7 @@ actionIcon: cancel; text: "tutti.editCatchBatch.action.cancelEditCatchBatch"; toolTipText: "tutti.editCatchBatch.action.cancelEditCatchBatch.tip"; - mnemonic: A; + i18nMnemonic: "tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic"; _tuttiAction: {CancelEditCatchBatchAction.class}; _help: {"tutti.editCatchBatch.action.cancelEditCatchBatch.help"}; } @@ -319,7 +319,7 @@ actionIcon: generate; text: "tutti.editCatchBatch.action.computeWeights"; toolTipText: "tutti.editCatchBatch.action.computeWeights.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editCatchBatch.action.computeWeights.mnemonic"; _tuttiAction: {ComputeWeightsAction.class}; _help: {"tutti.editCatchBatch.action.computeWeights.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EnterMelagWeightDialog.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EnterMelagWeightDialog.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/EnterMelagWeightDialog.css 2013-03-18 09:13:40 UTC (rev 640) @@ -42,12 +42,12 @@ #cancelButton { text: "tutti.createMelag.action.cancel"; toolTipText: "tutti.createMelag.action.cancel.tip"; - mnemonic:A; + i18nMnemonic: "tutti.createMelag.action.cancel.mnemonic"; } #validateButton { text: "tutti.createMelag.action.validate"; toolTipText: "tutti.createMelag.action.validate.tip"; - mnemonic:V; + i18nMnemonic: "tutti.createMelag.action.validate.mnemonic"; enabled: { editor.getModel() != null }; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -34,13 +34,13 @@ actionIcon: cancel; text: "tutti.selectSpecies.action.cancel"; toolTipText: "tutti.selectSpecies.action.cancel.tip"; - mnemonic:A; + i18nMnemonic: "tutti.selectSpecies.action.cancel.mnemonic"; } #validateButton { actionIcon: accept; text: "tutti.selectSpecies.action.validate"; toolTipText: "tutti.selectSpecies.action.validate.tip"; - mnemonic:V; + i18nMnemonic: "tutti.selectSpecies.action.validate.mnemonic"; enabled: {model.getSelectedSpecies() != null}; } \ No newline at end of file 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-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -133,18 +133,18 @@ #splitSpeciesBatchMenu { actionIcon: batch-split; - text: "tutti.editSpeciesBatch.tutti.action.splitSpeciesBatch"; + text: "tutti.editSpeciesBatch.action.splitSpeciesBatch"; toolTipText: "tutti.editSpeciesBatch.action.splitSpeciesBatch.tip"; - mnemonic: S; + i18nMnemonic: "tutti.editSpeciesBatch.action.splitSpeciesBatch.mnemonic"; enabled: {model.isTableViewModeAll() && model.isSplitSpeciesBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.splitSpeciesBatch.help"}; } #removeSpeciesBatchMenu { actionIcon: batch-delete; - text: "tutti.editSpeciesBatch.tutti.action.removeSpeciesBatch"; + text: "tutti.editSpeciesBatch.action.removeSpeciesBatch"; toolTipText: "tutti.editSpeciesBatch.action.removeSpeciesBatch.tip"; - mnemonic: R; + i18nMnemonic: "tutti.editSpeciesBatch.action.removeSpeciesBatch.mnemonic"; _tuttiAction: {RemoveSpeciesBatchAction.class}; enabled: {model.isTableViewModeAll() && model.isRemoveSpeciesBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.removeSpeciesBatch.help"}; @@ -152,9 +152,9 @@ #removeSpeciesSubBatchMenu { actionIcon: batch-delete; - text: "tutti.editSpeciesBatch.tutti.action.removeSpeciesSubBatch"; + text: "tutti.editSpeciesBatch.action.removeSpeciesSubBatch"; toolTipText: "tutti.editSpeciesBatch.action.removeSpeciesSubBatch.tip"; - mnemonic: R; + i18nMnemonic: "tutti.editSpeciesBatch.action.removeSpeciesSubBatch.mnemonic"; _tuttiAction: {RemoveSpeciesSubBatchAction.class}; enabled: {model.isTableViewModeAll() && model.isRemoveSpeciesSubBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.removeSpeciesSubBatch.help"}; @@ -162,9 +162,9 @@ #renameSpeciesBatchMenu { actionIcon: batch-rename; - text: "tutti.editSpeciesBatch.tutti.action.renameSpeciesBatch"; + text: "tutti.editSpeciesBatch.action.renameSpeciesBatch"; toolTipText: "tutti.editSpeciesBatch.action.renameSpeciesBatch.tip"; - mnemonic: C; + i18nMnemonic: "tutti.editSpeciesBatch.action.renameSpeciesBatch.mnemonic"; _tuttiAction: {RenameSpeciesBatchAction.class}; enabled: {model.isTableViewModeAll() && model.isRenameSpeciesBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.renameSpeciesBatch.help"}; @@ -172,9 +172,9 @@ #createMelag { actionIcon: batch-rename; - text: "tutti.editSpeciesBatch.tutti.action.createMelag"; + text: "tutti.editSpeciesBatch.action.createMelag"; toolTipText: "tutti.editSpeciesBatch.action.createMelag.tip"; - mnemonic: M; + i18nMnemonic: "tutti.editSpeciesBatch.action.createMelag.mnemonic"; _tuttiAction: {CreateMelagAction.class}; enabled: {!model.isTableViewModeLeaf() && model.isCreateMelagEnabled()}; _help: {"tutti.editSpeciesBatch.action.createMelag.help"}; @@ -182,9 +182,9 @@ #createSpeciesBatchButton { actionIcon: batch-create; - text: "tutti.editSpeciesBatch.tutti.action.createSpeciesBatch"; + text: "tutti.editSpeciesBatch.action.createSpeciesBatch"; toolTipText: "tutti.editSpeciesBatch.action.createSpeciesBatch.tip"; - mnemonic: C; + i18nMnemonic: "tutti.editSpeciesBatch.action.createSpeciesBatch.mnemonic"; enabled: {model.isCreateSpeciesBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.createSpeciesBatch.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -211,25 +211,16 @@ actionIcon: generate; text: "tutti.editSpeciesFrequencies.action.generate"; toolTipText: "tutti.editSpeciesFrequencies.action.generate.tip"; - mnemonic: G; + i18nMnemonic: "tutti.editSpeciesFrequencies.action.generate.mnemonic"; enabled: {model.isCanGenerate()}; _help: {"tutti.editSpeciesFrequencies.action.generate.help"}; } -/*#closeButton { - actionIcon: "close"; - text: "tutti.action.close"; - toolTipText: "tutti.editSpeciesFrequencies.action.close.tip"; - mnemonic: F; - enabled: {model.getRows().size() == 0 || model.getLengthStepCaracteristic() != null}; - _help: {"tutti.editSpeciesFrequencies.action.close.help"}; -}*/ - #cancelButton { actionIcon: cancel; text: "tutti.editSpeciesFrequencies.action.cancel"; toolTipText: "tutti.editSpeciesFrequencies.action.cancel.tip"; - mnemonic: C; + i18nMnemonic: "tutti.editSpeciesFrequencies.action.cancel.mnemonic"; _help: {"tutti.editSpeciesFrequencies.action.cancel.help"}; } @@ -237,7 +228,7 @@ actionIcon: save; text: "tutti.editSpeciesFrequencies.action.save"; toolTipText: "tutti.editSpeciesFrequencies.action.save.tip"; - mnemonic: S; + i18nMnemonic: "tutti.editSpeciesFrequencies.action.save.mnemonic"; enabled: {model.isValid()}; _help: {"tutti.editSpeciesFrequencies.action.save.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/CreateSpeciesBatchUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -87,7 +87,7 @@ #addSpeciesButton { text: "tutti.createSpeciesBatch.action.addSpecies"; toolTipText: "tutti.createSpeciesBatch.action.addSpecies.tip"; - mnemonic: A; + i18nMnemonic: "tutti.createSpeciesBatch.action.addSpecies.mnemonic"; _tuttiAction: {AddSpeciesAction.class}; _help: {"tutti.createSpeciesBatch.action.addSpecies.help"}; } @@ -96,7 +96,7 @@ actionIcon: save; text: "tutti.createSpeciesBatch.action.save"; toolTipText: "tutti.createSpeciesBatch.action.save.tip"; - mnemonic: E; + i18nMnemonic: "tutti.createSpeciesBatch.action.save.mnemonic"; enabled: {model.isValid()}; _help: {"tutti.createSpeciesBatch.action.save.help"}; } @@ -105,6 +105,6 @@ actionIcon: cancel; text: "tutti.createSpeciesBatch.action.cancel"; toolTipText: "tutti.createSpeciesBatch.action.cancel.tip"; - mnemonic: A; + i18nMnemonic: "tutti.createSpeciesBatch.action.cancel.mnemonic"; _help: {"tutti.createSpeciesBatch.action.cancel.help"}; } 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-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -98,7 +98,7 @@ actionIcon: cancel; text: "tutti.splitSpeciesBatch.action.cancel"; toolTipText: "tutti.splitSpeciesBatch.action.cancel.tip"; - mnemonic: A; + i18nMnemonic: "tutti.splitSpeciesBatch.action.cancel.mnemonic"; _help: {"tutti.splitSpeciesBatch.action.cancel.help"}; } @@ -106,7 +106,7 @@ actionIcon: save; text: "tutti.splitSpeciesBatch.action.save"; toolTipText: "tutti.splitSpeciesBatch.action.save.tip"; - mnemonic: E; + i18nMnemonic: "tutti.splitSpeciesBatch.action.save.mnemonic"; enabled: {model.isValid()}; _help: {"tutti.splitSpeciesBatch.action.save.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -48,6 +48,6 @@ actionIcon: batch-delete; text: "tutti.gearUseFeatureTable.action.removeCaracteristic"; toolTipText: "tutti.gearUseFeatureTable.action.removeCaracteristic.tip"; - mnemonic: R; + i18nMnemonic: "tutti.gearUseFeatureTable.action.removeCaracteristic.mnemonic"; enabled: {model.isRemoveCaracteristicEnabled()}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -48,6 +48,6 @@ actionIcon: batch-delete; text: "tutti.vesselUseFeatureTable.action.removeCaracteristic"; toolTipText: "tutti.vesselUseFeatureTable.action.removeCaracteristic.tip"; - mnemonic: R; + i18nMnemonic: "tutti.vesselUseFeatureTable.action.removeCaracteristic.mnemonic"; enabled: {model.isRemoveCaracteristicEnabled()}; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -76,7 +76,7 @@ actionIcon: save; text: "tutti.editProgram.action.saveProgram"; toolTipText: "tutti.editProgram.action.saveProgram.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editProgram.action.saveProgram.mnemonic"; _tuttiAction: {SaveProgramAction.class}; enabled: {model.isModify() && model.isValid()}; _help: {"tutti.editProgram.action.saveProgram.help"}; @@ -86,7 +86,7 @@ actionIcon: cancel; text: "tutti.editProgram.action.closeEditProgram"; toolTipText: "tutti.editProgram.action.closeEditProgram.tip"; - mnemonic: A; + i18nMnemonic: "tutti.editProgram.action.closeEditProgram.mnemonic"; _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; _help: {"tutti.editProgram.action.cancelProgram.help"}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -78,7 +78,7 @@ actionIcon: save; text: "tutti.editProtocol.action.saveProtocol"; toolTipText: "tutti.editProtocol.action.saveProtocol.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editProtocol.action.saveProtocol.mnemonic"; enabled: {model.isModify() && model.isValid()}; _tuttiAction: {SaveProtocolAction.class}; _help: {"tutti.editProtocol.action.saveProtocol.help"}; @@ -88,7 +88,7 @@ actionIcon: cancel; text: "tutti.editProtocol.action.closeEditProtocol"; toolTipText: "tutti.editProtocol.action.closeEditProtocol.tip"; - mnemonic: A; + i18nMnemonic: "tutti.editProtocol.action.closeEditProtocol.mnemonic"; _tuttiAction: {fr.ifremer.tutti.ui.swing.content.SelectCruiseAction.class}; _help: {"tutti.editProtocol.action.closeEditProtocol.help"}; } @@ -102,7 +102,7 @@ #selectOtherSpeciesButton { text: "tutti.editProtocol.action.selectOtherSpecies"; toolTipText: "tutti.editProtocol.action.selectOtherSpecies.tip"; - mnemonic: S; + i18nMnemonic: "tutti.editProtocol.action.selectOtherSpecies.mnemonic"; _tuttiAction: {SelectOtherSpeciesAction.class}; _help: {"tutti.editProtocol.action.selectOtherSpecies.help"}; } @@ -110,7 +110,7 @@ #addSpeciesProtocolButton { actionIcon: add; toolTipText: "tutti.editProtocol.action.addSpeciesProtocol.tip"; - mnemonic: A; + i18nMnemonic: "tutti.editProtocol.action.addSpeciesProtocol.mnemonic"; _tuttiAction: {AddSpeciesProtocolAction.class}; enabled: {speciesComboBox.getSelectedItem() != null}; _help: {"tutti.editProtocol.action.addSpeciesProtocol.help"}; @@ -124,7 +124,7 @@ actionIcon: batch-delete; text: "tutti.editProtocol.action.removeSpeciesProtocol"; toolTipText: "tutti.editProtocol.action.removeSpeciesProtocol.tip"; - mnemonic: R; + i18nMnemonic: "tutti.editProtocol.action.removeSpeciesProtocol.mnemonic"; _tuttiAction: {RemoveSpeciesProtocolAction.class}; enabled: {model.isRemoveSpeciesEnabled()}; _help: {"tutti.editProtocol.action.removeSpeciesProtocol.help"}; @@ -147,7 +147,7 @@ actionIcon: import; text: "tutti.editProtocol.action.importProtocolSpecies"; toolTipText: "tutti.editProtocol.action.importProtocolSpecies.tip"; - mnemonic: I; + i18nMnemonic: "tutti.editProtocol.action.importProtocolSpecies.mnemonic"; _tuttiAction: {ImportProtocolSpeciesAction.class}; _help: {"tutti.editProtocol.action.importProtocolSpecies.help"}; } @@ -156,7 +156,7 @@ actionIcon: export; text: "tutti.editProtocol.action.exportProtocolSpecies"; toolTipText: "tutti.editProtocol.action.exportProtocolSpecies.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editProtocol.action.exportProtocolSpecies.mnemonic"; _tuttiAction: {ExportProtocolSpeciesAction.class}; _help: {"tutti.editProtocol.action.exportProtocolSpecies.help"}; } @@ -165,7 +165,7 @@ actionIcon: import; text: "tutti.editProtocol.action.importProtocolCaracteristic"; toolTipText: "tutti.editProtocol.action.importProtocolCaracteristic.tip"; - mnemonic: I; + i18nMnemonic: "tutti.editProtocol.action.importProtocolCaracteristic.mnemonic"; _tuttiAction: {ImportProtocolCaracteristicAction.class}; _help: {"tutti.editProtocol.action.importProtocolCaracteristic.help"}; } @@ -174,7 +174,7 @@ actionIcon: export; text: "tutti.editProtocol.action.exportProtocolCaracteristic"; toolTipText: "tutti.editProtocol.action.exportProtocolCaracteristic.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editProtocol.action.exportProtocolCaracteristic.mnemonic"; _tuttiAction: {ExportProtocolCaracteristicAction.class}; _help: {"tutti.editProtocol.action.exportProtocolCaracteristic.tip"}; } @@ -183,7 +183,7 @@ actionIcon: export; text: "tutti.editProtocol.action.exportProtocolAllCaracteristic"; toolTipText: "tutti.editProtocol.action.exportProtocolAllCaracteristic.tip"; - mnemonic: E; + i18nMnemonic: "tutti.editProtocol.action.exportProtocolAllCaracteristic.mnemonic"; _tuttiAction: {ExportAllCaracteristicAction.class}; _help: {"tutti.editProtocol.action.exportProtocolAllCaracteristic.help"}; } 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-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/referential/ManageTemporaryReferentialUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -40,7 +40,7 @@ #exportSpeciesExampleButton { actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample"; - mnemonic: E; + i18nMnemonic: "tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.mnemonic"; _tuttiAction: {ExportTemporarySpeciesExampleAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.help"}; @@ -49,7 +49,7 @@ #importSpeciesButton { actionIcon: import; text: "tutti.manageTemporaryReferential.action.importTemporarySpecies"; - mnemonic: I; + i18nMnemonic: "tutti.manageTemporaryReferential.action.importTemporarySpecies.mnemonic"; _tuttiAction: {ImportTemporarySpeciesAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.importTemporarySpecies.tip"; _help: {"tutti.manageTemporaryReferential.action.importTemporarySpecies.help"}; @@ -64,7 +64,7 @@ #exportVesselExampleButton { actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporaryVesselExample"; - mnemonic: E; + i18nMnemonic: "tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.mnemonic"; _tuttiAction: {ExportTemporaryVesselExampleAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.help"}; @@ -73,7 +73,7 @@ #importVesselButton { actionIcon: import; text: "tutti.manageTemporaryReferential.action.importTemporaryVessel"; - mnemonic: I; + i18nMnemonic: "tutti.manageTemporaryReferential.action.importTemporaryVessel.mnemonic"; _tuttiAction: {ImportTemporaryVesselAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryVessel.tip"; _help: {"tutti.manageTemporaryReferential.action.importTemporaryVessel.help"}; @@ -88,7 +88,7 @@ #exportGearExampleButton { actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporaryGearExample"; - mnemonic: E; + i18nMnemonic: "tutti.manageTemporaryReferential.action.exportTemporaryGearExample.mnemonic"; _tuttiAction: {ExportTemporaryGearExampleAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporaryGearExample.help"}; @@ -97,7 +97,7 @@ #importGearButton { actionIcon: import; text: "tutti.manageTemporaryReferential.action.importTemporaryGear"; - mnemonic: I; + i18nMnemonic: "tutti.manageTemporaryReferential.action.importTemporaryGear.mnemonic"; _tuttiAction: {ImportTemporaryGearAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.importTemporaryGear.tip"; _help: {"tutti.manageTemporaryReferential.action.importTemporaryGear.help"}; @@ -112,7 +112,7 @@ #exportPersonExampleButton { actionIcon: export; text: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample"; - mnemonic: E; + i18nMnemonic: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.mnemonic"; _tuttiAction: {ExportTemporaryPersonExampleAction.class}; toolTipText: "tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip"; _help: {"tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.help"}; @@ -121,7 +121,7 @@ #importPersonButton { actionIcon: import; text: "tutti.manageTemporaryReferential.action.importTemporaryPerson"; - mnemonic: I; + 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/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentEditorUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -48,11 +48,7 @@ #addButton { actionIcon: add; + toolTipText: "tutti.attachmentEditor.action.add.tip"; + i18nMnemonic: "tutti.attachmentEditor.action.add.mnemonic"; } -#closeButton { - actionIcon: close; - text: "tutti.attachmentEditor.action.close"; - toolTipText: "tutti.attachmentEditor.action.close.tip"; - mnemonic: F; -} Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/attachment/AttachmentItem.css 2013-03-18 09:13:40 UTC (rev 640) @@ -38,14 +38,17 @@ #openAttachmentButton { actionIcon: "open-file"; toolTipText: "tutti.attachmentEditor.action.open.tip"; + i18nMnemonic: "tutti.attachmentEditor.action.open.mnemonic"; } #saveAttachmentButton { actionIcon: "import"; toolTipText: "tutti.attachmentEditor.action.save.tip"; + i18nMnemonic: "tutti.attachmentEditor.action.save.mnemonic"; } #removeAttachmentButton { actionIcon: "delete"; toolTipText: "tutti.attachmentEditor.action.remove.tip"; + i18nMnemonic: "tutti.attachmentEditor.action.remove.mnemonic"; } \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css 2013-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/comment/CommentEditorUI.css 2013-03-18 09:13:40 UTC (rev 640) @@ -30,9 +30,3 @@ #commentEditorTopPanel { title: "tutti.commentEditor.title"; } - -#closeButton { - actionIcon: close; - text: "tutti.action.close"; - mnemonic: F; -} \ No newline at end of file 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-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-03-18 09:13:40 UTC (rev 640) @@ -8,9 +8,14 @@ tutti.action.cancel= tutti.action.removeCaracteristic= tutti.action.validate= +tutti.attachmentEditor.action.add.mnemonic= +tutti.attachmentEditor.action.add.tip= tutti.attachmentEditor.action.closeAttachment.tip= +tutti.attachmentEditor.action.open.mnemonic= tutti.attachmentEditor.action.open.tip= +tutti.attachmentEditor.action.remove.mnemonic= tutti.attachmentEditor.action.remove.tip= +tutti.attachmentEditor.action.save.mnemonic= tutti.attachmentEditor.action.save.tip= tutti.attachmentEditor.action.tip= tutti.attachmentEditor.deleteAttachment.message= @@ -85,18 +90,23 @@ tutti.config.sampleOrder.title= tutti.config.title= tutti.createMelag.action.cancel= +tutti.createMelag.action.cancel.mnemonic= tutti.createMelag.action.cancel.tip= tutti.createMelag.action.validate= +tutti.createMelag.action.validate.mnemonic= tutti.createMelag.action.validate.tip= tutti.createMelag.error.message= tutti.createMelag.error.title= tutti.createMelag.message= tutti.createMelag.title= tutti.createSpeciesBatch.action.addSpecies= +tutti.createSpeciesBatch.action.addSpecies.mnemonic= tutti.createSpeciesBatch.action.addSpecies.tip= tutti.createSpeciesBatch.action.cancel= +tutti.createSpeciesBatch.action.cancel.mnemonic= tutti.createSpeciesBatch.action.cancel.tip= tutti.createSpeciesBatch.action.save= +tutti.createSpeciesBatch.action.save.mnemonic= tutti.createSpeciesBatch.action.save.tip= tutti.createSpeciesBatch.field.batchWeight= tutti.createSpeciesBatch.field.batchWeight.tip= @@ -109,18 +119,25 @@ tutti.dbManager.action.chooseDbExportFile= tutti.dbManager.action.chooseDbFile= tutti.dbManager.action.closeDb= +tutti.dbManager.action.closeDb.mnemonic= tutti.dbManager.action.closeDb.tip= tutti.dbManager.action.exportAndCleanDb= +tutti.dbManager.action.exportAndCleanDb.mnemonic= tutti.dbManager.action.exportAndCleanDb.tip= tutti.dbManager.action.exportDb= +tutti.dbManager.action.exportDb.mnemonic= tutti.dbManager.action.exportDb.tip= tutti.dbManager.action.importDb= +tutti.dbManager.action.importDb.mnemonic= tutti.dbManager.action.importDb.tip= tutti.dbManager.action.installDb= +tutti.dbManager.action.installDb.mnemonic= tutti.dbManager.action.installDb.tip= tutti.dbManager.action.openDb= +tutti.dbManager.action.openDb.mnemonic= tutti.dbManager.action.openDb.tip= tutti.dbManager.action.upgradeDb= +tutti.dbManager.action.upgradeDb.mnemonic= tutti.dbManager.action.upgradeDb.tip= tutti.dbManager.info.db.loaded= tutti.dbManager.info.no.db.exist= @@ -145,6 +162,7 @@ tutti.editBenthosBatch.table.header.toConfirm= tutti.editBenthosBatch.table.header.weight= tutti.editCatchBatch.action.cancelEditCatchBatch= +tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic= tutti.editCatchBatch.action.cancelEditCatchBatch.tip= tutti.editCatchBatch.action.computeWeights= tutti.editCatchBatch.action.computeWeights.error.incoherentCategoryWeight= @@ -154,13 +172,16 @@ tutti.editCatchBatch.action.computeWeights.error.incoherentSpeciesTotalSorted= tutti.editCatchBatch.action.computeWeights.error.incoherentTotal= tutti.editCatchBatch.action.computeWeights.error.noWeight= +tutti.editCatchBatch.action.computeWeights.mnemonic= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message= tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title= tutti.editCatchBatch.action.computeWeights.tip= tutti.editCatchBatch.action.importPupitri= +tutti.editCatchBatch.action.importPupitri.mnemonic= tutti.editCatchBatch.action.importPupitri.tip= tutti.editCatchBatch.action.saveCatchBatch= +tutti.editCatchBatch.action.saveCatchBatch.mnemonic= tutti.editCatchBatch.action.saveCatchBatch.tip= tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch= tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch= @@ -199,10 +220,13 @@ tutti.editCatchBatch.legend.species= tutti.editCatchBatch.legend.total= tutti.editCruise.action.closeEditCruise= +tutti.editCruise.action.closeEditCruise.mnemonic= tutti.editCruise.action.closeEditCruise.tip= tutti.editCruise.action.generateCampaignName= +tutti.editCruise.action.generateCampaignName.mnemonic= tutti.editCruise.action.generateName.tip= tutti.editCruise.action.saveCruise= +tutti.editCruise.action.saveCruise.mnemonic= tutti.editCruise.action.saveCruise.tip= tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise= tutti.editCruise.askSaveBeforeLeaving.saveCruise= @@ -244,14 +268,18 @@ tutti.editCruise.title.edit.cruise= tutti.editFishingOperation.action.attachments.tip= tutti.editFishingOperation.action.cancelEditFishingOperation= +tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic= tutti.editFishingOperation.action.cancelEditFishingOperation.tip= tutti.editFishingOperation.action.editFishingOperation.tip= tutti.editFishingOperation.action.importCasino= +tutti.editFishingOperation.action.importCasino.mnemonic= tutti.editFishingOperation.action.importCasino.tip= tutti.editFishingOperation.action.resetEditFishingOperation= tutti.editFishingOperation.action.resetEditFishingOperation.tip= tutti.editFishingOperation.action.resetFishingOperationValidState= +tutti.editFishingOperation.action.resetFishingOperationValidState.mnemonic= tutti.editFishingOperation.action.resetFishingOperationValidState.tip= +tutti.editFishingOperation.action.saveEditFishingOperation.mnemonic= tutti.editFishingOperation.action.saveEditFishingOperation.tip= tutti.editFishingOperation.action.saveFishingOperation= tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation= @@ -341,8 +369,10 @@ tutti.editPlanktonBatch.table.header.toConfirm= tutti.editPlanktonBatch.table.header.weight= tutti.editProgram.action.closeEditProgram= +tutti.editProgram.action.closeEditProgram.mnemonic= tutti.editProgram.action.closeEditProgram.tip= tutti.editProgram.action.saveProgram= +tutti.editProgram.action.saveProgram.mnemonic= tutti.editProgram.action.saveProgram.tip= tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram= tutti.editProgram.askSaveBeforeLeaving.saveProgram= @@ -354,26 +384,36 @@ tutti.editProgram.field.zone.tip= tutti.editProgram.title.create.program= tutti.editProgram.title.edit.program= +tutti.editProtocol.action.addSpeciesProtocol.mnemonic= tutti.editProtocol.action.addSpeciesProtocol.tip= tutti.editProtocol.action.chooseProtocolCaracteristicFile= tutti.editProtocol.action.chooseProtocolSpeciesFile= tutti.editProtocol.action.closeEditProtocol= +tutti.editProtocol.action.closeEditProtocol.mnemonic= tutti.editProtocol.action.closeEditProtocol.tip= tutti.editProtocol.action.exportProtocolAllCaracteristic= +tutti.editProtocol.action.exportProtocolAllCaracteristic.mnemonic= tutti.editProtocol.action.exportProtocolAllCaracteristic.tip= tutti.editProtocol.action.exportProtocolCaracteristic= +tutti.editProtocol.action.exportProtocolCaracteristic.mnemonic= tutti.editProtocol.action.exportProtocolCaracteristic.tip= tutti.editProtocol.action.exportProtocolSpecies= +tutti.editProtocol.action.exportProtocolSpecies.mnemonic= tutti.editProtocol.action.exportProtocolSpecies.tip= tutti.editProtocol.action.importProtocolCaracteristic= +tutti.editProtocol.action.importProtocolCaracteristic.mnemonic= tutti.editProtocol.action.importProtocolCaracteristic.tip= tutti.editProtocol.action.importProtocolSpecies= +tutti.editProtocol.action.importProtocolSpecies.mnemonic= tutti.editProtocol.action.importProtocolSpecies.tip= tutti.editProtocol.action.removeSpeciesProtocol= +tutti.editProtocol.action.removeSpeciesProtocol.mnemonic= tutti.editProtocol.action.removeSpeciesProtocol.tip= tutti.editProtocol.action.saveProtocol= +tutti.editProtocol.action.saveProtocol.mnemonic= tutti.editProtocol.action.saveProtocol.tip= tutti.editProtocol.action.selectOtherSpecies= +tutti.editProtocol.action.selectOtherSpecies.mnemonic= tutti.editProtocol.action.selectOtherSpecies.tip= tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol= tutti.editProtocol.askSaveBeforeLeaving.saveProtocol= @@ -420,11 +460,23 @@ tutti.editProtocol.title.edit.protocol= tutti.editProtocol.warn.clone= tutti.editProtocol.warn.import= +tutti.editSpeciesBatch.action.createMelag= +tutti.editSpeciesBatch.action.createMelag.mnemonic= tutti.editSpeciesBatch.action.createMelag.tip= +tutti.editSpeciesBatch.action.createSpeciesBatch= +tutti.editSpeciesBatch.action.createSpeciesBatch.mnemonic= tutti.editSpeciesBatch.action.createSpeciesBatch.tip= +tutti.editSpeciesBatch.action.removeSpeciesBatch= +tutti.editSpeciesBatch.action.removeSpeciesBatch.mnemonic= tutti.editSpeciesBatch.action.removeSpeciesBatch.tip= +tutti.editSpeciesBatch.action.removeSpeciesSubBatch= +tutti.editSpeciesBatch.action.removeSpeciesSubBatch.mnemonic= tutti.editSpeciesBatch.action.removeSpeciesSubBatch.tip= +tutti.editSpeciesBatch.action.renameSpeciesBatch= +tutti.editSpeciesBatch.action.renameSpeciesBatch.mnemonic= tutti.editSpeciesBatch.action.renameSpeciesBatch.tip= +tutti.editSpeciesBatch.action.splitSpeciesBatch= +tutti.editSpeciesBatch.action.splitSpeciesBatch.mnemonic= tutti.editSpeciesBatch.action.splitSpeciesBatch.tip= tutti.editSpeciesBatch.field.speciesTotalInertWeight= tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip= @@ -460,17 +512,14 @@ tutti.editSpeciesBatch.table.header.species= tutti.editSpeciesBatch.table.header.toConfirm= tutti.editSpeciesBatch.table.header.weight= -tutti.editSpeciesBatch.tutti.action.createMelag= -tutti.editSpeciesBatch.tutti.action.createSpeciesBatch= -tutti.editSpeciesBatch.tutti.action.removeSpeciesBatch= -tutti.editSpeciesBatch.tutti.action.removeSpeciesSubBatch= -tutti.editSpeciesBatch.tutti.action.renameSpeciesBatch= -tutti.editSpeciesBatch.tutti.action.splitSpeciesBatch= tutti.editSpeciesFrequencies.action.cancel= +tutti.editSpeciesFrequencies.action.cancel.mnemonic= tutti.editSpeciesFrequencies.action.cancel.tip= tutti.editSpeciesFrequencies.action.generate= +tutti.editSpeciesFrequencies.action.generate.mnemonic= tutti.editSpeciesFrequencies.action.generate.tip= tutti.editSpeciesFrequencies.action.save= +tutti.editSpeciesFrequencies.action.save.mnemonic= tutti.editSpeciesFrequencies.action.save.tip= tutti.editSpeciesFrequencies.field.lengthStepCaracteristic= tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip= @@ -500,6 +549,7 @@ tutti.error.errorpane.htmlmessage= tutti.error.ui.business.error= tutti.error.ui.other.error= +tutti.fishingOperations.action.newFishingOperation.mnemonic= tutti.fishingOperations.action.newFishingOperation.tip= tutti.fishingOperations.info.no.fishingOperation.selected= tutti.fishingOperations.title.edit.operations= @@ -528,6 +578,7 @@ tutti.flash.info.species.remove.from.protocol= tutti.flash.info.species.replaced= tutti.gearUseFeatureTable.action.removeCaracteristic= +tutti.gearUseFeatureTable.action.removeCaracteristic.mnemonic= tutti.gearUseFeatureTable.action.removeCaracteristic.tip= tutti.gearUseFeatureTable.table.header.key= tutti.gearUseFeatureTable.table.header.value= @@ -545,49 +596,71 @@ tutti.label.tab.species= tutti.legend.frequencyConfiguration= tutti.legend.splitSpeciesBatchConfiguration= +tutti.main.action..mnemonic= tutti.main.action.about= +tutti.main.action.about.mnemonic= tutti.main.action.about.tip= +tutti.main.action.changeLocale.mnemonic= tutti.main.action.changeLocale.tip= tutti.main.action.changeLocaleFR= +tutti.main.action.changeLocaleFR.mnemonic= tutti.main.action.changeLocaleFR.tip= tutti.main.action.changeLocaleUK= +tutti.main.action.changeLocaleUK.mnemonic= tutti.main.action.changeLocaleUK.tip= tutti.main.action.configuration= +tutti.main.action.configuration.mnemonic= tutti.main.action.configuration.tip= tutti.main.action.editCatches= +tutti.main.action.editCatches.mnemonic= tutti.main.action.editCatches.tip= tutti.main.action.editProgram.tip= tutti.main.action.editSelectedCruise= +tutti.main.action.editSelectedCruise.mnemonic= tutti.main.action.editSelectedCruise.tip= tutti.main.action.editSelectedProgram= +tutti.main.action.editSelectedProgram.mnemonic= tutti.main.action.editSelectedProtocol= +tutti.main.action.editSelectedProtocol.mnemonic= tutti.main.action.editSelectedProtocol.tip= tutti.main.action.exit= +tutti.main.action.exit.mnemonic= tutti.main.action.exit.tip= tutti.main.action.goto.previousScreen.tip= tutti.main.action.importTemporaryReferential= +tutti.main.action.importTemporaryReferential.mnemonic= tutti.main.action.importTemporaryReferential.tip= tutti.main.action.manageDb= +tutti.main.action.manageDb.mnemonic= tutti.main.action.manageDb.tip= tutti.main.action.reloadTutti= tutti.main.action.selectCruise= +tutti.main.action.selectCruise.mnemonic= tutti.main.action.selectCruise.tip= tutti.main.action.showHelp= +tutti.main.action.showHelp.mnemonic= tutti.main.action.showHelp.tip= tutti.main.action.site= +tutti.main.action.site.mnemonic= tutti.main.action.site.tip= tutti.main.action.updateApplication= +tutti.main.action.updateApplication.mnemonic= tutti.main.action.updateApplication.tip= tutti.main.action.validateCatches= +tutti.main.action.validateCatches.mnemonic= tutti.main.action.validateCatches.tip= tutti.main.menu.actions= +tutti.main.menu.actions.mnemonic= tutti.main.menu.actions.tip= tutti.main.menu.administration= +tutti.main.menu.administration.mnemonic= tutti.main.menu.administration.tip= tutti.main.menu.changeLocale= tutti.main.menu.file= +tutti.main.menu.file.mnemonic= tutti.main.menu.file.tip= tutti.main.menu.help= +tutti.main.menu.help.mnemonic= tutti.main.menu.help.tip= tutti.main.title.applicationName= tutti.main.title.noSelectedCruise= @@ -602,20 +675,28 @@ tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile= tutti.manageTemporaryReferential.action.chooseReferentialVesselFile= tutti.manageTemporaryReferential.action.exportTemporaryGearExample= +tutti.manageTemporaryReferential.action.exportTemporaryGearExample.mnemonic= tutti.manageTemporaryReferential.action.exportTemporaryGearExample.tip= tutti.manageTemporaryReferential.action.exportTemporaryPersonExample= +tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.mnemonic= tutti.manageTemporaryReferential.action.exportTemporaryPersonExample.tip= tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample= +tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.mnemonic= tutti.manageTemporaryReferential.action.exportTemporarySpeciesExample.tip= tutti.manageTemporaryReferential.action.exportTemporaryVesselExample= +tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.mnemonic= tutti.manageTemporaryReferential.action.exportTemporaryVesselExample.tip= tutti.manageTemporaryReferential.action.importTemporaryGear= +tutti.manageTemporaryReferential.action.importTemporaryGear.mnemonic= tutti.manageTemporaryReferential.action.importTemporaryGear.tip= tutti.manageTemporaryReferential.action.importTemporaryPerson= +tutti.manageTemporaryReferential.action.importTemporaryPerson.mnemonic= tutti.manageTemporaryReferential.action.importTemporaryPerson.tip= tutti.manageTemporaryReferential.action.importTemporarySpecies= +tutti.manageTemporaryReferential.action.importTemporarySpecies.mnemonic= tutti.manageTemporaryReferential.action.importTemporarySpecies.tip= tutti.manageTemporaryReferential.action.importTemporaryVessel= +tutti.manageTemporaryReferential.action.importTemporaryVessel.mnemonic= tutti.manageTemporaryReferential.action.importTemporaryVessel.tip= tutti.manageTemporaryReferential.field.gear= tutti.manageTemporaryReferential.field.gear.tip= @@ -642,30 +723,42 @@ tutti.sampleCategoryType.sortedUnsorted= tutti.selectCruise.action.chooseProtocolFile= tutti.selectCruise.action.cloneProtocol= +tutti.selectCruise.action.cloneProtocol.mnemonic= tutti.selectCruise.action.cloneProtocol.tip= tutti.selectCruise.action.deleteProtocol= tutti.selectCruise.action.deleteProtocol.message= +tutti.selectCruise.action.deleteProtocol.mnemonic= tutti.selectCruise.action.deleteProtocol.tip= tutti.selectCruise.action.deleteProtocol.title= tutti.selectCruise.action.editCatches= +tutti.selectCruise.action.editCatches.mnemonic= tutti.selectCruise.action.editCatches.tip= tutti.selectCruise.action.editCruise= +tutti.selectCruise.action.editCruise.mnemonic= tutti.selectCruise.action.editCruise.tip= tutti.selectCruise.action.editProgram= +tutti.selectCruise.action.editProgram.mnemonic= tutti.selectCruise.action.editProgram.tip= tutti.selectCruise.action.editProtocol= +tutti.selectCruise.action.editProtocol.mnemonic= tutti.selectCruise.action.editProtocol.tip= tutti.selectCruise.action.exportProtocol= +tutti.selectCruise.action.exportProtocol.mnemonic= tutti.selectCruise.action.exportProtocol.tip= tutti.selectCruise.action.importProtocol= +tutti.selectCruise.action.importProtocol.mnemonic= tutti.selectCruise.action.importProtocol.tip= tutti.selectCruise.action.newCruise= +tutti.selectCruise.action.newCruise.mnemonic= tutti.selectCruise.action.newCruise.tip= tutti.selectCruise.action.newProgram= +tutti.selectCruise.action.newProgram.mnemonic= tutti.selectCruise.action.newProgram.tip= tutti.selectCruise.action.newProtocol= +tutti.selectCruise.action.newProtocol.mnemonic= tutti.selectCruise.action.newProtocol.tip= tutti.selectCruise.action.validateCatches= +tutti.selectCruise.action.validateCatches.mnemonic= tutti.selectCruise.action.validateCatches.tip= tutti.selectCruise.field.cruise= tutti.selectCruise.field.cruise.tip= @@ -678,13 +771,17 @@ tutti.selectCruise.title.choose.importFile= tutti.selectCruise.warn.invalid.selected.data= tutti.selectSpecies.action.cancel= +tutti.selectSpecies.action.cancel.mnemonic= tutti.selectSpecies.action.cancel.tip= tutti.selectSpecies.action.validate= +tutti.selectSpecies.action.validate.mnemonic= tutti.selectSpecies.action.validate.tip= tutti.selectSpecies.title= tutti.splitSpeciesBatch.action.cancel= +tutti.splitSpeciesBatch.action.cancel.mnemonic= tutti.splitSpeciesBatch.action.cancel.tip= tutti.splitSpeciesBatch.action.save= +tutti.splitSpeciesBatch.action.save.mnemonic= tutti.splitSpeciesBatch.action.save.tip= tutti.splitSpeciesBatch.field.batchWeight= tutti.splitSpeciesBatch.field.batchWeightField.tip= @@ -761,6 +858,7 @@ tutti.validator.warning.longitude.outOfBounds= tutti.validator.warning.longitude.second.outOfBounds= tutti.vesselUseFeatureTable.action.removeCaracteristic= +tutti.vesselUseFeatureTable.action.removeCaracteristic.mnemonic= tutti.vesselUseFeatureTable.action.removeCaracteristic.tip= tutti.vesselUseFeatureTable.table.header.key= tutti.vesselUseFeatureTable.table.header.value= 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-03-17 23:58:54 UTC (rev 639) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-03-18 09:13:40 UTC (rev 640) @@ -5,10 +5,16 @@ tutti.about.title=À propos de Tutti tutti.about.translate.content=<h2>Comment traduire Tutti</h2>Vous pouvez nous aider à traduire Tutti.<hr/> <ul><li>Récupérer le fichier tutti-i18n.csv dans le répertoire i18n</li><li>ouvrez le avec un tableur (le caractère séprateur est une Tabultation)</li><li>Traduisez, Améliorer, ...</li><li>Enfin renvoyez-le nous</li></ul> Nous intégrerons vos modifications avant la prochaine version. tutti.about.translate.title=Traduire Tutti +tutti.attachmentEditor.action.add.mnemonic=A +tutti.attachmentEditor.action.add.tip=Ajouter une pièce jointe tutti.attachmentEditor.action.close=Fermer tutti.attachmentEditor.action.closeAttachment.tip=Fermer la fenêtre des pièces-jointes +tutti.attachmentEditor.action.mnemonic.tip=E +tutti.attachmentEditor.action.open.mnemonic=O tutti.attachmentEditor.action.open.tip=Ouvrir la pièce jointe +tutti.attachmentEditor.action.remove.mnemonic=u tutti.attachmentEditor.action.remove.tip=Supprimer la pièce jointe +tutti.attachmentEditor.action.save.mnemonic=E tutti.attachmentEditor.action.save.tip=Enregistrer la pièce jointe en local tutti.attachmentEditor.action.tip=Pièces jointes tutti.attachmentEditor.deleteAttachment.message=Êtes-vous sûr de vouloir supprimer la pièce-jointe %s ? @@ -81,19 +87,24 @@ tutti.config.sampleOrder.title=Catégorie d'échantillonnage tutti.config.title=Configuration tutti.createMelag.action.cancel=Annuler -tutti.createMelag.action.cancel.tip= +tutti.createMelag.action.cancel.mnemonic=A +tutti.createMelag.action.cancel.tip=Annuler la création du MELAG tutti.createMelag.action.validate=Valider -tutti.createMelag.action.validate.tip= +tutti.createMelag.action.validate.mnemonic=V +tutti.createMelag.action.validate.tip=Valider la création du MELAG tutti.createMelag.error.message=Erreur à la ligne %s tutti.createMelag.error.title=Erreur tutti.createMelag.message=Combien pesait le MELAG (kg) ? tutti.createMelag.title=Poids du MELAG (kg) tutti.createSpeciesBatch.action.addSpecies=... +tutti.createSpeciesBatch.action.addSpecies.mnemonic=. tutti.createSpeciesBatch.action.addSpecies.tip=Sélectionner une autre espèce tutti.createSpeciesBatch.action.cancel=Annuler -tutti.createSpeciesBatch.action.cancel.tip= +tutti.createSpeciesBatch.action.cancel.mnemonic=A +tutti.createSpeciesBatch.action.cancel.tip=Annuler la création du lôt espèce tutti.createSpeciesBatch.action.save=Enregistrer -tutti.createSpeciesBatch.action.save.tip= +tutti.createSpeciesBatch.action.save.mnemonic=E +tutti.createSpeciesBatch.action.save.tip=Enregister la création du lôt espèce tutti.createSpeciesBatch.field.batchWeight=Poids du lot (kg) tutti.createSpeciesBatch.field.batchWeight.tip= tutti.createSpeciesBatch.field.sortedUnsortedCategory=V / HV @@ -105,18 +116,25 @@ 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.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.tip=Exporter la base de données au format zip tutti.dbManager.action.importDb=Importer une base +tutti.dbManager.action.importDb.mnemonic=i tutti.dbManager.action.importDb.tip=Importer la base de données au format zip tutti.dbManager.action.installDb=Installer +tutti.dbManager.action.installDb.mnemonic=n tutti.dbManager.action.installDb.tip=Télécharger puis installer la base de données tutti.dbManager.action.openDb=Ouvrir +tutti.dbManager.action.openDb.mnemonic=O tutti.dbManager.action.openDb.tip=Ouvrir la base de données tutti.dbManager.action.upgradeDb=Vérifier les mises à jour +tutti.dbManager.action.upgradeDb.mnemonic=V tutti.dbManager.action.upgradeDb.tip=Mettre à jour les référentiels si nécessaire tutti.dbManager.info.db.loaded=<html>Tutti est connecté à une base de données<hr/>Url de connexion \: %s</html> tutti.dbManager.info.no.db.exist=Aucune base détectée, vous pouvez installer la dernière disponible sur le réseau ou bien en importer une. @@ -141,8 +159,9 @@ tutti.editBenthosBatch.table.header.toConfirm=A Confirmer tutti.editBenthosBatch.table.header.weight=Poids tutti.editCatchBatch.action.cancelEditCatchBatch=Réinitialiser +tutti.editCatchBatch.action.cancelEditCatchBatch.mnemonic=R tutti.editCatchBatch.action.cancelEditCatchBatch.tip=Réinitialiser l'édition de la capture -tutti.editCatchBatch.action.computeWeights=Elever les poids +tutti.editCatchBatch.action.computeWeights=Élever les poids tutti.editCatchBatch.action.computeWeights.error.incoherentCategoryWeight=Le poids total des mensurations est supérieur au poids de la catégorie tutti.editCatchBatch.action.computeWeights.error.incoherentParentCategoryWeight=Le poids de la catégorie est différent de la somme des poids de ses sous-catégories tutti.editCatchBatch.action.computeWeights.error.incoherentRowWeightCategory=Le poids de la catégorie ne peut pas être nul si le poids de sous-échantillonage est renseigné @@ -150,13 +169,16 @@ tutti.editCatchBatch.action.computeWeights.error.incoherentSpeciesTotalSorted=Le poids total Vrac des espèces est inférieur à la somme des poids Vrac triés, inerte trié et vivant non détaillé trié tutti.editCatchBatch.action.computeWeights.error.incoherentTotal=Le poids total de la capture ne correspond pas à la somme des poids totaux Vrac, Hors Vrac et non triés tutti.editCatchBatch.action.computeWeights.error.noWeight=Un lot n'a pas de poids +tutti.editCatchBatch.action.computeWeights.mnemonic=É tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.help=Est-ce bien une valeur observée ?<ul><li>Non pour remplacer la valeur saisie par le poids calculé</li><li>Oui pour garder la valeur saisie</li></ul>. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.message=Le Poids total VRAC saisi est supérieur de moins de %s%% au Poids total Vrac trié. tutti.editCatchBatch.action.computeWeights.replaceTotalSortedWeight.title=Poids total VRAC peu différent du Poids total Vrac trié tutti.editCatchBatch.action.computeWeights.tip=Elever les poids tutti.editCatchBatch.action.importPupitri=Import Pupitri +tutti.editCatchBatch.action.importPupitri.mnemonic=I tutti.editCatchBatch.action.importPupitri.tip=Import Pupitri tutti.editCatchBatch.action.saveCatchBatch=Sauver +tutti.editCatchBatch.action.saveCatchBatch.mnemonic=S tutti.editCatchBatch.action.saveCatchBatch.tip=Sauver la capture tutti.editCatchBatch.askCancelEditBeforeLeaving.cancelEditCatchBatch=La capture n'est pas valide et ne peut pas être enregistrée. tutti.editCatchBatch.askSaveBeforeLeaving.saveCatchBatch=Des modifications sur la capture n'ont pas été enregistrées. @@ -197,11 +219,14 @@ tutti.editCatchBatch.legend.species=Espèces tutti.editCatchBatch.legend.total=Capture tutti.editCruise.action.closeEditCruise=Fermer -tutti.editCruise.action.closeEditCruise.tip= +tutti.editCruise.action.closeEditCruise.mnemonic=com +tutti.editCruise.action.closeEditCruise.tip=Fermer l'écran d'édition de campagne tutti.editCruise.action.generateCampaignName=Générer le nom -tutti.editCruise.action.generateName.tip= +tutti.editCruise.action.generateCampaignName.mnemonic=G +tutti.editCruise.action.generateName.tip=Générer le nom normalisé de la campagne tutti.editCruise.action.saveCruise=Enregistrer -tutti.editCruise.action.saveCruise.tip= +tutti.editCruise.action.saveCruise.mnemonic=E +tutti.editCruise.action.saveCruise.tip=Enregister la campagne tutti.editCruise.askCancelEditBeforeLeaving.cancelSaveCruise=La campagne n'est pas valide et ne peut pas être enregistrée. tutti.editCruise.askSaveBeforeLeaving.saveCruise=Des modifications sur la campagne n'ont pas été enregistrées. tutti.editCruise.field.beginDate=Date de début @@ -242,14 +267,18 @@ tutti.editCruise.title.edit.cruise=Éditer une campagne existante tutti.editFishingOperation.action.attachments.tip= tutti.editFishingOperation.action.cancelEditFishingOperation=Annuler +tutti.editFishingOperation.action.cancelEditFishingOperation.mnemonic=A tutti.editFishingOperation.action.cancelEditFishingOperation.tip=Annuler la création du trait tutti.editFishingOperation.action.editFishingOperation.tip=Éditer l'opération de pêche tutti.editFishingOperation.action.importCasino=Import Casino +tutti.editFishingOperation.action.importCasino.mnemonic=I tutti.editFishingOperation.action.importCasino.tip=Import Casino tutti.editFishingOperation.action.resetEditFishingOperation=Réinitialiser tutti.editFishingOperation.action.resetEditFishingOperation.tip=Réinitialiser l'édition du trait tutti.editFishingOperation.action.resetFishingOperationValidState=Réinitialiser -tutti.editFishingOperation.action.resetFishingOperationValidState.tip= +tutti.editFishingOperation.action.resetFishingOperationValidState.mnemonic=é +tutti.editFishingOperation.action.resetFishingOperationValidState.tip=Réinitialiser l'état de validation du trait +tutti.editFishingOperation.action.saveEditFishingOperation.mnemonic=E tutti.editFishingOperation.action.saveEditFishingOperation.tip=Enregistrer le trait tutti.editFishingOperation.action.saveFishingOperation=Enregistrer tutti.editFishingOperation.askCancelEditBeforeLeaving.cancelEditFishingOperation=Le trait modifié n'est pas valide et ne peut pas être enregistré. @@ -339,8 +368,10 @@ tutti.editPlanktonBatch.table.header.toConfirm=A Confirmer tutti.editPlanktonBatch.table.header.weight=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 tutti.editProgram.action.saveProgram=Enregistrer +tutti.editProgram.action.saveProgram.mnemonic=E tutti.editProgram.action.saveProgram.tip=Enregistrer la série de campagne tutti.editProgram.askCancelEditBeforeLeaving.cancelSaveProgram=La série de campagne n'est pas valide et ne peut pas être enregistrée. tutti.editProgram.askSaveBeforeLeaving.saveProgram=Des modifications sur la série de campagne n'ont pas été enregistrées. @@ -352,30 +383,39 @@ tutti.editProgram.field.zone.tip= tutti.editProgram.title.create.program=Créer une nouvelle série de campagne tutti.editProgram.title.edit.program=Éditer une série de campagne existante +tutti.editProtocol.action.addSpeciesProtocol.mnemonic=j tutti.editProtocol.action.addSpeciesProtocol.tip=Ajouter une espèce au protocole tutti.editProtocol.action.chooseProtocolCaracteristicFile=Choisir le fichier des caractéristiques tutti.editProtocol.action.chooseProtocolSpeciesFile=Choisir le fichier des espèces tutti.editProtocol.action.closeEditProtocol=Fermer -tutti.editProtocol.action.closeEditProtocol.tip= +tutti.editProtocol.action.closeEditProtocol.mnemonic=F +tutti.editProtocol.action.closeEditProtocol.tip=Fermer l'écran d'édition du protocole tutti.editProtocol.action.exportProtocolAllCaracteristic=Exporter toutes les caractéristiques +tutti.editProtocol.action.exportProtocolAllCaracteristic.mnemonic=t tutti.editProtocol.action.exportProtocolAllCaracteristic.tip=Exporter toutes les caractéristiques (sans les affecter à un écran) tutti.editProtocol.action.exportProtocolCaracteristic=Exporter les caractéristiques +tutti.editProtocol.action.exportProtocolCaracteristic.mnemonic=c 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.tip=Exporter les espèces du protocole tutti.editProtocol.action.importProtocolCaracteristic=Importer les caractéristiques +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.tip=importer les espèces dans le protocole tutti.editProtocol.action.removeSpeciesProtocol=Supprimer l'espèce +tutti.editProtocol.action.removeSpeciesProtocol.mnemonic=S tutti.editProtocol.action.removeSpeciesProtocol.tip=Supprimer l'espèce tutti.editProtocol.action.saveProtocol=Enregistrer +tutti.editProtocol.action.saveProtocol.mnemonic=E tutti.editProtocol.action.saveProtocol.tip=Enregistrer le protocol tutti.editProtocol.action.selectOtherSpecies=... +tutti.editProtocol.action.selectOtherSpecies.mnemonic=. tutti.editProtocol.action.selectOtherSpecies.tip=Sélectionner une autre espèce tutti.editProtocol.askCancelEditBeforeLeaving.cancelSaveProtocol=Le protocole n'est pas valide et ne peut pas être enregistré. tutti.editProtocol.askSaveBeforeLeaving.saveProtocol=Des modifications sur le protocole n'ont pas été enregistrées. -tutti.editProtocol.field..tip= tutti.editProtocol.field.comment=Commentaire tutti.editProtocol.field.comment.tip= tutti.editProtocol.field.protocol.name=Nom @@ -418,11 +458,23 @@ tutti.editProtocol.title.edit.protocol=Éditer un protocol de saisie existant tutti.editProtocol.warn.clone=Le protocole que vous venez de cloner ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". tutti.editProtocol.warn.import=Le protocole que vous venez d'importer ne sera sauvegardé que lorsque vous cliquerez sur le bouton "Enregistrer". +tutti.editSpeciesBatch.action.createMelag=Espèces d'un MELAG +tutti.editSpeciesBatch.action.createMelag.mnemonic=C tutti.editSpeciesBatch.action.createMelag.tip=Calcul des poids des lots appartenant à un MELAG -tutti.editSpeciesBatch.action.createSpeciesBatch.tip= +tutti.editSpeciesBatch.action.createSpeciesBatch=Créer un lot pour une espèce +tutti.editSpeciesBatch.action.createSpeciesBatch.mnemonic=C +tutti.editSpeciesBatch.action.createSpeciesBatch.tip=Créer un nouveau lot pour une espèce +tutti.editSpeciesBatch.action.removeSpeciesBatch=Supprimer le lot +tutti.editSpeciesBatch.action.removeSpeciesBatch.mnemonic=S tutti.editSpeciesBatch.action.removeSpeciesBatch.tip=Supprimer le lot courant (celui de la ligne sélectionnée) et tous ces fils +tutti.editSpeciesBatch.action.removeSpeciesSubBatch=Supprimer les lots fils +tutti.editSpeciesBatch.action.removeSpeciesSubBatch.mnemonic=f tutti.editSpeciesBatch.action.removeSpeciesSubBatch.tip=Supprimer tous les lots fils du lot sélectionné -tutti.editSpeciesBatch.action.renameSpeciesBatch.tip= +tutti.editSpeciesBatch.action.renameSpeciesBatch=Corriger l'espèce +tutti.editSpeciesBatch.action.renameSpeciesBatch.mnemonic=o +tutti.editSpeciesBatch.action.renameSpeciesBatch.tip=Corriger l'espèce +tutti.editSpeciesBatch.action.splitSpeciesBatch=Catégoriser le lot +tutti.editSpeciesBatch.action.splitSpeciesBatch.mnemonic=C tutti.editSpeciesBatch.action.splitSpeciesBatch.tip=Catégoriser le lot courant (celui de la ligne sélectionné) tutti.editSpeciesBatch.field.speciesTotalInertWeight=Poids inerte trié (kg) tutti.editSpeciesBatch.field.speciesTotalInertWeight.tip= @@ -459,18 +511,15 @@ tutti.editSpeciesBatch.table.header.toConfirm=A Confirmer tutti.editSpeciesBatch.table.header.weight=Poids sous-échantillonné (kg) tutti.editSpeciesBatch.title.batchActions=Actions -tutti.editSpeciesBatch.tutti.action.createMelag=Èspèces d'un MELAG -tutti.editSpeciesBatch.tutti.action.createSpeciesBatch=Créer un lot pour une espèce -tutti.editSpeciesBatch.tutti.action.removeSpeciesBatch=Supprimer le lot -tutti.editSpeciesBatch.tutti.action.removeSpeciesSubBatch=Supprimer les lots fils -tutti.editSpeciesBatch.tutti.action.renameSpeciesBatch=Corriger l'espèce -tutti.editSpeciesBatch.tutti.action.splitSpeciesBatch=Catégoriser le lot tutti.editSpeciesFrequencies.action.cancel=Annuler -tutti.editSpeciesFrequencies.action.cancel.tip= +tutti.editSpeciesFrequencies.action.cancel.mnemonic=A +tutti.editSpeciesFrequencies.action.cancel.tip=Anuler l'édition des mensurations tutti.editSpeciesFrequencies.action.generate=Générer -tutti.editSpeciesFrequencies.action.generate.tip= +tutti.editSpeciesFrequencies.action.generate.mnemonic=G +tutti.editSpeciesFrequencies.action.generate.tip=Générer les mensurations tutti.editSpeciesFrequencies.action.save=Enregistrer -tutti.editSpeciesFrequencies.action.save.tip= +tutti.editSpeciesFrequencies.action.save.mnemonic=E +tutti.editSpeciesFrequencies.action.save.tip=Enreigstrer les mensurations tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip= tutti.editSpeciesFrequencies.field.maxStep=Classe max @@ -499,6 +548,7 @@ tutti.error.errorpane.htmlmessage=<html><body>Une erreur s'est produite\: %s</body></html> tutti.error.ui.business.error=Erreur tutti.error.ui.other.error=Erreur +tutti.fishingOperations.action.newFishingOperation.mnemonic=C tutti.fishingOperations.action.newFishingOperation.tip=Créer une nouvelle opération de pêche tutti.fishingOperations.info.no.fishingOperation.selected=< Aucun trait sélectionné > tutti.fishingOperations.title.edit.operations=Saisie des opérations de pêches (%s) @@ -526,8 +576,9 @@ tutti.flash.info.species.imported.in.protocol.severalReplaced=Espèces importées dans le protocole depuis le fichier %s. %s remplacées par leur référent. tutti.flash.info.species.remove.from.protocol=L'espèce %s a été retirée du protocole. tutti.flash.info.species.replaced=L'espèce %s a été remplacée par son référent %s. -tutti.gearUseFeatureTable.action.removeCaracteristic=Supprimer la caractéristique -tutti.gearUseFeatureTable.action.removeCaracteristic.tip= +tutti.gearUseFeatureTable.action.removeCaracteristic=Supprimer +tutti.gearUseFeatureTable.action.removeCaracteristic.mnemonic=S +tutti.gearUseFeatureTable.action.removeCaracteristic.tip=Supprimer la caractéristique tutti.gearUseFeatureTable.table.header.key=Caractéristique tutti.gearUseFeatureTable.table.header.value=Valeur tutti.gearUseFeatureTable.title=Mise en oeuvre de l'engin @@ -545,48 +596,69 @@ tutti.legend.frequencyConfiguration=Configuration tutti.legend.splitSpeciesBatchConfiguration=Configuration tutti.main.action.about=À propos +tutti.main.action.about.mnemonic=À tutti.main.action.about.tip=À Propos +tutti.main.action.changeLocale.mnemonic=l tutti.main.action.changeLocale.tip=Changer de langue tutti.main.action.changeLocaleFR=Français +tutti.main.action.changeLocaleFR.mnemonic=F tutti.main.action.changeLocaleFR.tip=Passer en français tutti.main.action.changeLocaleUK=Anglais +tutti.main.action.changeLocaleUK.mnemonic=A tutti.main.action.changeLocaleUK.tip=Passer en anglais tutti.main.action.configuration=Configuration +tutti.main.action.configuration.mnemonic=C tutti.main.action.configuration.tip=Configurer Tutti tutti.main.action.editCatches=Saisir les captures -tutti.main.action.editCatches.tip=Editer les catpures -tutti.main.action.editProgram.tip=Editer la série de campagne +tutti.main.action.editCatches.mnemonic=S +tutti.main.action.editCatches.tip=Éditer les captures +tutti.main.action.editProgram.tip=Éditer la série de campagne tutti.main.action.editSelectedCruise=Campagne +tutti.main.action.editSelectedCruise.mnemonic=C tutti.main.action.editSelectedCruise.tip=Éditer la campagne sélectionnée tutti.main.action.editSelectedProgram=Série de campagne +tutti.main.action.editSelectedProgram.mnemonic=S tutti.main.action.editSelectedProtocol=Protocole +tutti.main.action.editSelectedProtocol.mnemonic=P tutti.main.action.editSelectedProtocol.tip=Éditer le protocole sélectionné tutti.main.action.exit=Quitter +tutti.main.action.exit.mnemonic=Q tutti.main.action.exit.tip=Quitter l'application tutti.main.action.goto.previousScreen.tip=Retour à l'écran précédent tutti.main.action.importTemporaryReferential=Référentiels temporaires +tutti.main.action.importTemporaryReferential.mnemonic=R tutti.main.action.importTemporaryReferential.tip=Importer des référentiels temporaires tutti.main.action.manageDb=Gestionnaire de base +tutti.main.action.manageDb.mnemonic=G tutti.main.action.manageDb.tip=Gérer la base de données utilisée par Tutti tutti.main.action.reloadTutti=Redémarrer Tutti tutti.main.action.selectCruise=Sélectionner une campagne +tutti.main.action.selectCruise.mnemonic=S tutti.main.action.selectCruise.tip=Sélectionner la campagne à utiliser tutti.main.action.showHelp=Aide +tutti.main.action.showHelp.mnemonic=i tutti.main.action.showHelp.tip=Accéder à l'aide de l'application tutti.main.action.site=Site +tutti.main.action.site.mnemonic=S tutti.main.action.site.tip=Accéder au site du projet Tutti tutti.main.action.updateApplication=Vérifier les mises à jour +tutti.main.action.updateApplication.mnemonic=V tutti.main.action.updateApplication.tip=Vérifier les mises à jour logicielles tutti.main.action.validateCatches=Valider les captures +tutti.main.action.validateCatches.mnemonic=V tutti.main.action.validateCatches.tip=Valider les captures tutti.main.menu.actions=Actions +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.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.tip=Aide tutti.main.title.applicationName=Tutti tutti.main.title.noSelectedCruise=Pas de campagne sélectionné @@ -601,20 +673,28 @@ tutti.manageTemporaryReferential.action.chooseReferentialSpeciesFile=Choisir le fichier de référentiel espèce tutti.manageTemporaryReferential.action.chooseReferentialVesselFile=Choisir le fichier de référentiel navire 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= @@ -641,30 +721,42 @@ tutti.sampleCategoryType.sortedUnsorted=V/HV 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.validateCatches=Valider les captures +tutti.selectCruise.action.validateCatches.mnemonic=V tutti.selectCruise.action.validateCatches.tip=Valider les captures tutti.selectCruise.field.cruise=Campagne tutti.selectCruise.field.cruise.tip= @@ -677,14 +769,18 @@ tutti.selectCruise.title.choose.importFile=Importer le protocole tutti.selectCruise.warn.invalid.selected.data=Les données sélectionnées ne sont pas valides, impossible de saisir ou valider les captures. tutti.selectSpecies.action.cancel=Annuler -tutti.selectSpecies.action.cancel.tip= +tutti.selectSpecies.action.cancel.mnemonic=A +tutti.selectSpecies.action.cancel.tip=Annuler la sélection de l'espèce tutti.selectSpecies.action.validate=Valider -tutti.selectSpecies.action.validate.tip= +tutti.selectSpecies.action.validate.mnemonic=V +tutti.selectSpecies.action.validate.tip=Valider la sélection de l'espèce tutti.selectSpecies.title=Choisissez une espèce tutti.splitSpeciesBatch.action.cancel=Annuler -tutti.splitSpeciesBatch.action.cancel.tip= +tutti.splitSpeciesBatch.action.cancel.mnemonic=A +tutti.splitSpeciesBatch.action.cancel.tip=Annuler le sous-échantillonnage tutti.splitSpeciesBatch.action.save=Enregistrer -tutti.splitSpeciesBatch.action.save.tip= +tutti.splitSpeciesBatch.action.save.mnemonic=E +tutti.splitSpeciesBatch.action.save.tip=Sauver le sous-échantillonage tutti.splitSpeciesBatch.field.batchWeight=Poids total à catégoriser tutti.splitSpeciesBatch.field.batchWeightField.tip= tutti.splitSpeciesBatch.field.category=Catégorie @@ -759,8 +855,9 @@ tutti.validator.warning.longitude.minute.outOfBounds=La minute de la latitude doit être comprise entre 0 et 60 tutti.validator.warning.longitude.outOfBounds=La Latitude doit être comprise entre -180.0 et 180.0 tutti.validator.warning.longitude.second.outOfBounds=La seconde de la longitude doit être comprise entre 0 et 60 -tutti.vesselUseFeatureTable.action.removeCaracteristic=Supprimer la caractéristique -tutti.vesselUseFeatureTable.action.removeCaracteristic.tip= +tutti.vesselUseFeatureTable.action.removeCaracteristic=Supprimer +tutti.vesselUseFeatureTable.action.removeCaracteristic.mnemonic=S +tutti.vesselUseFeatureTable.action.removeCaracteristic.tip=Supprimer la caractéristique tutti.vesselUseFeatureTable.table.header.key=Caractéristique tutti.vesselUseFeatureTable.table.header.value=Valeur tutti.vesselUseFeatureTable.title=Hydrologie et paramètres environnementaux

1 0

r639 - trunk/tutti-service
by tchemit＠users.forge.codelutin.com March 17, 2013

March 17, 2013

Author: tchemit Date: 2013-03-18 00:58:54 +0100 (Mon, 18 Mar 2013) New Revision: 639 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/639 Log: fix dependencies Modified: trunk/tutti-service/pom.xml Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-03-17 23:54:03 UTC (rev 638) +++ trunk/tutti-service/pom.xml 2013-03-17 23:58:54 UTC (rev 639) @@ -98,6 +98,11 @@ <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs2</artifactId> + </dependency> +  <dependency>

1 0

r638 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com March 17, 2013

March 17, 2013

Author: tchemit Date: 2013-03-18 00:54:03 +0100 (Mon, 18 Mar 2013) New Revision: 638 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/638 Log: fix help sensitive context Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-03-15 14:30:50 UTC (rev 637) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiHelpBroker.java 2013-03-17 23:54:03 UTC (rev 638) @@ -25,12 +25,20 @@ */ import jaxx.runtime.JAXXObject; +import jaxx.runtime.SwingUtil; +import jaxx.runtime.awt.visitor.BuildTreeVisitor; +import jaxx.runtime.awt.visitor.ComponentTreeNode; +import jaxx.runtime.awt.visitor.GetCompopentAtPointVisitor; import jaxx.runtime.swing.help.JAXXHelpBroker; +import jaxx.runtime.swing.help.JAXXHelpUI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import javax.swing.AbstractButton; +import java.awt.Component; +import java.awt.Point; import java.awt.event.ActionListener; +import java.awt.event.MouseEvent; /** * Help broker. @@ -79,4 +87,37 @@ } } } + + @Override + public String findHelpId(Component comp) { + + JAXXHelpUI parentContainer = SwingUtil.getParent(comp, + JAXXHelpUI.class); + + String result; + if (parentContainer != null && this != parentContainer.getBroker()) { + + JAXXHelpBroker broker = parentContainer.getBroker(); + result = broker.findHelpId(comp); + } else { + result = super.findHelpId(comp); + } + + return result; + } + + @Override + public Component getDeppestComponent(Component mouseComponent, MouseEvent event) { + ComponentTreeNode tree = BuildTreeVisitor.buildTree(mouseComponent); + + Point point = event.getPoint(); + + Component component = GetCompopentAtPointVisitor.get(tree, point); + if (log.isInfoEnabled()) { + log.info("Component at (" + point + "): " + component); + } + return component; + } + + }

1 0

r637 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by kmorin＠users.forge.codelutin.com March 15, 2013

March 15, 2013

Author: kmorin Date: 2013-03-15 15:30:50 +0100 (Fri, 15 Mar 2013) New Revision: 637 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/637 Log: debug save gear features caracteristics in operation Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-03-15 13:48:21 UTC (rev 636) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/FishingOperationPersistenceServiceImpl.java 2013-03-15 14:30:50 UTC (rev 637) @@ -875,7 +875,7 @@ // Nothing to do : will be removed later, using notChangedGearUseMeasurements } else if (gearUseCaracteristics != null && gearUseCaracteristics.size() > 0) { for (Caracteristic caracteristic : gearUseCaracteristics.keySet()) { - GearUseMeasurement gum = setGearUseMeasurement(scientificCruise, gearUseFeatures, caracteristic, vesselUseCaracteristics.get(caracteristic)); + GearUseMeasurement gum = setGearUseMeasurement(scientificCruise, gearUseFeatures, caracteristic, gearUseCaracteristics.get(caracteristic)); notChangedGearUseMeasurements.remove(gum); } }

1 0

r636 - trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol
by kmorin＠users.forge.codelutin.com March 15, 2013

March 15, 2013

Author: kmorin Date: 2013-03-15 14:48:21 +0100 (Fri, 15 Mar 2013) New Revision: 636 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/636 Log: refs #2041 [PROTOCOLE] - Esp?\195?\168ces - Import des esp?\195?\168ces Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-03-15 12:55:36 UTC (rev 635) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRow.java 2013-03-15 13:48:21 UTC (rev 636) @@ -29,6 +29,7 @@ import fr.ifremer.tutti.persistence.entities.referential.Species; import java.io.Serializable; +import org.apache.commons.lang3.StringUtils; /** * Row of a {@link SpeciesProtocol} to import or export. @@ -100,9 +101,11 @@ } public void setSpeciesName(String name) { - boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); - setMadeFromAReferentTaxon(madeFromAReferentTaxon && - species != null && species.getName().equals(name)); + if (!StringUtils.isEmpty(name)) { + boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); + setMadeFromAReferentTaxon(madeFromAReferentTaxon && + species != null && species.getName().equals(name)); + } } public String getSpeciesRefTaxCode() { @@ -110,9 +113,11 @@ } public void setSpeciesRefTaxCode(String refTaxCode) { - boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); - setMadeFromAReferentTaxon(madeFromAReferentTaxon && - species != null && species.getRefTaxCode().equals(refTaxCode)); + if (!StringUtils.isEmpty(refTaxCode)) { + boolean madeFromAReferentTaxon = isMadeFromAReferentTaxon(); + setMadeFromAReferentTaxon(madeFromAReferentTaxon && + species != null && species.getRefTaxCode().equals(refTaxCode)); + } } public void setSpecies(Species species) { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-03-15 12:55:36 UTC (rev 635) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/protocol/SpeciesRowModel.java 2013-03-15 13:48:21 UTC (rev 636) @@ -71,6 +71,9 @@ } }); + newOptionalColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); + newOptionalColumn(SpeciesRow.PROPERTY_SPECIES_NAME); + newForeignKeyColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_ID, SpeciesRow.PROPERTY_LENGTH_STEP_PMFM, Caracteristic.class, @@ -82,8 +85,6 @@ newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_FRACTION_NAME); newIgnoredColumn(SpeciesRow.PROPERTY_LENGTH_STEP_PMFM_METHOD_NAME); - newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_REF_TAX_CODE); - newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_NAME); newMandatoryColumn(SpeciesRow.PROPERTY_SPECIES_SURVEY_CODE, new TuttiCsvUtil.StringParserFormatter(null, true)); newMandatoryColumn(SpeciesRow.PROPERTY_SIZE_ENABLED, Common.PRIMITIVE_BOOLEAN); newMandatoryColumn(SpeciesRow.PROPERTY_SEX_ENABLED, Common.PRIMITIVE_BOOLEAN);

1 0

r635 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config
by tchemit＠users.forge.codelutin.com March 15, 2013

March 15, 2013

Author: tchemit Date: 2013-03-15 13:55:36 +0100 (Fri, 15 Mar 2013) New Revision: 635 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/635 Log: fix option that are not transient (so can be saved in user config file) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-15 12:34:40 UTC (rev 634) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-03-15 12:55:36 UTC (rev 635) @@ -94,7 +94,7 @@ // get all transient and final option keys Set<String> optionToSkip = - ApplicationConfigHelper.getTransientOrFinalOptionKey(providers); + ApplicationConfigHelper.getTransientOptionKeys(providers); if (log.isDebugEnabled()) { log.debug("Option that won't be saved: " + optionToSkip);

1 0

Build failed in Jenkins: tutti #522
by admin+hudson＠codelutin.com March 15, 2013

March 15, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/522/changes> Changes: [Tony Chemit] - add gotoPreviousScreen action (used by config screen) - fixes #2135: [TECH] - Fichier de configuration de base obsolète lors d'une installation (ou mise à jour) ------------------------------------------ [...truncated 361 lines...] 2013-03-15 13:32:02,858 689 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-03-15 13:32:02,861 692 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-03-15 13:32:02,866 697 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-03-15 13:32:02,868 699 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-03-15 13:32:02,878 709 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-03-15 13:32:02,881 712 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-03-15 13:32:02,881 712 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import species from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-03-15 13:32:02,883 714 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Species - fr.ifremer.tutti.persistence.entities.referential.Species > [null] , will create a new default one. 2013-03-15 13:32:02,889 720 [main] INFO fr.ifremer.tutti.service.PersistenceService - Open persistence service 2013-03-15 13:32:02,893 724 [main] INFO fr.ifremer.tutti.service.PersistenceService - Persistence driver *Mock persistence service implementation* opened. 2013-03-15 13:32:02,893 724 [main] INFO fr.ifremer.tutti.service.referential.TuttiReferentialImportExportService - Will import gears from file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/surefi…> 2013-03-15 13:32:02,896 727 [main] INFO org.nuiton.util.beans.BinderFactory - No binder model found for <fr.ifremer.tutti.persistence.entities.referential.Gear - fr.ifremer.tutti.persistence.entities.referential.Gear > [null] , will create a new default one. Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.287 sec Results : Tests run: 15, Failures: 0, Errors: 0, Skipped: 0 mojoSucceeded org.apache.maven.plugins:maven-surefire-plugin:2.14(default-test) [JENKINS] Recording test results mojoStarted org.apache.maven.plugins:maven-jar-plugin:2.4(default-jar) [INFO] [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ tutti-service --- [INFO] Building jar: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> mojoSucceeded org.apache.maven.plugins:maven-jar-plugin:2.4(default-jar) mojoStarted org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) [INFO] [INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ tutti-service --- mojoSucceeded org.apache.maven.plugins:maven-site-plugin:3.2(attach-descriptor) mojoStarted org.apache.maven.plugins:maven-install-plugin:2.4(default-install) [INFO] [INFO] --- maven-install-plugin:2.4:install (default-install) @ tutti-service --- [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/1.1-SNAPSHOT/tutti-service-1.1-SNAPSHOT.jar [INFO] Installing <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/maven/data/repository/fr/ifremer/tutti/tutti-service/1.1-SNAPSHOT/tutti-service-1.1-SNAPSHOT.pom mojoSucceeded org.apache.maven.plugins:maven-install-plugin:2.4(default-install) projectSucceeded fr.ifremer.tutti:tutti-service:1.1-SNAPSHOT projectStarted fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 42.6 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… (2 KB at 39.1 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.14-… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… (808 B at 10.1 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.14-… (808 B at 9.5 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/nuiton-valid… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/nuiton-… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/nuiton-… (2 KB at 53.7 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/nuiton-valid… (2 KB at 49.3 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 42.5 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… (2 KB at 37.9 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 48.3 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 33.4 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (5 KB at 135.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 40.1 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… (2 KB at 36.9 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 44.8 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… (2 KB at 32.9 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (78 KB at 1368.1 KB/sec) mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target> [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.nuiton.jaxx:jaxx-maven-plugin:2.5.14-SNAPSHOT(default) [INFO] [INFO] --- jaxx-maven-plugin:2.5.14-SNAPSHOT:generate (default) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 39.0 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 37.9 KB/sec) [INFO] use project compile scope class-path [INFO] Detects 30 modified jaxx file(s). mojoSucceeded org.nuiton.jaxx:jaxx-maven-plugin:2.5.14-SNAPSHOT(default)[INFO] Generated 30 file(s) in 18.672s mojoStarted org.nuiton.jaxx:jaxx-maven-plugin:2.5.14-SNAPSHOT(default) [INFO] [INFO] --- jaxx-maven-plugin:2.5.14-SNAPSHOT:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/fil…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/fil…> [INFO] No keys to add. mojoSucceeded org.nuiton.jaxx:jaxx-maven-plugin:2.5.14-SNAPSHOT(default) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserJava (scan-sources) @ tutti-ui-swing --- mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT[INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(get) [INFO] [INFO] --- i18n-maven-plugin:2.5:get (get) @ tutti-ui-swing --- mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(get) forkedProjectSucceeded fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 239/930 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 760/1447 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(collect-i18n-artifacts) [INFO] [INFO] --- i18n-maven-plugin:2.5:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 12 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/i18n/…> [INFO] collected 12 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/i18n/…> mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(collect-i18n-artifacts) forkedProjectSucceeded fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(make-bundle) [INFO] [INFO] --- i18n-maven-plugin:2.5:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 240/1194 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 834/1711 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(make-bundle) mojoStarted org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) [INFO] [INFO] --- license-maven-plugin:1.4:update-project-license (attach-licenses) @ tutti-ui-swing --- mojoSucceeded org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) mojoStarted org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) [INFO] [INFO] --- license-maven-plugin:1.4:add-third-party (attach-licenses) @ tutti-ui-swing --- [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/gener…> mojoSucceeded org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses)[INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 91 resources [INFO] Copying 4 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources)[INFO] Copying 4 resources mojoStarted org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile) [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 234 source files to <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/target/class…> mojoFailed org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile)[INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[480,67] error: unreported exception IOException; must be caught or declared to be thrown [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[336,33] error: cannot find symbol [ERROR] symbol: method generateExternalDbFiles(boolean) location: variable persistenceConfig of type TuttiPersistenceConfig <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[180,55] error: cannot find symbol [ERROR] symbol: variable DB_CACHE_DIRECTORY location: class TuttiPersistenceConfigOption <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/main/jav…>:[179,55] error: cannot find symbol [INFO] 4 errors [INFO] ------------------------------------------------------------- projectFailed fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT sessionEnded [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Tutti ............................................. SUCCESS [6.689s] [INFO] Tutti :: Persistence .............................. SUCCESS [19.659s] [INFO] Tutti :: Service .................................. SUCCESS [3.510s] [INFO] Tutti :: UI ....................................... FAILURE [30.264s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 1:01.920s [INFO] Finished at: Fri Mar 15 13:32:33 CET 2013 [INFO] Final Memory: 59M/170M [INFO] ------------------------------------------------------------------------ Projects to build: [MavenProject: fr.ifremer:tutti:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-persistence:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-service:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml,> MavenProject: fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT @ <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/pom.xml]> [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-03-15_13-31-26/archive/fr.ifremer.tutti/tutti-service/1.1-SNAPSHOT/tutti-service-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-service/target/tutti-…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-service/builds/2013-03-15_13-31-26/archive/fr.ifremer.tutti/tutti-service/1.1-SNAPSHOT/tutti-service-1.1-SNAPSHOT.jar [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-03-15_13-31-26/archive/fr.ifremer.tutti/tutti-ui-swing/1.1-SNAPSHOT/tutti-ui-swing-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-ui-swing/src/license/…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-ui-swing/builds/2013-03-15_13-31-26/archive/fr.ifremer.tutti/tutti-ui-swing/1.1-SNAPSHOT/tutti-ui-swing-1.1-SNAPSHOT-third-party.properties [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-03-15_13-31-26/archive/fr.ifremer/tutti/1.1-SNAPSHOT/tutti-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/target/tutti-1.1-SNAPSHOT-s…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer$tutti/builds/2013-03-15_13-31-26/archive/fr.ifremer/tutti/1.1-SNAPSHOT/tutti-1.1-SNAPSHOT-site_fr.xml [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/pom.xml> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-03-15_13-31-26/archive/fr.ifremer.tutti/tutti-persistence/1.1-SNAPSHOT/tutti-persistence-1.1-SNAPSHOT.pom [JENKINS] Archiving <http://ci.nuiton.org/jenkins/job/tutti/ws/trunk/tutti-persistence/target/tu…> to /var/local/jenkins/data/jobs/tutti/modules/fr.ifremer.tutti$tutti-persistence/builds/2013-03-15_13-31-26/archive/fr.ifremer.tutti/tutti-persistence/1.1-SNAPSHOT/tutti-persistence-1.1-SNAPSHOT.jar Waiting for Jenkins to finish collecting data mavenExecutionResult exceptions not empty message : Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-ui-swing: Compilation failure cause : Compilation failure Stack trace : org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:2.5.1:compile (default-compile) on project tutti-ui-swing: Compilation failure at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:213) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:84) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:59) at org.apache.maven.lifecycle.internal.LifecycleStarter.singleThreadedBuild(LifecycleStarter.java:183) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:161) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:320) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:156) at org.jvnet.hudson.maven3.launcher.Maven3Launcher.main(Maven3Launcher.java:79) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:601) at org.codehaus.plexus.classworlds.launcher.Launcher.launchStandard(Launcher.java:329) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:239) at org.jvnet.hudson.maven3.agent.Maven3Main.launch(Maven3Main.java:158) at hudson.maven.Maven3Builder.call(Maven3Builder.java:100) at hudson.maven.Maven3Builder.call(Maven3Builder.java:66) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:326) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask$Sync.innerRun(FutureTask.java:334) at java.util.concurrent.FutureTask.run(FutureTask.java:166) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1110) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:603) at java.lang.Thread.run(Thread.java:722) Caused by: org.apache.maven.plugin.CompilationFailureException: Compilation failure at org.apache.maven.plugin.AbstractCompilerMojo.execute(AbstractCompilerMojo.java:729) at org.apache.maven.plugin.CompilerMojo.execute(CompilerMojo.java:128) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:101) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:209) ... 27 more Sending e-mails to: tutti-commits(a)list.forge.codelutin.com chemit(a)codelutin.com channel stopped

1 1

Build failed in Jenkins: tutti » Tutti :: UI #522
by admin+hudson＠codelutin.com March 15, 2013

March 15, 2013

See <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/522/…> Changes: [Tony Chemit] - add gotoPreviousScreen action (used by config screen) - fixes #2135: [TECH] - Fichier de configuration de base obsolète lors d'une installation (ou mise à jour) ------------------------------------------ projectStarted fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Tutti :: UI 1.1-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 42.6 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ma… (2 KB at 39.1 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.14-… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/2.… (808 B at 10.1 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/2.5.14-… (808 B at 9.5 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/nuiton-valid… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/nuiton-… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/nuiton-… (2 KB at 53.7 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/nuiton-valid… (2 KB at 49.3 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 42.5 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-ru… (2 KB at 37.9 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 48.3 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 33.4 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (5 KB at 135.7 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 40.1 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-wi… (2 KB at 36.9 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 44.8 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-va… (2 KB at 32.9 KB/sec) Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (78 KB at 1368.1 KB/sec) mojoStarted org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) [INFO] [INFO] Deleting <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ tutti-ui-swing --- mojoSucceeded org.apache.maven.plugins:maven-clean-plugin:2.5(default-clean) mojoStarted org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) [INFO] [INFO] --- maven-enforcer-plugin:1.2:enforce (check-project-files) @ tutti-ui-swing --- mojoSucceeded org.apache.maven.plugins:maven-enforcer-plugin:1.2(check-project-files) mojoStarted org.nuiton.jaxx:jaxx-maven-plugin:2.5.14-SNAPSHOT(default) [INFO] [INFO] --- jaxx-maven-plugin:2.5.14-SNAPSHOT:generate (default) @ tutti-ui-swing --- Downloading: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… Downloading: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… Downloaded: http://nexus.nuiton.org/nexus/content/groups/tutti-group/org/nuiton/jaxx/ja… (2 KB at 39.0 KB/sec) Downloaded: http://nexus.nuiton.org/nexus/content/groups/public/org/nuiton/jaxx/jaxx-co… (2 KB at 37.9 KB/sec) [INFO] use project compile scope class-path [INFO] Detects 30 modified jaxx file(s). mojoSucceeded org.nuiton.jaxx:jaxx-maven-plugin:2.5.14-SNAPSHOT(default)[INFO] Generated 30 file(s) in 18.672s mojoStarted org.nuiton.jaxx:jaxx-maven-plugin:2.5.14-SNAPSHOT(default) [INFO] [INFO] --- jaxx-maven-plugin:2.5.14-SNAPSHOT:generate-help-ids (default) @ tutti-ui-swing --- [INFO] Store detected help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Merge help ids to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. [INFO] Use input file: <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] No keys to add. mojoSucceeded org.nuiton.jaxx:jaxx-maven-plugin:2.5.14-SNAPSHOT(default) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserJava (scan-sources) @ tutti-ui-swing --- mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:parserValidation (scan-sources) @ tutti-ui-swing --- [INFO] Load rules file validation.rules mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT[INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Copying tutti-ui-swing.properties to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(get) [INFO] [INFO] --- i18n-maven-plugin:2.5:get (get) @ tutti-ui-swing --- mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(get) forkedProjectSucceeded fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) [INFO] [INFO] --- i18n-maven-plugin:2.5:gen (scan-sources) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 239/930 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 760/1447 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(scan-sources) forkedProjectStarted fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(collect-i18n-artifacts) [INFO] [INFO] --- i18n-maven-plugin:2.5:collect-i18n-artifacts (collect-i18n-artifacts) @ tutti-ui-swing --- [INFO] collected 12 i18n artifacts for locale fr_FR stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] collected 12 i18n artifacts for locale en_GB stored in <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(collect-i18n-artifacts) forkedProjectSucceeded fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT mojoStarted org.nuiton.i18n:i18n-maven-plugin:2.5(make-bundle) [INFO] [INFO] --- i18n-maven-plugin:2.5:bundle (make-bundle) @ tutti-ui-swing --- [WARNING] bundle fr_FR contains 240/1194 empty entries! (use -Di18n.showEmpty to see these entries) [WARNING] bundle en_GB contains 834/1711 empty entries! (use -Di18n.showEmpty to see these entries) mojoSucceeded org.nuiton.i18n:i18n-maven-plugin:2.5(make-bundle) mojoStarted org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) [INFO] [INFO] --- license-maven-plugin:1.4:update-project-license (attach-licenses) @ tutti-ui-swing --- mojoSucceeded org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) mojoStarted org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses) [INFO] [INFO] --- license-maven-plugin:1.4:add-third-party (attach-licenses) @ tutti-ui-swing --- [WARNING] No license name defined for org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final [INFO] Load missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> [INFO] Missing file <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> is up-to-date. [INFO] Writing third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> [INFO] Writing bundled third-party file to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> mojoSucceeded org.codehaus.mojo:license-maven-plugin:1.4(attach-licenses)[INFO] Will attach third party file from <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…> mojoStarted org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources) [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ tutti-ui-swing --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 4 resources [INFO] Copying 91 resources [INFO] Copying 4 resources mojoSucceeded org.apache.maven.plugins:maven-resources-plugin:2.6(default-resources)[INFO] Copying 4 resources mojoStarted org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile) [INFO] [INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ tutti-ui-swing --- [INFO] Compiling 234 source files to <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/t…> mojoFailed org.apache.maven.plugins:maven-compiler-plugin:2.5.1(default-compile)[INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] bootstrap class path not set in conjunction with -source 1.6 <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[480,67] error: unreported exception IOException; must be caught or declared to be thrown [ERROR] <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[336,33] error: cannot find symbol [ERROR] symbol: method generateExternalDbFiles(boolean) location: variable persistenceConfig of type TuttiPersistenceConfig <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[180,55] error: cannot find symbol [ERROR] symbol: variable DB_CACHE_DIRECTORY location: class TuttiPersistenceConfigOption <http://ci.nuiton.org/jenkins/job/tutti/fr.ifremer.tutti$tutti-ui-swing/ws/s…>:[179,55] error: cannot find symbol [INFO] 4 errors [INFO] ------------------------------------------------------------- projectFailed fr.ifremer.tutti:tutti-ui-swing:1.1-SNAPSHOT

1 1

r634 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config tutti-persistence/src/main/resources tutti-persistence/src/main/resources/i18n tutti-service/src/main/java/fr/ifremer/tutti/service/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing
by tchemit＠users.forge.codelutin.com March 15, 2013

March 15, 2013

Author: tchemit Date: 2013-03-15 13:34:40 +0100 (Fri, 15 Mar 2013) New Revision: 634 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/634 Log: normalize config options Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties trunk/tutti-persistence/src/main/resources/tutti-db-conf.properties trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-03-15 12:25:00 UTC (rev 633) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/RessourceClassLoader.java 2013-03-15 12:34:40 UTC (rev 634) @@ -28,6 +28,7 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; +import fr.ifremer.tutti.TuttiIOUtil; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -74,13 +75,13 @@ loader = URLClassLoader.newInstance(EMPTY_URL_ARRAY); } - public void addDirectory(File... directories) throws IOException { + public void addDirectory(File... directories) { for (File directory : directories) { if (!this.directories.contains(directory)) { this.directories.add(directory); // force to create directory - FileUtils.forceMkdir(directory); + TuttiIOUtil.forceMkdir(directory, "could not create directory"); } } loader = null; @@ -100,7 +101,8 @@ public void addSearchInDirectoriesPredicate(Predicate<String> predicate) { Preconditions.checkNotNull(predicate, "search predicate can not be null"); - this.searchInDirectoriesPredicate = Predicates.and(searchInDirectoriesPredicate, predicate); + this.searchInDirectoriesPredicate = + Predicates.and(searchInDirectoriesPredicate, predicate); } public void setSearchInDirectoriesPredicate(Predicate<String> searchInDirectoriesPredicate) { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java 2013-03-15 12:25:00 UTC (rev 633) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfig.java 2013-03-15 12:34:40 UTC (rev 634) @@ -28,8 +28,9 @@ import com.google.common.base.Predicate; import com.google.common.collect.Sets; import com.google.common.io.Files; +import fr.ifremer.tutti.TuttiIOUtil; +import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.RessourceClassLoader; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -71,11 +72,11 @@ this.config = config; } - public void initConfig(RessourceClassLoader resourceLoader) throws IOException { + public void initConfig(RessourceClassLoader resourceLoader) { - FileUtils.forceMkdir(getDbDirectory()); - FileUtils.forceMkdir(getDbAttachmentDirectory()); - FileUtils.forceMkdir(getProtocolDirectory()); + TuttiIOUtil.forceMkdir(getDbDirectory(), "could not create directory"); + TuttiIOUtil.forceMkdir(getDbAttachmentDirectory(), "could not create directory"); + TuttiIOUtil.forceMkdir(getProtocolDirectory(), "could not create directory"); // add a predicate to search the configuration file from his directory instead of the class-path @@ -97,16 +98,14 @@ // add his directory in path to search resourceLoader.addDirectory(configurationPath.getParentFile()); - // generate configuration file if required - generateDbConfiguration(configurationPath); - // get enumeration file path File enumerationPath = getDbEnumerationPath(); // add his directory in path to search resourceLoader.addDirectory(enumerationPath.getParentFile()); - generateDbEnumerationConfiguration(enumerationPath); + // generate external configuration files if required + generateExternalDbFiles(false); } public File getDbConfigurationPath() { @@ -122,11 +121,11 @@ } public File getCacheDirectory() { - return config.getOptionAsFile(TuttiPersistenceConfigOption.CACHE_DIRECTORY.getKey()); + return config.getOptionAsFile(TuttiPersistenceConfigOption.DB_CACHE_DIRECTORY.getKey()); } public File getProtocolDirectory() { - return config.getOptionAsFile(TuttiPersistenceConfigOption.PROTOCOL_DIRECTORY.getKey()); + return config.getOptionAsFile(TuttiPersistenceConfigOption.DB_PROTOCOL_DIRECTORY.getKey()); } public String getDbName() { @@ -181,10 +180,29 @@ return config; } - public void generateDbConfiguration(File destination) throws IOException { + public void generateExternalDbFiles(boolean force) { - if (!destination.exists()) { + try { + generateDbConfiguration(force); + } catch (IOException e) { + throw new TuttiTechnicalException("Could not generate db configuration file"); + } + + try { + + generateDbEnumerationConfiguration(force); + } catch (IOException e) { + throw new TuttiTechnicalException("Could not generate db enumeration file"); + } + } + + protected void generateDbConfiguration(boolean force) throws IOException { + + File destination = getDbConfigurationPath(); + + if (force || !destination.exists()) { + // load db configuration template (tutti-db.properties) if (log.isInfoEnabled()) { @@ -223,10 +241,12 @@ } } - public void generateDbEnumerationConfiguration(File destination) throws IOException { + protected void generateDbEnumerationConfiguration(boolean force) throws IOException { - if (!destination.exists()) { + File destination = getDbEnumerationPath(); + if (force || !destination.exists()) { + // load enumeration mapping from classpath (enumerations.properties) if (log.isInfoEnabled()) { Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java 2013-03-15 12:25:00 UTC (rev 633) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/config/TuttiPersistenceConfigOption.java 2013-03-15 12:34:40 UTC (rev 634) @@ -55,17 +55,17 @@ true, true), - CACHE_DIRECTORY( - "tutti.persistence.cache.directory", - n_("tutti.config.option.persistence.cache.directory.description"), + DB_CACHE_DIRECTORY( + "tutti.persistence.db.cache.directory", + n_("tutti.config.option.persistence.db.cache.directory.description"), "${tutti.data.directory}/dbcache", File.class, true, true), - PROTOCOL_DIRECTORY( - "tutti.persistence.protocol.directory", - n_("tutti.config.option.persistence.protocol.directory.description"), + DB_PROTOCOL_DIRECTORY( + "tutti.persistence.db.protocol.directory", + n_("tutti.config.option.persistence.db.protocol.directory.description"), "${tutti.data.directory}/protocol", File.class, true, @@ -135,22 +135,22 @@ n_("tutti.config.option.persistence.hibernate.showSql.description"), Boolean.FALSE.toString(), boolean.class, - true, - true), + false, + false), HIBERNATE_USE_SQL_COMMENT( "tutti.persistence.hibernate.useSqlComment", n_("tutti.config.option.persistence.hibernate.useSqlComment.description"), Boolean.FALSE.toString(), boolean.class, - true, - true), + false, + false), HIBERNATE_FORMAT_SQL( "tutti.persistence.hibernate.formatSql", n_("tutti.config.option.persistence.hibernate.formatSql.description"), Boolean.FALSE.toString(), boolean.class, - true, - true); + false, + false); /** Configuration key. */ private final String key; Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-03-15 12:25:00 UTC (rev 633) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties 2013-03-15 12:34:40 UTC (rev 634) @@ -1,9 +1,10 @@ -tutti.config.option.persistence.cache.directory.description= tutti.config.option.persistence.db.attachment.directory.description= +tutti.config.option.persistence.db.cache.directory.description= tutti.config.option.persistence.db.configurationPath.description= tutti.config.option.persistence.db.directory.description= tutti.config.option.persistence.db.enumerationPath.description= tutti.config.option.persistence.db.name.description= +tutti.config.option.persistence.db.protocol.directory.description= tutti.config.option.persistence.hibernate.dialect.description= tutti.config.option.persistence.hibernate.formatSql.description= tutti.config.option.persistence.hibernate.showSql.description= @@ -12,7 +13,6 @@ tutti.config.option.persistence.jdbc.password.description= tutti.config.option.persistence.jdbc.url.description= tutti.config.option.persistence.jdbc.username.description= -tutti.config.option.persistence.protocol.directory.description= tutti.config.persistence= tutti.persistence.batch.validation.horsVracBenthosNotFound= tutti.persistence.batch.validation.horsVracSpeciesNotFound= Modified: trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-03-15 12:25:00 UTC (rev 633) +++ trunk/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties 2013-03-15 12:34:40 UTC (rev 634) @@ -1,9 +1,10 @@ -tutti.config.option.persistence.cache.directory.description=Répertoire où sont stoquées les caches de persistence tutti.config.option.persistence.db.attachment.directory.description=Répoertoire où sont stoquées les pièces-jointes +tutti.config.option.persistence.db.cache.directory.description=Répertoire où sont stoquées les caches de persistence tutti.config.option.persistence.db.configurationPath.description=Chemin du fichier de configuration d'Adagio tutti.config.option.persistence.db.directory.description=Répertoire où est la base de données tutti.config.option.persistence.db.enumerationPath.description=Chemin du fichier de correspondance des constantes tutti.config.option.persistence.db.name.description=Nom du fichier de la base de données +tutti.config.option.persistence.db.protocol.directory.description=Répertoire où sont conservés les protocoles tutti.config.option.persistence.hibernate.dialect.description=Le dialect hibernate utilisée pour communiquer avec la base de données tutti.config.option.persistence.hibernate.formatSql.description=Option pour ajouter les commentaires dans les requètes sql générées. tutti.config.option.persistence.hibernate.showSql.description=Option pour afficher ou non les requète sql dans les logs @@ -12,7 +13,6 @@ tutti.config.option.persistence.jdbc.password.description=Mot de passe de l'utilisateur pour se connecter à la base de données tutti.config.option.persistence.jdbc.url.description=URL de connexion à la base de données tutti.config.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données -tutti.config.option.persistence.protocol.directory.description=Répertoire où sont conservés les protocoles tutti.config.persistence=Configuration de la persistence de Tutti tutti.persistence.batch.validation.horsVracBenthosNotFound=Lot 'Hors Vrac > Benthos' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.horsVracNotFound=Lot 'Hors Vrac' non trouvé, ou configuré avec d'autres critères de classement. Modified: trunk/tutti-persistence/src/main/resources/tutti-db-conf.properties =================================================================== --- trunk/tutti-persistence/src/main/resources/tutti-db-conf.properties 2013-03-15 12:25:00 UTC (rev 633) +++ trunk/tutti-persistence/src/main/resources/tutti-db-conf.properties 2013-03-15 12:34:40 UTC (rev 634) @@ -36,7 +36,7 @@ dataSource.jdbc.url=${tutti.persistence.jdbc.url} #Cache configuration -ehcache.disk.store.dir=${tutti.persistence.cache.directory} +ehcache.disk.store.dir=${tutti.persistence.db.cache.directory} # Hibernate configuration : hibernate.dialect=${tutti.persistence.hibernate.dialect} Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java 2013-03-15 12:25:00 UTC (rev 633) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/config/TuttiServiceConfigOption.java 2013-03-15 12:34:40 UTC (rev 634) @@ -59,7 +59,9 @@ "tutti.tmp.directory", n_("tutti.config.option.tmp.directory.description"), "${tutti.data.directory}/temp", - File.class), + File.class, + true, + true), CSV_SEPARATOR( "tutti.csv.separator", n_("tutti.config.option.csv.separator.description"), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-03-15 12:25:00 UTC (rev 633) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiApplicationUpdaterCallBack.java 2013-03-15 12:34:40 UTC (rev 634) @@ -157,39 +157,18 @@ public void updateDone(Map<String, ApplicationInfo> appToUpdate, Map<String, Exception> appUpdateError) { - boolean doRestart = updateDoneJre(appToUpdate, appUpdateError); - + boolean updateJRE = updateDoneJre(appToUpdate, appUpdateError); boolean updateTutti = updateDoneTutti(appToUpdate, appUpdateError); - doRestart |= updateTutti; + boolean updateI18n = updateDoneI18n(appToUpdate, appUpdateError); + boolean updateHelp = updateDoneHelp(appToUpdate, appUpdateError); - doRestart |= updateDoneI18n(appToUpdate, appUpdateError); - doRestart |= updateDoneHelp(appToUpdate, appUpdateError); + boolean doRestart = updateJRE || updateTutti || updateI18n || updateHelp; updateDoneDb(appToUpdate, appUpdateError); if (doRestart) { applicationUpdated = true; - - if (updateTutti) { - - TuttiPersistenceConfig persistenceConfig = - context.getConfig().getServiceConfig().getPersistenceConfig(); - - // must remove the enumeration file at exit - File enumerationPath = persistenceConfig.getDbEnumerationPath(); - TuttiIOUtil.forceDeleteOnExit( - enumerationPath, - "Could not delete enumeration file " + enumerationPath - ); - - //FIXME-check this is necessary: i18n is no more generated ? - // must also remove i18n directory - File i18nDirectory = context.getConfig().getI18nDirectory(); - TuttiIOUtil.forceDeleteOnExit( - i18nDirectory, - "Could not delete i18n directory " + i18nDirectory); - } } } @@ -250,6 +229,30 @@ info.oldVersion, info.newVersion)); } doRestart = true; + + TuttiPersistenceConfig persistenceConfig = + context.getConfig().getServiceConfig().getPersistenceConfig(); + + // must remove the enumeration file at exit + File enumerationPath = persistenceConfig.getDbEnumerationPath(); + TuttiIOUtil.forceDeleteOnExit( + enumerationPath, + "Could not delete enumeration file " + enumerationPath + ); + + // must remove the db conf file at exit + File dbConfPath = persistenceConfig.getDbConfigurationPath(); + TuttiIOUtil.forceDeleteOnExit( + dbConfPath, + "Could not delete db conf file " + dbConfPath + ); + + //FIXME-check this is necessary: i18n is no more generated ? + // must also remove i18n directory + File i18nDirectory = context.getConfig().getI18nDirectory(); + TuttiIOUtil.forceDeleteOnExit( + i18nDirectory, + "Could not delete i18n directory " + i18nDirectory); } } return doRestart; @@ -327,12 +330,8 @@ // before install or update, regenerate db configuration files - TuttiPersistenceConfig persistenceConfig = - context.getConfig().getServiceConfig().getPersistenceConfig(); + TuttiPersistenceConfig persistenceConfig = regenerateDbConf(); - context.showInformationMessage( - "Regénérer les fichiers de configuration de la base"); - persistenceConfig.generateExternalDbFiles(true); if (Version.VZERO.toString().equals(info.oldVersion)) { @@ -349,6 +348,16 @@ } } + protected TuttiPersistenceConfig regenerateDbConf() { + + TuttiPersistenceConfig persistenceConfig = + context.getConfig().getServiceConfig().getPersistenceConfig(); + + context.showInformationMessage( + "Regénérer les fichiers de configuration de la base"); + return persistenceConfig; + } + protected ApplicationInfo getInfo(UpdateType type, Map<String, ApplicationInfo> appToUpdate) { return appToUpdate.get(type.name().toLowerCase());

1 0