CLDR-18475 deps, web: remove org.json from deps, fix rtl (#4566)

Author: srl295

tools/cldr-apps/js/src/esm/cldrSurvey.mjs

@@ -87,8 +87,6 @@ const timerSpeed = 15000; // 15 seconds
 const fastTimerSpeed = 3000; // 3 seconds
 let statusTimeout = null;
 
-let overridedir = null;
-
 /************************/
 
 function getDidUnbust() {
@@ -812,18 +810,15 @@ function locInfo(loc) {
   return locmap.getLocaleInfo(loc);
 }
 
-function setOverrideDir(dir) {
-  overridedir = dir;
-}
-
 /**
  * Set the dir and lang attributes for a node that represents
  * a CLDR value.
  * Also appends the 'cldrValue' class to the node.
- * @param {Node} node DOM node
- * @param {String} loc locale
+ * @param {Node} node DOM node to be set
+ * @param {String} loc locale (default locale if falsy)
+ * @param {String} overridedir override the directionality (not used if falsy)
  */
-function setLang(node, loc) {
+function setLang(node, loc, overridedir) {
   var info = locInfo(loc);
 
   if (overridedir) {
@@ -979,7 +974,6 @@ export {
   localizeFlyover,
   parseStatusAction,
   setLang,
-  setOverrideDir,
   setShower,
   showLoader,
   testsToHtml,

tools/cldr-apps/js/src/esm/cldrTable.mjs

@@ -177,8 +177,6 @@ function insertRowsIntoTbody(theTable, reuseTable) {
   for (let i in rowList) {
     const k = rowList[i];
     const theRow = theRows[k];
-    const dir = theRow.dir;
-    cldrSurvey.setOverrideDir(dir != null ? dir : null);
     /*
      * Don't regenerate the headings if we're re-using an existing table.
      */
@@ -809,7 +807,7 @@ function updateRowProposedWinningCell(tr, theRow, cell, protoButton) {
     const flagIcon = cldrSurvey.addIcon(cell, "s-flag");
     flagIcon.title = cldrText.get("flag_desc");
   }
-  cldrSurvey.setLang(cell);
+  cldrSurvey.setLang(cell, null, theRow.dir);
   tr.proposedcell = cell;
 
   /*
@@ -844,7 +842,7 @@ function updateRowProposedWinningCell(tr, theRow, cell, protoButton) {
 function updateRowOthersCell(tr, theRow, cell, protoButton) {
   let hadOtherItems = false;
   cldrDom.removeAllChildNodes(cell); // other
-  cldrSurvey.setLang(cell);
+  cldrSurvey.setLang(cell, null, theRow.dir);
 
   /*
    * Add the other vote info -- that is, vote info for the "Others" column.

tools/cldr-apps/pom.xml

@@ -110,12 +110,6 @@
 			<artifactId>javax.activation</artifactId>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/org.json/json -->
-		<dependency>
-			<groupId>org.json</groupId>
-			<artifactId>json</artifactId>
-		</dependency>
-
 		<!-- https://mvnrepository.com/artifact/org.jsoup/jsoup -->
 		<dependency>
 			<groupId>org.jsoup</groupId>

tools/cldr-apps/src/main/java/org/unicode/cldr/util/CLDRConfigImpl.java

@@ -10,22 +10,21 @@
 import java.net.URL;
 import java.util.Date;
 import java.util.Enumeration;
-import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 import java.util.logging.Logger;
 import javax.servlet.http.HttpServletRequest;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONString;
 import org.unicode.cldr.test.CheckCLDR;
 import org.unicode.cldr.web.CookieSession;
 import org.unicode.cldr.web.SurveyLog;
 import org.unicode.cldr.web.SurveyMain;
 import org.unicode.cldr.web.SurveyMain.Phase;
 import org.unicode.cldr.web.UserRegistry;
 import org.unicode.cldr.web.WebContext;
+import org.unicode.cldr.web.util.JSONException;
+import org.unicode.cldr.web.util.JSONObject;
+import org.unicode.cldr.web.util.JSONString;
 
 /**
  * This is a concrete implementation of CLDRConfig customized for SurveyTool usage. Its main
@@ -449,8 +448,8 @@ public JSONObject toJSONObject() throws JSONException {
         JSONObject ret = new JSONObject();
 
         ret.put("CLDR_HEADER", ""); // always show these
-        for (Entry<Object, Object> e : survprops.entrySet()) {
-            ret.put(e.getKey().toString(), e.getValue().toString());
+        for (final Object k : survprops.keySet()) {
+            ret.put(k.toString(), survprops.get(k).toString());
         }
 
         return ret;

tools/cldr-apps/src/main/java/org/unicode/cldr/web/AdminPanel.java

@@ -8,12 +8,12 @@
 import java.util.Random;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRConfigImpl;
 import org.unicode.cldr.util.VoteResolver;
+import org.unicode.cldr.web.util.JSONArray;
+import org.unicode.cldr.web.util.JSONException;
+import org.unicode.cldr.web.util.JSONObject;
 
 public class AdminPanel {
     public void getJson(
@@ -144,7 +144,7 @@ private void showExceptions(SurveyJSONWrapper r, HttpServletRequest request)
 
     private void showSettings(SurveyJSONWrapper r) throws JSONException {
         CLDRConfigImpl cci = (CLDRConfigImpl) (CLDRConfig.getInstance());
-        JSONObject all = new JSONObject().put("all", cci.toJSONObject());
+        JSONObject all = new JSONObject().put("all", cci);
         r.put("settings", all);
     }
 

tools/cldr-apps/src/main/java/org/unicode/cldr/web/BallotBox.java

@@ -4,10 +4,10 @@
 import java.util.Date;
 import java.util.Map;
 import java.util.Set;
-import org.json.JSONObject;
 import org.unicode.cldr.util.VoteResolver;
 import org.unicode.cldr.util.VoteType;
 import org.unicode.cldr.web.UserRegistry.User;
+import org.unicode.cldr.web.util.JSONObject;
 
 /**
  * @author srl This is an abstract interface for allowing SurveyTool-like input to a CLDRFile. It

tools/cldr-apps/src/main/java/org/unicode/cldr/web/ChunkyReader.java

@@ -22,12 +22,12 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.json.JSONString;
 import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.Pair;
+import org.unicode.cldr.web.util.JSONArray;
+import org.unicode.cldr.web.util.JSONException;
+import org.unicode.cldr.web.util.JSONObject;
+import org.unicode.cldr.web.util.JSONString;
 
 /**
  * This is only used by exception log readers

tools/cldr-apps/src/main/java/org/unicode/cldr/web/ClaGithubList.java

@@ -16,6 +16,7 @@
 import java.util.logging.Logger;
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRConfigImpl;
+import org.unicode.cldr.web.util.JsonUtil;
 
 /**
  * Utility class for reading a signatures.json file This file can be downloaded from
@@ -174,7 +175,7 @@ Map<String, SignEntry> readSigners(final Path path) throws IOException {
 
     /** read from a Reader */
     Map<String, SignEntry> readSigners(final Reader r) throws IOException {
-        final Gson gson = new Gson();
+        final Gson gson = JsonUtil.gson();
         Map<String, SignEntry> allSigners = new HashMap<>();
         try (final JsonReader jr = gson.newJsonReader(r); ) {
             jr.beginArray();

tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java

@@ -43,16 +43,16 @@
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 import org.apache.ibatis.jdbc.ScriptRunner;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.unicode.cldr.icu.dev.util.ElapsedTimer;
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRConfig.Environment;
 import org.unicode.cldr.util.CLDRLocale;
 import org.unicode.cldr.util.CldrUtility;
 import org.unicode.cldr.util.PathHeader;
 import org.unicode.cldr.util.StackTracker;
+import org.unicode.cldr.web.util.JSONArray;
+import org.unicode.cldr.web.util.JSONException;
+import org.unicode.cldr.web.util.JSONObject;
 
 /** Singleton utility class for simple(r) DB access. */
 public class DBUtils {

tools/cldr-apps/src/main/java/org/unicode/cldr/web/ErrorSubtypes.java

@@ -5,9 +5,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.unicode.cldr.test.CheckCLDR.CheckStatus.Subtype;
+import org.unicode.cldr.web.util.JSONException;
+import org.unicode.cldr.web.util.JSONObject;
 
 public class ErrorSubtypes {