r2846 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . ui - Isis-fish-commits

16 Dec 2009

Author: chatellier
Date: 2009-12-16 11:51:57 +0000 (Wed, 16 Dec 2009)
New Revision: 2846

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
Log:
Clean config class (remove unused option, and commented options)

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

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2009-12-15 15:36:25 UTC (rev 2845)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisConfig.java	2009-12-16 11:51:57 UTC (rev 2846)
@@ -327,33 +327,6 @@
         return result;
     }
     
-    /**
-     * Retourne l'url du serveur de simulation
-     * @return simulator server
-     */
-    public String getSimulatorServer() {
-        String result = getOption(Option.SIMULATOR_SERVER.key);
-        return result;
-    }
-    
-    /**
-     * Retourne le login pour acceder au serveur de simulation
-     * @return simulator username
-     */
-    public String getSimulatorUsername() {
-        String result = getOption(Option.SIMULATOR_USER_NAME.key);
-        return result;
-    }
-
-    /**
-     * Retourne le mot de passe pour acceder au serveur de simulation
-     * @return simulator password
-     */
-    public String getSimulatorPassword() {
-        String result = getOption(Option.SIMULATOR_PASSWORD.key);
-        return result;
-    }
-    
     public String getSimulatorClassfile() {
         String result = getOption(Option.SIMULATOR_CLASSFILE.key);
         return result;
@@ -576,18 +549,6 @@
         setOption(Option.SSH_KEY_FILE.key, sshFile.getAbsolutePath());
     }
 
-    /*
-     * Le type de simulation par defaut a utiliser (local, remote, ...)
-     * @return
-     *)
-    public boolean isSimulatorLocal() {
-        // FIXME never called
-        String value = getOption(Option.SIMULATOR_LAUNCHER.key);
-        // and following code always return false :
-        boolean result = "local".equalsIgnoreCase(value);
-        return result;
-    }*/
-
     /*public boolean isUseVCS() {
         String value = getOption(Option.VCS_TYPE.key);
         boolean result = !VCSNone.TYPE_NONE.equals(value);
@@ -597,17 +558,12 @@
     public boolean isLaunchUI() {
         boolean result = getOptionAsBoolean(Option.LAUNCH_UI.key);
         return result;
-    }  
+    }
 
     public void setSimulatorLauncher(String value) {
         setOption(Option.SIMULATOR_LAUNCHER.key, value);
-    }  
+    }
 
-//    public boolean isSimulationShowOnlyQueue() {
-//        Boolean result = getOptionAsBoolean(Option.SIMULATION_SHOW_ONLY_QUEUE.key);
-//        return result;
-//    }  
-
     public boolean isSimulationShowOnlyError() {
         Boolean result = getOptionAsBoolean(Option.SIMULATION_SHOW_ONLY_ERROR.key);
         return result;
@@ -826,7 +782,6 @@
         String[] keys = new String[]{
             "compileDirectory", Option.COMPILATION_DIRECTORY.key,
             "defaultBackupDirectory", Option.BACKUP_DIRECTORY.key,
-            "defaultExportDirectory", Option.DEFAULT_EXPORT_DIRECTORY.key,
             "defaultExportNames", Option.DEFAULT_EXPORT_NAMES.key,
             "defaultMapFile", Option.DEFAULT_MAP_FILENAME.key,
             "defaultResultNames", Option.DEFAULT_RESULT_NAMES.key,
@@ -834,9 +789,6 @@
             "defaultTagValue", Option.DEFAULT_TAG_VALUE.key,
             "javadocURL", Option.JAVADOC_URL.key,
             "locale", Option.LOCALE.key,
-            "login", Option.SIMULATOR_USER_NAME.key,
-            "password", Option.SIMULATOR_PASSWORD.key,
-            "simulationServer", Option.SIMULATOR_SERVER.key,
             "simulationShowOnlyError", Option.SIMULATION_SHOW_ONLY_ERROR.key,
             "simulationShowOnlyQueue", null, // Option.SIMULATION_SHOW_ONLY_QUEUE.key,
             "smtpServer", Option.SMTP_SERVER.key,
@@ -910,7 +862,6 @@
         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"),
 
-        DEFAULT_EXPORT_DIRECTORY("default.export.directory", _("isisfish.config.main.defaultExportDirectory.description"), getUserHome() + File.separator + "isis-export"),
         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"),
@@ -924,11 +875,6 @@
         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_SERVER("simulation.server", _("isisfish.config.main.simulationServer.description"), "http://simulateur.ifremer.fr:9090"),
-        /** le login a utiliser pour les launcher distant, le type du launcher est ajouter a la cle (car 1 login par launcher) */
-        SIMULATOR_USER_NAME("simulator.username", _("isisfish.config.main.login.description"), "anonymous"),
-        SIMULATOR_PASSWORD("simulator.password", _("isisfish.config.main.password.description"), "guest"),
-
         /** Serveur accessible par ssh : address */
         SIMULATOR_SSH_SERVER("simulation.ssh.server", _("isisfish.config.main.simulation.ssh.server.description"), "caparmor"),
         /** Serveur accessible par ssh : nom du service de transfert de fichier */
@@ -951,10 +897,7 @@
         SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", _("isisfish.config.main.simulation.ssh.max.threads.description"), "1"),
 
         LOCALE("locale", _("isisfish.config.main.locale.description"), "fr_FR"),
-        // REGION_MAP("regionMap", _("isisfish.config.main.regionMap.description"), "maps"),
-        // RESULT_EXPORT("resultExport", String.class, 15, n_("isisfish.config.main.resultExport.description"), "resultExports"),
         SIMULATION_SHOW_ONLY_ERROR("simulationShowOnlyError", _("isisfish.config.main.simulationShowOnlyError.description"), "false"),
-        // SIMULATION_SHOW_ONLY_QUEUE("simulationShowOnlyQueue", _("isisfish.config.main.simulationShowOnlyQueue.description"), "true"),
         
         // if false no graphical interface
         LAUNCH_UI("launch.ui", _("isisfish.config.main.launchUI.description"), "true"),
@@ -972,7 +915,7 @@
         VCS_TYPE(VCS.VCS_TYPE, _("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_SSH_KEY_FILE(VCS.VCS_SSH_KEY_FILE, _("isisfish.config.vcs.keyFile.description"), getUserHome() + File.separator + ".ssh" + File.separator + "isis_rsa"),
+        
         // 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"), ""),

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	2009-12-15 15:36:25 UTC (rev 2845)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx	2009-12-16 11:51:57 UTC (rev 2846)
@@ -100,7 +100,7 @@
     }
     
     /**
-     * Show congig frame (Jaxx based).
+     * Show config frame (Jaxx based).
      */
     protected void config() {
         ConfigUIModel model = new ConfigUIModel(IsisFish.config);
@@ -115,7 +115,6 @@
                 IsisConfig.Option.MONITORING_DIRECTORY,
                 IsisConfig.Option.JAVADOC_DIRECTORY,
                 IsisConfig.Option.BACKUP_DIRECTORY,
-                IsisConfig.Option.DEFAULT_EXPORT_DIRECTORY,
                 IsisConfig.Option.LOCALE,
                 IsisConfig.Option.SIMULATION_SHOW_ONLY_ERROR
                 );

    

r2846 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish: . ui

chatellier＠users.labs.libre-entreprise.org

tags

participants (1)