i273: rename method for clarity.

ashoos72 · Jun 30, 2021 · 4f69e88 · 4f69e88
1 parent 2fa0058
commit 4f69e88
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/edu/csus/ecs/pc2/core/report/ExtractPlaybackLoadFilesReport.java b/src/edu/csus/ecs/pc2/core/report/ExtractPlaybackLoadFilesReport.java
@@ -125,7 +125,7 @@ private void writeJudgementRecord(PrintWriter printWriter, Run run, JudgementRec
 
         //if we found a judgement string, try to convert it to a corresponding CLICS acronym
         if (result!=null && result.length()>0) {
-            CLICS_JUDGEMENT_ACRONYM acronym = CLICSJudgementType.getCLICSAcronym(result);
+            CLICS_JUDGEMENT_ACRONYM acronym = CLICSJudgementType.getCLICSAcronymFromDisplayText(result);
             if (acronym!=null) {
                 result = acronym.name();
             }

diff --git a/src/edu/csus/ecs/pc2/core/util/JSONTool.java b/src/edu/csus/ecs/pc2/core/util/JSONTool.java
@@ -504,7 +504,7 @@ public ObjectNode convertJudgementToJSON(Run submission) {
                     resultString = judgementRecord.getValidatorResultString();
                     if (resultString!=null) {
                         //try to convert the validator string to a known acronym
-                        CLICS_JUDGEMENT_ACRONYM acronym = CLICSJudgementType.getCLICSAcronym(resultString);
+                        CLICS_JUDGEMENT_ACRONYM acronym = CLICSJudgementType.getCLICSAcronymFromDisplayText(resultString);
                         //check if we got back a judgement acronym
                         if (acronym!=null) {
                             resultString = acronym.name();

diff --git a/src/edu/csus/ecs/pc2/shadow/ShadowController.java b/src/edu/csus/ecs/pc2/shadow/ShadowController.java
@@ -597,7 +597,7 @@ private Map<String, ShadowJudgementInfo> getJudgementsMap(Run[] pc2Runs) {
                         }
 
                         // try to convert the judgement string text to a corresponding acronym (returns null if judgementString is null or not found)
-                        CLICS_JUDGEMENT_ACRONYM acronym = CLICSJudgementType.getCLICSAcronym(judgementString);
+                        CLICS_JUDGEMENT_ACRONYM acronym = CLICSJudgementType.getCLICSAcronymFromDisplayText(judgementString);
 
                         if (acronym == null) {
                             // we couldn't find a CLICS judgement matching the string;
@@ -609,7 +609,7 @@ private Map<String, ShadowJudgementInfo> getJudgementsMap(Run[] pc2Runs) {
                                 judgementString = judgementString.substring(5); // strip off the "No - "
                             }
 
-                            acronym = CLICSJudgementType.getCLICSAcronym(judgementString);
+                            acronym = CLICSJudgementType.getCLICSAcronymFromDisplayText(judgementString);
 
                         }
 
@@ -923,4 +923,12 @@ private boolean restartShadowIfNeeded(ContestInformation ci) {
         }
         return (result);
     }
+
+    public IInternalContest getLocalContest() {
+        return localContest;
+    }
+
+    public IInternalController getLocalController() {
+        return localController;
+    }
 }