Author: tchemit Date: 2012-08-17 00:53:47 +0200 (Fri, 17 Aug 2012) New Revision: 423 Url: http://forge.codelutin.com/repositories/revision/sammoa/423 Log: add new temp directory in config + csv separator (for in.out csv) + never used direct transaltion in Configuration : enum = static Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java Modified: trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java =================================================================== --- trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-08-16 22:51:57 UTC (rev 422) +++ trunk/sammoa-application/src/main/java/fr/ulr/sammoa/application/SammoaConfig.java 2012-08-16 22:53:47 UTC (rev 423) @@ -312,6 +312,18 @@ return result; } + public File getTmpDirectory() { + File result = getOrCreateDirectory(SammoaConfigOption.TMP_DIRECTORY); + return result; + } + + public char getCsvSeparator() { + char csvSeparator = applicationConfig.getOption( + char.class, SammoaConfigOption.CSV_SEPARATOR.key); + Preconditions.checkNotNull(csvSeparator); + return csvSeparator; + } + /** * All Sammoa configuration options. * @@ -327,10 +339,15 @@ File.class ), CAMPAIGN_DIRECTORY("campaign.directory", - n_("sammoa.config.campaign.directory"), - "${data.directory}/campaign", - File.class + n_("sammoa.config.campaign.directory"), + "${data.directory}/campaign", + File.class ), + TMP_DIRECTORY("tmp.directory", + n_("sammoa.config.tmp.directory"), + "${java.io.tmpdir}/sammoa", + File.class + ), LOG_FILE("log.file", n_("sammoa.config.log.file"), "${data.directory}/log/sammoa.log", @@ -404,74 +421,77 @@ ), KEY_START("ui." + PROPERTY_START, - _("sammoa.config.ui.start"), + n_("sammoa.config.ui.start"), "ctrl pressed A", KeyStroke.class, false, false), KEY_STOP("ui." + PROPERTY_STOP, - _("sammoa.config.ui.stop"), + n_("sammoa.config.ui.stop"), "ctrl pressed T", KeyStroke.class, false, false), KEY_BEGIN("ui." + PROPERTY_BEGIN, - _("sammoa.config.ui.begin"), + n_("sammoa.config.ui.begin"), "pressed F5", KeyStroke.class, false, false), KEY_END("ui." + PROPERTY_END, - _("sammoa.config.ui.end"), + n_("sammoa.config.ui.end"), "pressed F9", KeyStroke.class, false, false), KEY_NEXT("ui." + PROPERTY_NEXT, - _("sammoa.config.ui.next"), + n_("sammoa.config.ui.next"), "pressed F10", KeyStroke.class, false, false), KEY_ADD("ui." + PROPERTY_ADD, - _("sammoa.config.ui.add"), + n_("sammoa.config.ui.add"), "pressed F7", KeyStroke.class, false, false), KEY_LEFT_OBSERVATION("ui." + PROPERTY_LEFT_OBSERVATION, - _("sammoa.config.ui.leftObservation"), + n_("sammoa.config.ui.leftObservation"), "pressed F1", KeyStroke.class, false, false), KEY_CENTER_OBSERVATION("ui." + PROPERTY_CENTER_OBSERVATION, - _("sammoa.config.ui.centerObservation"), + n_("sammoa.config.ui.centerObservation"), "pressed F3", KeyStroke.class, false, false), KEY_RIGHT_OBSERVATION("ui." + PROPERTY_RIGHT_OBSERVATION, - _("sammoa.config.ui.rightObservation"), + n_("sammoa.config.ui.rightObservation"), "pressed F12", KeyStroke.class, false, false), KEY_CIRCLE_BACK("ui." + PROPERTY_CIRCLE_BACK, - _("sammoa.config.ui.circleBack"), + n_("sammoa.config.ui.circleBack"), "pressed F11", KeyStroke.class, false, - false); + false), + CSV_SEPARATOR("sammoa.csv.separator", + n_("sammoa.config.csv.separator"), + ";", char.class); /** Configuration key. */ private final String key;