Index: ChangeLog =================================================================== RCS file: /cvsroot/classpath/classpath/ChangeLog,v retrieving revision 1.2386.2.91 diff -u -3 -p -u -r1.2386.2.91 ChangeLog --- ChangeLog 2 Apr 2005 21:51:46 -0000 1.2386.2.91 +++ ChangeLog 3 Apr 2005 00:04:49 -0000 @@ -3,7 +3,109 @@ * java/lang/StringBuilder.java: Change references to System.arraycopy to VMSystem.arraycopy. - + +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. + 2005-03-28 Sven de Marothy * gnu/java/io/decode/DecoderUnicodeBig.java, Index: gnu/classpath/SystemProperties.java =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/classpath/SystemProperties.java,v retrieving revision 1.1.2.3 diff -u -3 -p -u -r1.1.2.3 SystemProperties.java --- gnu/classpath/SystemProperties.java 23 Mar 2005 21:00:03 -0000 1.1.2.3 +++ gnu/classpath/SystemProperties.java 3 Apr 2005 00:04:50 -0000 @@ -106,9 +106,7 @@ public class SystemProperties //# UTF8 dp.put("gnu.java.io.encoding_scheme_alias.utf8", "UTF8"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF8", "UTF8"); dp.put("gnu.java.io.encoding_scheme_alias.utf-8", "UTF8"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF-8", "UTF8"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1208", "UTF8"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1209", "UTF8"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-5304", "UTF8"); @@ -117,24 +115,20 @@ public class SystemProperties dp.put("gnu.java.io.encoding_scheme_alias.cp1208", "UTF8"); //# UTF16 Little Endian - dp.put("gnu.java.io.encoding_scheme_alias.UTF16LE", "UTF16LE"); dp.put("gnu.java.io.encoding_scheme_alias.utf16le", "UTF16LE"); dp.put("gnu.java.io.encoding_scheme_alias.utf-16le", "UTF16LE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF-16LE", "UTF16LE"); dp.put("gnu.java.io.encoding_scheme_alias.x-utf-16le", "UTF16LE"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1202", "UTF16LE"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-13490", "UTF16LE"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-17586", "UTF16LE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF16_LittleEndian", + dp.put("gnu.java.io.encoding_scheme_alias.utf16_littleendian", "UTF16LE"); dp.put("gnu.java.io.encoding_scheme_alias.windows-1200", "UTF16LE"); - dp.put("gnu.java.io.encoding_scheme_alias.UnicodeLittleUnmarked", "UTF16LE"); + dp.put("gnu.java.io.encoding_scheme_alias.unicodelittleunmarked", "UTF16LE"); //# UTF16 Big Endian - dp.put("gnu.java.io.encoding_scheme_alias.UTF16BE", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.utf16be", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.utf-16be", "UTF16BE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF-16BE", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.x-utf-16be", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1200", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1201", "UTF16BE"); @@ -144,59 +138,49 @@ public class SystemProperties dp.put("gnu.java.io.encoding_scheme_alias.windows-1201", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.cp1200", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.cp1201", "UTF16BE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF16_BigEndian", "UTF16BE"); - dp.put("gnu.java.io.encoding_scheme_alias.UnicodeBigUnmarked", "UTF16BE"); + dp.put("gnu.java.io.encoding_scheme_alias.utf16_bigendian", "UTF16BE"); + dp.put("gnu.java.io.encoding_scheme_alias.unicodebigunmarked", "UTF16BE"); //# UTF16 - dp.put("gnu.java.io.encoding_scheme_alias.UTF16", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.utf16", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.utf-16", "UTF16BE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF-16", "UTF16BE"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-10646-UCS-2", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.iso-10646-ucs-2", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.unicode", "UTF16BE"); - dp.put("gnu.java.io.encoding_scheme_alias.csUnicode", "UTF16BE"); + dp.put("gnu.java.io.encoding_scheme_alias.csunicode", "UTF16BE"); dp.put("gnu.java.io.encoding_scheme_alias.ucs-2", "UTF16BE"); //# UTF32 Little Endian - dp.put("gnu.java.io.encoding_scheme_alias.UTF32LE", "UTF32LE"); dp.put("gnu.java.io.encoding_scheme_alias.utf32le", "UTF32LE"); dp.put("gnu.java.io.encoding_scheme_alias.utf-32le", "UTF32LE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF-32LE", "UTF32LE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF32_LittleEndian", + dp.put("gnu.java.io.encoding_scheme_alias.utf32_littleendian", "UTF32LE"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1234", "UTF32LE"); //# UTF32 Big Endian - dp.put("gnu.java.io.encoding_scheme_alias.UTF32BE", "UTF32BE"); - dp.put("gnu.java.io.encoding_scheme_alias.utf-32be", "UTF32BE"); dp.put("gnu.java.io.encoding_scheme_alias.utf32be", "UTF32BE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF-32BE", "UTF32BE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF32_BigEndian", + dp.put("gnu.java.io.encoding_scheme_alias.utf-32be", "UTF32BE"); + dp.put("gnu.java.io.encoding_scheme_alias.utf32_bigendian", "UTF32BE"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1232", "UTF32BE"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1233", "UTF32BE"); //# UTF32 - dp.put("gnu.java.io.encoding_scheme_alias.UTF32", "UTF32BE"); - dp.put("gnu.java.io.encoding_scheme_alias.utf-32", "UTF32BE"); dp.put("gnu.java.io.encoding_scheme_alias.utf32", "UTF32BE"); - dp.put("gnu.java.io.encoding_scheme_alias.UTF-32", "UTF32BE"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-10646-UCS-4", + dp.put("gnu.java.io.encoding_scheme_alias.utf-32", "UTF32BE"); + dp.put("gnu.java.io.encoding_scheme_alias.iso-10646-ucs-4", "UTF32BE"); - dp.put("gnu.java.io.encoding_scheme_alias.csUCS4", "UTF32BE"); + dp.put("gnu.java.io.encoding_scheme_alias.csucs4", "UTF32BE"); dp.put("gnu.java.io.encoding_scheme_alias.ucs-4", "UTF32BE"); //# US-ASCII - dp.put("gnu.java.io.encoding_scheme_alias.ASCII", "ASCII"); - dp.put("gnu.java.io.encoding_scheme_alias.US-ASCII", "ASCII"); dp.put("gnu.java.io.encoding_scheme_alias.ascii", "ASCII"); - dp.put("gnu.java.io.encoding_scheme_alias.ANSI_X3.4-1968", "ASCII"); - dp.put("gnu.java.io.encoding_scheme_alias.ANSI_X3.4-1986", "ASCII"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_646.irv:1991", "ASCII"); + dp.put("gnu.java.io.encoding_scheme_alias.us-ascii", "ASCII"); + dp.put("gnu.java.io.encoding_scheme_alias.ansi_x3.4-1968", "ASCII"); + dp.put("gnu.java.io.encoding_scheme_alias.ansi_x3.4-1986", "ASCII"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_646.irv:1991", "ASCII"); dp.put("gnu.java.io.encoding_scheme_alias.iso_646.irv:1983", "ASCII"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO646-US", "ASCII"); + dp.put("gnu.java.io.encoding_scheme_alias.iso646-us", "ASCII"); dp.put("gnu.java.io.encoding_scheme_alias.us", "ASCII"); - dp.put("gnu.java.io.encoding_scheme_alias.csASCII", "ASCII"); + dp.put("gnu.java.io.encoding_scheme_alias.csascii", "ASCII"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-6", "ASCII"); dp.put("gnu.java.io.encoding_scheme_alias.cp367", "ASCII"); dp.put("gnu.java.io.encoding_scheme_alias.ascii7", "ASCII"); @@ -205,20 +189,17 @@ public class SystemProperties //# iso-8859-1 (latin 1) dp.put("gnu.java.io.encoding_scheme_alias.8859_1", "8859_1"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_1", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_1", "8859_1"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_1", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_1", "8859_1"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-1", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-1", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-819", "8859_1"); - dp.put("gnu.java.io.encoding_scheme_alias.IBM819", "8859_1"); + dp.put("gnu.java.io.encoding_scheme_alias.ibm819", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.cp819", "8859_1"); - dp.put("gnu.java.io.encoding_scheme_alias.Latin1", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.latin1", "8859_1"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin1", "8859_1"); + dp.put("gnu.java.io.encoding_scheme_alias.latin1", "8859_1"); + dp.put("gnu.java.io.encoding_scheme_alias.csisolatin1", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-100", "8859_1"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-1:1987", "8859_1"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-1:1987", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.l1", "8859_1"); dp.put("gnu.java.io.encoding_scheme_alias.819", "8859_1"); @@ -228,15 +209,11 @@ public class SystemProperties "8859_2"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-912", "8859_2"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_2", "8859_2"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_2", "8859_2"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_2", "8859_2"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_2", "8859_2"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-2", "8859_2"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-2", "8859_2"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-2:1987", "8859_2"); - dp.put("gnu.java.io.encoding_scheme_alias.Latin2", "8859_2"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-2:1987", "8859_2"); dp.put("gnu.java.io.encoding_scheme_alias.latin2", "8859_2"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin2", "8859_2"); + dp.put("gnu.java.io.encoding_scheme_alias.csisolatin2", "8859_2"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-101", "8859_2"); dp.put("gnu.java.io.encoding_scheme_alias.l2", "8859_2"); dp.put("gnu.java.io.encoding_scheme_alias.8859_2", "8859_2"); @@ -250,15 +227,11 @@ public class SystemProperties "8859_3"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-913", "8859_3"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_3", "8859_3"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_3", "8859_3"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_3", "8859_3"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_3", "8859_3"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-3", "8859_3"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-3", "8859_3"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-3:1988", "8859_3"); - dp.put("gnu.java.io.encoding_scheme_alias.Latin3", "8859_3"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-3:1988", "8859_3"); dp.put("gnu.java.io.encoding_scheme_alias.latin3", "8859_3"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin3", "8859_3"); + dp.put("gnu.java.io.encoding_scheme_alias.csisolatin3", "8859_3"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-109", "8859_3"); dp.put("gnu.java.io.encoding_scheme_alias.l3", "8859_3"); dp.put("gnu.java.io.encoding_scheme_alias.cp913", "8859_3"); @@ -271,16 +244,12 @@ public class SystemProperties "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-914", "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_4", "8859_4"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_4", "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_4", "8859_4"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_4", "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-4", "8859_4"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-4", "8859_4"); - dp.put("gnu.java.io.encoding_scheme_alias.Latin4", "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.latin4", "8859_4"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin4", "8859_4"); + dp.put("gnu.java.io.encoding_scheme_alias.csisolatin4", "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-110", "8859_4"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-4:1988", "8859_4"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-4:1988", "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.l4", "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.cp914", "8859_4"); dp.put("gnu.java.io.encoding_scheme_alias.914", "8859_4"); @@ -291,17 +260,14 @@ public class SystemProperties dp.put("gnu.java.io.encoding_scheme_alias.ibm-915_P100-1995", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-915", "8859_5"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_5", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_5", "8859_5"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_5", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_5", "8859_5"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-5", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-5", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.cyrillic", "8859_5"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatinCyrillic", + dp.put("gnu.java.io.encoding_scheme_alias.csisolatincyrillic", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-144", "8859_5"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-5:1988", "8859_5"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-5:1988", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.cp915", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.915", "8859_5"); dp.put("gnu.java.io.encoding_scheme_alias.windows-28595", "8859_5"); @@ -311,43 +277,37 @@ public class SystemProperties dp.put("gnu.java.io.encoding_scheme_alias.ibm-1089_P100-1995", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1089", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_6", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_6", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_6", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_6", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-6", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-6", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.arabic", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatinArabic", "8859_6"); + dp.put("gnu.java.io.encoding_scheme_alias.csisolatinarabic", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-127", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-6:1987", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.ECMA-114", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.ASMO-708", "8859_6"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-6:1987", "8859_6"); + dp.put("gnu.java.io.encoding_scheme_alias.ecma-114", "8859_6"); + dp.put("gnu.java.io.encoding_scheme_alias.asmo-708", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.8859_6", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.cp1089", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.1089", "8859_6"); dp.put("gnu.java.io.encoding_scheme_alias.windows-28596", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-6-I", "8859_6"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-6-E", "8859_6"); + dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-6-i", "8859_6"); + dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-6-e", "8859_6"); //# iso-8859-7 (greek) dp.put("gnu.java.io.encoding_scheme_alias.8859_7", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-813_P100-1995", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-813", "8859_7"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_7", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_7", "8859_7"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_7", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_7", "8859_7"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-7", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-7", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.greek", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.greek8", "8859_7"); - dp.put("gnu.java.io.encoding_scheme_alias.ELOT_928", "8859_7"); - dp.put("gnu.java.io.encoding_scheme_alias.ECMA-118", "8859_7"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatinGreek", "8859_7"); + dp.put("gnu.java.io.encoding_scheme_alias.elot_928", "8859_7"); + dp.put("gnu.java.io.encoding_scheme_alias.ecma-118", "8859_7"); + dp.put("gnu.java.io.encoding_scheme_alias.csisolatingreek", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-126", "8859_7"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-7:1987", "8859_7"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-7:1987", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.cp813", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.813", "8859_7"); dp.put("gnu.java.io.encoding_scheme_alias.windows-28597", "8859_7"); @@ -357,18 +317,15 @@ public class SystemProperties dp.put("gnu.java.io.encoding_scheme_alias.ibm-916_P100-1995", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-916", "8859_8"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_8", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_8", "8859_8"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_8", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_8", "8859_8"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-8", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-8", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.hebrew", "8859_8"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatinHebrew", "8859_8"); + dp.put("gnu.java.io.encoding_scheme_alias.csisolatinhebrew", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-138", "8859_8"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-8:1988", "8859_8"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-8-I", "8859_8"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-8-E", "8859_8"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-8:1988", "8859_8"); + dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-8-i", "8859_8"); + dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-8-e", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.cp916", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.916", "8859_8"); dp.put("gnu.java.io.encoding_scheme_alias.windows-28598", "8859_8"); @@ -379,32 +336,25 @@ public class SystemProperties "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-920", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_9", "8859_9"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_9", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-9", "8859_9"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-9", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_9", "8859_9"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_9", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.latin5", "8859_9"); - dp.put("gnu.java.io.encoding_scheme_alias.Latin5", "8859_9"); - dp.put("gnu.java.io.encoding_scheme_alias.csISOLatin5", "8859_9"); + dp.put("gnu.java.io.encoding_scheme_alias.csisolatin5", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.iso-ir-148", "8859_9"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859-9:1989", "8859_9"); + dp.put("gnu.java.io.encoding_scheme_alias.iso_8859-9:1989", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.l5", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.cp920", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.920", "8859_9"); dp.put("gnu.java.io.encoding_scheme_alias.windows-28599", "8859_9"); - dp.put("gnu.java.io.encoding_scheme_alias.ECMA-128", "8859_9"); + dp.put("gnu.java.io.encoding_scheme_alias.ecma-128", "8859_9"); //# iso-8859-13 dp.put("gnu.java.io.encoding_scheme_alias.8859_13", "8859_13"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-921_P100-1995", "8859_13"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-921", "8859_13"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_13", "8859_13"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_13", "8859_13"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_13", "8859_13"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_13", "8859_13"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-13", "8859_13"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-13", "8859_13"); dp.put("gnu.java.io.encoding_scheme_alias.8859_13", "8859_13"); dp.put("gnu.java.io.encoding_scheme_alias.cp921", "8859_13"); @@ -412,19 +362,15 @@ public class SystemProperties //# iso-8859-15 (latin-9) dp.put("gnu.java.io.encoding_scheme_alias.8859_15", "8859_15"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO8859_15", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.iso8859_15", "8859_15"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO-8859-15", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.iso-8859-15", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.8859-15", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.latin9", "8859_15"); - dp.put("gnu.java.io.encoding_scheme_alias.Latin9", "8859_15"); - dp.put("gnu.java.io.encoding_scheme_alias.ISO_8859_15", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.iso_8859_15", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-923_P100-1998", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-923", "8859_15"); - dp.put("gnu.java.io.encoding_scheme_alias.Latin-9", "8859_15"); + dp.put("gnu.java.io.encoding_scheme_alias.latin-9", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.l9", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.latin0", "8859_15"); dp.put("gnu.java.io.encoding_scheme_alias.csisolatin0", "8859_15"); @@ -435,62 +381,42 @@ public class SystemProperties dp.put("gnu.java.io.encoding_scheme_alias.windows-28605", "8859_15"); //# Windows-1252 (cp-1252) - dp.put("gnu.java.io.encoding_scheme_alias.Windows1252", "Windows1252"); + dp.put("gnu.java.io.encoding_scheme_alias.windows1252", "Windows1252"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-5348_P100-1997", "Windows1252"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-5348", "Windows1252"); dp.put("gnu.java.io.encoding_scheme_alias.windows-1252", "Windows1252"); - dp.put("gnu.java.io.encoding_scheme_alias.Windows-1252", - "Windows1252"); dp.put("gnu.java.io.encoding_scheme_alias.cp1252", "Windows1252"); - dp.put("gnu.java.io.encoding_scheme_alias.CP1252", "Windows1252"); dp.put("gnu.java.io.encoding_scheme_alias.cp-1252", "Windows1252"); - dp.put("gnu.java.io.encoding_scheme_alias.CP-1252", "Windows1252"); - dp.put("gnu.java.io.encoding_scheme_alias.windows1252", "Windows1252"); //# Windows-1250 (cp-1250) - dp.put("gnu.java.io.encoding_scheme_alias.Windows1250", "Windows1250"); + dp.put("gnu.java.io.encoding_scheme_alias.windows1250", "Windows1250"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-5346_P100-1998", "Windows1250"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-5346", "Windows1250"); dp.put("gnu.java.io.encoding_scheme_alias.windows-1250", "Windows1250"); - dp.put("gnu.java.io.encoding_scheme_alias.Windows-1250", - "Windows1250"); dp.put("gnu.java.io.encoding_scheme_alias.cp1250", "Windows1250"); - dp.put("gnu.java.io.encoding_scheme_alias.CP1250", "Windows1250"); dp.put("gnu.java.io.encoding_scheme_alias.cp-1250", "Windows1250"); - dp.put("gnu.java.io.encoding_scheme_alias.CP-1250", "Windows1250"); - dp.put("gnu.java.io.encoding_scheme_alias.windows1250", "Windows1250"); //# ebcdic-xml-us - dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC_XML_US", - "EBCDIC_XML_US"); - dp.put("gnu.java.io.encoding_scheme_alias.ebcdic-xml-us", + dp.put("gnu.java.io.encoding_scheme_alias.ebcdic_xml_us", "EBCDIC_XML_US"); dp.put("gnu.java.io.encoding_scheme_alias.ebcdic", "EBCDIC_XML_US"); - dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC", "EBCDIC_XML_US"); - dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC-XML-US", - "EBCDIC_XML_US"); - dp.put("gnu.java.io.encoding_scheme_alias.ebcdic_xml_us", + dp.put("gnu.java.io.encoding_scheme_alias.ebcdic-xml-us", "EBCDIC_XML_US"); //# ebcdic latin 1 (cp1047) - dp.put("gnu.java.io.encoding_scheme_alias.Cp1047", "Cp1047"); + dp.put("gnu.java.io.encoding_scheme_alias.cp1047", "Cp1047"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1047_P100-1995", "Cp1047"); dp.put("gnu.java.io.encoding_scheme_alias.ibm-1047", "Cp1047"); - dp.put("gnu.java.io.encoding_scheme_alias.IBM1047", "Cp1047"); + dp.put("gnu.java.io.encoding_scheme_alias.ibm1047", "Cp1047"); dp.put("gnu.java.io.encoding_scheme_alias.cpibm1047", "Cp1047"); - dp.put("gnu.java.io.encoding_scheme_alias.cp1047", "Cp1047"); - dp.put("gnu.java.io.encoding_scheme_alias.CP1047", "Cp1047"); dp.put("gnu.java.io.encoding_scheme_alias.cp-1047", "Cp1047"); - dp.put("gnu.java.io.encoding_scheme_alias.CP-1047", "Cp1047"); dp.put("gnu.java.io.encoding_scheme_alias.ebcdic1047", "Cp1047"); - dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC1047", "Cp1047"); dp.put("gnu.java.io.encoding_scheme_alias.ebcdic-1047", "Cp1047"); - dp.put("gnu.java.io.encoding_scheme_alias.EBCDIC-1047", "Cp1047"); // 8859_1 is a safe default encoding to use when not explicitly set if (defaultProperties.get("file.encoding") == null) Index: gnu/java/awt/peer/gtk/GdkGraphics.java =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphics.java,v retrieving revision 1.27.2.5 diff -u -3 -p -u -r1.27.2.5 GdkGraphics.java --- gnu/java/awt/peer/gtk/GdkGraphics.java 19 Feb 2005 10:50:28 -0000 1.27.2.5 +++ gnu/java/awt/peer/gtk/GdkGraphics.java 3 Apr 2005 00:04:50 -0000 @@ -147,11 +147,6 @@ public class GdkGraphics extends Graphic int height = img.getHeight (null); copyPixmap (img.getGraphics (), x, y, width, height); - // FIXME: need to differentiate between SOMEBITS and FRAMEBITS. - if (observer != null) - observer.imageUpdate (img, - ImageObserver.FRAMEBITS, - x, y, width, height); return true; } @@ -171,12 +166,6 @@ public class GdkGraphics extends Graphic int height = img.getHeight (null); copyPixmap (img.getGraphics (), x, y, width, height); - - // FIXME: need to differentiate between SOMEBITS and FRAMEBITS. - if (observer != null) - observer.imageUpdate (img, - ImageObserver.FRAMEBITS, - x, y, width, height); return true; } @@ -197,11 +186,6 @@ public class GdkGraphics extends Graphic copyAndScalePixmap (img.getGraphics (), false, false, 0, 0, img.getWidth (null), img.getHeight (null), x, y, width, height); - // FIXME: need to differentiate between SOMEBITS and FRAMEBITS. - if (observer != null) - observer.imageUpdate (img, - ImageObserver.FRAMEBITS, - x, y, width, height); return true; } @@ -286,12 +270,6 @@ public class GdkGraphics extends Graphic copyAndScalePixmap (img.getGraphics (), x_flip, y_flip, sx_start, sy_start, s_width, s_height, dx_start, dy_start, d_width, d_height); - - // FIXME: need to differentiate between SOMEBITS and FRAMEBITS. - if (observer != null) - observer.imageUpdate (img, - ImageObserver.FRAMEBITS, - dx_start, dy_start, d_width, d_height); return true; } @@ -404,7 +382,10 @@ public class GdkGraphics extends Graphic 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 () @@ -445,7 +426,8 @@ public class GdkGraphics extends Graphic 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: gnu/java/awt/peer/gtk/GtkImagePainter.java =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkImagePainter.java,v retrieving revision 1.10.2.2 diff -u -3 -p -u -r1.10.2.2 GtkImagePainter.java --- gnu/java/awt/peer/gtk/GtkImagePainter.java 16 Jan 2005 15:15:01 -0000 1.10.2.2 +++ gnu/java/awt/peer/gtk/GtkImagePainter.java 3 Apr 2005 00:04:50 -0000 @@ -184,11 +184,6 @@ public class GtkImagePainter implements startX + x, startY + y, width, height, convertPixels (pixels, model), offset, scansize, affine); - - if (observer != null) - observer.imageUpdate (image, - ImageObserver.SOMEBITS, - x, y, width, height); } public void Index: gnu/java/io/EncodingManager.java =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/io/EncodingManager.java,v retrieving revision 1.7.2.5 diff -u -3 -p -u -r1.7.2.5 EncodingManager.java --- gnu/java/io/EncodingManager.java 13 Mar 2005 14:38:25 -0000 1.7.2.5 +++ gnu/java/io/EncodingManager.java 3 Apr 2005 00:04:50 -0000 @@ -169,8 +169,7 @@ private static Constructor findDecoderCo throws UnsupportedEncodingException { // First check for an aliased encoding name - encoding = SystemProperties.getProperty("gnu.java.io.encoding_scheme_alias." + - encoding, encoding); + encoding = resolveAlias(encoding); StringTokenizer st = new StringTokenizer(encoding_path, ":"); @@ -190,6 +189,16 @@ private static Constructor findDecoderCo /*************************************************************************/ +private static String resolveAlias(String encoding) +{ + String prefix = "gnu.java.io.encoding_scheme_alias."; + // Aliases should preferably be defined in lowercase so that they + // can be matched case-insensitively, but for compatibility we will + // first look for an exact match. + return SystemProperties.getProperty(prefix + encoding, + SystemProperties.getProperty(prefix + encoding.toLowerCase(), encoding)); +} + /** * This method loads anEncoder
class for the given
* encoding name.
@@ -200,8 +209,7 @@ private static Constructor findEncoderCo
throws UnsupportedEncodingException
{
// First check for an aliased encoding name
- encoding = SystemProperties.getProperty("gnu.java.io.encoding_scheme_alias." +
- encoding, encoding);
+ encoding = resolveAlias(encoding);
StringTokenizer st = new StringTokenizer(encoding_path, ":");
Index: gnu/xml/aelfred2/XmlParser.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/xml/aelfred2/XmlParser.java,v
retrieving revision 1.1.2.3
diff -u -3 -p -u -r1.1.2.3 XmlParser.java
--- gnu/xml/aelfred2/XmlParser.java 23 Mar 2005 21:00:04 -0000 1.1.2.3
+++ gnu/xml/aelfred2/XmlParser.java 3 Apr 2005 00:04:51 -0000
@@ -3382,7 +3382,7 @@ loop:
{
if (ids.systemId.indexOf('#') != -1)
{
- handler.verror("SYSTEM id has an URI fragment: " + ids.systemId);
+ handler.verror("SYSTEM id has a URI fragment: " + ids.systemId);
}
ids.baseUri = handler.getSystemId();
if (ids.baseUri == null && uriWarnings)
Index: java/awt/geom/CubicCurve2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/geom/CubicCurve2D.java,v
retrieving revision 1.7.2.3
diff -u -3 -p -u -r1.7.2.3 CubicCurve2D.java
--- java/awt/geom/CubicCurve2D.java 19 Feb 2005 10:50:32 -0000 1.7.2.3
+++ java/awt/geom/CubicCurve2D.java 3 Apr 2005 00:04:52 -0000
@@ -689,7 +689,7 @@ public abstract class CubicCurve2D imple
* result of -1 indicates that the equation is constant (i.e.,
* always or never zero).
*
- * @author Brain Gouph (address@hidden)
+ * @author Brian Gough (address@hidden)
* (original C implementation in the GNU Scientific Library)
*
Index: java/awt/geom/QuadCurve2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/geom/QuadCurve2D.java,v
retrieving revision 1.11.2.2
diff -u -3 -p -u -r1.11.2.2 QuadCurve2D.java
--- java/awt/geom/QuadCurve2D.java 19 Feb 2005 10:50:32 -0000 1.11.2.2
+++ java/awt/geom/QuadCurve2D.java 3 Apr 2005 00:04:52 -0000
@@ -562,7 +562,7 @@ public abstract class QuadCurve2D implem
* result of -1 indicates that the equation is constant (i.e.,
* always or never zero).
*
- * @author Brain Gouph (address@hidden)
+ * @author Brian Gouph (address@hidden)
* (original C implementation in the GNU Scientific Library)
*
Index: java/awt/image/ConvolveOp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/ConvolveOp.java,v
retrieving revision 1.2.2.1
diff -u -3 -p -u -r1.2.2.1 ConvolveOp.java
--- java/awt/image/ConvolveOp.java 16 Jan 2005 02:14:47 -0000 1.2.2.1
+++ java/awt/image/ConvolveOp.java 3 Apr 2005 00:04:52 -0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 Free Software Foundation -- ConvolveOp
+/* ConvolveOp.java --
+ Copyright (C) 2004 Free Software Foundation -- ConvolveOp
This file is part of GNU Classpath.
@@ -34,12 +35,7 @@ this exception to your version of the li
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
-/*
- * Created on Nov 1, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
+
package java.awt.image;
import java.awt.Graphics2D;
Index: java/awt/image/IndexColorModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/IndexColorModel.java,v
retrieving revision 1.7.2.3
diff -u -3 -p -u -r1.7.2.3 IndexColorModel.java
--- java/awt/image/IndexColorModel.java 16 Jan 2005 02:14:47 -0000 1.7.2.3
+++ java/awt/image/IndexColorModel.java 3 Apr 2005 00:04:52 -0000
@@ -432,7 +432,7 @@ public class IndexColorModel extends Col
*/
public final int getRGB (int pixel)
{
- if (pixel < map_size)
+ if (pixel >= 0 && pixel < map_size)
return rgb[pixel];
return 0;
Index: java/beans/beancontext/BeanContextServicesSupport.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/beancontext/BeanContextServicesSupport.java,v
retrieving revision 1.4
diff -u -3 -p -u -r1.4 BeanContextServicesSupport.java
--- java/beans/beancontext/BeanContextServicesSupport.java 26 Dec 2003 19:39:54 -0000 1.4
+++ java/beans/beancontext/BeanContextServicesSupport.java 3 Apr 2005 00:04:52 -0000
@@ -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
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,
Index: java/beans/beancontext/BeanContextSupport.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/beancontext/BeanContextSupport.java,v
retrieving revision 1.2
diff -u -3 -p -u -r1.2 BeanContextSupport.java
--- java/beans/beancontext/BeanContextSupport.java 26 Jun 2003 19:52:43 -0000 1.2
+++ java/beans/beancontext/BeanContextSupport.java 3 Apr 2005 00:04:52 -0000
@@ -1,5 +1,5 @@
-/* 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.
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can
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
@@ -153,23 +153,31 @@ public class BeanContextSupport extends
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 ()
@@ -216,7 +224,7 @@ public class BeanContextSupport extends
public void clear ()
{
- throw new Error ("Not implemented");
+ throw new UnsupportedOperationException();
}
public boolean contains (Object o)
@@ -302,7 +310,7 @@ public class BeanContextSupport extends
public Locale getLocale ()
{
- throw new Error ("Not implemented");
+ return locale;
}
public URL getResource (String name, BeanContextChild bcc)
@@ -317,7 +325,8 @@ public class BeanContextSupport extends
protected void initialize ()
{
- throw new Error ("Not implemented");
+ bcmListeners = new ArrayList();
+ children = new HashMap();
}
public Object instantiateChild (String beanName)
@@ -343,7 +352,7 @@ public class BeanContextSupport extends
public Iterator iterator ()
{
- throw new Error ("Not implemented");
+ return children.keySet().iterator();
}
public boolean needsGui ()
@@ -369,17 +378,20 @@ public class BeanContextSupport extends
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)
@@ -389,7 +401,7 @@ public class BeanContextSupport extends
public boolean retainAll (Collection c)
{
- throw new Error ("Not implemented");
+ throw new UnsupportedOperationException();
}
protected final void serialize (ObjectOutputStream oos, Collection coll)
@@ -416,12 +428,12 @@ public class BeanContextSupport extends
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)
Index: java/io/PipedInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/PipedInputStream.java,v
retrieving revision 1.15.2.2
diff -u -3 -p -u -r1.15.2.2 PipedInputStream.java
--- java/io/PipedInputStream.java 16 Jan 2005 02:14:48 -0000 1.15.2.2
+++ java/io/PipedInputStream.java 3 Apr 2005 00:04:53 -0000
@@ -1,5 +1,5 @@
/* PipedInputStream.java -- Read portion of piped streams.
- Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -226,18 +226,17 @@ public class PipedInputStream extends In
}
/**
- * This method reads bytes from the stream into a caller supplied buffer.
- * It starts storing bytes at position offset
into the
- * buffer and
- * reads a maximum of len
bytes. Note that this method
- * can actually
- * read fewer than len
bytes. The actual number of bytes
- * read is
- * returned. A -1 is returned to indicated that no bytes can be read
+ * This method reads one byte from the stream.
+ * -1 is returned to indicated that no bytes can be read
* because the end of the stream was reached. If the stream is already
* closed, a -1 will again be returned to indicate the end of the stream.
- * - * This method will block if no byte is available to be read. + * + *
This method will block if no byte is available to be read.
+ * + * @return the value of the read byte value, or -1 of the end of the stream + * was reached + * + * @throws IOException if an error occured */ public int read() throws IOException { @@ -248,7 +247,7 @@ public class PipedInputStream extends In // if this method is never called. int r = read(read_buf, 0, 1); - return r != -1 ? read_buf[0] : -1; + return r != -1 ? (read_buf[0] & 0xff) : -1; } /** Index: java/lang/AssertionError.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/lang/AssertionError.java,v retrieving revision 1.3.2.1 diff -u -3 -p -u -r1.3.2.1 AssertionError.java --- java/lang/AssertionError.java 19 Feb 2005 10:50:35 -0000 1.3.2.1 +++ java/lang/AssertionError.java 3 Apr 2005 00:04:53 -0000 @@ -43,7 +43,7 @@ package java.lang; * statement added in JDK 1.4, to indicate that an assertion failed. There * are enough constructors to ensure that *new AssertionError(expression)
will work for all
- * espressions, regardless of type, as if the error message were given by
+ * expressions, regardless of type, as if the error message were given by
* the string "" + expression
. This extends Error,
* because you usually do not want to inadvertently trap an assertion failure.
*
Index: java/lang/ClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/ClassLoader.java,v
retrieving revision 1.31.2.7
diff -u -3 -p -u -r1.31.2.7 ClassLoader.java
--- java/lang/ClassLoader.java 21 Mar 2005 12:10:17 -0000 1.31.2.7
+++ java/lang/ClassLoader.java 3 Apr 2005 00:04:53 -0000
@@ -321,28 +321,28 @@ public abstract class ClassLoader
{
// Have we already loaded this class?
Class> c = findLoadedClass(name);
- if (c != null)
- return c;
-
- // Can the class be loaded by a parent?
- try
+ if (c == null)
{
- if (parent == null)
+ // Can the class be loaded by a parent?
+ try
{
- c = VMClassLoader.loadClass(name, resolve);
- if (c != null)
- return c;
+ if (parent == null)
+ {
+ c = VMClassLoader.loadClass(name, resolve);
+ if (c != null)
+ return c;
+ }
+ else
+ {
+ return parent.loadClass(name, resolve);
+ }
}
- else
+ catch (ClassNotFoundException e)
{
- return parent.loadClass(name, resolve);
}
+ // Still not found, we have to do it ourself.
+ c = findClass(name);
}
- catch (ClassNotFoundException e)
- {
- }
- // Still not found, we have to do it ourself.
- c = findClass(name);
if (resolve)
resolveClass(c);
return c;
Index: java/lang/System.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/System.java,v
retrieving revision 1.38.2.9
diff -u -3 -p -u -r1.38.2.9 System.java
--- java/lang/System.java 20 Jan 2005 15:15:00 -0000 1.38.2.9
+++ java/lang/System.java 3 Apr 2005 00:04:53 -0000
@@ -307,12 +307,10 @@ public final class System
* Provides a couple of exceptions, thrown by methods in the address@hidden org.omg.CORBA.ORB} class.
+ + + Index: scripts/classpath.spec.in =================================================================== RCS file: scripts/classpath.spec.in diff -N scripts/classpath.spec.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ scripts/classpath.spec.in 3 Apr 2005 00:04:55 -0000 @@ -0,0 +1,66 @@ +# $Id: classpath.spec.in,v 1.1 2005/03/22 19:06:33 archie172 Exp $ + +%define version_num @PACKAGE_VERSION@ +%define release_num 1 + +Summary: GNU Classpath Java class libraries +Name: classpath +Version: %{version_num} +Release: %{release_num} +Group: Development/Tools +Copyright: GPL+exception +URL: http://www.classpath.org/ +BuildRoot: %{_tmppath}/%{name}-root +BuildRequires: jikes, zip +Packager: GNU Classpath +Source: ftp://ftp.gnu.org/pub/gnu/classpath/classpath-%{version_num}.tar.gz + +%description +GNU Classpath, Essential Libraries for Java, is a GNU project to create +free core class libraries for use with virtual machines and compilers +for the Java programming language. + +%prep +%setup -n classpath-%{version_num} + +%build +pushd ${RPM_BUILD_DIR}/classpath-%{version_num} +# Determine if we can build the GTK stuff +GTKPEER='disable' +if pkg-config --exists 'gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0'; then + GTKPEER='enable' +fi +%configure --with-jikes --enable-jni --${GTKPEER}-gtk-peer +make +popd + +%install +pushd ${RPM_BUILD_DIR}/classpath-%{version_num} +%{makeinstall} +popd + +pushd ${RPM_BUILD_ROOT}/%{_infodir} +rm -f dir +for i in *; do + mv $i classpath-$i +done +popd + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + +%clean +rm -rf ${RPM_BUILD_ROOT} + +%files +%defattr(-,root,root) +%doc AUTHORS COPYING LICENSE README THANKYOU +%{_libdir}/classpath +%dir %{_datadir}/classpath +%{_libdir}/security/classpath.security +%{_datadir}/classpath/glibj.zip +%doc %{_datadir}/classpath/api +%doc %{_datadir}/classpath/examples +%doc %{_infodir}/* +