This fixes the ordering of zone names in the generator.
Updated locale data will shortly fix this in GNU Classpath itself.
ChangeLog:
2008-06-29 Andrew John Hughes <[EMAIL PROTECTED]>
PR classpath/22851:
* src/gnu/localegen/JavaGenerator.java:
Fix ordering of zone names.
* src/gnu/localegen/Main.java:
Update copyright.
* src/gnu/localegen/PropertiesGenerator.java,
Fix ordering of zone names and include
separators to mark missing fields.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
Index: src/gnu/localegen/JavaGenerator.java
===================================================================
RCS file: /sources/classpath/cp-tools/src/gnu/localegen/JavaGenerator.java,v
retrieving revision 1.26
diff -u -u -r1.26 JavaGenerator.java
--- src/gnu/localegen/JavaGenerator.java 6 Mar 2005 21:58:59 -0000
1.26
+++ src/gnu/localegen/JavaGenerator.java 30 Jun 2008 00:25:24 -0000
@@ -50,10 +50,10 @@
"mediumTimeFormat",
"longTimeFormat",
"fullTimeFormat" };
- private static final String[] classpathZoneOrder = { "zone.short.standard",
- "zone.long.standard",
- "zone.short.daylight",
- "zone.long.daylight" };
+ private static final String[] classpathZoneOrder = { "zone.long.standard",
+ "zone.short.standard",
+ "zone.long.daylight",
+ "zone.short.daylight" };
private static final String collatorIdentifiers = "<=,;@&!";
/*
Index: src/gnu/localegen/Main.java
===================================================================
RCS file: /sources/classpath/cp-tools/src/gnu/localegen/Main.java,v
retrieving revision 1.8
diff -u -u -r1.8 Main.java
--- src/gnu/localegen/Main.java 4 May 2005 07:20:00 -0000 1.8
+++ src/gnu/localegen/Main.java 30 Jun 2008 00:25:24 -0000
@@ -1,5 +1,5 @@
/*/
- * gnu.localegen.Main Copyright (C) 2004 Free Software Foundation,
+ * gnu.localegen.Main Copyright (C) 2004, 2008 Free Software Foundation,
* Inc.
*
* This file is part of GNU Classpath.
@@ -116,7 +116,7 @@
static void printVersion()
{
System.out.println(" This is the LDML to GNU Classpath converter");
- System.out.println(" Copyright (C) 2004 The Free Software Foundation.");
+ System.out.println(" Copyright (C) 2004, 2006, 2008 The Free Software
Foundation.");
System.out.println();
}
}
Index: src/gnu/localegen/PropertiesGenerator.java
===================================================================
RCS file:
/sources/classpath/cp-tools/src/gnu/localegen/PropertiesGenerator.java,v
retrieving revision 1.4
diff -u -u -r1.4 PropertiesGenerator.java
--- src/gnu/localegen/PropertiesGenerator.java 25 Mar 2006 23:06:07 -0000
1.4
+++ src/gnu/localegen/PropertiesGenerator.java 30 Jun 2008 00:25:25 -0000
@@ -1,5 +1,5 @@
/*
- * gnu.localegen.PropertiesGenerator Copyright (C) 2006
+ * gnu.localegen.PropertiesGenerator Copyright (C) 2006, 2008
* Free Software Foundation, Inc.
*
* This file is part of GNU Classpath.
@@ -51,10 +51,10 @@
"mediumTimeFormat",
"longTimeFormat",
"fullTimeFormat" };
- private static final String[] classpathZoneOrder = { "zone.short.standard",
- "zone.long.standard",
- "zone.short.daylight",
- "zone.long.daylight" };
+ private static final String[] classpathZoneOrder = { "zone.long.standard",
+ "zone.short.standard",
+ "zone.long.daylight",
+ "zone.short.daylight" };
private static final String collatorIdentifiers = "<=,;@&!";
/*
@@ -355,13 +355,9 @@
if (zoneData != null)
{
buffer2.append(convertToJavaString(zoneData.data));
- buffer2.append("\u00ae");
zoneDataFound = true;
}
- else
- {
- /* TODO: Emit a warning here "Insufficient data" */
- }
+ buffer2.append("\u00ae");
}
if (zoneDataFound)
{
