* java/util/UnknownFormatConversionException.java

	(serialVersionUID): New field.
	(s): Renamed from 'conv' for serialization.
	* java/util/MissingFormatWidthException.java (serialVersionUID):
	New field.
	(s): Renamed from 'width' for serialization.
	* java/util/MissingFormatArgumentException.java
	(serialVersionUID): New field.
	(s): Renamed from 'spec' for serialization.
	* java/util/IllegalFormatWidthException.java (serialVersionUID):
	New field.
	(w): Renamed from 'width' for serialization.
	* java/util/IllegalFormatPrecisionException.java
	(serialVersionUID): New field.
	(p): Renamed from 'precision' for serialization.
	* java/util/IllegalFormatFlagsException.java (serialVersionUID):
	New field.
	* java/util/IllegalFormatConversionException.java
	(serialVersionUID): New field.
	(c): Renamed from 'conv' for serialization.
	(arg): Renamed from 'argClass' for serialization.
	* java/util/IllegalFormatCodePointException.java
	(serialVersionUID): New field.
	(c): Renamed from 'codepoint' for serialization.
	* java/util/FormatFlagsConversionMismatchException.java
	(serialVersionUID): New field.
	(f): Renamed from 'flags' for serialization.
	(c): Renamed from 'conversion' for serialization.
	* java/util/DuplicateFormatFlagsException.java (serialVersionUID):
	New field.
	* java/util/IllegalFormatException.java (serialVersionUID): New
	field.
	* java/util/FormatterClosedException.java (serialVersionUID): New
	field.
	* java/util/InvalidPropertiesFormatException.java: New file.

15 files changed, 168 insertions, 34 deletions

diff --git a/ChangeLog b/ChangeLog
index b4a809d4a..c7c06579a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+2005-08-13  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/UnknownFormatConversionException.java
+	(serialVersionUID): New field.
+	(s): Renamed from 'conv' for serialization.
+	* java/util/MissingFormatWidthException.java (serialVersionUID):
+	New field.
+	(s): Renamed from 'width' for serialization.
+	* java/util/MissingFormatArgumentException.java
+	(serialVersionUID): New field.
+	(s): Renamed from 'spec' for serialization.
+	* java/util/IllegalFormatWidthException.java (serialVersionUID):
+	New field.
+	(w): Renamed from 'width' for serialization.
+	* java/util/IllegalFormatPrecisionException.java
+	(serialVersionUID): New field.
+	(p): Renamed from 'precision' for serialization.
+	* java/util/IllegalFormatFlagsException.java (serialVersionUID):
+	New field.
+	* java/util/IllegalFormatConversionException.java
+	(serialVersionUID): New field.
+	(c): Renamed from 'conv' for serialization.
+	(arg): Renamed from 'argClass' for serialization.
+	* java/util/IllegalFormatCodePointException.java
+	(serialVersionUID): New field.
+	(c): Renamed from 'codepoint' for serialization.
+	* java/util/FormatFlagsConversionMismatchException.java
+	(serialVersionUID): New field.
+	(f): Renamed from 'flags' for serialization.
+	(c): Renamed from 'conversion' for serialization.
+	* java/util/DuplicateFormatFlagsException.java (serialVersionUID):
+	New field.
+	* java/util/IllegalFormatException.java (serialVersionUID): New
+	field.
+	* java/util/FormatterClosedException.java (serialVersionUID): New
+	field.
+	* java/util/InvalidPropertiesFormatException.java: New file.
+
 2005-08-05  Lillian Angel  <langel@redhat.com>
 	
 	* javax/swing/plaf/basic/BasicTreeUI.java:
