From 8d6cd83a7f7a707aebe9e8f0b98d1bb9a6c0f390 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Sun, 3 Apr 2005 00:09:08 +0000 Subject: 2005-04-03 Andrew John Hughes Merge from HEAD --> generics-branch for 28th of March to 2nd of April. Changelog: 2005-04-01 Tom Tromey * java/lang/AssertionError.java: Typo fix. 2005-04-01 Michael Koch * java/io/PipedInputStream.java (read): Make sure a positive byte value is returned. Revised javadoc. Thanks to Olafur Bragason for reporting these bugs. 2005-04-01 Guilhem Lavaux * java/awt/image/IndexColorModel.java (getRGB): Check if pixel is negative. 2005-03-31 Thomas Fitzsimmons * javax/swing/text/JTextComponent.java (viewToModel): New method. 2005-03-31 Audrius Meskauskas * org/omg/CORBA/ORBPackage/InconsistentTypeCode.java, org/omg/CORBA/ORBPackage/InvalidName.java, org/omg/CORBA/ORBPackage/package.html: New files. 2005-03-31 Michael Koch * 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-03-30 Sven de Marothy * gnu/java/awt/peer/gtk/GdkGraphics.java: (drawImage): Don't notify the image observer for offscreen images. * gnu/java/awt/peer/gtk/GtkImagePainter.java: (setPixels): Don't notify the image observer. 2005-03-30 Michael Koch * 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-03-30 Michael Koch * java/awt/image/ConvolveOp.java: Removed comment added by eclipse. 2005-03-30 Michael Koch * gnu/xml/aelfred2/XmlParser.java: Revert my typo fix. 2005-03-30 Michael Koch * java/awt/geom/CubicCurve2D.java, java/awt/geom/QuadCurve2D.java: Fixed typo in name of Brian Cough. 2005-03-29 Guilhem Lavaux * native/jni/java-nio/gnu_java_nio_VMSelector.c (Java_gnu_java_nio_VMSelector_select): Use GetStaticMethodID for Thread.interrupted(). 2005-03-29 Jeroen Frijters * gnu/classpath/SystemProperties.java (static): Converted encoding aliases to lower case and removed redudant aliases. * gnu/java/io/EncodingManager.java (findEncoderConstructor, findDecoderConstructor): Call new method resolveAlias(). (resolveAlias): New method. * java/lang/System.java (getProperties): Removed uppercase aliases from comments. 2005-03-28 Tom Tromey * java/net/URL.java (DEFAULT_SEARCH_PATH): Added org.metastatic.jessie. 2005-03-28 Tom Tromey * java/lang/ClassLoader.java (loadClass): Resolve class even if it was already found. --- .../beancontext/BeanContextServicesSupport.java | 49 ++++++++++++---------- 1 file changed, 28 insertions(+), 21 deletions(-) (limited to 'java/beans/beancontext/BeanContextServicesSupport.java') diff --git a/java/beans/beancontext/BeanContextServicesSupport.java b/java/beans/beancontext/BeanContextServicesSupport.java index 60aab693d..318bf9bea 100644 --- a/java/beans/beancontext/BeanContextServicesSupport.java +++ b/java/beans/beancontext/BeanContextServicesSupport.java @@ -1,5 +1,5 @@ -/* 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. @@ -7,7 +7,7 @@ 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 @@ -120,34 +120,36 @@ public class BeanContextServicesSupport 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) @@ -202,8 +204,7 @@ public class BeanContextServicesSupport throw new Error ("Not implemented"); } - protected final void - fireServiceRevoked (BeanContextServiceRevokedEvent bcsre) + protected final void fireServiceRevoked(BeanContextServiceRevokedEvent event) { throw new Error ("Not implemented"); } @@ -250,7 +251,10 @@ public class BeanContextServicesSupport public void initialize () { - throw new Error ("Not implemented"); + super.initialize(); + + bcsListeners = new ArrayList(); + services = new HashMap(); } protected void initializeBeanContextResources () @@ -269,10 +273,13 @@ public class BeanContextServicesSupport 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, -- cgit v1.2.1