Changeset 13507 in josm for trunk/src

Timestamp:

2018-03-04T22:09:01+01:00 (6 years ago)

Author:

stoecker

Message:

see #11392 - take new shorter I18n implementation also for plugins

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/tests/MapCSSTagChecker.java (modified) (1 diff)
• gui/mappaint/mapcss/MapCSSStyleSource.java (modified) (1 diff)
• gui/tagging/presets/TaggingPresetReader.java (modified) (1 diff)
• tools/I18n.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java

@@ -745 +745 @@
              Reader reader = new BufferedReader(UTFInputStreamReader.create(s))) {
             if (zip != null)
-                I18n.addTextsZip(cache.getFile());
+                I18n.addTexts(cache.getFile());
             result = TagCheck.readMapCSS(reader);
             checks.remove(url);

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -516 +516 @@
             zipFile = new ZipFile(file, StandardCharsets.UTF_8);
             zipIcons = file;
-            I18n.addTextsZip(zipIcons);
+            I18n.addTexts(zipIcons);
             ZipEntry zipEntry = zipFile.getEntry(zipEntryPath);
             return zipFile.getInputStream(zipEntry);

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java

@@ -344 +344 @@
             if (zip != null) {
                 zipIcons = cf.getFile();
-                I18n.addTextsZip(zipIcons);
+                I18n.addTexts(zipIcons);
             }
             try (InputStreamReader r = UTFInputStreamReader.create(zip == null ? cf.getInputStream() : zip)) {

trunk/src/org/openstreetmap/josm/tools/I18n.java

@@ -20 +20 @@
 import java.util.Locale;
 import java.util.Map;
-import java.util.jar.JarInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
@@ -370 +369 @@
     /**
      * I18n initialization for plugins.
-     * @param source file path/name of the JAR file containing translation strings
+     * @param source file path/name of the JAR or Zip file containing translation strings
      * @since 4159
      */
     public static void addTexts(File source) {
-        if ("en".equals(loadedCode))
-            return;
-        final String enfile = "data/en.lang";
-        final String langfile = "data/"+loadedCode+".lang";
-        try (
-            InputStream fis = Files.newInputStream(source.toPath());
-            JarInputStream jar = new JarInputStream(fis)
-        ) {
-            ZipEntry e;
-            boolean found = false;
-            while (!found && (e = jar.getNextEntry()) != null) {
-                String name = e.getName();
-                if (enfile.equals(name))
-                    found = true;
-            }
-            if (found) {
-                try (
-                    InputStream fisTrans = Files.newInputStream(source.toPath());
-                    JarInputStream jarTrans = new JarInputStream(fisTrans)
-                ) {
-                    found = false;
-                    while (!found && (e = jarTrans.getNextEntry()) != null) {
-                        String name = e.getName();
-                        if (name.equals(langfile))
-                            found = true;
-                    }
-                    if (found)
-                        load(jar, jarTrans, true);
-                }
-            }
-        } catch (IOException | InvalidPathException e) {
-            Logging.trace(e);
-        }
-    }
-
-    /**
-     * I18n initialization for Zip based resources.
-     * @param source input Zip source
-     * @since 13502
-     */
-    public static void addTextsZip(File source) {
         if ("en".equals(loadedCode))
             return;