Scarab commit: svn commit: r10498 - trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java

Author: ronvoe122
Date: 2007-12-11 14:42:20-0800
New Revision: 10498

Modified:
   trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java

Log:
SCB2467: dates in an issue search were always parsed using the date format of the default locale (en_US).

Fixed two occurrences and refactored into own method.

Modified: trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java?view=diff&rev=10498&p1=trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java&p2=trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java&r1=10497&r2=10498
==============================================================================
--- trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java	(original)
+++ trunk/src/java/org/tigris/scarab/util/word/IssueSearch.java	2007-12-11 14:42:20-0800
@@ -68,7 +68,6 @@
 
 import org.apache.commons.collections.map.LinkedMap;
 import org.apache.commons.lang.StringUtils;
-import org.apache.fulcrum.localization.Localization;
 import org.apache.torque.TorqueException;
 import org.apache.torque.util.Criteria;
 import org.apache.torque.util.SqlEnum;
@@ -100,6 +99,7 @@
 import org.tigris.scarab.services.security.ScarabSecurity;
 import org.tigris.scarab.tools.ScarabLocalizationTool;
 import org.tigris.scarab.tools.localization.L10NKeySet;
+import org.tigris.scarab.tools.localization.Localizable;
 import org.tigris.scarab.util.ScarabConstants;
 import org.tigris.scarab.util.ScarabException;
 import org.tigris.scarab.search.CachedQuery;
@@ -910,10 +910,7 @@
         	}
             else if (dateString.indexOf(':') == -1)
             {
-                String[] patterns = {
-                    Localization.getString(this.locale, "ShortDatePattern"),
-                    ScarabConstants.ISO_DATE_PATTERN };
-                date = parseDate(dateString, patterns);
+                date = parseDate(dateString, L10NKeySet.ShortDatePattern);
                 
                 if (addTwentyFourHours) 
                 {                
@@ -922,15 +919,23 @@
             }
             else
             {
-                String[] patterns = {
-                    Localization.getString(this.locale, "ShortDateTimePattern"),
-                    ScarabConstants.ISO_DATETIME_PATTERN };
-                date = parseDate(dateString, patterns);        
+                date = parseDate(dateString, L10NKeySet.ShortDateTimePattern);        
             }
         }
         
         return date;
     }
+
+    private Date parseDate(String dateString, Localizable dateFormat) 
+        throws ParseException
+    {
+        Date date;
+        String[] patterns = {
+            L10N.get(dateFormat),
+            ScarabConstants.ISO_DATETIME_PATTERN };
+        date = parseDate(dateString, patterns);
+        return date;
+    }
     
     /**
      * Attempts to parse a String as a Date, trying each pattern in