From: cesarvh <cesarv.h@berkeley.edu>
Date: Wed, 17 Oct 2018 02:44:11 +0000 (-0700)
Subject: UJ-2: Simplified code
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=394b9bf04c395d90dfc79523bd09e874d56a8146;p=tmp%2Fjakarta-migration.git

UJ-2: Simplified code
---

diff --git a/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/antlr/ANTLRStructuredDateEvaluator.java b/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/antlr/ANTLRStructuredDateEvaluator.java
index 52d15ae46..654c2fbb7 100644
--- a/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/antlr/ANTLRStructuredDateEvaluator.java
+++ b/services/structureddate/structureddate/src/main/java/org/collectionspace/services/structureddate/antlr/ANTLRStructuredDateEvaluator.java
@@ -465,17 +465,16 @@ public class ANTLRStructuredDateEvaluator extends StructuredDateBaseListener imp
 		Integer num2;
 		Integer num3;
 
-		if (eraLast) {
-			// Si		
-			num1 = (Integer) stack.pop(); // year or day
-			num2 = (Integer) stack.pop(); // month
-			num3 = (Integer) stack.pop(); // year or day
-			era = (Era) stack.pop(); // era...
-		} else {
+		if (!eraLast) {
 			era = (Era) stack.pop(); // damn eras
-			num1 = (Integer) stack.pop(); // year or day
-			num2 = (Integer) stack.pop(); // month
-			num3 = (Integer) stack.pop(); //  day
+		}
+
+		num1 = (Integer) stack.pop(); // year or day
+		num2 = (Integer) stack.pop(); // month
+		num3 = (Integer) stack.pop(); //  day
+		
+		if (eraLast) {
+			era =  (Era) stack.pop();
 		}
 
 		Integer dayOfMonth = num1;
@@ -483,8 +482,9 @@ public class ANTLRStructuredDateEvaluator extends StructuredDateBaseListener imp
 		Integer year = num3;
 		
 		if (DateUtils.isValidDate(num3, num2, num1, era)) {
-			// Do nothing, already in the right format
+			// Do nothing, already in the right format (Era Year Month Day)
 		} else if (DateUtils.isValidDate(num1, num2, num3, era)) {
+			// Use other format: Day Month Year Era
 			dayOfMonth = num3;
 			year = num1;
 		}