[Isis-fish-commits] r3174 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . actions

17 Mar 2011

Author: chatellier
Date: 2011-03-17 10:35:24 +0000 (Thu, 17 Mar 2011)
New Revision: 3174

Log:
Fix i18n init

Modified:
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java
   isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java
===================================================================

--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2011-03-17 10:34:38 UTC (rev 3173)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2011-03-17 10:35:24 UTC (rev 3174)
@@ -5,7 +5,7 @@
  * $Id$
  * $HeadURL$
  * %%
- * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin
+ * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Benjamin Poussin, CHatellier Eric
  * %%
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as
@@ -26,6 +26,7 @@
 package fr.ifremer.isisfish;
 
 import static org.nuiton.i18n.I18n._;
+import static org.nuiton.i18n.I18n.n_;
 
 import java.io.File;
 import java.net.MalformedURLException;
@@ -868,7 +869,7 @@
      * @throws org.nuiton.util.ArgumentsParserException
      */
     @Override
-    public void parse(String[] args) throws ArgumentsParserException {
+    public void parse(String... args) throws ArgumentsParserException {
         super.parse(args);
         // dans la version precedente (3.1) seul le fichier user existe, il est
         // donc le seul a devoir etre modifie
@@ -954,89 +955,89 @@
      */
     public static enum Option implements OptionDef {
 
-        COMPILATION_DIRECTORY("compilation.directory", _("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"),
-        MONITORING_DIRECTORY("monitoring.directory", _("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"),
-        JAVADOC_DIRECTORY("javadoc.directory", _("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"),
-        CONFIG_FILE(CONFIG_FILE_NAME, _("isisfish.config.main.configFileName.description"), CONFIG_FILENAME),
-        BACKUP_DIRECTORY("backup.directory", _("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"),
+        COMPILATION_DIRECTORY("compilation.directory", n_("isisfish.config.main.compileDirectory.description"), getUserHome() + File.separator + "isis-build"),
+        MONITORING_DIRECTORY("monitoring.directory", n_("isisfish.config.main.monitoringDirectory.description"), getUserHome() + File.separator + "isis-monitoring"),
+        JAVADOC_DIRECTORY("javadoc.directory", n_("isisfish.config.main.javadocDirectory.description"), getUserHome() + File.separator + "isis-docs"),
+        CONFIG_FILE(CONFIG_FILE_NAME, n_("isisfish.config.main.configFileName.description"), CONFIG_FILENAME),
+        BACKUP_DIRECTORY("backup.directory", n_("isisfish.config.main.defaultBackupDirectory.description"), getUserHome() + File.separator + "isis-backup"),
 
-        DEFAULT_EXPORT_NAMES("default.export.names", _("isisfish.config.main.defaultExportNames.description"), ""),
-        DEFAULT_RESULT_NAMES("default.result.names", _("isisfish.config.main.defaultResultNames.description"), ""),
-        DEFAULT_MAP_FILENAME("default.map.filename", _("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"),
-        DEFAULT_TAG_VALUE("default.tagvalue", _("isisfish.config.main.defaultTagValue.description"), ""),
-        ENCODING("encoding", _("isisfish.config.main.encoding.description"), "UTF-8"),
-        JAVADOC_URL("javadoc.url", _("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/"),
+        DEFAULT_EXPORT_NAMES("default.export.names", n_("isisfish.config.main.defaultExportNames.description"), ""),
+        DEFAULT_RESULT_NAMES("default.result.names", n_("isisfish.config.main.defaultResultNames.description"), ""),
+        DEFAULT_MAP_FILENAME("default.map.filename", n_("isisfish.config.main.defaultMapFile.description"), "maps/vmap_area_thin.shp"),
+        DEFAULT_TAG_VALUE("default.tagvalue", n_("isisfish.config.main.defaultTagValue.description"), ""),
+        ENCODING("encoding", n_("isisfish.config.main.encoding.description"), "UTF-8"),
+        JAVADOC_URL("javadoc.url", n_("isisfish.config.main.javadocURL.description"), "http://isis-fish.labs.libre-entreprise.org/isis-fish/apidocs/"),
         
-        SIMULATOR_CLASSFILE("simulator.classfile", _("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"),
+        SIMULATOR_CLASSFILE("simulator.classfile", n_("isisfish.config.main.defaultSimulator.description"), "DefaultSimulator.java"),
         /** prevu pour l'architecture de lancement en plugin: local, isis-server, caparmor, ... */
-        SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", _("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()),
-        SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", _("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()),
-        SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", _("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()),
+        SIMULATOR_LAUNCHER(SimulationService.SIMULATION_LAUNCHER + ".3", n_("isisfish.config.main.localSimulator.description"), InProcessSimulatorLauncher.class.getName()),
+        SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", n_("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()),
+        SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", n_("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()),
 
         /** Serveur accessible par ssh : address */
-        SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor"),
+        SIMULATOR_SSH_SERVER("simulation.ssh.server", n_("isisfish.config.main.simulation.ssh.server.description"), "caparmor"),
         /** Serveur accessible par ssh : login */
-        SIMULATOR_SSH_USER_NAME("simulation.ssh.username", _("isisfish.config.main.simulation.ssh.username.description"), ""),
+        SIMULATOR_SSH_USER_NAME("simulation.ssh.username", n_("isisfish.config.main.simulation.ssh.username.description"), ""),
         /** Serveur accessible par ssh : user home directory */
-        SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", _("isisfish.config.main.simulation.ssh.userhome.description"), ""),
+        SIMULATOR_SSH_USER_HOME("simulation.ssh.userhome", n_("isisfish.config.main.simulation.ssh.userhome.description"), ""),
         /** Serveur accessible par ssh : remote data path */
-        SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", _("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"),
+        SIMULATOR_SSH_DATAPATH("simulation.ssh.datapath", n_("isisfish.config.main.simulation.ssh.datapath.description"), "isis-database-3"),
         /** Serveur accessible par ssh : remote isis home install */
-        SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", _("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()),
+        SIMULATOR_SSH_ISIS_HOME("simulation.ssh.isis.home", n_("isisfish.config.main.simulation.ssh.isis.home.description"), "/home3/caparmor/poussin/isis-fish-" + IsisConfig.getApiVersion()),
         /** Serveur accessible par ssh : remote tmp path */
-        SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", _("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"),
+        SIMULATOR_SSH_TMPPATH("simulation.ssh.tmppath", n_("isisfish.config.main.simulation.ssh.tmppath.description"), "isis-tmp"),
         /** Serveur accessible par SSH : emplacement de Java (full path) */
-        SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath", _("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk/bin/java"),
+        SIMULATOR_SSH_JAVAPATH("simulation.ssh.javapath", n_("isisfish.config.main.simulation.ssh.javapath.description"), "/home3/caparmor/poussin/jdk/bin/java"),
         /** Serveur accessible par SSH : emplacement des executables pbs */
-        SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", _("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"),
+        SIMULATOR_SSH_PBSBINPATH("simulation.ssh.pbsbinpath", n_("isisfish.config.main.simulation.ssh.pbsbinpath.description"), "/usr/pbs/bin"),
         /** Serveur accessible par SSH : option de l'executable qsub (defaut to -m n = no mail) */
-        SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", _("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"),
+        SIMULATOR_SSH_PBSQSUBOPTIONS("simulation.ssh.pbsqsuboptions", n_("isisfish.config.main.simulation.ssh.pbsqsuboptions.description"), "-m n"),
         /** Serveur accessible par SSH : interval de check du fichier de control */
-        SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", _("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"),
+        SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", n_("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"),
         /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */
-        SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", _("isisfish.config.main.simulation.ssh.max.threads.description"), "1"),
+        SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", n_("isisfish.config.main.simulation.ssh.max.threads.description"), "1"),
 
         /** Application locale (for i18n init). */
-        LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"),
-        SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", _("isisfish.config.main.simulationShowOnlyError.description"), "false"),
+        LOCALE("locale", n_("isisfish.config.main.locale.description"), "fr_FR"),
+        SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", n_("isisfish.config.main.simulationShowOnlyError.description"), "false"),
         
         /** Perform ui launch option. */
-        LAUNCH_UI("launch.ui", _("isisfish.config.main.launchUI.description"), "true"),
+        LAUNCH_UI("launch.ui", n_("isisfish.config.main.launchUI.description"), "true"),
         /** Perform data migration option. */
-        PERFORM_MIGRATION("perform.migration", _("isisfish.config.main.performmigration.description"), "true"),
+        PERFORM_MIGRATION("perform.migration", n_("isisfish.config.main.performmigration.description"), "true"),
         /** Perform vcs update option. */
-        PERFORM_VCS_UPDATE("perform.vcsupdate", _("isisfish.config.main.performvcsupdate.description"), "true"),
+        PERFORM_VCS_UPDATE("perform.vcsupdate", n_("isisfish.config.main.performvcsupdate.description"), "true"),
         /** Perform cron option. */
-        PERFORM_CRON("perform.cron", _("isisfish.config.main.performcron.description"), "true"),
+        PERFORM_CRON("perform.cron", n_("isisfish.config.main.performcron.description"), "true"),
         
         /** Database directory. */
-        DATABASE_DIRECTORY("database.directory", _("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"),
+        DATABASE_DIRECTORY("database.directory", n_("isisfish.config.vcs.localDatabasePath.description"), getUserHome() + File.separator + "isis-database-3"),
         /** Database lock mode (h2).*/
-        DATABASE_LOCK_MODE("database.lockmode", _("isisfish.config.database.lockmode.description"), "file"),
+        DATABASE_LOCK_MODE("database.lockmode", n_("isisfish.config.database.lockmode.description"), "file"),
         
         // SSH (global, for both VCS and caparmor)
-        SSH_KEY_FILE("ssh.key.file", _("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"),
+        SSH_KEY_FILE("ssh.key.file", n_("isisfish.config.ssh.key.file.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"),
         //SSH_PASSPHRASE_ENABLED("ssh.passphrase.enabled", _("isisfish.config.vcs.noPassPhrase.description"), "false"),
         //SSH_PASSPHRASE("ssh.passphrase", _("isisfish.config.vcs.passphrase.description"), ""),
 
         // can be None, CVS or SVN. only None or SVN work
-        VCS_TYPE(VCS.VCS_TYPE, _("isisfish.config.vcs.type.description"), VCS.TYPE_SVN),
+        VCS_TYPE(VCS.VCS_TYPE, n_("isisfish.config.vcs.type.description"), VCS.TYPE_SVN),
         // depend of VCS_TYPE, for SVN can be svn, svn+ssh, http or file
-        VCS_PROTOCOL(VCS.VCS_PROTOCOL, _("isisfish.config.vcs.useSshConnexion.description"), "svn"),
+        VCS_PROTOCOL(VCS.VCS_PROTOCOL, n_("isisfish.config.vcs.useSshConnexion.description"), "svn"),
         
         // user login to access vcs
-        VCS_USER_NAME(VCS.VCS_USER_NAME, _("isisfish.config.vcs.userName.description"), ""),
-        VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, _("isisfish.config.vcs.userPassword.description"), ""),
-        VCS_HOST_NAME(VCS.VCS_HOST_NAME, _("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"),
-        VCS_PATH(VCS.VCS_PATH, _("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data/"),
+        VCS_USER_NAME(VCS.VCS_USER_NAME, n_("isisfish.config.vcs.userName.description"), ""),
+        VCS_USER_PASSWORD(VCS.VCS_USER_PASSWORD, n_("isisfish.config.vcs.userPassword.description"), ""),
+        VCS_HOST_NAME(VCS.VCS_HOST_NAME, n_("isisfish.config.vcs.hostName.description"), "labs.libre-entreprise.org"),
+        VCS_PATH(VCS.VCS_PATH, n_("isisfish.config.vcs.remotePath.description"), "/svnroot/isis-fish-data/"),
 
-        USER_NAME("user.name", _("isisfish.config.main.userName.description"), System.getProperty("user.name")),
-        SMTP_SERVER("smtpServer", _("isisfish.config.main.smtpServer.description"), "smtp"),
-        USER_MAIL("userMail", _("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key);
+        USER_NAME("user.name", n_("isisfish.config.main.userName.description"), System.getProperty("user.name")),
+        SMTP_SERVER("smtpServer", n_("isisfish.config.main.smtpServer.description"), "smtp"),
+        USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key);
         
-        public final String key;
-        public final String description;
-        public final String defaultValue;
+        public String key;
+        public String description;
+        public String defaultValue;
 
         private Option(String key, String description, String defaultValue) {
             this.key = key;
@@ -1057,7 +1058,7 @@
          */
         @Override
         public String getDescription() {
-            return description;
+            return _(description);
         }
 
         /*
@@ -1091,6 +1092,30 @@
         public boolean isTransient() {
             return false;
         }
+
+        /*
+         * @see org.nuiton.util.ApplicationConfig.OptionDef#setDefaultValue(java.lang.String)
+         */
+        @Override
+        public void setDefaultValue(String defaultValue) {
+            this.defaultValue = defaultValue;
+        }
+
+        /*
+         * @see org.nuiton.util.ApplicationConfig.OptionDef#setTransient(boolean)
+         */
+        @Override
+        public void setTransient(boolean isTransient) {
+            
+        }
+
+        /*
+         * @see org.nuiton.util.ApplicationConfig.OptionDef#setFinal(boolean)
+         */
+        @Override
+        public void setFinal(boolean isFinal) {
+            
+        }
     }
     
     //////////////////////////////////////////////////
@@ -1098,58 +1123,70 @@
     //////////////////////////////////////////////////
     
     public static enum Action {
-        HELP(_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"),
-        VERSION(_("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"),
+        HELP(n_("Show help"), OtherAction.class.getName() + "#help", "-h", "--help"),
+        VERSION(n_("Show version"), OtherAction.class.getName() + "#version", "-v", "--version"),
         
-        IMPORT_ANALYSE_PLAN(_(""), ImportAction.class.getName() + "#importAnalysePlan", "--importAnalysePlan"),
-        IMPORT_EXPORT(_(""), ImportAction.class.getName() + "#importExport", "--importExport"),
-        IMPORT_RULE(_(""), ImportAction.class.getName() + "#importRule", "--importRule"),
-        IMPORT_SCRIPT(_("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"),
-        IMPORT_SIMULATOR(_(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"),
-        IMPORT_FORMULA(_(""), ImportAction.class.getName() + "#importFormula", "--importFormula"),
-        IMPORT_REGION(_(""), ImportAction.class.getName() + "#importRegion", "--importRegion"),
-        IMPORT_REGION_AND_RENAME(_(""), ImportAction.class.getName() + "#importRegionAndRename", "--importRegionAndRename"),
-        IMPORT_SIMULATION(_(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"),
-        IMPORT_SCRIPT_MODULE(_("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"),
+        IMPORT_ANALYSE_PLAN(n_(""), ImportAction.class.getName() + "#importAnalysePlan", "--importAnalysePlan"),
+        IMPORT_EXPORT(n_(""), ImportAction.class.getName() + "#importExport", "--importExport"),
+        IMPORT_RULE(n_(""), ImportAction.class.getName() + "#importRule", "--importRule"),
+        IMPORT_SCRIPT(n_("Import one java file script source"), ImportAction.class.getName() + "#importScript", "--importScript"),
+        IMPORT_SIMULATOR(n_(""), ImportAction.class.getName() + "#importSimulator", "--importSimulator"),
+        IMPORT_FORMULA(n_(""), ImportAction.class.getName() + "#importFormula", "--importFormula"),
+        IMPORT_REGION(n_(""), ImportAction.class.getName() + "#importRegion", "--importRegion"),
+        IMPORT_REGION_AND_RENAME(n_(""), ImportAction.class.getName() + "#importRegionAndRename", "--importRegionAndRename"),
+        IMPORT_SIMULATION(n_(""), ImportAction.class.getName() + "#importSimulation", "--importSimulation"),
+        IMPORT_SCRIPT_MODULE(n_("Import zipped file containing all scripts directory structure"), ImportAction.class.getName() + "#importScriptModule", "--importScriptModule"),
 
-        LIST_ANALYSE_PLAN(_(""), ExportAction.class.getName() + "#listAnalysePlan", "--listAnalysePlan"),
-        LIST_EXPORT(_(""), ExportAction.class.getName() + "#listExport", "--listExport"),
-        LIST_RULE(_(""), ExportAction.class.getName() + "#listRule", "--listRule"),
-        LIST_SCRIPT(_(""), ExportAction.class.getName() + "#listScript", "--listScript"),
-        LIST_SIMULATOR(_(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"),
-        LIST_FORMULA(_(""), ExportAction.class.getName() + "#listFormula", "--listFormula"),
-        LIST_REGION(_(""), ExportAction.class.getName() + "#listRegion", "--listRegion"),
-        LIST_SIMULATION(_(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"),
+        LIST_ANALYSE_PLAN(n_(""), ExportAction.class.getName() + "#listAnalysePlan", "--listAnalysePlan"),
+        LIST_EXPORT(n_(""), ExportAction.class.getName() + "#listExport", "--listExport"),
+        LIST_RULE(n_(""), ExportAction.class.getName() + "#listRule", "--listRule"),
+        LIST_SCRIPT(n_(""), ExportAction.class.getName() + "#listScript", "--listScript"),
+        LIST_SIMULATOR(n_(""), ExportAction.class.getName() + "#listSimulator", "--listSimulator"),
+        LIST_FORMULA(n_(""), ExportAction.class.getName() + "#listFormula", "--listFormula"),
+        LIST_REGION(n_(""), ExportAction.class.getName() + "#listRegion", "--listRegion"),
+        LIST_SIMULATION(n_(""), ExportAction.class.getName() + "#listSimulation", "--listSimulation"),
 
-        EXPORT_ANALYSE_PLAN(_(""), ExportAction.class.getName() + "#exportAnalysePlan", "--exportAnalysePlan"),
-        EXPORT_EXPORT(_(""), ExportAction.class.getName() + "#exportExport", "--exportExport"),
-        EXPORT_RULE(_(""), ExportAction.class.getName() + "#exportRule", "--exportRule"),
-        EXPORT_SCRIPT(_(""), ExportAction.class.getName() + "#exportScript", "--exportScript"),
-        EXPORT_SIMULATOR(_(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"),
-        EXPORT_FORMULA(_(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"),
-        EXPORT_REGION(_(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"),
-        EXPORT_SIMULATION(_(""), ExportAction.class.getName() + "#exportSimulation", "--exportSimulation"),
+        EXPORT_ANALYSE_PLAN(n_(""), ExportAction.class.getName() + "#exportAnalysePlan", "--exportAnalysePlan"),
+        EXPORT_EXPORT(n_(""), ExportAction.class.getName() + "#exportExport", "--exportExport"),
+        EXPORT_RULE(n_(""), ExportAction.class.getName() + "#exportRule", "--exportRule"),
+        EXPORT_SCRIPT(n_(""), ExportAction.class.getName() + "#exportScript", "--exportScript"),
+        EXPORT_SIMULATOR(n_(""), ExportAction.class.getName() + "#exportSimulator", "--exportSimulator"),
+        EXPORT_FORMULA(n_(""), ExportAction.class.getName() + "#exportFormula", "--exportFormula"),
+        EXPORT_REGION(n_(""), ExportAction.class.getName() + "#exportRegion", "--exportRegion"),
+        EXPORT_SIMULATION(n_(""), ExportAction.class.getName() + "#exportSimulation", "--exportSimulation"),
                 
-        VCS_SSH_CREATE_KEY(_(""), VCSAction.class.getName() + "#sshCreateKey", "--sshCreateKey"),
-        VCS_UPDATE(_(""), VCSAction.class.getName() + "#vcsUpdate", "--vcsUpdate"),
-        VCS_ADD(_(""), VCSAction.class.getName() + "#vcsAdd", "--vcsAdd"),
-        VCS_REMOVE(_(""), VCSAction.class.getName() + "#vcsRemove", "--vcsRemove"),
-        VCS_COMMIT(_(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"),
+        VCS_SSH_CREATE_KEY(n_(""), VCSAction.class.getName() + "#sshCreateKey", "--sshCreateKey"),
+        VCS_UPDATE(n_(""), VCSAction.class.getName() + "#vcsUpdate", "--vcsUpdate"),
+        VCS_ADD(n_(""), VCSAction.class.getName() + "#vcsAdd", "--vcsAdd"),
+        VCS_REMOVE(n_(""), VCSAction.class.getName() + "#vcsRemove", "--vcsRemove"),
+        VCS_COMMIT(n_(""), VCSAction.class.getName() + "#vcsCommit", "--vcsCommit"),
 
-        SIMULATE_WITH_REGION(_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"),
-        SIMULATE_WITH_SIMULATION(_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"),
-        SIMULATE_WITH_SIMULATION_AND_SCRIPT(_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"),
-        SIMULATE_REMOTELLY(_(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"),
-        SIMULATE_REMOTELLY_WITH_PRESCRIPT(_(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript");
+        SIMULATE_WITH_REGION(n_(""), SimulationAction.class.getName() + "#simulateWithRegion", "--simulateWithRegion"),
+        SIMULATE_WITH_SIMULATION(n_(""), SimulationAction.class.getName() + "#simulateWithSimulation", "--simulateWithSimulation"),
+        SIMULATE_WITH_SIMULATION_AND_SCRIPT(n_(""), SimulationAction.class.getName() + "#simulateWithSimulationAndScript", "--simulateWithSimulationAndScript"),
+        SIMULATE_REMOTELLY(n_(""), SimulationAction.class.getName() + "#simulateRemotelly", "--simulateRemotelly"),
+        SIMULATE_REMOTELLY_WITH_PRESCRIPT(n_(""), SimulationAction.class.getName() + "#simulateRemotellyWithPreScript", "--simulateRemotellyWithPreScript");
         
-        public String description;
-        public String action;
-        public String[] aliases;
+        protected String description;
+        protected String action;
+        protected String[] aliases;
 
         private Action(String description, String action, String ... aliases) {
             this.description = description;
             this.action = action;
             this.aliases = aliases;
-        }   
+        }
+        
+        public String getDescription() {
+            return _(description);
+        }
+        
+        public String getAction() {
+            return action;
+        }
+        
+        public String[] getAliases() {
+            return aliases;
+        }
     }
 }

Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java
===================================================================
--- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java	2011-03-17 10:34:38 UTC (rev 3173)
+++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java	2011-03-17 10:35:24 UTC (rev 3174)
@@ -58,7 +58,7 @@
         
         System.out.println("Actions:");
         for (IsisConfig.Action a : IsisConfig.Action.values()) {
-            System.out.println("\t" + Arrays.toString(a.aliases) + "(" + a.action + ") : " + a.description);
+            System.out.println("\t" + Arrays.toString(a.getAliases()) + "(" + a.getAction() + ") : " + a.getDescription());
         }
         System.exit(0);
     }

    

[Isis-fish-commits] r3174 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish: . actions

chatellier＠users.labs.libre-entreprise.org