Hi,
I applied Mark' suggestion to use a shared instance of the
DefaultExceptionListener for all [XML]Encoders and XMLDecoders.

Furthermore I moved the class to the gnu.java.beans package.

The ChangeLog:

2006-01-29  Robert Schuster  <[EMAIL PROTECTED]>

        * gnu/java/beans/decoder/DefaultExceptionListener.java: Moved to
        parent package.
        * gnu/java/beans/DefaultExceptionListener.java: Constant public field
        INSTANCE added.
        * java/beans/XMLDecoder.java:
        (setExceptionListener): Use shared DefaultExceptionListener
        instance.
        * java/beans/Encoder.java:
        (setExceptionListener): Use shared DefaultExceptionListener
        instance.

cya
Robert
Index: java/beans/XMLDecoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/XMLDecoder.java,v
retrieving revision 1.4
diff -u -r1.4 XMLDecoder.java
--- java/beans/XMLDecoder.java	2 Jul 2005 20:32:37 -0000	1.4
+++ java/beans/XMLDecoder.java	29 Jan 2006 19:05:36 -0000
@@ -1,5 +1,5 @@
 /* java.beans.XMLDecoder --
-   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,7 @@
 
 package java.beans;
 
-import gnu.java.beans.decoder.DefaultExceptionListener;
+import gnu.java.beans.DefaultExceptionListener;
 import gnu.java.beans.decoder.PersistenceParser;
 
 import java.io.IOException;
@@ -289,7 +289,7 @@
 		// uses a default implementation when null 
 		if (listener == null)
 		{
-			listener = new DefaultExceptionListener();
+			listener = DefaultExceptionListener.INSTANCE;
 		}
 		exceptionListener = listener;
 	}
Index: java/beans/Encoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/Encoder.java,v
retrieving revision 1.2
diff -u -r1.2 Encoder.java
--- java/beans/Encoder.java	24 Jan 2006 16:57:57 -0000	1.2
+++ java/beans/Encoder.java	29 Jan 2006 19:05:36 -0000
@@ -1,5 +1,5 @@
 /* Encoder.java
- Copyright (C) 2005 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2006 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -38,6 +38,7 @@
 
 package java.beans;
 
+import gnu.java.beans.DefaultExceptionListener;
 import gnu.java.beans.encoder.ArrayPersistenceDelegate;
 import gnu.java.beans.encoder.ClassPersistenceDelegate;
 import gnu.java.beans.encoder.CollectionPersistenceDelegate;
@@ -168,13 +169,8 @@
    */
   public void setExceptionListener(ExceptionListener listener)
   {
-    exceptionListener = (listener != null) ? listener : new ExceptionListener()
-    {
-      public void exceptionThrown(Exception e)
-      {
-        System.err.println("exception thrown: " + e);
-      }
-    };
+    exceptionListener = (listener != null) 
+	? listener : DefaultExceptionListener.INSTANCE;
   }
 
   /**
Index: gnu/java/beans/DefaultExceptionListener.java
===================================================================
RCS file: gnu/java/beans/DefaultExceptionListener.java
diff -N gnu/java/beans/DefaultExceptionListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/beans/DefaultExceptionListener.java	29 Jan 2006 19:05:36 -0000
@@ -0,0 +1,66 @@
+/* gnu.java.beans.DefaultExceptionListener
+   Copyright (C) 2004, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 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 gnu.java.beans;
+
+import java.beans.ExceptionListener;
+
+/** The DefaultExceptionListener is the default implementation of the
+ * [EMAIL PROTECTED] ExceptionListener} interface. An instance of
+ * this class is used whenever the user provided no
+ * <code>ExceptionListener</code> instance on its own.
+ *
+ * <p>The implementation just writes the exception's message
+ * to <code>System.err</code> and is used by the [EMAIL PROTECTED] java.beans.Encoder}
+ * and the [EMAIL PROTECTED] java.beans.XMLDecoder}.
+ * </p>
+ *
+ * @author Robert Schuster ([EMAIL PROTECTED])
+ */
+public class DefaultExceptionListener implements ExceptionListener
+{
+  public final static DefaultExceptionListener INSTANCE
+    = new DefaultExceptionListener();
+  
+  public void exceptionThrown(Exception e)
+  {
+    System.err.println("exception thrown: "
+                       + e + " - message: "
+                       + e.getMessage());
+  }
+  
+}

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to