svn commit: r553009 - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/ui/struts2/util/ src/java/org/apache/roller/weblogger/util/ test/java/org/apache/roller/weblogger/business/

[ag...@apache.org]

Author: agilliland
Date: Tue Jul  3 15:37:44 2007
New Revision: 553009

URL: http://svn.apache.org/viewvc?view=rev&rev=553009
Log:
deleting more unused classes.


Removed:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/LRUCache.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/LocaleComparator.java
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/util/TimeZoneComparator.java
Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIUtils.java
    roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIUtils.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIUtils.java?view=diff&rev=553009&r1=553008&r2=553009
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIUtils.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/util/UIUtils.java Tue Jul  3 15:37:44 2007
@@ -20,23 +20,19 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.TimeZone;
-import java.util.TreeMap;
-import org.apache.roller.weblogger.util.LocaleComparator;
 
 
 /**
  * A utilities class used by the Weblogger UI.
  */
-public class UIUtils {
+public final class UIUtils {
     
-    private static List locales = null;
-    private static List timeZones = null;
+    private static final List locales;
+    private static final List timeZones;
     
     
     // load up the locales and time zones lists
@@ -58,6 +54,23 @@
     
     public static List getTimeZones() {
         return timeZones;
+    }
+    
+    
+    // special comparator for sorting locales
+    private static final class LocaleComparator implements Comparator {
+        public int compare(Object obj1, Object obj2) {
+            if (obj1 instanceof Locale && obj2 instanceof Locale) {
+                Locale locale1 = (Locale)obj1;
+                Locale locale2 = (Locale)obj2;
+                int compName = locale1.getDisplayName().compareTo(locale2.getDisplayName());
+                if (compName == 0) {
+                    return locale1.toString().compareTo(locale2.toString());
+                }
+                return compName;
+            }
+            return 0;
+        }
     }
     
 }

Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java?view=diff&rev=553009&r1=553008&r2=553009
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java Tue Jul  3 15:37:44 2007
@@ -36,7 +36,7 @@
 import org.apache.roller.weblogger.pojos.RuntimeConfigProperty;
 import org.apache.roller.weblogger.pojos.User;
 import org.apache.roller.weblogger.pojos.Weblog;
-import org.apache.roller.weblogger.util.DateUtil;
+import org.apache.roller.util.DateUtil;
 
 
 /**