--- /home/cpdev/src/classpath/java/text/DateFormatSymbols.java	2005-07-02 21:03:44.000000000 +0000
+++ java/text/DateFormatSymbols.java	2005-06-30 05:34:49.000000000 +0000
@@ -41,7 +41,6 @@
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.util.StringTokenizer;
 
 /**
  * This class acts as container for locale specific date/time formatting
@@ -79,36 +78,13 @@
   transient String[] dateFormats;
   transient String[] timeFormats;
 
-  private static String[] getStringArray(ResourceBundle res, String name)
-  { 
-    return res.getString(name).split("\u00ae");
-  }
-
-  private String[][] getZoneStrings(ResourceBundle res)
-  {
-    try
-      {
-        int index = 0;
-        String data = res.getString("zoneStrings");
-	String[] zones = data.split("\u00a9");
-	String[][] array = new String[zones.length][];
-	for (int a = 0; a < zones.length; ++a)
-	  array[a] = zones[a].split("\u00ae");
-	return array;
-      }
-    catch (MissingResourceException e)
-      {
-	return new String[0][];
-      }
-  }
-  
   private String[] formatsForKey(ResourceBundle res, String key) 
   {
-    String[] values = new String[formatPrefixes.length];
-    
+    String[] values = new String [formatPrefixes.length];
     for (int i = 0; i < formatPrefixes.length; i++)
-      values[i] = res.getString(formatPrefixes[i] + key);
-  
+      {
+        values[i] = res.getString(formatPrefixes[i]+key);
+      }
     return values;
   }
 
@@ -125,14 +101,15 @@
       = ResourceBundle.getBundle("gnu.java.locale.LocaleInformation", locale,
       				 ClassLoader.getSystemClassLoader());
 
-    ampms = getStringArray(res, "ampms");
-    eras = getStringArray(res, "eras");
-    localPatternChars = res.getString("localPatternChars");
-    months = getStringArray(res, "months");
-    shortMonths = getStringArray(res, "shortMonths");
-    shortWeekdays = getStringArray(res, "shortWeekdays");
-    weekdays = getStringArray(res, "weekdays");
-    zoneStrings = getZoneStrings(res);
+    ampms = res.getStringArray ("ampms");
+    eras = res.getStringArray ("eras");
+    localPatternChars = res.getString ("localPatternChars");
+    months = res.getStringArray ("months");
+    shortMonths = res.getStringArray ("shortMonths");
+    shortWeekdays = res.getStringArray ("shortWeekdays");
+    weekdays = res.getStringArray ("weekdays");
+    zoneStrings = (String[][]) res.getObject ("zoneStrings");
+
     dateFormats = formatsForKey(res, "DateFormat");
     timeFormats = formatsForKey(res, "TimeFormat");
   }