Re: [cp-patches] FYI: java.beans.XMLDecoder

[Mark Wielaard]

Hi Robert,

On Mon, 2005-01-03 at 01:10 +0100, Robert Schuster wrote:
> Here is the patch Mark asked for. It implements java.beans.XMLDecoder.

Thanks!

I made one small change to the Dummy handlers. The methods need (at
least according to jikes) to return a value if so declared.

2005-01-02  Mark Wielaard  <address@hidden>

       * gnu/java/beans/decoder/DummyHandler.java: Add return statements for
       failing methods.
       * gnu/java/beans/decoder/DummyContext.java: Likewise.

Also added your missing ChangeLog entry.

Cheers,

Mark

Index: gnu/java/beans/decoder/DummyContext.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/beans/decoder/DummyContext.java,v
retrieving revision 1.1
diff -u -r1.1 DummyContext.java
--- gnu/java/beans/decoder/DummyContext.java    2 Jan 2005 23:53:42 -0000       
1.1
+++ gnu/java/beans/decoder/DummyContext.java    3 Jan 2005 07:19:45 -0000
@@ -69,6 +69,7 @@
     public Object endContext(Context outerContext) throws AssemblyException
     {
         fail();
+       return null;
     }
 
     /* (non-Javadoc)
@@ -77,6 +78,7 @@
     public boolean subContextFailed()
     {
         fail();
+       return false;
     }
 
     /* (non-Javadoc)
@@ -93,6 +95,7 @@
     public Object get(int index) throws AssemblyException
     {
         fail();
+       return null;
     }
 
     /* (non-Javadoc)
@@ -101,10 +104,13 @@
     public Object getResult()
     {
         fail();
+       return null;
     }
 
     private void fail()
     {
-        throw new InternalError("Invoking the DummyContext is not expected - 
Please file a bug report at gnu.org/software/classpath.");
+        throw new InternalError("Invoking the DummyContext is not expected"
+                               + " - Please file a bug report at"
+                               + " http://www/gnu.org/software/classpath/.";);
     }
 }
Index: gnu/java/beans/decoder/DummyHandler.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/java/beans/decoder/DummyHandler.java,v
retrieving revision 1.1
diff -u -r1.1 DummyHandler.java
--- gnu/java/beans/decoder/DummyHandler.java    2 Jan 2005 23:53:42 -0000       
1.1
+++ gnu/java/beans/decoder/DummyHandler.java    3 Jan 2005 07:19:45 -0000
@@ -89,6 +89,7 @@
         throws ClassNotFoundException
     {
         fail();
+       return null;
     }
 
     /* (non-Javadoc)
@@ -137,15 +138,19 @@
     public Object getObject(String objectId)
     {
         fail();
+       return null;
     }
 
     public ElementHandler getParent()
     {
         fail();
+       return null;
     }
 
     private void fail()
     {
-        throw new InternalError("Invoking the DummyHandler is not expected - 
Please file a bug report at gnu.org/software/classpath.");
+        throw new InternalError("Invoking the DummyHandler is not expected"
+                               + " - Please file a bug report at "
+                               + " http://www.gnu.org/software/classpath/.";);
     }
 }

signature.asc
Description: This is a digitally signed message part