CLDR-13457 Dashboard rename New to Changed (#307)

-For changedOldValue, rename New (N) to Changed (C), and rename last-release to baseline

-Fix some warnings by deleting unused parameter nonVettingPhase

-Remove unused old temporary debugTimeStamp from json

-Delete some old commented-out dead code

-Comments

Author: btangmu

tools/cldr-apps/src/org/unicode/cldr/web/VettingViewerQueue.java

@@ -47,8 +47,6 @@
 import com.ibm.icu.impl.Row.R4;
 import com.ibm.icu.lang.CharSequences;
 import com.ibm.icu.text.DurationFormat;
-import com.ibm.icu.text.SimpleDateFormat;
-import com.ibm.icu.util.Calendar;
 import com.ibm.icu.util.ULocale;
 
 /**
@@ -161,8 +159,6 @@ private static class QueueEntry {
         public Map<Pair<CLDRLocale, Organization>, VVOutput> output = new TreeMap<Pair<CLDRLocale, Organization>, VVOutput>();
     }
 
-//    public static QueueEntry summaryEntry = null;
-
     private static final Object OnlyOneVetter = new Object() {
     }; // TODO: remove.
 
@@ -229,8 +225,8 @@ public Task(QueueEntry entry, CLDRLocale locale, SurveyMain sm, String baseUrl,
             this.st_org = st_org;
             this.entry = entry;
             this.sm = sm;
-            this.usersLevel = usersLevel; // Level.get(ctx.getEffectiveCoverageLevel());
-            this.usersOrg = usersOrg; // VoteResolver.Organization.fromString(ctx.session.user.voterOrg());
+            this.usersLevel = usersLevel;
+            this.usersOrg = usersOrg;
         }
 
         /**
@@ -297,26 +293,11 @@ public void nudge() {
 
                             if ((now - last) > 1200) {
                                 last = now;
-                                // StringBuffer bar =
-                                // SurveyProgressManager.appendProgressBar(new
-                                // StringBuffer(),n,ourmax);
-                                // String remStr="";
                                 if (n > 500) {
                                     progress.update(n, setRemStr(now));
                                 } else {
                                     progress.update(n);
                                 }
-                                // try {
-                                // mout.println("<script type=\"text/javascript\">document.getElementById('LoadingBar').innerHTML=\""+bar+
-                                // " ("+n+" items loaded" + remStr + ")" +
-                                // "\";</script>");
-                                // mout.flush();
-                                // } catch (java.io.IOException e) {
-                                // System.err.println("Nudge: got IOException  "
-                                // + e.toString() + " after " + n);
-                                // throw new RuntimeException(e); // stop
-                                // processing
-                                // }
                             }
                         }
 
@@ -335,7 +316,7 @@ public void done() {
                     }
 
                     if (!isSummary(locale)) {
-                        vv.generateHtmlErrorTables(aBuffer, choiceSet, locale.getBaseName(), usersOrg, usersLevel, true, false);
+                        vv.generateHtmlErrorTables(aBuffer, choiceSet, locale.getBaseName(), usersOrg, usersLevel, false);
                     } else {
                         if (DEBUG)
                             System.err.println("Starting summary gen..");
@@ -629,13 +610,6 @@ private void getJSONReview(Appendable output, CLDRFile sourceFile, CLDRFile base
             reviewInfo.put("hidden", review.getHiddenField(ctx.userId(), ctx.getLocale().toString()));
             reviewInfo.put("direction", ctx.getDirectionForLocale());
 
-            /*
-             * Add a time stamp to the json for debugging. This is probably temporary.
-             * There's a bug we're unable to reproduce anywhere other than the production server.
-             * Reference: https://unicode-org.atlassian.net/browse/CLDR-13124
-             */
-            reviewInfo.put("debugTimeStamp", new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(Calendar.getInstance().getTime()).toString());
-
             output.append(reviewInfo.toString());
         } catch (JSONException | IOException e) {
             e.printStackTrace();
@@ -695,14 +669,15 @@ public void writeVettingViewerOutput(CLDRLocale locale, StringBuffer aBuffer, We
                 Factory baselineFactory = CLDRConfig.getInstance().getCommonAndSeedAndMainAndAnnotationsFactory();
                 CLDRFile baselineFile = baselineFactory.make(loc, true);
                 Relation<R2<SectionId, PageId>, VettingViewer<Organization>.WritingInfo> file;
-                file = vv.generateFileInfoReview(aBuffer, choiceSet, loc, usersOrg, usersLevel, true, quick, sourceFile, quick ? null : baselineFile);
+                file = vv.generateFileInfoReview(aBuffer, choiceSet, loc, usersOrg, usersLevel, quick, sourceFile, quick ? null : baselineFile);
                 this.getJSONReview(aBuffer, sourceFile, baselineFile, file, choiceSet, loc, true, quick, ctx);
             } else {
                 /*
                  * TODO: if this is not dead code (i.e., if r_vetting.jsp is still used), could pass
                  * sourceFile and baselineFile to generateHtmlErrorTables rather than recreating in that function.
+                 * This really appears to be dead code!
                  */
-                vv.generateHtmlErrorTables(aBuffer, choiceSet, loc, usersOrg, usersLevel, true, quick);
+                vv.generateHtmlErrorTables(aBuffer, choiceSet, loc, usersOrg, usersLevel, quick);
             }
         } else {
             if (DEBUG) {
@@ -868,14 +843,6 @@ private QueueEntry getEntry(CookieSession session) {
         return entry;
     }
 
-//    private synchronized QueueEntry getSummaryEntry() {
-//        QueueEntry entry = summaryEntry;
-//        if (summaryEntry == null) {
-//            entry = summaryEntry = new QueueEntry();
-//        }
-//        return entry;
-//    }
-
     LruMap<CLDRLocale, BallotBox<UserRegistry.User>> ballotBoxes = new LruMap<CLDRLocale, BallotBox<User>>(8);
 
     BallotBox<UserRegistry.User> getBox(SurveyMain sm, CLDRLocale loc) {

tools/java/org/unicode/cldr/util/VettingViewer.java

@@ -111,9 +111,9 @@ public enum Choice {
             "The English value has changed in CLDR, but the corresponding value for your language has not. Check if any changes are needed in your language.",
             6),
         /**
-         * The value changed from the last version of CLDR
+         * The value changed from the baseline
          */
-        changedOldValue('N', "New", "The winning value was altered from the last-released CLDR value. (Informational)", 7),
+        changedOldValue('C', "Changed", "The winning value was altered from the baseline value. (Informational)", 7),
         /**
          * Given the users' coverage, some items are missing.
          */
@@ -479,10 +479,9 @@ public String getUrl(CLDRLocale locale) {
      * @param localeId
      * @param user
      * @param usersLevel
-     * @param nonVettingPhase
      */
     public void generateHtmlErrorTables(Appendable output, EnumSet<Choice> choices, String localeID, T user,
-        Level usersLevel, boolean nonVettingPhase, boolean quick) {
+        Level usersLevel, boolean quick) {
 
         // Gather the relevant paths
         // each one will be marked with the choice that it triggered.
@@ -501,7 +500,7 @@ public void generateHtmlErrorTables(Appendable output, EnumSet<Choice> choices,
             }
         }
 
-        FileInfo fileInfo = new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, nonVettingPhase, user,
+        FileInfo fileInfo = new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, user,
             usersLevel, quick);
 
         // now write the results out
@@ -522,14 +521,14 @@ public void generateHtmlErrorTables(Appendable output, EnumSet<Choice> choices,
      * Called only by writeVettingViewerOutput
      */
     public Relation<R2<SectionId, PageId>, WritingInfo> generateFileInfoReview(Appendable output, EnumSet<Choice> choices, String localeID, T user,
-        Level usersLevel, boolean nonVettingPhase, boolean quick, CLDRFile sourceFile, CLDRFile baselineFile) {
+        Level usersLevel, boolean quick, CLDRFile sourceFile, CLDRFile baselineFile) {
 
         // Gather the relevant paths
         // each one will be marked with the choice that it triggered.
         Relation<R2<SectionId, PageId>, WritingInfo> sorted = Relation.of(
             new TreeMap<R2<SectionId, PageId>, Set<WritingInfo>>(), TreeSet.class);
 
-        new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, nonVettingPhase, user,
+        new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, user,
             usersLevel, quick);
 
         // now write the results out
@@ -551,16 +550,30 @@ public void addAll(FileInfo other) {
 
         private FileInfo getFileInfo(CLDRFile sourceFile, CLDRFile baselineFile,
             Relation<R2<SectionId, PageId>, WritingInfo> sorted,
-            EnumSet<Choice> choices, String localeID, boolean nonVettingPhase,
+            EnumSet<Choice> choices, String localeID,
             T user, Level usersLevel, boolean quick) {
             return this.getFileInfo(sourceFile, baselineFile, sorted,
-                choices, localeID, nonVettingPhase,
+                choices, localeID,
                 user, usersLevel, quick, null);
         }
 
+        /**
+         * Loop through paths for the Dashboard
+         *
+         * @param sourceFile
+         * @param baselineFile
+         * @param sorted
+         * @param choices
+         * @param localeID
+         * @param user
+         * @param usersLevel
+         * @param quick
+         * @param xpath
+         * @return
+         */
         private FileInfo getFileInfo(CLDRFile sourceFile, CLDRFile baselineFile,
             Relation<R2<SectionId, PageId>, WritingInfo> sorted,
-            EnumSet<Choice> choices, String localeID, boolean nonVettingPhase,
+            EnumSet<Choice> choices, String localeID,
             T user, Level usersLevel, boolean quick, String xpath) {
 
             errorChecker.initErrorStatus(sourceFile);
@@ -860,7 +873,7 @@ private void writeSummaryTable(Appendable output, String header, Level desiredLe
             if (organization != null) {
                 level = StandardCodes.make().getLocaleCoverageLevel(organization.toString(), localeID);
             }
-            FileInfo fileInfo = new FileInfo().getFileInfo(sourceFile, baselineFile, null, choices, localeID, true, organization, level, false);
+            FileInfo fileInfo = new FileInfo().getFileInfo(sourceFile, baselineFile, null, choices, localeID, organization, level, false);
             localeNameToFileInfo.put(name, fileInfo);
             totals.addAll(fileInfo);
 
@@ -1426,7 +1439,7 @@ public ArrayList<String> getErrorOnPath(EnumSet<Choice> choices, String localeID
         } catch (Exception e) {
         }
 
-        EnumSet<Choice> errors = new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, nonVettingPhase, user, usersLevel,
+        EnumSet<Choice> errors = new FileInfo().getFileInfo(sourceFile, baselineFile, sorted, choices, localeID, user, usersLevel,
             false, path).problems;
 
         ArrayList<String> out = new ArrayList<String>();
@@ -1739,7 +1752,7 @@ public static void writeFile(String myOutputDir, VettingViewer<Organization> tab
 
         switch (newCode) {
         case newCode:
-            tableView.generateHtmlErrorTables(out, choiceSet, localeStringID, organization, usersLevel, SHOW_ALL, false);
+            tableView.generateHtmlErrorTables(out, choiceSet, localeStringID, organization, usersLevel, false);
             break;
             // case oldCode:
             // tableView.generateHtmlErrorTablesOld(out, choiceSet, localeStringID, userNumericID, usersLevel, SHOW_ALL);