Index: lutinutil/src/java/org/codelutin/util/FileCompletion.java diff -u lutinutil/src/java/org/codelutin/util/FileCompletion.java:1.3 lutinutil/src/java/org/codelutin/util/FileCompletion.java:1.4 --- lutinutil/src/java/org/codelutin/util/FileCompletion.java:1.3 Tue Nov 6 13:31:16 2007 +++ lutinutil/src/java/org/codelutin/util/FileCompletion.java Sun Dec 30 22:24:58 2007 @@ -70,10 +70,10 @@ public FileCompletion(boolean creation, boolean exit) { this.exit = exit; this.creation = creation; - if (Locale.getDefault().getLanguage() == "fr") - I18n.init("fr", "FR"); + if (Locale.getDefault().getLanguage().equals("fr")) + I18n.init2("fr", "FR","ISO-8859-1"); else - I18n.init("en", "US"); + I18n.init2("en", "US","ISO-8859-1"); console = System.console(); consoleAvailable = (console != null); @@ -93,8 +93,8 @@ System.out.println(I18n._("lutinutil.fileCompletion.cancel")); System.out.println(I18n._("lutinutil.fileCompletion.enter")); line = System.getProperty("user.dir"); - File f = new File(line); - line = line + readLine("> " + line + f.separator); + File f; + line = line + readLine("> " + line + File.separator); f = new File(line); String moreLastLine = line; boolean isDirectory = true; @@ -117,7 +117,7 @@ String[] listFichier = fTmp.list(filtre); if (listFichier.length == 1) { if (!(fTmp.getParentFile()==null)) - line = fTmp.getCanonicalPath() + f.separator + line = fTmp.getCanonicalPath() + File.separator + listFichier[0]; else line = fTmp.getCanonicalPath() + listFichier[0]; @@ -134,7 +134,7 @@ filtre.setFilter(f.getName()); String[] listFichier = f.getParentFile().list(filtre); if (listFichier.length <= 1 - || line.charAt(line.length() - 1) == f.separatorChar) { + || line.charAt(line.length() - 1) == File.separatorChar) { line = f.getCanonicalPath(); isDirectory = true; @@ -147,16 +147,16 @@ moreLastLine = line; f = new File(line); if (f.isDirectory() && isDirectory - && !(line.charAt(line.length() - 1) == f.separatorChar)) - line = line + f.separator; + && !(line.charAt(line.length() - 1) == File.separatorChar)) + line = line + File.separator; String read = readLine("> " + line); line = line + read; f = new File(line); - if (read.equals("") || read.equals(f.separator)) + if (read.equals("") || read.equals(File.separator)) afficherListe(f.list()); - if (line.matches(".* " + f.separator + ".*") - || line.matches(".*" + f.separator + " .*")) + if (line.matches(".* " + File.separator + ".*") + || line.matches(".*" + File.separator + " .*")) line = lastLine; f = new File(line); } @@ -173,8 +173,8 @@ private String filtre; /** - * @param File - * dir, String name + * @param dir + * @param name * @return boolean */ public boolean accept(File dir, String name) { @@ -184,7 +184,7 @@ /** * le parametre est le debut des noms de fichiers a afficher * - * @param String + * @param s */ public void setFilter(String s) { filtre = s; @@ -193,8 +193,7 @@ /** * - * @param String - * path + * @param path * @return String */ private String readLine(String path) { @@ -214,8 +213,7 @@ /** * - * @param String[] - * listefichiers + * @param listefichiers */ private void afficherListe(String[] listefichiers) { if (listefichiers != null) {