CLDR-15381 Java formatting with prettier, tabWidth 4

package.json

@@ -0,0 +1,12 @@
+{
+  "prettier": {
+    "overrides": [
+      {
+        "files": ["*.java"],
+        "options": {
+          "tabWidth": 4
+        }
+      }
+    ]
+  }
+}

tools/cldr-code/src/main/java/org/unicode/cldr/util/ApproximateWidth.java

@@ -3,6 +3,7 @@
 import com.ibm.icu.dev.util.UnicodeMap;
 
 public class ApproximateWidth {
+
     static UnicodeMap<Integer> data = new UnicodeMap<>();
     static Integer defaultWidth;
 
@@ -35,14 +36,21 @@ public void handleComment(String line, int commentCharPosition) {
             }
 
             @Override
-            protected boolean handleLine(int lineCount, int start, int end, String[] items) {
+            protected boolean handleLine(
+                int lineCount,
+                int start,
+                int end,
+                String[] items
+            ) {
                 data.putAll(start, end, Integer.parseInt(items[1]));
                 return true;
             }
-
         };
 
-        MyFileHander.process(ApproximateWidth.class, "data/ApproximateWidth.txt");
+        MyFileHander.process(
+            ApproximateWidth.class,
+            "data/ApproximateWidth.txt"
+        );
     }
 
     public static void main(String[] args) {

tools/cldr-code/src/main/java/org/unicode/cldr/util/ArrayComparator.java

@@ -9,6 +9,7 @@
 import java.util.Comparator;
 
 public class ArrayComparator implements Comparator {
+
     public static final Comparator COMPARABLE = new Comparator() {
         @Override
         public int compare(Object o1, Object o2) {
@@ -28,7 +29,9 @@ public ArrayComparator(Comparator[] comparators, int[] reordering) {
             }
         } else {
             if (this.reordering.length != this.comparators.length) {
-                throw new IllegalArgumentException("comparator and reordering lengths must match");
+                throw new IllegalArgumentException(
+                    "comparator and reordering lengths must match"
+                );
             }
         }
     }
@@ -59,6 +62,7 @@ public int compare(Object a0, Object a1) {
     }
 
     static class CatchExceptionComparator implements Comparator {
+
         private Comparator other;
 
         public CatchExceptionComparator(Comparator other) {
@@ -76,5 +80,4 @@ public int compare(Object arg0, Object arg1) throws RuntimeException {
             }
         }
     }
-
-}
+}

tools/cldr-code/src/main/java/org/unicode/cldr/util/BNF.java

@@ -6,6 +6,7 @@
  */
 package org.unicode.cldr.util;
 
+import com.ibm.icu.text.UnicodeSet;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -14,9 +15,8 @@
 import java.util.Random;
 import java.util.Set;
 
