Changeset 7893 in josm for trunk/src

Timestamp:

2014-12-26T15:05:04+01:00 (10 years ago)

Author:

Don-vip

Message:

code cleanup, fix various warnings, improve javadoc

File:

• trunk/src/org/openstreetmap/josm/tools/I18n.java (modified) (20 diffs)

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

@@ -39 +39 @@
     }
 
-    private enum PluralMode { MODE_NOTONE, MODE_NONE, MODE_GREATERONE,
+    private enum PluralMode {
+        MODE_NOTONE, MODE_NONE, MODE_GREATERONE,
         MODE_CS/*, MODE_AR*/, MODE_PL/*, MODE_RO*/, MODE_RU, MODE_SK/*, MODE_SL*/}
     private static PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
@@ -138 +139 @@
      * After translation, the localizations are distributed with the main program.
      * <br>
-     * For example, {@code tr("JOSM''s default value is ''{0}''.", val)}.
+     * For example, <code>tr("JOSM''s default value is ''{0}''.", val)</code>.
      * <br>
      * Use {@link #trn} for distinguishing singular from plural text, i.e.,
@@ -149 +150 @@
      * An apostrophe ' must be quoted by another apostrophe.
      * @param objects the parameters for the string.
-     * Mark occurrences in {@code text} with {@code {0}}, {@code {1}}, ...
+     * Mark occurrences in {@code text} with <code>{0}</code>, <code>{1}</code>, ...
      * @return the translated string.
      * @see #trn
@@ -192 +193 @@
      * the translatable strings from the source files).
      *
-     * For example, {@code
+     * For example, <code>
      * String[] options = new String[] {marktr("up"), marktr("down")};
-     * lbl.setText(tr(options[0]));}
+     * lbl.setText(tr(options[0]));</code>
      * @param text the string to be marked for translation.
      * @return {@code text} unmodified.
@@ -211 +212 @@
      * <br>
      * For instance, {@code trn("There was an error!", "There were errors!", i)} or
-     * {@code trn("Found {0} error in {1}!", "Found {0} errors in {1}!", i, Integer.toString(i), url)}.
+     * <code>trn("Found {0} error in {1}!", "Found {0} errors in {1}!", i, Integer.toString(i), url)</code>.
      *
      * @param singularText the singular text to translate.
@@ -223 +224 @@
      * @param n a number to determine whether {@code singularText} or {@code pluralText} is used.
      * @param objects the parameters for the string.
-     * Mark occurrences in {@code singularText} and {@code pluralText} with {@code {0}}, {@code {1}}, ...
+     * Mark occurrences in {@code singularText} and {@code pluralText} with <code>{0}</code>, <code>{1}</code>, ...
      * @return the translated string.
      * @see #tr
@@ -250 +251 @@
      * @param n a number to determine whether {@code singularText} or {@code pluralText} is used.
      * @param objects the parameters for the string.
-     * Mark occurrences in {@code singularText} and {@code pluralText} with {@code {0}}, {@code {1}}, ...
+     * Mark occurrences in {@code singularText} and {@code pluralText} with <code>{0}</code>, <code>{1}</code>, ...
      * @return the translated string.
      * @see #tr
@@ -260 +261 @@
     }
 
-    private static final String gettext(String text, String ctx, boolean lazy)
-    {
+    private static final String gettext(String text, String ctx, boolean lazy) {
         int i;
-        if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0)
-        {
+        if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0) {
             ctx = text.substring(2,i-1);
             text = text.substring(i+1);
         }
-        if(strings != null)
-        {
+        if(strings != null) {
             String trans = strings.get(ctx == null ? text : "_:"+ctx+"\n"+text);
             if(trans != null)
@@ -287 +285 @@
     }
 
-
     /* try without context, when context try fails */
     private static final String gettext_lazy(String text, String ctx) {
@@ -293 +290 @@
     }
 
-    private static final String gettextn(String text, String plural, String ctx, long num)
-    {
+    private static final String gettextn(String text, String plural, String ctx, long num) {
         int i;
-        if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0)
-        {
+        if(ctx == null && text.startsWith("_:") && (i = text.indexOf('\n')) >= 0) {
             ctx = text.substring(2,i-1);
             text = text.substring(i+1);
         }
-        if(pstrings != null)
-        {
+        if(pstrings != null) {
             i = pluralEval(num);
             String[] trans = pstrings.get(ctx == null ? text : "_:"+ctx+"\n"+text);
@@ -327 +321 @@
     public static final Locale[] getAvailableTranslations() {
         Collection<Locale> v = new ArrayList<>(languages.size());
-        if(getTranslationFile("en") != null)
-        {
+        if(getTranslationFile("en") != null) {
             for (String loc : languages.keySet()) {
                 if(getTranslationFile(loc) != null) {
@@ -347 +340 @@
     }
 
-    public static boolean hasCode(String code)
-    {
+    /**
+     * Determines if a language exists for the given code.
+     * @param code The language code
+     * @return {@code true} if a language exists, {@code false} otherwise
+     */
+    public static boolean hasCode(String code) {
         return languages.containsKey(code);
     }
 
-    public static void init()
-    {
+    /**
+     * I18n initialization.
+     */
+    public static void init() {
         //languages.put("ar", PluralMode.MODE_AR);
         languages.put("bg", PluralMode.MODE_NOTONE);
@@ -499 +498 @@
            }
          */
-        try
-        {
+        try {
             InputStream ens = new BufferedInputStream(en);
             InputStream trs = new BufferedInputStream(tr);
@@ -507 +505 @@
             boolean multimode = false;
             byte[] str = new byte[4096];
-            for(;;)
-            {
-                if(multimode)
-                {
+            for(;;) {
+                if(multimode) {
                     int ennum = ens.read();
                     int trnum = trs.read();
@@ -522 +518 @@
                     String[] enstrings = new String[ennum];
                     String[] trstrings = new String[trnum];
-                    for(int i = 0; i < ennum; ++i)
-                    {
+                    for(int i = 0; i < ennum; ++i) {
                         int val = ens.read(enlen);
                         if(val != 2) /* file corrupt */
@@ -536 +531 @@
                         enstrings[i] = new String(str, 0, val, StandardCharsets.UTF_8);
                     }
-                    for(int i = 0; i < trnum; ++i)
-                    {
+                    for(int i = 0; i < trnum; ++i) {
                         int val = trs.read(trlen);
                         if(val != 2) /* file corrupt */
@@ -553 +547 @@
                         p.put(enstrings[0], trstrings);
                     }
-                }
-                else
-                {
+                } else {
                     int enval = ens.read(enlen);
                     int trval = trs.read(trlen);
@@ -569 +561 @@
                     if(trval == 0xFFFE) /* marks identical string, handle equally to non-translated */
                         trval = 0;
-                    if(enval == 0xFFFF)
-                    {
+                    if(enval == 0xFFFF) {
                         multimode = true;
                         if(trval != 0xFFFF) /* files do not match */
@@ -596 +587 @@
                 }
             }
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             return false;
         }
@@ -655 +645 @@
     }
 
-    private static int pluralEval(long n)
-    {
-        switch(pluralMode)
-        {
+    private static int pluralEval(long n) {
+        switch(pluralMode) {
         case MODE_NOTONE: /* bg, da, de, el, en, en_GB, es, et, eu, fi, gl, is, it, iw_IL, nb, nl, sv */
             return ((n != 1) ? 1 : 0);