Author: chatellier Date: 2011-05-24 14:37:23 +0000 (Tue, 24 May 2011) New Revision: 3338 Log: Fix i18n code format Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2011-05-24 14:33:15 UTC (rev 3337) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2011-05-24 14:37:23 UTC (rev 3338) @@ -97,8 +97,7 @@ RegionStorage.importAndRenameZip(region, regionName); } else { if (log.isWarnEnabled()) { - log.warn(_( - "Region %s allready exist in repository. Can't import", + log.warn(_("Region %s allready exist in repository. Can't import", regionName)); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-05-24 14:33:15 UTC (rev 3337) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2011-05-24 14:37:23 UTC (rev 3338) @@ -295,8 +295,7 @@ // on leve un runtime, car normalement cette erreur est pratiquement // impossible car on creer l'url a partir d'un File ce qui ne pose // noralement pas de probleme - throw new IsisFishRuntimeException(_( - "isisfish.error.change.classloader", directory), eee); + throw new IsisFishRuntimeException(_("isisfish.error.change.classloader", directory), eee); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-05-24 14:33:15 UTC (rev 3337) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2011-05-24 14:37:23 UTC (rev 3338) @@ -543,8 +543,7 @@ port = Integer.parseInt(sPort); } catch (NumberFormatException e) { if (log.isWarnEnabled()) { - log.warn(_( - "isisfish.error.simulation.remote.wrongportvalue", + log.warn(_("isisfish.error.simulation.remote.wrongportvalue", sPort)); } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2011-05-24 14:33:15 UTC (rev 3337) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2011-05-24 14:37:23 UTC (rev 3338) @@ -318,15 +318,13 @@ if (log.isErrorEnabled()) { log.error("Can't connect", e); } - setTestMessage(_( - "isisfish.simulator.ssh.configuration.connectionerror", e + setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e .getMessage()), true); } catch (SSHException e) { if (log.isErrorEnabled()) { log.error("Can't connect", e); } - setTestMessage(_( - "isisfish.simulator.ssh.configuration.connectionerror", e + setTestMessage(_("isisfish.simulator.ssh.configuration.connectionerror", e .getMessage()), true); } catch (InvalidPassphraseException e) { if (log.isErrorEnabled()) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-05-24 14:33:15 UTC (rev 3337) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2011-05-24 14:37:23 UTC (rev 3338) @@ -86,21 +86,6 @@ import freemarker.template.Configuration; import freemarker.template.Template; -// chemit-2011-05-13 Avoid none public classes since JAXX can not parse multi classes in java file... -/* -class ScriptFileFilter implements FileFilter { - protected FileFilter filter; - - public ScriptFileFilter(FileFilter filter) { - this.filter = filter; - } - - public boolean accept(File dir) { - return !filter.accept(dir) || dir.getName().equals("data"); - } -} -*/ - /** * ScriptAction. * @@ -1048,8 +1033,7 @@ //TODO again the file in panel but not in tree panel ? codeStorage.delete(deleteRemote); if (codeStorage.getFile().exists()) { - ErrorHelper.showErrorDialog(_( - "isisfish.error.script.delete", codeStorage + ErrorHelper.showErrorDialog(_("isisfish.error.script.delete", codeStorage .getFile())); } } catch (Exception eee) { Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2011-05-24 14:33:15 UTC (rev 3337) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2011-05-24 14:37:23 UTC (rev 3338) @@ -128,8 +128,7 @@ isValid = true; passphraseForKeys.put(privatekeyFile, passphrase); } else { - message = _( - "isisfish.ssh.askpassphrase.wrongpassphrase", + message = _("isisfish.ssh.askpassphrase.wrongpassphrase", privatekeyFile); } } while (!isValid); @@ -169,4 +168,4 @@ return String.valueOf(passwordField.getPassword()); } -} \ No newline at end of file +}