-import com.ibm.icu.text.UnicodeSet;
-
 public class BNF {
+
     private Map map = new HashMap();
     private Set variables = new HashSet();
     private Pick pick = null;
@@ -66,8 +66,7 @@ public BNF(Random random, Quoter quoter) {
 
     public BNF addRules(String rules) {
         t.setSource(rules);
-        while (addRule()) {
-        }
+        while (addRule()) {}
         return this; // for chaining
     }
 
@@ -79,12 +78,12 @@ public BNF complete() {
         variables.addAll(t.getLookedUpItems());
         if (!ruleSet.equals(variables)) {
             String msg = showDiff(variables, ruleSet);
-            if (msg.length() != 0) msg = "Error: Missing definitions for: " + msg;
+            if (msg.length() != 0) msg =
+                "Error: Missing definitions for: " + msg;
             String temp = showDiff(ruleSet, variables);
-            if (temp.length() != 0) temp = "Warning: Defined but not used: " + temp;
-            if (msg.length() == 0)
-                msg = temp;
-            else if (temp.length() != 0) {
+            if (temp.length() != 0) temp =
+                "Warning: Defined but not used: " + temp;
+            if (msg.length() == 0) msg = temp; else if (temp.length() != 0) {
                 msg = msg + "; " + temp;
             }
             error(msg);
@@ -95,9 +94,7 @@ else if (temp.length() != 0) {
             if (msg.length() != 0) msg = "Missing definitions for: " + msg;
             String temp = showDiff(ruleSet, variables);
             if (temp.length() != 0) temp = "Defined but not used: " + temp;
-            if (msg.length() == 0)
-                msg = temp;
-            else if (temp.length() != 0) {
+            if (msg.length() == 0) msg = temp; else if (temp.length() != 0) {
                 msg = msg + "; " + temp;
             }
             error(msg);
@@ -140,8 +137,7 @@ String showDiff(Set a, Set b) {
     }
 
     void error(String msg) {
-        throw new IllegalArgumentException(msg
-            + "\r\n" + t.toString());
+        throw new IllegalArgumentException(msg + "\r\n" + t.toString());
     }
 
     private boolean addRule() {
@@ -193,37 +189,37 @@ Pick qualify(Pick item) {
         int[] weights;
         int type = t.next();
         switch (type) {
-        case '@':
-            return new Pick.Quote(item);
-        case '~':
-            return new Pick.Morph(item);
-        case '?':
-            int weight = getWeight();
-            if (weight == NO_WEIGHT) weight = 50;
-            weights = new int[] { 100 - weight, weight };
-            return Pick.repeat(0, 1, weights, item);
-        case '*':
-            weights = getWeights();
-            return Pick.repeat(1, maxRepeat, weights, item);
-        case '+':
-            weights = getWeights();
-            return Pick.repeat(1, maxRepeat, weights, item);
-        case '{':
-            if (t.next() != Tokenizer.NUMBER) error("missing number");
-            int start = (int) t.getNumber();
-            int end = start;
-            type = t.next();
-            if (type == ',') {
-                end = maxRepeat;
+            case '@':
+                return new Pick.Quote(item);
+            case '~':
+                return new Pick.Morph(item);
+            case '?':
+                int weight = getWeight();
+                if (weight == NO_WEIGHT) weight = 50;
+                weights = new int[] { 100 - weight, weight };
+                return Pick.repeat(0, 1, weights, item);
+            case '*':
+                weights = getWeights();
+                return Pick.repeat(1, maxRepeat, weights, item);
+            case '+':
+                weights = getWeights();
+                return Pick.repeat(1, maxRepeat, weights, item);
+            case '{':
+                if (t.next() != Tokenizer.NUMBER) error("missing number");
+                int start = (int) t.getNumber();
+                int end = start;
                 type = t.next();
-                if (type == Tokenizer.NUMBER) {
-                    end = (int) t.getNumber();
+                if (type == ',') {
+                    end = maxRepeat;
                     type = t.next();
+                    if (type == Tokenizer.NUMBER) {
+                        end = (int) t.getNumber();
+                        type = t.next();
+                    }
                 }
-            }
-            if (type != '}') error("missing }");
-            weights = getWeights();
-            return Pick.repeat(start, end, weights, item);
+                if (type != '}') error("missing }");
+                weights = getWeights();
+                return Pick.repeat(start, end, weights, item);
         }
         t.backup();
         return item;
@@ -289,7 +285,8 @@ Pick getAlternation() {
                 last = temp;
                 lastWeight = weight;
             } else {
-                if (result == null) result = Pick.makeAlternation().or2(lastWeight, last);
+                if (result == null) result =
+                    Pick.makeAlternation().or2(lastWeight, last);
                 result = result.or2(weight, temp);
             }
             int token = t.next();

tools/cldr-code/src/main/java/org/unicode/cldr/util/BoilerplateUtilities.java

@@ -16,8 +16,7 @@ public static String toStringHelper(Object object) {
             Object value = "no-access";
             try {
                 value = fields[i].get(object);
-            } catch (Exception e) {
-            }
+            } catch (Exception e) {}
             if (value == null) continue;
             if (gotOne) result.append(", ");
             result.append(fields[i].getName()).append('=').append(value);
@@ -54,11 +53,10 @@ public static int compareToHelper(Object a, Object b, int depth) {
             try {
                 fields[i].get(a);
                 fields[i].get(b);
-            } catch (Exception e) {
-            }
+            } catch (Exception e) {}
             int result = compareToHelper(a, b, depth + 1);
             if (result != 0) return result;
         }
         return 0;
     }
-}
+}