diff --git a/java/util/DuplicateFormatFlagsException.java b/java/util/DuplicateFormatFlagsException.java
index dcfbb774e..32e259097 100644
--- a/java/util/DuplicateFormatFlagsException.java
+++ b/java/util/DuplicateFormatFlagsException.java
@@ -41,6 +41,9 @@ package java.util;
 /** @since 1.5 */
 public class DuplicateFormatFlagsException extends IllegalFormatException
 {
+  private static final long serialVersionUID = 18890531L;
+
+  // Note: name fixed by serialization.
   private String flags;
 
   public DuplicateFormatFlagsException(String flags)
diff --git a/java/util/FormatFlagsConversionMismatchException.java b/java/util/FormatFlagsConversionMismatchException.java
index 1df3e11e8..300e7f265 100644
--- a/java/util/FormatFlagsConversionMismatchException.java
+++ b/java/util/FormatFlagsConversionMismatchException.java
@@ -42,22 +42,26 @@ package java.util;
 public class FormatFlagsConversionMismatchException
   extends IllegalFormatException
 {
-  private String flags;
-  private char conversion;
+  private static final long serialVersionUID = 19120414L;
 
-  public FormatFlagsConversionMismatchException(String flags, char conversion)
+  // Note: name fixed by serialization.
+  private String f;
+  // Note: name fixed by serialization.
+  private char c;
+
+  public FormatFlagsConversionMismatchException(String f, char c)
   {
-    this.flags = flags;
-    this.conversion = conversion;
+    this.f = f;
+    this.c = c;
   }
 
   public char getConversion()
   {
-    return conversion;
+    return c;
   }
 
   public String getFlags()
   {
-    return flags;
+    return f;
   }
 }
diff --git a/java/util/FormatterClosedException.java b/java/util/FormatterClosedException.java
index 1743d70ad..d99edfd8c 100644
--- a/java/util/FormatterClosedException.java
+++ b/java/util/FormatterClosedException.java
@@ -41,6 +41,8 @@ package java.util;
 /** @since 1.5 */
 public class FormatterClosedException extends IllegalStateException
 {
+  private static final long serialVersionUID = 1811216L;
+
   public FormatterClosedException()
   {
   }
diff --git a/java/util/IllegalFormatCodePointException.java b/java/util/IllegalFormatCodePointException.java
index 6c2161455..d5ffc5a3f 100644
--- a/java/util/IllegalFormatCodePointException.java
+++ b/java/util/IllegalFormatCodePointException.java
@@ -41,15 +41,18 @@ package java.util;
 /** @since 1.5 */
 public class IllegalFormatCodePointException extends IllegalFormatException
 {
-  int codepoint;
+  private static final long serialVersionUID = 19080630L;
+
+  // Note: name fixed by serialization.
+  int c;
 
   public IllegalFormatCodePointException(int c)
   {
-    this.codepoint = c;
+    this.c = c;
   }
 
   public int getCodePoint()
   {
-    return codepoint;
+    return c;
   }
 }
diff --git a/java/util/IllegalFormatConversionException.java b/java/util/IllegalFormatConversionException.java
index 36f459ad7..c188cd87d 100644
--- a/java/util/IllegalFormatConversionException.java
+++ b/java/util/IllegalFormatConversionException.java
@@ -41,22 +41,26 @@ package java.util;
 /** @since 1.5 */
 public class IllegalFormatConversionException extends IllegalFormatException
 {
-  char conv;
-  Class<?> argClass;
+  private static final long serialVersionUID = 17000126L;
 
-  public IllegalFormatConversionException(char conv, Class<?> argClass)
+  // Note: name fixed by serialization.
+  char c;
+  // Note: name fixed by serialization.
+  Class<?> arg;
+
+  public IllegalFormatConversionException(char c, Class<?> arg)
   {
-    this.conv = conv;
-    this.argClass = argClass;
+    this.c = c;
+    this.arg = arg;
   }
 
   public char getConversion()
   {
-    return conv;
+    return c;
   }
 
   public Class<?> getArgumentClass()
   {
-    return argClass;
+    return arg;
   }
 }
diff --git a/java/util/IllegalFormatException.java b/java/util/IllegalFormatException.java
index 6b4a478c4..32b959e7b 100644
--- a/java/util/IllegalFormatException.java
+++ b/java/util/IllegalFormatException.java
@@ -41,6 +41,8 @@ package java.util;
 /** @since 1.5 */
 public class IllegalFormatException extends IllegalArgumentException
 {
+  private static final long serialVersionUID = 18830826L;
+
   IllegalFormatException()
   {
   }
diff --git a/java/util/IllegalFormatFlagsException.java b/java/util/IllegalFormatFlagsException.java
index 221751075..045fd4cd5 100644
--- a/java/util/IllegalFormatFlagsException.java
+++ b/java/util/IllegalFormatFlagsException.java
@@ -41,6 +41,9 @@ package java.util;
 /** @since 1.5 */
 public class IllegalFormatFlagsException extends IllegalFormatException
 {
+  private static final long serialVersionUID = 790824L;
+
+  // Note: name fixed by serialization.
   private String flags;
 
   public IllegalFormatFlagsException(String flags)
diff --git a/java/util/IllegalFormatPrecisionException.java b/java/util/IllegalFormatPrecisionException.java
index 8b0b0ca9e..a392e49ef 100644
--- a/java/util/IllegalFormatPrecisionException.java
+++ b/java/util/IllegalFormatPrecisionException.java
@@ -41,16 +41,19 @@ package java.util;
 /** @since 1.5 */
 public class IllegalFormatPrecisionException extends IllegalFormatException
 {
-  private int precision;
+  private static final long serialVersionUID = 18711008L;
 
-  public IllegalFormatPrecisionException(int precision)
+  // Note: name fixed by serialization.
+  private int p;
+
+  public IllegalFormatPrecisionException(int p)
   {
     super();
-    this.precision = precision;
+    this.p = p;
   }
 
   public int getPrecision()
   {
-    return precision;
+    return p;
   }
 }
diff --git a/java/util/IllegalFormatWidthException.java b/java/util/IllegalFormatWidthException.java
index d842ad67f..d3f72ef8a 100644
--- a/java/util/IllegalFormatWidthException.java
+++ b/java/util/IllegalFormatWidthException.java
@@ -41,16 +41,19 @@ package java.util;
 /** @since 1.5 */
 public class IllegalFormatWidthException extends IllegalFormatException
 {
-  private int width;
+  private static final long serialVersionUID = 16660902L;
 
-  public IllegalFormatWidthException(int width)
+  // Note: name fixed by serialization.
+  private int w;
+
+  public IllegalFormatWidthException(int w)
   {
     super();
-    this.width = width;
+    this.w = w;
   }
 
   public int getWidth()
   {
-    return width;
+    return w;
   }
 }
diff --git a/java/util/InvalidPropertiesFormatException.java b/java/util/InvalidPropertiesFormatException.java
new file mode 100644
index 000000000..5d8d7279a
--- /dev/null
+++ b/java/util/InvalidPropertiesFormatException.java
@@ -0,0 +1,57 @@
+/* InvalidPropertiesFormatException.java
+   Copyright (C) 2005  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package java.util;
+
+import java.io.IOException;
+
+// FIXME: serialization methods should throw NotSerializableException
+/** @since 1.5 */
+public class InvalidPropertiesFormatException extends IOException
+{
+  public InvalidPropertiesFormatException(String message)
+  {
+    super(message);
+  }
+
+  public InvalidPropertiesFormatException(Throwable cause)
+  {
+    super();
+    initCause(cause);
+  }
+}
diff --git a/java/util/MissingFormatArgumentException.java b/java/util/MissingFormatArgumentException.java
index ba99c7e26..2ed9761a8 100644
--- a/java/util/MissingFormatArgumentException.java
+++ b/java/util/MissingFormatArgumentException.java
@@ -41,15 +41,18 @@ package java.util;
 /** @since 1.5 */
 public class MissingFormatArgumentException extends IllegalFormatException
 {
-  private String spec;
+  private static final long serialVersionUID = 19190115L;
+
+  // Note: name fixed by serialization.
+  private String s;
 
   public MissingFormatArgumentException(String s)
   {
-    this.spec = s;
+    this.s = s;
   }
 
   public String getFormatSpecifier()
   {
-    return spec;
+    return s;
   }
 }
diff --git a/java/util/MissingFormatWidthException.java b/java/util/MissingFormatWidthException.java
index 89c3689bb..3d3b24994 100644
--- a/java/util/MissingFormatWidthException.java
+++ b/java/util/MissingFormatWidthException.java
@@ -41,15 +41,18 @@ package java.util;
 /** @since 1.5 */
 public class MissingFormatWidthException extends IllegalFormatException
 {
-  private String width;
+  private static final long serialVersionUID = 15560123L;
+
+  // Note: name fixed by serialization.
+  private String s;
 
   public MissingFormatWidthException(String s)
   {
-    this.width = s;
+    this.s = s;
   }
 
   public String getFormatSpecifier()
   {
-    return width;
+    return s;
   }
 }
diff --git a/java/util/UnknownFormatConversionException.java b/java/util/UnknownFormatConversionException.java
index b72b6e268..eac36a19d 100644
--- a/java/util/UnknownFormatConversionException.java
+++ b/java/util/UnknownFormatConversionException.java
@@ -41,15 +41,18 @@ package java.util;
 /** @since 1.5 */
 public class UnknownFormatConversionException extends IllegalFormatException
 {
-  private String conv;
+  private static final long serialVersionUID = 19060418L;
+
+  // Note: name fixed by serialization.
+  private String s;
 
   public UnknownFormatConversionException(String s)
   {
-    this.conv = s;
+    this.s = s;
   }
 
   public String getConversion()
   {
-    return conv;
+    return s;
   }
 }
diff --git a/java/util/UnknownFormatFlagsException.java b/java/util/UnknownFormatFlagsException.java
index bd241d0f2..538e49251 100644
--- a/java/util/UnknownFormatFlagsException.java
+++ b/java/util/UnknownFormatFlagsException.java
@@ -41,6 +41,9 @@ package java.util;
 /** @since 1.5 */
 public class UnknownFormatFlagsException extends IllegalFormatException
 {
+  private static final long serialVersionUID = 19370506L;
+
+  // Note: name fixed by serialization.
   private String flags;
 
   public UnknownFormatFlagsException(String s)