Index: gnu/java/awt/peer/gtk/GdkGraphics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphics.java,v
retrieving revision 1.38
diff -u -r1.38 GdkGraphics.java
--- gnu/java/awt/peer/gtk/GdkGraphics.java	30 Mar 2005 17:10:10 -0000	1.38
+++ gnu/java/awt/peer/gtk/GdkGraphics.java	31 Mar 2005 08:05:27 -0000
@@ -382,7 +382,10 @@
 
   public Rectangle getClipBounds ()
   {
-    return new Rectangle (clip.x, clip.y, clip.width, clip.height);
+    if (clip == null)
+      return null;
+    else
+      return clip.getBounds();
   }
 
   public Color getColor ()
@@ -423,7 +426,8 @@
 
   public void setClip (Shape clip)
   {
-    setClip (clip.getBounds ());
+    if (clip != null)
+      setClip(clip.getBounds());
   }
 
   private native void setFGColor(int red, int green, int blue);
Index: java/beans/beancontext/BeanContextSupport.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/beancontext/BeanContextSupport.java,v
retrieving revision 1.3
diff -u -r1.3 BeanContextSupport.java
--- java/beans/beancontext/BeanContextSupport.java	30 Mar 2005 12:46:33 -0000	1.3
+++ java/beans/beancontext/BeanContextSupport.java	31 Mar 2005 08:05:27 -0000
@@ -163,14 +163,14 @@
     if (children.containsKey(targetChild))
       return false;
 
-    System.out.println("java.beans.beancontext.BeanContextSupport.add() ignored for now");
+    // FIXME: The second argument is surely wrong.
+    children.put(targetChild, targetChild);
     return true;
-    //throw new Error ("Not implemented");
   }
 
   public boolean addAll (Collection c)
   {
-    throw new Error ("Not implemented");
+    throw new UnsupportedOperationException();
   }
 
   public void addBeanContextMembershipListener
@@ -224,7 +224,7 @@
 
   public void clear ()
   {
-    throw new Error ("Not implemented");
+    throw new UnsupportedOperationException();
   }
 
   public boolean contains (Object o)
@@ -391,7 +391,7 @@
 
   public boolean removeAll (Collection c)
   {
-    throw new Error ("Not implemented");
+    throw new UnsupportedOperationException();
   }
 
   public void removeBeanContextMembershipListener (BeanContextMembershipListener bcml)
@@ -401,7 +401,7 @@
 
   public boolean retainAll (Collection c)
   {
-    throw new Error ("Not implemented");
+    throw new UnsupportedOperationException();
   }
 
   protected final void serialize (ObjectOutputStream oos, Collection coll)