+2005-04-19 Michael Koch <konqueror@gmx.de>
+
+ * gnu/java/awt/peer/gtk/GdkGraphics.java
+ (getClipBounds): Handle clip being null.
+ (setClip): Likewise.
+ * java/beans/beancontext/BeanContextSupport.java
+ (add): Implemented.
+ (addAll): Likewise.
+ (clear): Likewise.
+ (removeAll): Likewise.
+ (retainAll): Likewise.
+
+2005-04-19 Michael Koch <konqueror@gmx.de>
+
+ * java/beans/beancontext/BeanContextServicesSupport.java
+ (BeanContextServicesSupport): Reimplemented.
+ (addBeanContextServicesListener): Implemented.
+ (initialize): Likewise.
+ (removeBeanContextServicesListener): Likewise.
+ * java/beans/beancontext/BeanContextSupport.java
+ (add): Likewise.
+ (addBeanContextMembershipListener): Likewise.
+ (getLocale): Likewise.
+ (initialize): Likewise.
+ (iterator): Likewise.
+ (remove): Likewise.
+ (toArray): Likewise.
+
2005-04-19 Roman Kennke <roman@kennke.org>
* java/awt/MediaTracker.java:
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 ()
public void setClip (Shape clip)
{
- setClip (clip.getBounds ());
+ if (clip != null)
+ setClip(clip.getBounds());
}
private native void setFGColor(int red, int green, int blue);
-/* java.beans.beancontext.BeanContextServicesSupport
- Copyright (C) 2003 Free Software Foundation, Inc.
+/* BeanContextServicesSupport.java --
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
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
public BeanContextServicesSupport ()
{
- this (null, null, true, true);
+ super();
}
public BeanContextServicesSupport (BeanContextServices peer)
{
- this (peer, null, true, true);
+ super(peer);
}
- public BeanContextServicesSupport (BeanContextServices peer, Locale lcle)
+ public BeanContextServicesSupport(BeanContextServices peer, Locale locale)
{
- this (peer, lcle, true, true);
+ super(peer, locale);
}
- public BeanContextServicesSupport (BeanContextServices peer, Locale lcle,
- boolean dtime)
+ public BeanContextServicesSupport(BeanContextServices peer, Locale locale,
+ boolean dtime)
{
- this (peer, lcle, dtime, true);
+ super(peer, locale, dtime);
}
- public BeanContextServicesSupport (BeanContextServices peer, Locale lcle,
- boolean dtime, boolean visible)
+ public BeanContextServicesSupport(BeanContextServices peer, Locale locale,
+ boolean dtime, boolean visible)
{
- throw new Error ("Not implemented");
+ super(peer, locale, dtime, visible);
}
- public void addBeanContextServicesListener (BeanContextServicesListener bcsl)
+ public void addBeanContextServicesListener
+ (BeanContextServicesListener listener)
{
- throw new Error ("Not implemented");
+ if (! bcsListeners.contains(listener))
+ bcsListeners.add(listener);
}
public boolean addService (Class serviceClass, BeanContextServiceProvider bcsp)
throw new Error ("Not implemented");
}
- protected final void
- fireServiceRevoked (BeanContextServiceRevokedEvent bcsre)
+ protected final void fireServiceRevoked(BeanContextServiceRevokedEvent event)
{
throw new Error ("Not implemented");
}
public void initialize ()
{
- throw new Error ("Not implemented");
+ super.initialize();
+
+ bcsListeners = new ArrayList();
+ services = new HashMap();
}
protected void initializeBeanContextResources ()
throw new Error ("Not implemented");
}
- public void
- removeBeanContextServicesListener (BeanContextServicesListener bcsl)
+ public void removeBeanContextServicesListener
+ (BeanContextServicesListener listener)
{
- throw new Error ("Not implemented");
+ int index = bcsListeners.indexOf(listener);
+
+ if (index > -1)
+ bcsListeners.remove(index);
}
public void revokeService (Class serviceClass, BeanContextServiceProvider bcsp,
-/* java.beans.beancontext.BeanContextSupport
- Copyright (C) 2003 Free Software Foundation, Inc.
+/* BeanContextSupport.java --
+ Copyright (C) 2003, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
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
okToUseGui = visible;
initialize ();
-
- throw new Error ("Not implemented");
}
public boolean add (Object targetChild)
{
- throw new Error ("Not implemented");
+ if (targetChild == null)
+ throw new IllegalArgumentException();
+
+ if (children.containsKey(targetChild))
+ return false;
+
+ // FIXME: The second argument is surely wrong.
+ children.put(targetChild, targetChild);
+ return true;
}
public boolean addAll (Collection c)
{
- throw new Error ("Not implemented");
+ throw new UnsupportedOperationException();
}
- public void addBeanContextMembershipListener (BeanContextMembershipListener bcml)
+ public void addBeanContextMembershipListener
+ (BeanContextMembershipListener listener)
{
- throw new Error ("Not implemented");
+ if (! bcmListeners.contains(listener))
+ bcmListeners.add(listener);
}
public boolean avoidingGui ()
public void clear ()
{
- throw new Error ("Not implemented");
+ throw new UnsupportedOperationException();
}
public boolean contains (Object o)
public Locale getLocale ()
{
- throw new Error ("Not implemented");
+ return locale;
}
public URL getResource (String name, BeanContextChild bcc)
protected void initialize ()
{
- throw new Error ("Not implemented");
+ bcmListeners = new ArrayList();
+ children = new HashMap();
}
public Object instantiateChild (String beanName)
public Iterator iterator ()
{
- throw new Error ("Not implemented");
+ return children.keySet().iterator();
}
public boolean needsGui ()
public boolean remove (Object targetChild)
{
- throw new Error ("Not implemented");
+ return remove(targetChild, true);
}
protected boolean remove (Object targetChild, boolean callChildSetBC)
{
+ if (targetChild == null)
+ throw new IllegalArgumentException();
+
throw new Error ("Not implemented");
}
public boolean removeAll (Collection c)
{
- throw new Error ("Not implemented");
+ throw new UnsupportedOperationException();
}
public void removeBeanContextMembershipListener (BeanContextMembershipListener bcml)
public boolean retainAll (Collection c)
{
- throw new Error ("Not implemented");
+ throw new UnsupportedOperationException();
}
protected final void serialize (ObjectOutputStream oos, Collection coll)
public Object[] toArray ()
{
- throw new Error ("Not implemented");
+ return children.keySet().toArray();
}
- public Object[] toArray (Object[] arry)
+ public Object[] toArray(Object[] array)
{
- throw new Error ("Not implemented");
+ return children.keySet().toArray(array);
}
protected boolean validatePendingAdd (Object targetChild)