2005-04-20 Sven de Marothy <sven@physto.se>

	* java/text/SimpleDateFormat.java:
	(formatWithAttribute): Pad year before truncating digits.

From-SVN: r98444

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index aeca35fb08aba3eef6e1e594118d0e4af1e4d039..203ea97305418f1e5f127a4c0a8a5f83354f2474 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-20  Sven de Marothy  <sven@physto.se>
+
+       * java/text/SimpleDateFormat.java:
+       (formatWithAttribute): Pad year before truncating digits.
+
 2005-04-20  Michael Koch  <konqueror@gmx.de>
 
        * gnu/java/net/PlainDatagramSocketImpl.java:

diff --git a/libjava/java/text/SimpleDateFormat.java b/libjava/java/text/SimpleDateFormat.java
index 190b4d624f4759efd537dd1254a731463001a633..06275b628ca61db06610476a7bc2f2ceca2ba934 100644 (file)
--- a/libjava/java/text/SimpleDateFormat.java
+++ b/libjava/java/text/SimpleDateFormat.java
@@ -680,7 +680,7 @@ public class SimpleDateFormat extends DateFormat
                buffer.setDefaultAttribute (DateFormat.Field.YEAR);
                if (cf.getSize() == 2)
                  {
-                   temp = String.valueOf (calendar.get (Calendar.YEAR));
+                   temp = "00"+String.valueOf (calendar.get (Calendar.YEAR));
                    buffer.append (temp.substring (temp.length() - 2));
                  }
                else