* java/util/GregorianCalendar.java (setDefaultTime): New method.

	(GregorianCalendar): Use it in all constructors.
	* java/util/Calendar.java (Calendar): Changed argument name to
	`zone' to match code.
	* gnu/gcj/text/LocaleData_en.java: Added collatorRule element.
	* java/text/CollationKey.java: New file.
	* java/text/CollationElementIterator.java: New file.
	* java/text/Collator.java: New file.
	* java/text/RuleBasedCollator.java: New file.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@26654 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 10 insertions, 1 deletions

diff --git a/libjava/java/util/Calendar.java b/libjava/java/util/Calendar.java
index 8649adf600d..f4806a35bdc 100644
--- a/libjava/java/util/Calendar.java
+++ b/libjava/java/util/Calendar.java
@@ -88,7 +88,7 @@ public abstract class Calendar implements java.io.Serializable, Cloneable
     this (null, null);
   }
 
-  protected Calendar (TimeZone tx, Locale loc)
+  protected Calendar (TimeZone zone, Locale loc)
   {
     fields = new int[FIELD_COUNT];
     isSet = new boolean[FIELD_COUNT];
diff --git a/libjava/java/util/GregorianCalendar.java b/libjava/java/util/GregorianCalendar.java
index d20c06ef825..26a9814fc8c 100644
--- a/libjava/java/util/GregorianCalendar.java
+++ b/libjava/java/util/GregorianCalendar.java
@@ -107,11 +107,13 @@ public class GregorianCalendar extends Calendar {
   public GregorianCalendar (TimeZone zone, Locale locale)
   {
     super (zone, locale);
+    setDefaultTime ();
   }
 
   public GregorianCalendar (int year, int month, int date)
   {
     this((TimeZone) null);
+    setDefaultTime ();
     set (year, month, date);
   }
 
@@ -119,6 +121,7 @@ public class GregorianCalendar extends Calendar {
 			    int hour, int minute)
   {
     this((TimeZone) null);
+    setDefaultTime ();
     set (year, month, date, hour, minute);
   }
 
@@ -126,9 +129,15 @@ public class GregorianCalendar extends Calendar {
 			    int hour, int minute, int second)
   {
     this((TimeZone) null);
+    setDefaultTime ();
     set (year, month, date, hour, minute, second);
   }
 
+  private final void setDefaultTime ()
+  {
+    setTimeInMillis (System.currentTimeMillis());
+  }
+
   public int getMinimum(int calfield) { return mins[calfield]; }
   public int getGreatestMinimum(int calfield) { return mins[calfield]; }
   public int getMaximum(int calfield) { return maxs[calfield]; }