From MAILER-DAEMON Sun Feb 01 11:47:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AnKkO-00024x-Uf
	for mharc-commit-classpath@gnu.org; Sun, 01 Feb 2004 11:47:00 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AnKkM-00024F-3o
	for commit-classpath@gnu.org; Sun, 01 Feb 2004 11:46:58 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AnKjp-00020j-E2
	for commit-classpath@gnu.org; Sun, 01 Feb 2004 11:46:56 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AnKjo-000203-OQ
	for commit-classpath@gnu.org; Sun, 01 Feb 2004 11:46:24 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AnKjK-0006VO-00
	for <commit-classpath@gnu.org>; Sun, 01 Feb 2004 17:45:54 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-lKvZT7kImwPMT6B6zq9O"
Message-Id: <1075653982.2102.48.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 01 Feb 2004 17:46:22 +0100
Subject: PATCH: Add texinfo escapes for brackets
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Feb 2004 16:46:59 -0000


--=-lKvZT7kImwPMT6B6zq9O
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

I needed the following patch for getting makeinfo (GNU texinfo) 4.6 to
process doc/hacking.texinfo again.

Cheers,

Mark

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1860
diff -u -r1.1860 ChangeLog
--- ChangeLog	31 Jan 2004 15:18:09 -0000	1.1860
+++ ChangeLog	1 Feb 2004 16:45:18 -0000
@@ -1,3 +1,8 @@
+2004-02-01  Mark Wielaard  <mark@klomp.org>
+
+	* doc/hacking.texinfo (Programming Standards): Escape { and } with @
+	in examples.
+
 2004-01-31  Michael Koch  <konqueror@gmx.de>
=20
 	* resource/java/security/Makefile.am: Removed comment that does not
Index: doc/hacking.texinfo
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/classpath/classpath/doc/hacking.texinfo,v
retrieving revision 1.17
diff -u -r1.17 hacking.texinfo
--- doc/hacking.texinfo	30 Jan 2004 23:37:34 -0000	1.17
+++ doc/hacking.texinfo	1 Feb 2004 16:45:18 -0000
@@ -390,14 +390,14 @@
 redundant modifiers in comments:
=20
 @example
-/*abstract*/ interface I {
+/*abstract*/ interface I @{
    /*public abstract*/ void m();
    /*public static final*/ int i =3D 1;
-   /*public static*/ class Inner {}
-}
-final class C {
-   /*final*/ void m() {}
-}
+   /*public static*/ class Inner @{@}
+@}
+final class C @{
+   /*final*/ void m() @{@}
+@}
 @end example
=20
 Note that Jikes will generate warnings for these if you use


--=-lKvZT7kImwPMT6B6zq9O
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBAHS1cxVhZCJWr9QwRAoJYAKCtlZ2a35bOhV1PfXVfQkRgON7qfwCglxPT
dn5v0P8FSKQuNhtBn/nFryA=
=NdPp
-----END PGP SIGNATURE-----

--=-lKvZT7kImwPMT6B6zq9O--




From MAILER-DAEMON Sun Feb 01 11:57:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AnKuB-0004tv-U3
	for mharc-commit-classpath@gnu.org; Sun, 01 Feb 2004 11:57:07 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AnKu9-0004sx-59
	for commit-classpath@gnu.org; Sun, 01 Feb 2004 11:57:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AnKta-0004iV-TM
	for commit-classpath@gnu.org; Sun, 01 Feb 2004 11:57:02 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AnKta-0004iC-9d
	for commit-classpath@gnu.org; Sun, 01 Feb 2004 11:56:30 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AnKt6-0006Wj-00
	for <commit-classpath@gnu.org>; Sun, 01 Feb 2004 17:56:00 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-wlV7405Jlbc+KrFhj7XD"
Message-Id: <1075654588.2102.52.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 01 Feb 2004 17:56:28 +0100
Subject: PATCH: Use gthread for gtk-peers
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Feb 2004 16:57:06 -0000


--=-wlV7405Jlbc+KrFhj7XD
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

I needed the following patch to get the AWT peers working with JamVM.

Cheers,

Mark

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1861
diff -u -r1.1861 ChangeLog
--- ChangeLog	1 Feb 2004 16:46:37 -0000	1.1861
+++ ChangeLog	1 Feb 2004 16:53:46 -0000
@@ -1,5 +1,12 @@
 2004-02-01  Mark Wielaard  <mark@klomp.org>
=20
+	* configure.ac: Add PKG_CHECK_MODULES check for GTHREAD.
+	* native/jni/gtk-peer/Makefile.am (libgtkpeer_la_LDFLAGS): Remove
+	GLIB_LIBS, add GTHREAD_LIBS.
+	(INCLUDES): Add GTHREAD_CFLAGS.
+
+2004-02-01  Mark Wielaard  <mark@klomp.org>
+
 	* doc/hacking.texinfo (Programming Standards): Escape { and } with @
 	in examples.
=20
Index: configure.ac
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.3
diff -u -r1.3 configure.ac
--- configure.ac	30 Jan 2004 21:37:09 -0000	1.3
+++ configure.ac	1 Feb 2004 16:53:46 -0000
@@ -120,8 +120,12 @@
     JAPHAR_GREP_CFLAGS(-Wall, [ CFLAGS=3D"$CFLAGS -Wall" ])
   fi
=20
-  dnl Check for AWT related glib/gtk/libart_lgpl
+  dnl Check for AWT related gthread/gtk/libart_lgpl
   if test "x${COMPILE_GTK_PEER}" =3D xyes; then
+     PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >=3D 2.2)
+     AC_SUBST(GTHREAD_CFLAGS)
+     AC_SUBST(GTHREAD_LIBS)
+
      PKG_CHECK_MODULES(GTK, gtk+-2.0 >=3D 2.2)
      AC_SUBST(GTK_CFLAGS)
      AC_SUBST(GTK_LIBS)
Index: native/jni/gtk-peer/Makefile.am
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- native/jni/gtk-peer/Makefile.am	27 Jan 2004 22:30:38 -0000	1.4
+++ native/jni/gtk-peer/Makefile.am	1 Feb 2004 16:53:46 -0000
@@ -35,9 +35,10 @@
 			gtkpeer.h=20
=20
 libgtkpeer_la_LIBADD =3D $(top_builddir)/native/jni/classpath/native_state=
.lo
-libgtkpeer_la_LDFLAGS =3D -module -version-info @LIBVERSION@ @GTK_LIBS@ @G=
LIB_LIBS@ @LIBART_LIBS@
+libgtkpeer_la_LDFLAGS =3D -module -version-info @LIBVERSION@ @GTHREAD_LIBS=
@ @GTK_LIBS@ @LIBART_LIBS@
=20
 INCLUDES =3D -I. @EXTRA_INCLUDES@ \
+	   @GTHREAD_CFLAGS@ \
 	   @GTK_CFLAGS@ \
 	   @LIBART_CFLAGS@ \
 	   -I$(top_srcdir)/native/jni/classpath \


--=-wlV7405Jlbc+KrFhj7XD
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBAHS+7xVhZCJWr9QwRAvW/AJ43vHz9+wv9FL7Ctcu+7femlCnGOACgm2Fc
DzPIbfFmKY8vjtBhV7AAR8o=
=EIvl
-----END PGP SIGNATURE-----

--=-wlV7405Jlbc+KrFhj7XD--




From MAILER-DAEMON Mon Feb 02 05:26:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AnbHx-0000dt-Uf
	for mharc-commit-classpath@gnu.org; Mon, 02 Feb 2004 05:26:45 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AnbHv-0000cx-VW
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:26:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AnbHP-0000Zr-HV
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:26:42 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AnbHM-0000Yt-3y
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:26:08 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Mon, 2 Feb 2004 11:26:02 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C847@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: gnu/java/net/protocol/file/Handler.java
Thread-Index: AcPpc0Fgk0/X3shVQFigDH/homCwegAA6qwA
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: <commit-classpath@gnu.org>
Subject: FYI: Patch: gnu/java/net/protocol/file/Handler.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2004 10:26:45 -0000

Hi,

I checked in my patch for relative file urls.

Regards,
Jeroen

2004-02-02  Jeroen Frijters  <jeroen@frijters.net>

        * gnu/java/net/protocol/file/Handler.java (parseURL): Fixed
support
        for relative file: urls.

Index: gnu/java/net/protocol/file/Handler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file:
/cvsroot/classpath/classpath/gnu/java/net/protocol/file/Handler.java,v
retrieving revision 1.13
diff -u -r1.13 Handler.java
--- gnu/java/net/protocol/file/Handler.java	2 Dec 2003 09:28:21
-0000	1.13
+++ gnu/java/net/protocol/file/Handler.java	2 Feb 2004 09:49:10
-0000
@@ -251,8 +251,8 @@
            =20
             int idx =3D file.lastIndexOf ("/"); =20
=20
-            if (idx =3D=3D -1) //context path is weird
-              file =3D "/" + url_string;=20
+            if (idx =3D=3D -1) //no context path, make relative url
+              file =3D url_string;=20
             else if (idx =3D=3D (file.length() - 1))
               //just concatenate two parts
               file =3D file + url_string;



From MAILER-DAEMON Mon Feb 02 05:31:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AnbK8-0001BE-JI
	for mharc-commit-classpath@gnu.org; Mon, 02 Feb 2004 05:29:00 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AnbK5-0001Av-Hu
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:28:57 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AnbJZ-00012a-0W
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:28:56 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AnbJX-000124-Ig
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:28:23 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----_=_NextPart_001_01C3E977.48A09F80"
Date: Mon, 2 Feb 2004 11:28:16 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C848@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: yes
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: ObjectInputStream,
	ObjectStreamClass sand ObjectStreamField
Thread-Index: AcPpd0Uu1S+JqFmISwScyZm1m6bMQQ==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: <commit-classpath@gnu.org>
Subject: FYI: Patch: ObjectInputStream,
	ObjectStreamClass sand ObjectStreamField
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2004 10:28:58 -0000

This is a multi-part message in MIME format.

------_=_NextPart_001_01C3E977.48A09F80
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Hi,

I committed my optimizations to ObjectInputStream. This contains some
more changes since I posted my request for comments (sorry about that).

Regards,
Jeroen

2004-02-02  Jeroen Frijters  <jeroen@frijters.net>

        * java/io/ObjectInputStream.java: Made all calls
        to dumpElement[ln] conditional on dump flag. (readObject):
Changed to
        use cached info from ObjectStreamClass. (readClassDescriptor):
        Cache more information in ObjectStreamClass. (processResolution,
        readFields): Use cached info from ObjectStreamClass.
        (newObject): Throw exception instead of returning null for
failure.
        (getField, getMethod, callReadMethod, setBooleanField,
setByteField,
        setCharField, setDoubleField, setFloatField, setIntField,
        setLongField, setShortField, setObjectField, readObjectParams):
        Removed. (dumpElement, dumpElementln): Removed dump flag
condition
        check.
        * java/io/ObjectStreamField.java (hasReadMethod): Removed.
        (setClass): Added call to cacheMethods() (findMethod): New
method.
        (cacheMethods): New method. (ObjectStreamClass): Added call to
        cacheMethods(). (setFields): Cache fields. (getClassUID): Use
        AccessController.doPrivileged to invoke setAccessible.
        (readObjectMethod, readResolveMethod, realClassIsSerializable,
        realClassIsExternalizable, fieldMapping,
firstNonSerializableParent):
        New fields.
        * java/io/ObjectStreamField.java (ObjectStreamField): New
constructor.
        (ObjectStreamField): Removed FIXME workaround. (getTypeString,
        isPrimitive): Made safe for cases where type =3D=3D null.
        (setBooleanField, setByteField, setCharField, setShortField,
        setIntField, setLongField, setFloatField, setDoubleField,
        setObjectField): New methods.

------_=_NextPart_001_01C3E977.48A09F80
Content-Type: application/octet-stream;
	name="ois.patch"
Content-Transfer-Encoding: base64
Content-Description: ois.patch
Content-Disposition: attachment;
	filename="ois.patch"

SW5kZXg6IGphdmEvaW8vT2JqZWN0SW5wdXRTdHJlYW0uamF2YQ0KPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZp
bGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvamF2YS9pby9PYmplY3RJbnB1dFN0cmVh
bS5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNg0KZGlmZiAtdSAtcjEuMzYgT2JqZWN0
SW5wdXRTdHJlYW0uamF2YQ0KLS0tIGphdmEvaW8vT2JqZWN0SW5wdXRTdHJlYW0uamF2YQk5IEph
biAyMDA0IDA4OjU5OjMwIC0wMDAwCTEuMzYNCisrKyBqYXZhL2lvL09iamVjdElucHV0U3RyZWFt
LmphdmEJMiBGZWIgMjAwNCAwOTo0OToxMyAtMDAwMA0KQEAgLTEzOCw3ICsxMzgsNyBAQA0KICAg
ICB0aGlzLmlzRGVzZXJpYWxpemluZyA9IHRydWU7DQogDQogICAgIGJ5dGUgbWFya2VyID0gdGhp
cy5yZWFsSW5wdXRTdHJlYW0ucmVhZEJ5dGUoKTsNCi0gICAgZHVtcEVsZW1lbnQoIk1BUktFUjog
MHgiICsgSW50ZWdlci50b0hleFN0cmluZyhtYXJrZXIpICsgIiAiKTsNCisgICAgaWYoZHVtcCkg
ZHVtcEVsZW1lbnQoIk1BUktFUjogMHgiICsgSW50ZWdlci50b0hleFN0cmluZyhtYXJrZXIpICsg
IiAiKTsNCiANCiAgICAgdHJ5DQogICAgICAgew0KQEAgLTE1NSwyNSArMTU1LDI1IEBADQogCSAg
Y2FzZSBUQ19CTE9DS0RBVEFMT05HOg0KIAkgICAgew0KIAkgICAgICBpZiAobWFya2VyID09IFRD
X0JMT0NLREFUQUxPTkcpDQotCQlkdW1wRWxlbWVudGxuKCJCTE9DS0RBVEFMT05HIik7DQorCQlp
ZihkdW1wKSBkdW1wRWxlbWVudGxuKCJCTE9DS0RBVEFMT05HIik7DQogCSAgICAgIGVsc2UNCi0J
CWR1bXBFbGVtZW50bG4oIkJMT0NLREFUQSIpOw0KKwkJaWYoZHVtcCkgZHVtcEVsZW1lbnRsbigi
QkxPQ0tEQVRBIik7DQogCSAgICAgIHJlYWROZXh0QmxvY2sobWFya2VyKTsNCiAJICAgICAgdGhy
b3cgbmV3IFN0cmVhbUNvcnJ1cHRlZEV4Y2VwdGlvbigiVW5leHBlY3RlZCBibG9ja0RhdGEiKTsN
CiAJICAgIH0NCiANCiAJICBjYXNlIFRDX05VTEw6DQogCSAgICB7DQotCSAgICAgIGR1bXBFbGVt
ZW50bG4oIk5VTEwiKTsNCisJICAgICAgaWYoZHVtcCkgZHVtcEVsZW1lbnRsbigiTlVMTCIpOw0K
IAkgICAgICByZXRfdmFsID0gbnVsbDsNCiAJICAgICAgYnJlYWs7DQogCSAgICB9DQogDQogCSAg
Y2FzZSBUQ19SRUZFUkVOQ0U6DQogCSAgICB7DQotCSAgICAgIGR1bXBFbGVtZW50KCJSRUZFUkVO
Q0UgIik7DQorCSAgICAgIGlmKGR1bXApIGR1bXBFbGVtZW50KCJSRUZFUkVOQ0UgIik7DQogCSAg
ICAgIEludGVnZXIgb2lkID0gbmV3IEludGVnZXIodGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZElu
dCgpKTsNCi0JICAgICAgZHVtcEVsZW1lbnRsbihJbnRlZ2VyLnRvSGV4U3RyaW5nKG9pZC5pbnRW
YWx1ZSgpKSk7DQorCSAgICAgIGlmKGR1bXApIGR1bXBFbGVtZW50bG4oSW50ZWdlci50b0hleFN0
cmluZyhvaWQuaW50VmFsdWUoKSkpOw0KIAkgICAgICByZXRfdmFsID0gKChPYmplY3RJZGVudGl0
eVdyYXBwZXIpDQogCQkJIHRoaXMub2JqZWN0TG9va3VwVGFibGUuZ2V0KG9pZCkpLm9iamVjdDsN
CiAJICAgICAgYnJlYWs7DQpAQCAtMTgxLDcgKzE4MSw3IEBADQogDQogCSAgY2FzZSBUQ19DTEFT
UzoNCiAJICAgIHsNCi0JICAgICAgZHVtcEVsZW1lbnRsbigiQ0xBU1MiKTsNCisJICAgICAgaWYo
ZHVtcCkgZHVtcEVsZW1lbnRsbigiQ0xBU1MiKTsNCiAJICAgICAgT2JqZWN0U3RyZWFtQ2xhc3Mg
b3NjID0gKE9iamVjdFN0cmVhbUNsYXNzKXJlYWRPYmplY3QoKTsNCiAJICAgICAgQ2xhc3MgY2xh
enogPSBvc2MuZm9yQ2xhc3MoKTsNCiAJICAgICAgYXNzaWduTmV3SGFuZGxlKGNsYXp6KTsNCkBA
IC0xOTEsNyArMTkxLDcgQEANCiANCiAJICBjYXNlIFRDX1BST1hZQ0xBU1NERVNDOg0KIAkgICAg
ew0KLQkgICAgICBkdW1wRWxlbWVudGxuKCJQUk9YWUNMQVNTIik7DQorCSAgICAgIGlmKGR1bXAp
IGR1bXBFbGVtZW50bG4oIlBST1hZQ0xBU1MiKTsNCiAJICAgICAgaW50IG5faW50ZiA9IHRoaXMu
cmVhbElucHV0U3RyZWFtLnJlYWRJbnQoKTsNCiAJICAgICAgU3RyaW5nW10gaW50ZnMgPSBuZXcg
U3RyaW5nW25faW50Zl07DQogCSAgICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbl9pbnRmOyBpKysp
DQpAQCAtMjQyLDQxICsyNDIsNDIgQEANCiAJICBjYXNlIFRDX1NUUklORzoNCiAJICBjYXNlIFRD
X0xPTkdTVFJJTkc6DQogCSAgICB7DQotCSAgICAgIGR1bXBFbGVtZW50KCJTVFJJTkc9Iik7DQor
CSAgICAgIGlmKGR1bXApIGR1bXBFbGVtZW50KCJTVFJJTkc9Iik7DQogCSAgICAgIFN0cmluZyBz
ID0gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZFVURigpOw0KLQkgICAgICBkdW1wRWxlbWVudGxu
KHMpOw0KLQkgICAgICByZXRfdmFsID0gcHJvY2Vzc1Jlc29sdXRpb24ocywgYXNzaWduTmV3SGFu
ZGxlKHMpKTsNCisJICAgICAgaWYoZHVtcCkgZHVtcEVsZW1lbnRsbihzKTsNCisJICAgICAgcmV0
X3ZhbCA9IHByb2Nlc3NSZXNvbHV0aW9uKG51bGwsIHMsIGFzc2lnbk5ld0hhbmRsZShzKSk7DQog
CSAgICAgIGJyZWFrOw0KIAkgICAgfQ0KIA0KIAkgIGNhc2UgVENfQVJSQVk6DQogCSAgICB7DQot
CSAgICAgIGR1bXBFbGVtZW50bG4oIkFSUkFZIik7DQorCSAgICAgIGlmKGR1bXApIGR1bXBFbGVt
ZW50bG4oIkFSUkFZIik7DQogCSAgICAgIE9iamVjdFN0cmVhbUNsYXNzIG9zYyA9IChPYmplY3RT
dHJlYW1DbGFzcylyZWFkT2JqZWN0KCk7DQogCSAgICAgIENsYXNzIGNvbXBvbmVudFR5cGUgPSBv
c2MuZm9yQ2xhc3MoKS5nZXRDb21wb25lbnRUeXBlKCk7DQotCSAgICAgIGR1bXBFbGVtZW50KCJB
UlJBWSBMRU5HVEg9Iik7DQorCSAgICAgIGlmKGR1bXApIGR1bXBFbGVtZW50KCJBUlJBWSBMRU5H
VEg9Iik7DQogCSAgICAgIGludCBsZW5ndGggPSB0aGlzLnJlYWxJbnB1dFN0cmVhbS5yZWFkSW50
KCk7DQotCSAgICAgIGR1bXBFbGVtZW50bG4gKGxlbmd0aCArICI7IENPTVBPTkVOVCBUWVBFPSIg
KyBjb21wb25lbnRUeXBlKTsNCisJICAgICAgaWYoZHVtcCkgZHVtcEVsZW1lbnRsbiAobGVuZ3Ro
ICsgIjsgQ09NUE9ORU5UIFRZUEU9IiArIGNvbXBvbmVudFR5cGUpOw0KIAkgICAgICBPYmplY3Qg
YXJyYXkgPSBBcnJheS5uZXdJbnN0YW5jZShjb21wb25lbnRUeXBlLCBsZW5ndGgpOw0KIAkgICAg
ICBpbnQgaGFuZGxlID0gYXNzaWduTmV3SGFuZGxlKGFycmF5KTsNCiAJICAgICAgcmVhZEFycmF5
RWxlbWVudHMoYXJyYXksIGNvbXBvbmVudFR5cGUpOw0KLQkgICAgICBmb3IgKGludCBpID0gMCwg
bGVuID0gQXJyYXkuZ2V0TGVuZ3RoKGFycmF5KTsgaSA8IGxlbjsgaSsrKQ0KLQkJZHVtcEVsZW1l
bnRsbigiICBFTEVNRU5UWyIgKyBpICsgIl09IiArIEFycmF5LmdldChhcnJheSwgaSkpOw0KLQkg
ICAgICByZXRfdmFsID0gcHJvY2Vzc1Jlc29sdXRpb24oYXJyYXksIGhhbmRsZSk7DQorCSAgICAg
IGlmKGR1bXApDQorCSAgICAgICAgZm9yIChpbnQgaSA9IDAsIGxlbiA9IEFycmF5LmdldExlbmd0
aChhcnJheSk7IGkgPCBsZW47IGkrKykNCisJCSAgZHVtcEVsZW1lbnRsbigiICBFTEVNRU5UWyIg
KyBpICsgIl09IiArIEFycmF5LmdldChhcnJheSwgaSkpOw0KKwkgICAgICByZXRfdmFsID0gcHJv
Y2Vzc1Jlc29sdXRpb24obnVsbCwgYXJyYXksIGhhbmRsZSk7DQogCSAgICAgIGJyZWFrOw0KIAkg
ICAgfQ0KIA0KIAkgIGNhc2UgVENfT0JKRUNUOg0KIAkgICAgew0KLQkgICAgICBkdW1wRWxlbWVu
dGxuKCJPQkpFQ1QiKTsNCisJICAgICAgaWYoZHVtcCkgZHVtcEVsZW1lbnRsbigiT0JKRUNUIik7
DQogCSAgICAgIE9iamVjdFN0cmVhbUNsYXNzIG9zYyA9IChPYmplY3RTdHJlYW1DbGFzcylyZWFk
T2JqZWN0KCk7DQogCSAgICAgIENsYXNzIGNsYXp6ID0gb3NjLmZvckNsYXNzKCk7DQogCSAgICAg
IA0KLQkgICAgICBpZiAoIVNlcmlhbGl6YWJsZS5jbGFzcy5pc0Fzc2lnbmFibGVGcm9tKGNsYXp6
KSkNCisJICAgICAgaWYgKCFvc2MucmVhbENsYXNzSXNTZXJpYWxpemFibGUpDQogCQl0aHJvdyBu
ZXcgTm90U2VyaWFsaXphYmxlRXhjZXB0aW9uDQogCQkgIChjbGF6eiArICIgaXMgbm90IFNlcmlh
bGl6YWJsZSwgYW5kIHRodXMgY2Fubm90IGJlIGRlc2VyaWFsaXplZC4iKTsNCiAJICAgICAgDQot
CSAgICAgIGlmIChFeHRlcm5hbGl6YWJsZS5jbGFzcy5pc0Fzc2lnbmFibGVGcm9tKGNsYXp6KSkN
CisJICAgICAgaWYgKG9zYy5yZWFsQ2xhc3NJc0V4dGVybmFsaXphYmxlKQ0KIAkJew0KIAkJICBF
eHRlcm5hbGl6YWJsZSBvYmogPSBudWxsOw0KIAkJICANCkBAIC0zMTUsMjMgKzMxNiwxMSBAQA0K
IAkJICBpZiAocmVhZF9mcm9tX2Jsb2NrcykNCiAJCSAgICBzZXRCbG9ja0RhdGFNb2RlKG9sZG1v
ZGUpOw0KIAkJICANCi0JCSAgcmV0X3ZhbCA9IHByb2Nlc3NSZXNvbHV0aW9uKG9iaiwgaGFuZGxl
KTsNCisJCSAgcmV0X3ZhbCA9IHByb2Nlc3NSZXNvbHV0aW9uKG9zYywgb2JqLCBoYW5kbGUpOw0K
IAkJICBicmVhazsNCi0JCX0gLy8gZW5kIGlmIChFeHRlcm5hbGl6YWJsZS5jbGFzcy5pc0Fzc2ln
bmFibGVGcm9tIChjbGF6eikpDQotCSAgICAgIA0KLQkgICAgICAvLyBmaW5kIHRoZSBmaXJzdCBu
b24tc2VyaWFsaXphYmxlLCBub24tYWJzdHJhY3QNCi0JICAgICAgLy8gY2xhc3MgaW4gY2xhenon
cyBpbmhlcml0YW5jZSBoaWVyYXJjaHkNCi0JICAgICAgQ2xhc3MgZmlyc3Rfbm9uc2VyaWFsID0g
Y2xhenouZ2V0U3VwZXJjbGFzcygpOw0KLQkgICAgICB3aGlsZSAoU2VyaWFsaXphYmxlLmNsYXNz
LmlzQXNzaWduYWJsZUZyb20oZmlyc3Rfbm9uc2VyaWFsKQ0KLQkJICAgICB8fCBNb2RpZmllci5p
c0Fic3RyYWN0KGZpcnN0X25vbnNlcmlhbC5nZXRNb2RpZmllcnMoKSkpDQotCQlmaXJzdF9ub25z
ZXJpYWwgPSBmaXJzdF9ub25zZXJpYWwuZ2V0U3VwZXJjbGFzcygpOw0KLQkgICAgICANCi0JICAg
ICAgT2JqZWN0IG9iaiA9IG51bGw7DQotCSAgICAgIG9iaiA9IG5ld09iamVjdChjbGF6eiwgZmly
c3Rfbm9uc2VyaWFsKTsNCi0JICAgICAgDQotCSAgICAgIGlmIChvYmogPT0gbnVsbCkNCi0JCXRo
cm93IG5ldyBDbGFzc05vdEZvdW5kRXhjZXB0aW9uDQotCQkgICgiSW5zdGFuY2Ugb2YgIiArIGNs
YXp6ICsgIiBjb3VsZCBub3QgYmUgY3JlYXRlZCIpOw0KKwkJfSAvLyBlbmQgaWYgKG9zYy5yZWFs
Q2xhc3NJc0V4dGVybmFsaXphYmxlKQ0KKw0KKwkgICAgICBPYmplY3Qgb2JqID0gbmV3T2JqZWN0
KGNsYXp6LCBvc2MuZmlyc3ROb25TZXJpYWxpemFibGVQYXJlbnQpOw0KIAkgICAgICANCiAJICAg
ICAgaW50IGhhbmRsZSA9IGFzc2lnbk5ld0hhbmRsZShvYmopOw0KIAkgICAgICB0aGlzLmN1cnJl
bnRPYmplY3QgPSBvYmo7DQpAQCAtMzQyLDIwICszMzEsMjEgQEANCiAJCXsNCiAJCSAgdGhpcy5j
dXJyZW50T2JqZWN0U3RyZWFtQ2xhc3MgPSBoaWVyYXJjaHlbaV07DQogCQkgIA0KLQkJICBkdW1w
RWxlbWVudGxuKCJSZWFkaW5nIGZpZWxkcyBvZiAiICsgdGhpcy5jdXJyZW50T2JqZWN0U3RyZWFt
Q2xhc3MuZ2V0TmFtZSAoKSk7DQorCQkgIGlmKGR1bXApIGR1bXBFbGVtZW50bG4oIlJlYWRpbmcg
ZmllbGRzIG9mICIgKyB0aGlzLmN1cnJlbnRPYmplY3RTdHJlYW1DbGFzcy5nZXROYW1lICgpKTsN
CiANCiAJCSAgLy8gWFhYOiBzaG91bGQgaW5pdGlhbGl6ZSBmaWVsZHMgaW4gY2xhc3NlcyBpbiB0
aGUgaGllcmFyY2h5DQogCQkgIC8vIHRoYXQgYXJlbid0IGluIHRoZSBzdHJlYW0NCiAJCSAgLy8g
c2hvdWxkIHNraXAgb3ZlciBjbGFzc2VzIGluIHRoZSBzdHJlYW0gdGhhdCBhcmVuJ3QgaW4gdGhl
DQogCQkgIC8vIHJlYWwgY2xhc3NlcyBoaWVyYXJjaHkNCiAJCSAgDQotCQkgIGlmICh0aGlzLmN1
cnJlbnRPYmplY3RTdHJlYW1DbGFzcy5oYXNSZWFkTWV0aG9kKCkpDQorCQkgIE1ldGhvZCByZWFk
T2JqZWN0TWV0aG9kID0gdGhpcy5jdXJyZW50T2JqZWN0U3RyZWFtQ2xhc3MucmVhZE9iamVjdE1l
dGhvZDsNCisJCSAgaWYgKHJlYWRPYmplY3RNZXRob2QgIT0gbnVsbCkNCiAJCSAgICB7DQogCQkg
ICAgICBmaWVsZHNBbHJlYWR5UmVhZCA9IGZhbHNlOw0KIAkJICAgICAgYm9vbGVhbiBvbGRtb2Rl
ID0gc2V0QmxvY2tEYXRhTW9kZSh0cnVlKTsNCi0JCSAgICAgIGNhbGxSZWFkTWV0aG9kKG9iaiwg
dGhpcy5jdXJyZW50T2JqZWN0U3RyZWFtQ2xhc3MpOw0KKwkJICAgICAgY2FsbFJlYWRNZXRob2Qo
cmVhZE9iamVjdE1ldGhvZCwgdGhpcy5jdXJyZW50T2JqZWN0U3RyZWFtQ2xhc3MuZm9yQ2xhc3Mo
KSwgb2JqKTsNCiAJCSAgICAgIHNldEJsb2NrRGF0YU1vZGUob2xkbW9kZSk7DQotCQkgICAgICBk
dW1wRWxlbWVudCgiRU5EQkxPQ0tEQVRBPyAiKTsNCisJCSAgICAgIGlmKGR1bXApIGR1bXBFbGVt
ZW50KCJFTkRCTE9DS0RBVEE/ICIpOw0KIAkJICAgICAgdHJ5DQogCQkJew0KIAkJCSAgLy8gRklY
TUU6IFhYWDogVGhpcyB0cnkgYmxvY2sgaXMgdG8gY2F0Y2ggRU9GIHdoaWNoIGlzDQpAQCAtMzYz
LDE1ICszNTMsMTUgQEANCiAJCQkgIGlmICh0aGlzLnJlYWxJbnB1dFN0cmVhbS5yZWFkQnl0ZSgp
ICE9IFRDX0VOREJMT0NLREFUQSkNCiAJCQkgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uDQogCQkJ
ICAgICAgKCJObyBlbmQgb2YgYmxvY2sgZGF0YSBzZWVuIGZvciBjbGFzcyB3aXRoIHJlYWRPYmpl
Y3QgKE9iamVjdElucHV0U3RyZWFtKSBtZXRob2QuIik7DQotCQkJICBkdW1wRWxlbWVudGxuKCJ5
ZXMiKTsNCisJCQkgIGlmKGR1bXApIGR1bXBFbGVtZW50bG4oInllcyIpOw0KIAkJCX0NCiAJCSAg
ICAgIGNhdGNoIChFT0ZFeGNlcHRpb24gZSkNCiAJCQl7DQotCQkJICBkdW1wRWxlbWVudGxuKCJu
bywgZ290IEVPRkV4Y2VwdGlvbiIpOw0KKwkJCSAgaWYoZHVtcCkgZHVtcEVsZW1lbnRsbigibm8s
IGdvdCBFT0ZFeGNlcHRpb24iKTsNCiAJCQl9DQogCQkgICAgICBjYXRjaCAoSU9FeGNlcHRpb24g
ZSkNCiAJCQl7DQotCQkJICBkdW1wRWxlbWVudGxuKCJubywgZ290IElPRXhjZXB0aW9uIik7DQor
CQkJICBpZihkdW1wKSBkdW1wRWxlbWVudGxuKCJubywgZ290IElPRXhjZXB0aW9uIik7DQogCQkJ
fQ0KIAkJICAgIH0NCiAJCSAgZWxzZQ0KQEAgLTM4MiwyMSArMzcyLDIxIEBADQogDQogCSAgICAg
IHRoaXMuY3VycmVudE9iamVjdCA9IG51bGw7DQogCSAgICAgIHRoaXMuY3VycmVudE9iamVjdFN0
cmVhbUNsYXNzID0gbnVsbDsNCi0JICAgICAgcmV0X3ZhbCA9IHByb2Nlc3NSZXNvbHV0aW9uKG9i
aiwgaGFuZGxlKTsNCisJICAgICAgcmV0X3ZhbCA9IHByb2Nlc3NSZXNvbHV0aW9uKG9zYywgb2Jq
LCBoYW5kbGUpOw0KIAkgICAgICBicmVhazsNCiAJICAgIH0NCiANCiAJICBjYXNlIFRDX1JFU0VU
Og0KLQkgICAgZHVtcEVsZW1lbnRsbigiUkVTRVQiKTsNCisJICAgIGlmKGR1bXApIGR1bXBFbGVt
ZW50bG4oIlJFU0VUIik7DQogCSAgICBjbGVhckhhbmRsZXMoKTsNCiAJICAgIHJldF92YWwgPSBy
ZWFkT2JqZWN0KCk7DQogCSAgICBicmVhazsNCiANCiAJICBjYXNlIFRDX0VYQ0VQVElPTjoNCiAJ
ICAgIHsNCi0JICAgICAgZHVtcEVsZW1lbnQoIkVYQ0VQVElPTj0iKTsNCisJICAgICAgaWYoZHVt
cCkgZHVtcEVsZW1lbnQoIkVYQ0VQVElPTj0iKTsNCiAJICAgICAgRXhjZXB0aW9uIGUgPSAoRXhj
ZXB0aW9uKXJlYWRPYmplY3QoKTsNCi0JICAgICAgZHVtcEVsZW1lbnRsbihlLnRvU3RyaW5nKCkp
Ow0KKwkgICAgICBpZihkdW1wKSBkdW1wRWxlbWVudGxuKGUudG9TdHJpbmcoKSk7DQogCSAgICAg
IGNsZWFySGFuZGxlcygpOw0KIAkgICAgICB0aHJvdyBuZXcgV3JpdGVBYm9ydGVkRXhjZXB0aW9u
KCJFeGNlcHRpb24gdGhyb3duIGR1cmluZyB3cml0aW5nIG9mIHN0cmVhbSIsIGUpOw0KIAkgICAg
fQ0KQEAgLTQ0MCwyNyArNDMwLDI5IEBADQogICBwcm90ZWN0ZWQgT2JqZWN0U3RyZWFtQ2xhc3Mg
cmVhZENsYXNzRGVzY3JpcHRvcigpDQogICAgIHRocm93cyBDbGFzc05vdEZvdW5kRXhjZXB0aW9u
LCBJT0V4Y2VwdGlvbg0KICAgew0KLSAgICBkdW1wRWxlbWVudCgiQ0xBU1NERVNDIE5BTUU9Iik7
DQorICAgIGlmKGR1bXApIGR1bXBFbGVtZW50KCJDTEFTU0RFU0MgTkFNRT0iKTsNCiAgICAgU3Ry
aW5nIG5hbWUgPSB0aGlzLnJlYWxJbnB1dFN0cmVhbS5yZWFkVVRGKCk7DQotICAgIGR1bXBFbGVt
ZW50KG5hbWUgKyAiOyBVSUQ9Iik7DQorICAgIGlmKGR1bXApIGR1bXBFbGVtZW50KG5hbWUgKyAi
OyBVSUQ9Iik7DQogICAgIGxvbmcgdWlkID0gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZExvbmcg
KCk7DQotICAgIGR1bXBFbGVtZW50KExvbmcudG9IZXhTdHJpbmcodWlkKSArICI7IEZMQUdTPSIp
Ow0KKyAgICBpZihkdW1wKSBkdW1wRWxlbWVudChMb25nLnRvSGV4U3RyaW5nKHVpZCkgKyAiOyBG
TEFHUz0iKTsNCiAgICAgYnl0ZSBmbGFncyA9IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRCeXRl
ICgpOw0KLSAgICBkdW1wRWxlbWVudChJbnRlZ2VyLnRvSGV4U3RyaW5nKGZsYWdzKSArICI7IEZJ
RUxEIENPVU5UPSIpOw0KKyAgICBpZihkdW1wKSBkdW1wRWxlbWVudChJbnRlZ2VyLnRvSGV4U3Ry
aW5nKGZsYWdzKSArICI7IEZJRUxEIENPVU5UPSIpOw0KICAgICBzaG9ydCBmaWVsZF9jb3VudCA9
IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRTaG9ydCgpOw0KLSAgICBkdW1wRWxlbWVudGxuKFNo
b3J0LnRvU3RyaW5nKGZpZWxkX2NvdW50KSk7DQorICAgIGlmKGR1bXApIGR1bXBFbGVtZW50bG4o
U2hvcnQudG9TdHJpbmcoZmllbGRfY291bnQpKTsNCiAgICAgT2JqZWN0U3RyZWFtRmllbGRbXSBm
aWVsZHMgPSBuZXcgT2JqZWN0U3RyZWFtRmllbGRbZmllbGRfY291bnRdOw0KICAgICBPYmplY3RT
dHJlYW1DbGFzcyBvc2MgPSBuZXcgT2JqZWN0U3RyZWFtQ2xhc3MobmFtZSwgdWlkLA0KIAkJCQkJ
CSAgZmxhZ3MsIGZpZWxkcyk7DQogICAgIGFzc2lnbk5ld0hhbmRsZShvc2MpOw0KKw0KKyAgICBD
bGFzc0xvYWRlciBjdXJyZW50TG9hZGVyID0gY3VycmVudExvYWRlcigpOw0KIAkgICAgICANCiAg
ICAgZm9yIChpbnQgaSA9IDA7IGkgPCBmaWVsZF9jb3VudDsgaSsrKQ0KICAgICAgIHsNCi0JZHVt
cEVsZW1lbnQoIiAgVFlQRSBDT0RFPSIpOw0KKwlpZihkdW1wKSBkdW1wRWxlbWVudCgiICBUWVBF
IENPREU9Iik7DQogCWNoYXIgdHlwZV9jb2RlID0gKGNoYXIpdGhpcy5yZWFsSW5wdXRTdHJlYW0u
cmVhZEJ5dGUoKTsNCi0JZHVtcEVsZW1lbnQodHlwZV9jb2RlICsgIjsgRklFTEQgTkFNRT0iKTsN
CisJaWYoZHVtcCkgZHVtcEVsZW1lbnQodHlwZV9jb2RlICsgIjsgRklFTEQgTkFNRT0iKTsNCiAJ
U3RyaW5nIGZpZWxkX25hbWUgPSB0aGlzLnJlYWxJbnB1dFN0cmVhbS5yZWFkVVRGKCk7DQotCWR1
bXBFbGVtZW50bG4oZmllbGRfbmFtZSk7DQorCWlmKGR1bXApIGR1bXBFbGVtZW50bG4oZmllbGRf
bmFtZSk7DQogCVN0cmluZyBjbGFzc19uYW1lOw0KIAkJICANCiAJLy8gSWYgdGhlIHR5cGUgY29k
ZSBpcyBhbiBhcnJheSBvciBhbiBvYmplY3Qgd2UgbXVzdA0KQEAgLTQ3MywzNSArNDY1LDg3IEBA
DQogCSAgY2xhc3NfbmFtZSA9IFN0cmluZy52YWx1ZU9mKHR5cGVfY29kZSk7DQogCQkgIA0KIAlm
aWVsZHNbaV0gPQ0KLQkgIG5ldyBPYmplY3RTdHJlYW1GaWVsZChmaWVsZF9uYW1lLCBjbGFzc19u
YW1lLCBjdXJyZW50TG9hZGVyKCkpOw0KKwkgIG5ldyBPYmplY3RTdHJlYW1GaWVsZChmaWVsZF9u
YW1lLCBjbGFzc19uYW1lLCBjdXJyZW50TG9hZGVyKTsNCiAgICAgICB9DQogCSAgICAgIA0KICAg
ICAvKiBOb3cgdGhhdCBmaWVsZHMgaGF2ZSBiZWVuIHJlYWQgd2UgbWF5IHJlc29sdmUgdGhlIGNs
YXNzDQogICAgICAqIChhbmQgcmVhZCBhbm5vdGF0aW9uIGlmIG5lZWRlZCkuICovDQogICAgIENs
YXNzIGNsYXp6ID0gcmVzb2x2ZUNsYXNzKG9zYyk7DQotICAgIA0KLSAgICBmb3IgKGludCBpID0g
MDsgaSA8IGZpZWxkX2NvdW50OyBpKyspDQorDQorICAgIGJvb2xlYW4gb2xkbW9kZSA9IHNldEJs
b2NrRGF0YU1vZGUodHJ1ZSk7DQorICAgIG9zYy5zZXRDbGFzcyhjbGF6eiwgbG9va3VwQ2xhc3Mo
Y2xhenouZ2V0U3VwZXJjbGFzcygpKSk7DQorICAgIGNsYXNzTG9va3VwVGFibGUucHV0KGNsYXp6
LCBvc2MpOw0KKyAgICBzZXRCbG9ja0RhdGFNb2RlKG9sZG1vZGUpOw0KKw0KKyAgICAvLyBmaW5k
IHRoZSBmaXJzdCBub24tc2VyaWFsaXphYmxlLCBub24tYWJzdHJhY3QNCisgICAgLy8gY2xhc3Mg
aW4gY2xhenoncyBpbmhlcml0YW5jZSBoaWVyYXJjaHkNCisgICAgQ2xhc3MgZmlyc3Rfbm9uc2Vy
aWFsID0gY2xhenouZ2V0U3VwZXJjbGFzcygpOw0KKyAgICB3aGlsZSAoU2VyaWFsaXphYmxlLmNs
YXNzLmlzQXNzaWduYWJsZUZyb20oZmlyc3Rfbm9uc2VyaWFsKQ0KKwl8fCBNb2RpZmllci5pc0Fi
c3RyYWN0KGZpcnN0X25vbnNlcmlhbC5nZXRNb2RpZmllcnMoKSkpDQorCWZpcnN0X25vbnNlcmlh
bCA9IGZpcnN0X25vbnNlcmlhbC5nZXRTdXBlcmNsYXNzKCk7DQorDQorICAgIG9zYy5maXJzdE5v
blNlcmlhbGl6YWJsZVBhcmVudCA9IGZpcnN0X25vbnNlcmlhbDsNCisgICAgb3NjLnJlYWxDbGFz
c0lzU2VyaWFsaXphYmxlID0gU2VyaWFsaXphYmxlLmNsYXNzLmlzQXNzaWduYWJsZUZyb20oY2xh
enopOw0KKyAgICBvc2MucmVhbENsYXNzSXNFeHRlcm5hbGl6YWJsZSA9IEV4dGVybmFsaXphYmxl
LmNsYXNzLmlzQXNzaWduYWJsZUZyb20oY2xhenopOw0KKw0KKyAgICBPYmplY3RTdHJlYW1GaWVs
ZFtdIHN0cmVhbV9maWVsZHMgPSBvc2MuZmllbGRzOw0KKyAgICBPYmplY3RTdHJlYW1GaWVsZFtd
IHJlYWxfZmllbGRzID0gT2JqZWN0U3RyZWFtQ2xhc3MubG9va3VwKGNsYXp6KS5maWVsZHM7DQor
ICAgIE9iamVjdFN0cmVhbUZpZWxkW10gZmllbGRtYXBwaW5nID0gbmV3IE9iamVjdFN0cmVhbUZp
ZWxkWzIgKiBNYXRoLm1heChzdHJlYW1fZmllbGRzLmxlbmd0aCwgcmVhbF9maWVsZHMubGVuZ3Ro
KV07DQorICAgIG9zYy5maWVsZE1hcHBpbmcgPSBmaWVsZG1hcHBpbmc7DQorDQorICAgIGludCBz
dHJlYW1faWR4ID0gMDsNCisgICAgaW50IHJlYWxfaWR4ID0gMDsNCisgICAgaW50IG1hcF9pZHgg
PSAwOw0KKw0KKyAgICB3aGlsZSAoc3RyZWFtX2lkeCA8IHN0cmVhbV9maWVsZHMubGVuZ3RoDQor
CSAgIHx8IHJlYWxfaWR4IDwgcmVhbF9maWVsZHMubGVuZ3RoKQ0KICAgICAgIHsNCi0JRmllbGQg
ZjsNCi0JDQotCXRyeQ0KKwlPYmplY3RTdHJlYW1GaWVsZCBzdHJlYW1fZmllbGQgPSBudWxsOw0K
KwlPYmplY3RTdHJlYW1GaWVsZCByZWFsX2ZpZWxkID0gbnVsbDsNCisNCisJaWYgKHN0cmVhbV9p
ZHggPT0gc3RyZWFtX2ZpZWxkcy5sZW5ndGgpDQogCSAgew0KLQkgICAgZiA9IGNsYXp6LmdldERl
Y2xhcmVkRmllbGQoZmllbGRzW2ldLmdldE5hbWUoKSk7DQotCSAgICBpZiAoZiAhPSBudWxsICYm
ICFmLmdldFR5cGUoKS5lcXVhbHMoZmllbGRzW2ldLmdldFR5cGUoKSkpDQotCSAgICAgIHRocm93
IG5ldyBJbnZhbGlkQ2xhc3NFeGNlcHRpb24NCi0JCSgiaW52YWxpZCBmaWVsZCB0eXBlIGZvciAi
ICsgZmllbGRzW2ldLmdldE5hbWUoKSArICIgaW4gY2xhc3MgIg0KLQkJICsgbmFtZSArICIgKHJl
cXVlc3RlZCB3YXMgXCIiICsgZmllbGRzW2ldLmdldFR5cGUoKQ0KLQkJICsgIiBhbmQgZm91bmQg
XCIiICsgZi5nZXRUeXBlKCkgKyAiXCIpIik7IA0KKwkgICAgcmVhbF9maWVsZCA9IHJlYWxfZmll
bGRzW3JlYWxfaWR4KytdOw0KIAkgIH0NCi0JY2F0Y2ggKE5vU3VjaEZpZWxkRXhjZXB0aW9uIF8p
DQorCWVsc2UgaWYgKHJlYWxfaWR4ID09IHJlYWxfZmllbGRzLmxlbmd0aCkNCiAJICB7DQorCSAg
ICBzdHJlYW1fZmllbGQgPSBzdHJlYW1fZmllbGRzW3N0cmVhbV9pZHgrK107DQogCSAgfQ0KLSAg
ICAgIH0NCisJZWxzZQ0KKwkgIHsNCisJICAgIGludCBjb21wX3ZhbCA9DQorCQlyZWFsX2ZpZWxk
c1tyZWFsX2lkeF0uY29tcGFyZVRvIChzdHJlYW1fZmllbGRzW3N0cmVhbV9pZHhdKTsNCiANCi0g
ICAgYm9vbGVhbiBvbGRtb2RlID0gc2V0QmxvY2tEYXRhTW9kZSh0cnVlKTsNCi0gICAgb3NjLnNl
dENsYXNzKGNsYXp6LCBsb29rdXBDbGFzcyhjbGF6ei5nZXRTdXBlcmNsYXNzKCkpKTsNCi0gICAg
Y2xhc3NMb29rdXBUYWJsZS5wdXQoY2xhenosIG9zYyk7DQotICAgIHNldEJsb2NrRGF0YU1vZGUo
b2xkbW9kZSk7DQorCSAgICBpZiAoY29tcF92YWwgPCAwKQ0KKwkgICAgICB7DQorCQlyZWFsX2Zp
ZWxkID0gcmVhbF9maWVsZHNbcmVhbF9pZHgrK107DQorCSAgICAgIH0NCisJICAgIGVsc2UgaWYg
KGNvbXBfdmFsID4gMCkNCisJICAgICAgew0KKwkJc3RyZWFtX2ZpZWxkID0gc3RyZWFtX2ZpZWxk
c1tzdHJlYW1faWR4KytdOw0KKwkgICAgICB9DQorCSAgICBlbHNlDQorCSAgICAgIHsNCisJCXN0
cmVhbV9maWVsZCA9IHN0cmVhbV9maWVsZHNbc3RyZWFtX2lkeCsrXTsNCisJCXJlYWxfZmllbGQg
PSByZWFsX2ZpZWxkc1tyZWFsX2lkeCsrXTsNCisJCWlmKHN0cmVhbV9maWVsZC5nZXRUeXBlKCkg
IT0gcmVhbF9maWVsZC5nZXRUeXBlKCkpDQorCQkgICAgdGhyb3cgbmV3IEludmFsaWRDbGFzc0V4
Y2VwdGlvbg0KKwkJCSgiaW52YWxpZCBmaWVsZCB0eXBlIGZvciAiICsgcmVhbF9maWVsZC5nZXRO
YW1lKCkgKw0KKwkJCSIgaW4gY2xhc3MgIiArIG5hbWUpOw0KKwkgICAgICB9DQorCSAgfQ0KKwlp
ZiAoc3RyZWFtX2ZpZWxkICE9IG51bGwpDQorCSAgew0KKwkgICAgaWYgKHN0cmVhbV9maWVsZC5n
ZXRPZmZzZXQoKSA8IDApDQorCQlzdHJlYW1fZmllbGQgPSBudWxsOw0KKwkgICAgZWxzZSBpZiAo
IXN0cmVhbV9maWVsZC5pc1RvU2V0KCkpDQorCQlyZWFsX2ZpZWxkID0gbnVsbDsNCisJICB9DQor
CWlmIChyZWFsX2ZpZWxkICE9IG51bGwgJiYgIXJlYWxfZmllbGQuaXNUb1NldCgpKQ0KKwkgICAg
cmVhbF9maWVsZCA9IG51bGw7DQorCWZpZWxkbWFwcGluZ1ttYXBfaWR4KytdID0gc3RyZWFtX2Zp
ZWxkOw0KKwlmaWVsZG1hcHBpbmdbbWFwX2lkeCsrXSA9IHJlYWxfZmllbGQ7DQorICAgICAgfQ0K
IA0KICAgICByZXR1cm4gb3NjOw0KICAgfQ0KQEAgLTc2MywxMSArODA3LDExIEBADQogICBwcm90
ZWN0ZWQgdm9pZCByZWFkU3RyZWFtSGVhZGVyKCkNCiAgICAgdGhyb3dzIElPRXhjZXB0aW9uLCBT
dHJlYW1Db3JydXB0ZWRFeGNlcHRpb24NCiAgIHsNCi0gICAgZHVtcEVsZW1lbnQoIlNUUkVBTSBN
QUdJQyAiKTsNCisgICAgaWYoZHVtcCkgZHVtcEVsZW1lbnQoIlNUUkVBTSBNQUdJQyAiKTsNCiAg
ICAgaWYgKHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRTaG9ydCgpICE9IFNUUkVBTV9NQUdJQykN
CiAgICAgICB0aHJvdyBuZXcgU3RyZWFtQ29ycnVwdGVkRXhjZXB0aW9uKCJJbnZhbGlkIHN0cmVh
bSBtYWdpYyBudW1iZXIiKTsNCiANCi0gICAgZHVtcEVsZW1lbnRsbigiU1RSRUFNIFZFUlNJT04g
Iik7DQorICAgIGlmKGR1bXApIGR1bXBFbGVtZW50bG4oIlNUUkVBTSBWRVJTSU9OICIpOw0KICAg
ICBpZiAodGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZFNob3J0KCkgIT0gU1RSRUFNX1ZFUlNJT04p
DQogICAgICAgdGhyb3cgbmV3IFN0cmVhbUNvcnJ1cHRlZEV4Y2VwdGlvbigiSW52YWxpZCBzdHJl
YW0gdmVyc2lvbiBudW1iZXIiKTsNCiAgIH0NCkBAIC0xMDQ1LDcgKzEwODksNyBAQA0KICAgICog
ZGVzZXJpYWxpemluZyBjbGFzcyAoaWYgcHJlc2VudCkuIEl0IGNhbm5vdCAoYW5kIHNob3VsZCBu
b3QpYmUgY2FsbGVkDQogICAgKiBvdXRzaWRlIG9mIGl0LiBJdHMgZ29hbCBpcyB0byByZWFkIGFs
bCBmaWVsZHMgaW4gdGhlIHJlYWwgaW5wdXQgc3RyZWFtDQogICAgKiBhbmQga2VlcCB0aGVtIGFj
Y2Vzc2libGUgdGhyb3VnaCB0aGUge0BsaW5rICNHZXRGaWVsZH0gY2xhc3MuIENhbGxpbmcNCi0g
ICAqIHRoaXMgbWV0aG9kIHdpbGwgbm90IGFsdGVyYXRlIHRoZSBkZXNlcmlhbGl6aW5nIG9iamVj
dC4NCisgICAqIHRoaXMgbWV0aG9kIHdpbGwgbm90IGFsdGVyIHRoZSBkZXNlcmlhbGl6aW5nIG9i
amVjdC4NCiAgICAqDQogICAgKiBAcmV0dXJuIEEgdmFsaWQgZnJlc2hseSBjcmVhdGVkICdHZXRG
aWVsZCcgaW5zdGFuY2UgdG8gZ2V0IGFjY2VzcyB0bw0KICAgICogdGhlIGRlc2VyaWFsaXplZCBz
dHJlYW0uDQpAQCAtMTM3NSwyMCArMTQxOSwxOCBAQA0KICAgICByZXR1cm4gdGhpcy5uZXh0T0lE
Kys7DQogICB9DQogDQotICBwcml2YXRlIE9iamVjdCBwcm9jZXNzUmVzb2x1dGlvbihPYmplY3Qg
b2JqLCBpbnQgaGFuZGxlKQ0KKyAgcHJpdmF0ZSBPYmplY3QgcHJvY2Vzc1Jlc29sdXRpb24oT2Jq
ZWN0U3RyZWFtQ2xhc3Mgb3NjLCBPYmplY3Qgb2JqLCBpbnQgaGFuZGxlKQ0KICAgICB0aHJvd3Mg
SU9FeGNlcHRpb24NCiAgIHsNCi0gICAgaWYgKG9iaiBpbnN0YW5jZW9mIFNlcmlhbGl6YWJsZSkN
CisgICAgaWYgKG9zYyAhPSBudWxsICYmIG9iaiBpbnN0YW5jZW9mIFNlcmlhbGl6YWJsZSkNCiAg
ICAgICB7DQotICAgICAgICBNZXRob2QgbSA9IG51bGw7IA0KIAl0cnkNCiAJICB7DQotCSAgICBD
bGFzcyBjbGFzc0FyZ3NbXSA9IHt9Ow0KLQkgICAgbSA9IGdldE1ldGhvZChvYmouZ2V0Q2xhc3Mo
KSwgInJlYWRSZXNvbHZlIiwgY2xhc3NBcmdzKTsNCi0JICAgIG9iaiA9IG0uaW52b2tlKG9iaiwg
bmV3IE9iamVjdFtdIHt9KTsJDQotCSAgfQ0KLQljYXRjaCAoTm9TdWNoTWV0aG9kRXhjZXB0aW9u
IGlnbm9yZSkNCi0JICB7DQorCSAgICBNZXRob2QgbSA9IG9zYy5yZWFkUmVzb2x2ZU1ldGhvZDsg
DQorCSAgICBpZihtICE9IG51bGwpDQorCSAgICB7DQorCQlvYmogPSBtLmludm9rZShvYmosIG5l
dyBPYmplY3RbXSB7fSk7DQorCSAgICB9DQogCSAgfQ0KIAljYXRjaCAoSWxsZWdhbEFjY2Vzc0V4
Y2VwdGlvbiBpZ25vcmUpDQogCSAgew0KQEAgLTE0MjIsMTUgKzE0NjQsMTUgQEANCiAgIHsNCiAg
ICAgaWYgKG1hcmtlciA9PSBUQ19CTE9DS0RBVEEpDQogICAgICAgew0KLQlkdW1wRWxlbWVudCgi
QkxPQ0sgREFUQSBTSVpFPSIpOw0KKwlpZihkdW1wKSBkdW1wRWxlbWVudCgiQkxPQ0sgREFUQSBT
SVpFPSIpOw0KIAl0aGlzLmJsb2NrRGF0YUJ5dGVzID0gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVh
ZFVuc2lnbmVkQnl0ZSgpOw0KLQlkdW1wRWxlbWVudGxuIChJbnRlZ2VyLnRvU3RyaW5nKHRoaXMu
YmxvY2tEYXRhQnl0ZXMpKTsNCisJaWYoZHVtcCkgZHVtcEVsZW1lbnRsbiAoSW50ZWdlci50b1N0
cmluZyh0aGlzLmJsb2NrRGF0YUJ5dGVzKSk7DQogICAgICAgfQ0KICAgICBlbHNlIGlmIChtYXJr
ZXIgPT0gVENfQkxPQ0tEQVRBTE9ORykNCiAgICAgICB7DQotCWR1bXBFbGVtZW50KCJCTE9DSyBE
QVRBIExPTkcgU0laRT0iKTsNCisJaWYoZHVtcCkgZHVtcEVsZW1lbnQoIkJMT0NLIERBVEEgTE9O
RyBTSVpFPSIpOw0KIAl0aGlzLmJsb2NrRGF0YUJ5dGVzID0gdGhpcy5yZWFsSW5wdXRTdHJlYW0u
cmVhZEludCgpOw0KLQlkdW1wRWxlbWVudGxuIChJbnRlZ2VyLnRvU3RyaW5nKHRoaXMuYmxvY2tE
YXRhQnl0ZXMpKTsNCisJaWYoZHVtcCkgZHVtcEVsZW1lbnRsbiAoSW50ZWdlci50b1N0cmluZyh0
aGlzLmJsb2NrRGF0YUJ5dGVzKSk7DQogICAgICAgfQ0KICAgICBlbHNlDQogICAgICAgew0KQEAg
LTE1MTcsMTU5ICsxNTU5LDEyNCBAQA0KICAgcHJpdmF0ZSB2b2lkIHJlYWRGaWVsZHMgKE9iamVj
dCBvYmosIE9iamVjdFN0cmVhbUNsYXNzIHN0cmVhbV9vc2MpDQogICAgIHRocm93cyBDbGFzc05v
dEZvdW5kRXhjZXB0aW9uLCBJT0V4Y2VwdGlvbg0KICAgew0KLSAgICBPYmplY3RTdHJlYW1GaWVs
ZFtdIHN0cmVhbV9maWVsZHMgPSBzdHJlYW1fb3NjLmZpZWxkczsNCi0gICAgT2JqZWN0U3RyZWFt
RmllbGRbXSByZWFsX2ZpZWxkcyA9DQotICAgICAgbG9va3VwQ2xhc3Moc3RyZWFtX29zYy5mb3JD
bGFzcygpKS5maWVsZHM7DQotDQotICAgIGJvb2xlYW4gZGVmYXVsdF9pbml0aWFsaXplLCBzZXRf
dmFsdWU7DQotICAgIFN0cmluZyBmaWVsZF9uYW1lID0gbnVsbDsNCi0gICAgQ2xhc3MgdHlwZSA9
IG51bGw7DQotICAgIE9iamVjdFN0cmVhbUZpZWxkIHN0cmVhbV9maWVsZCA9IG51bGw7DQotICAg
IE9iamVjdFN0cmVhbUZpZWxkIHJlYWxfZmllbGQgPSBudWxsOw0KLSAgICBpbnQgc3RyZWFtX2lk
eCA9IDA7DQotICAgIGludCByZWFsX2lkeCA9IDA7DQorICAgIE9iamVjdFN0cmVhbUZpZWxkW10g
ZmllbGRzID0gc3RyZWFtX29zYy5maWVsZE1hcHBpbmc7DQogDQotICAgIHdoaWxlIChzdHJlYW1f
aWR4IDwgc3RyZWFtX2ZpZWxkcy5sZW5ndGgNCi0JICAgJiYgcmVhbF9pZHggPCByZWFsX2ZpZWxk
cy5sZW5ndGgpDQorICAgIGZvciAoaW50IGkgPSAwOyBpIDwgZmllbGRzLmxlbmd0aDsgaSArPSAy
KQ0KICAgICAgIHsNCi0JZGVmYXVsdF9pbml0aWFsaXplID0gZmFsc2U7DQotCXNldF92YWx1ZSA9
IHRydWU7DQotDQotCWlmIChzdHJlYW1faWR4ID09IHN0cmVhbV9maWVsZHMubGVuZ3RoKQ0KLQkg
IGRlZmF1bHRfaW5pdGlhbGl6ZSA9IHRydWU7DQotCWVsc2UNCi0JICB7DQotCSAgICBzdHJlYW1f
ZmllbGQgPSBzdHJlYW1fZmllbGRzW3N0cmVhbV9pZHhdOw0KLQkgICAgdHlwZSA9IHN0cmVhbV9m
aWVsZC5nZXRUeXBlKCk7DQotCSAgfQ0KLQ0KLQlpZiAocmVhbF9pZHggPT0gcmVhbF9maWVsZHMu
bGVuZ3RoKQ0KLQkgIHNldF92YWx1ZSA9IGZhbHNlOw0KLQllbHNlDQotCSAgew0KLQkgICAgcmVh
bF9maWVsZCA9IHJlYWxfZmllbGRzW3JlYWxfaWR4XTsNCi0JICAgIHR5cGUgPSByZWFsX2ZpZWxk
LmdldFR5cGUoKTsNCi0JICAgIGZpZWxkX25hbWUgPSByZWFsX2ZpZWxkLmdldE5hbWUoKTsNCi0J
ICB9DQotDQotCWlmIChzZXRfdmFsdWUgJiYgIWRlZmF1bHRfaW5pdGlhbGl6ZSkNCi0JICB7DQot
CSAgICBpbnQgY29tcF92YWwgPQ0KLQkgICAgICByZWFsX2ZpZWxkLmNvbXBhcmVUbyAoc3RyZWFt
X2ZpZWxkKTsNCi0NCi0JICAgIGlmIChjb21wX3ZhbCA8IDApDQotCSAgICAgIHsNCi0JCWRlZmF1
bHRfaW5pdGlhbGl6ZSA9IHRydWU7DQotCQlyZWFsX2lkeCsrOw0KLQkgICAgICB9DQotCSAgICBl
bHNlIGlmIChjb21wX3ZhbCA+IDApDQorCU9iamVjdFN0cmVhbUZpZWxkIHN0cmVhbV9maWVsZCA9
IGZpZWxkc1tpXTsNCisJT2JqZWN0U3RyZWFtRmllbGQgcmVhbF9maWVsZCA9IGZpZWxkc1tpICsg
MV07DQorCWlmKHN0cmVhbV9maWVsZCAhPSBudWxsIHx8IHJlYWxfZmllbGQgIT0gbnVsbCkNCisJ
ICB7DQorCSAgICBib29sZWFuIHJlYWRfdmFsdWUgPSBzdHJlYW1fZmllbGQgIT0gbnVsbDsNCisJ
ICAgIGJvb2xlYW4gc2V0X3ZhbHVlID0gcmVhbF9maWVsZCAhPSBudWxsOw0KKwkgICAgU3RyaW5n
IGZpZWxkX25hbWU7DQorCSAgICBjaGFyIHR5cGU7DQorCSAgICBpZiAoc3RyZWFtX2ZpZWxkICE9
IG51bGwpDQogCSAgICAgIHsNCi0JCXNldF92YWx1ZSA9IGZhbHNlOw0KLQkJc3RyZWFtX2lkeCsr
Ow0KKwkJZmllbGRfbmFtZSA9IHN0cmVhbV9maWVsZC5nZXROYW1lKCk7DQorCQl0eXBlID0gc3Ry
ZWFtX2ZpZWxkLmdldFR5cGVDb2RlKCk7DQogCSAgICAgIH0NCiAJICAgIGVsc2UNCiAJICAgICAg
ew0KLQkJcmVhbF9pZHgrKzsNCi0JCXN0cmVhbV9pZHgrKzsNCisJCWZpZWxkX25hbWUgPSByZWFs
X2ZpZWxkLmdldE5hbWUoKTsNCisJCXR5cGUgPSByZWFsX2ZpZWxkLmdldFR5cGVDb2RlKCk7DQog
CSAgICAgIH0NCi0JICB9DQotDQotCWlmIChzdHJlYW1fZmllbGQuZ2V0T2Zmc2V0KCkgPCAwKQ0K
LQkgIHsNCi0JICAgIGRlZmF1bHRfaW5pdGlhbGl6ZSA9IHRydWU7DQotCSAgICBzZXRfdmFsdWUg
PSBmYWxzZTsNCi0JICB9DQotCQ0KLQlpZiAoIXN0cmVhbV9maWVsZC5pc1RvU2V0KCkpIA0KLQkg
IHNldF92YWx1ZSA9IGZhbHNlOw0KIA0KLQl0cnkNCi0JICB7DQotCSAgICBpZiAodHlwZSA9PSBC
b29sZWFuLlRZUEUpDQotCSAgICAgIHsNCi0JCWJvb2xlYW4gdmFsdWUgPQ0KLQkJICBkZWZhdWx0
X2luaXRpYWxpemUgPyBmYWxzZSA6IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRCb29sZWFuKCk7
DQotCQlpZiAoIWRlZmF1bHRfaW5pdGlhbGl6ZSAmJiBzZXRfdmFsdWUpDQotCQkgIGR1bXBFbGVt
ZW50bG4oIiAgIiArIGZpZWxkX25hbWUgKyAiOiAiICsgdmFsdWUpOw0KLQkJaWYgKHNldF92YWx1
ZSkNCi0JCSAgc2V0Qm9vbGVhbkZpZWxkKG9iaiwgc3RyZWFtX29zYy5mb3JDbGFzcygpLCBmaWVs
ZF9uYW1lLCB2YWx1ZSk7DQotCSAgICAgIH0NCi0JICAgIGVsc2UgaWYgKHR5cGUgPT0gQnl0ZS5U
WVBFKQ0KLQkgICAgICB7DQotCQlieXRlIHZhbHVlID0NCi0JCSAgZGVmYXVsdF9pbml0aWFsaXpl
ID8gMCA6IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRCeXRlKCk7DQotCQlpZiAoIWRlZmF1bHRf
aW5pdGlhbGl6ZSAmJiBzZXRfdmFsdWUpDQotCQkgIGR1bXBFbGVtZW50bG4oIiAgIiArIGZpZWxk
X25hbWUgKyAiOiAiICsgdmFsdWUpOw0KLQkJaWYgKHNldF92YWx1ZSkNCi0JCSAgc2V0Qnl0ZUZp
ZWxkKG9iaiwgc3RyZWFtX29zYy5mb3JDbGFzcygpLCBmaWVsZF9uYW1lLCB2YWx1ZSk7DQotCSAg
ICAgIH0NCi0JICAgIGVsc2UgaWYgKHR5cGUgPT0gQ2hhcmFjdGVyLlRZUEUpDQotCSAgICAgIHsN
Ci0JCWNoYXIgdmFsdWUgPQ0KLQkJICBkZWZhdWx0X2luaXRpYWxpemUgPyAoY2hhcikwIDogdGhp
cy5yZWFsSW5wdXRTdHJlYW0ucmVhZENoYXIoKTsNCi0JCWlmICghZGVmYXVsdF9pbml0aWFsaXpl
ICYmIHNldF92YWx1ZSkNCi0JCSAgZHVtcEVsZW1lbnRsbigiICAiICsgZmllbGRfbmFtZSArICI6
ICIgKyB2YWx1ZSk7DQotCQlpZiAoc2V0X3ZhbHVlKQ0KLQkJICBzZXRDaGFyRmllbGQob2JqLCBz
dHJlYW1fb3NjLmZvckNsYXNzKCksIGZpZWxkX25hbWUsIHZhbHVlKTsNCi0JICAgICAgfQ0KLQkg
ICAgZWxzZSBpZiAodHlwZSA9PSBEb3VibGUuVFlQRSkNCi0JICAgICAgew0KLQkJZG91YmxlIHZh
bHVlID0NCi0JCSAgZGVmYXVsdF9pbml0aWFsaXplID8gMCA6IHRoaXMucmVhbElucHV0U3RyZWFt
LnJlYWREb3VibGUoKTsNCi0JCWlmICghZGVmYXVsdF9pbml0aWFsaXplICYmIHNldF92YWx1ZSkN
Ci0JCSAgZHVtcEVsZW1lbnRsbigiICAiICsgZmllbGRfbmFtZSArICI6ICIgKyB2YWx1ZSk7DQot
CQlpZiAoc2V0X3ZhbHVlKQ0KLQkJICBzZXREb3VibGVGaWVsZChvYmosIHN0cmVhbV9vc2MuZm9y
Q2xhc3MoKSwgZmllbGRfbmFtZSwgdmFsdWUpOw0KLQkgICAgICB9DQotCSAgICBlbHNlIGlmICh0
eXBlID09IEZsb2F0LlRZUEUpDQotCSAgICAgIHsNCi0JCWZsb2F0IHZhbHVlID0NCi0JCSAgZGVm
YXVsdF9pbml0aWFsaXplID8gMCA6IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRGbG9hdCgpOw0K
LQkJaWYgKCFkZWZhdWx0X2luaXRpYWxpemUgJiYgc2V0X3ZhbHVlKQ0KLQkJICBkdW1wRWxlbWVu
dGxuKCIgICIgKyBmaWVsZF9uYW1lICsgIjogIiArIHZhbHVlKTsNCi0JCWlmIChzZXRfdmFsdWUp
DQotCQkgIHNldEZsb2F0RmllbGQob2JqLCBzdHJlYW1fb3NjLmZvckNsYXNzKCksIGZpZWxkX25h
bWUsIHZhbHVlKTsNCi0JICAgICAgfQ0KLQkgICAgZWxzZSBpZiAodHlwZSA9PSBJbnRlZ2VyLlRZ
UEUpDQorCSAgICBzd2l0Y2godHlwZSkNCiAJICAgICAgew0KLQkJaW50IHZhbHVlID0NCi0JCSAg
ZGVmYXVsdF9pbml0aWFsaXplID8gMCA6IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRJbnQoKTsN
Ci0JCWlmICghZGVmYXVsdF9pbml0aWFsaXplICYmIHNldF92YWx1ZSkNCi0JCSAgZHVtcEVsZW1l
bnRsbigiICAiICsgZmllbGRfbmFtZSArICI6ICIgKyB2YWx1ZSk7DQotCQlpZiAoc2V0X3ZhbHVl
KQ0KLQkJICBzZXRJbnRGaWVsZChvYmosIHN0cmVhbV9vc2MuZm9yQ2xhc3MoKSwgZmllbGRfbmFt
ZSwgdmFsdWUpOw0KLQkgICAgICB9DQotCSAgICBlbHNlIGlmICh0eXBlID09IExvbmcuVFlQRSkN
Ci0JICAgICAgew0KLQkJbG9uZyB2YWx1ZSA9DQotCQkgIGRlZmF1bHRfaW5pdGlhbGl6ZSA/IDAg
OiB0aGlzLnJlYWxJbnB1dFN0cmVhbS5yZWFkTG9uZygpOw0KLQkJaWYgKCFkZWZhdWx0X2luaXRp
YWxpemUgJiYgc2V0X3ZhbHVlKQ0KLQkJICBkdW1wRWxlbWVudGxuKCIgICIgKyBmaWVsZF9uYW1l
ICsgIjogIiArIHZhbHVlKTsNCi0JCWlmIChzZXRfdmFsdWUpDQotCQkgIHNldExvbmdGaWVsZChv
YmosIHN0cmVhbV9vc2MuZm9yQ2xhc3MoKSwgZmllbGRfbmFtZSwgdmFsdWUpOw0KLQkgICAgICB9
DQotCSAgICBlbHNlIGlmICh0eXBlID09IFNob3J0LlRZUEUpDQotCSAgICAgIHsNCi0JCXNob3J0
IHZhbHVlID0NCi0JCSAgZGVmYXVsdF9pbml0aWFsaXplID8gKHNob3J0KTAgOiB0aGlzLnJlYWxJ
bnB1dFN0cmVhbS5yZWFkU2hvcnQoKTsNCi0JCWlmICghZGVmYXVsdF9pbml0aWFsaXplICYmIHNl
dF92YWx1ZSkNCi0JCSAgZHVtcEVsZW1lbnRsbigiICAiICsgZmllbGRfbmFtZSArICI6ICIgKyB2
YWx1ZSk7DQotCQlpZiAoc2V0X3ZhbHVlKQ0KLQkJICBzZXRTaG9ydEZpZWxkKG9iaiwgc3RyZWFt
X29zYy5mb3JDbGFzcygpLCBmaWVsZF9uYW1lLCB2YWx1ZSk7DQotCSAgICAgIH0NCi0JICAgIGVs
c2UNCi0JICAgICAgew0KLQkJT2JqZWN0IHZhbHVlID0NCi0JCSAgZGVmYXVsdF9pbml0aWFsaXpl
ID8gbnVsbCA6IHJlYWRPYmplY3QoKTsNCi0JCWlmIChzZXRfdmFsdWUpDQotCQkgIHNldE9iamVj
dEZpZWxkKG9iaiwgc3RyZWFtX29zYy5mb3JDbGFzcygpLCBmaWVsZF9uYW1lLA0KLQkJCQkgIHJl
YWxfZmllbGQuZ2V0VHlwZVN0cmluZygpLCB2YWx1ZSk7DQorCQljYXNlICdaJzoNCisJCSAgew0K
KwkJICAgIGJvb2xlYW4gdmFsdWUgPQ0KKwkJCXJlYWRfdmFsdWUgPyB0aGlzLnJlYWxJbnB1dFN0
cmVhbS5yZWFkQm9vbGVhbigpIDogZmFsc2U7DQorCQkgICAgaWYgKGR1bXAgJiYgcmVhZF92YWx1
ZSAmJiBzZXRfdmFsdWUpDQorCQkgICAgZHVtcEVsZW1lbnRsbigiICAiICsgZmllbGRfbmFtZSAr
ICI6ICIgKyB2YWx1ZSk7DQorCQkgICAgaWYgKHNldF92YWx1ZSkNCisJCQlyZWFsX2ZpZWxkLnNl
dEJvb2xlYW5GaWVsZChvYmosIHZhbHVlKTsNCisJCSAgICBicmVhazsNCisJCSAgfQ0KKwkJY2Fz
ZSAnQic6DQorCQkgIHsNCisJCSAgICBieXRlIHZhbHVlID0NCisJCQlyZWFkX3ZhbHVlID8gdGhp
cy5yZWFsSW5wdXRTdHJlYW0ucmVhZEJ5dGUoKSA6IDA7DQorCQkgICAgaWYgKGR1bXAgJiYgcmVh
ZF92YWx1ZSAmJiBzZXRfdmFsdWUpDQorCQkgICAgZHVtcEVsZW1lbnRsbigiICAiICsgZmllbGRf
bmFtZSArICI6ICIgKyB2YWx1ZSk7DQorCQkgICAgaWYgKHNldF92YWx1ZSkNCisJCQlyZWFsX2Zp
ZWxkLnNldEJ5dGVGaWVsZChvYmosIHZhbHVlKTsNCisJCSAgICBicmVhazsNCisJCSAgfQ0KKwkJ
Y2FzZSAnQyc6DQorCQkgIHsNCisJCSAgICBjaGFyIHZhbHVlID0NCisJCQlyZWFkX3ZhbHVlID8g
dGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZENoYXIoKTogMDsNCisJCSAgICBpZiAoZHVtcCAmJiBy
ZWFkX3ZhbHVlICYmIHNldF92YWx1ZSkNCisJCSAgICBkdW1wRWxlbWVudGxuKCIgICIgKyBmaWVs
ZF9uYW1lICsgIjogIiArIHZhbHVlKTsNCisJCSAgICBpZiAoc2V0X3ZhbHVlKQ0KKwkJCXJlYWxf
ZmllbGQuc2V0Q2hhckZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJICAgIGJyZWFrOw0KKwkJICB9DQor
CQljYXNlICdEJzoNCisJCSAgew0KKwkJICAgIGRvdWJsZSB2YWx1ZSA9DQorCQkJcmVhZF92YWx1
ZSA/IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWREb3VibGUoKSA6IDA7DQorCQkgICAgaWYgKGR1
bXAgJiYgcmVhZF92YWx1ZSAmJiBzZXRfdmFsdWUpDQorCQkgICAgZHVtcEVsZW1lbnRsbigiICAi
ICsgZmllbGRfbmFtZSArICI6ICIgKyB2YWx1ZSk7DQorCQkgICAgaWYgKHNldF92YWx1ZSkNCisJ
CQlyZWFsX2ZpZWxkLnNldERvdWJsZUZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJICAgIGJyZWFrOw0K
KwkJICB9DQorCQljYXNlICdGJzoNCisJCSAgew0KKwkJICAgIGZsb2F0IHZhbHVlID0NCisJCQly
ZWFkX3ZhbHVlID8gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZEZsb2F0KCkgOiAwOw0KKwkJICAg
IGlmIChkdW1wICYmIHJlYWRfdmFsdWUgJiYgc2V0X3ZhbHVlKQ0KKwkJICAgIGR1bXBFbGVtZW50
bG4oIiAgIiArIGZpZWxkX25hbWUgKyAiOiAiICsgdmFsdWUpOw0KKwkJICAgIGlmIChzZXRfdmFs
dWUpDQorCQkJcmVhbF9maWVsZC5zZXRGbG9hdEZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJICAgIGJy
ZWFrOw0KKwkJICB9DQorCQljYXNlICdJJzoNCisJCSAgew0KKwkJICAgIGludCB2YWx1ZSA9DQor
CQkJcmVhZF92YWx1ZSA/IHRoaXMucmVhbElucHV0U3RyZWFtLnJlYWRJbnQoKSA6IDA7DQorCQkg
ICAgaWYgKGR1bXAgJiYgcmVhZF92YWx1ZSAmJiBzZXRfdmFsdWUpDQorCQkgICAgZHVtcEVsZW1l
bnRsbigiICAiICsgZmllbGRfbmFtZSArICI6ICIgKyB2YWx1ZSk7DQorCQkgICAgaWYgKHNldF92
YWx1ZSkNCisJCQlyZWFsX2ZpZWxkLnNldEludEZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJICAgIGJy
ZWFrOw0KKwkJICB9DQorCQljYXNlICdKJzoNCisJCSAgew0KKwkJICAgIGxvbmcgdmFsdWUgPQ0K
KwkJCXJlYWRfdmFsdWUgPyB0aGlzLnJlYWxJbnB1dFN0cmVhbS5yZWFkTG9uZygpIDogMDsNCisJ
CSAgICBpZiAoZHVtcCAmJiByZWFkX3ZhbHVlICYmIHNldF92YWx1ZSkNCisJCSAgICBkdW1wRWxl
bWVudGxuKCIgICIgKyBmaWVsZF9uYW1lICsgIjogIiArIHZhbHVlKTsNCisJCSAgICBpZiAoc2V0
X3ZhbHVlKQ0KKwkJCXJlYWxfZmllbGQuc2V0TG9uZ0ZpZWxkKG9iaiwgdmFsdWUpOw0KKwkJICAg
IGJyZWFrOw0KKwkJICB9DQorCQljYXNlICdTJzoNCisJCSAgew0KKwkJICAgIHNob3J0IHZhbHVl
ID0NCisJCQlyZWFkX3ZhbHVlID8gdGhpcy5yZWFsSW5wdXRTdHJlYW0ucmVhZFNob3J0KCkgOiAw
Ow0KKwkJICAgIGlmIChkdW1wICYmIHJlYWRfdmFsdWUgJiYgc2V0X3ZhbHVlKQ0KKwkJICAgIGR1
bXBFbGVtZW50bG4oIiAgIiArIGZpZWxkX25hbWUgKyAiOiAiICsgdmFsdWUpOw0KKwkJICAgIGlm
IChzZXRfdmFsdWUpDQorCQkJcmVhbF9maWVsZC5zZXRTaG9ydEZpZWxkKG9iaiwgdmFsdWUpOw0K
KwkJICAgIGJyZWFrOw0KKwkJICB9DQorCQljYXNlICdMJzoNCisJCWNhc2UgJ1snOg0KKwkJICB7
DQorCQkgICAgT2JqZWN0IHZhbHVlID0NCisJCQlyZWFkX3ZhbHVlID8gcmVhZE9iamVjdCgpIDog
bnVsbDsNCisJCSAgICBpZiAoc2V0X3ZhbHVlKQ0KKwkJCXJlYWxfZmllbGQuc2V0T2JqZWN0Rmll
bGQob2JqLCB2YWx1ZSk7DQorCQkgICAgYnJlYWs7DQorCQkgIH0NCisJCWRlZmF1bHQ6DQorCQkg
ICAgdGhyb3cgbmV3IEludGVybmFsRXJyb3IoIkludmFsaWQgdHlwZSBjb2RlOiAiICsgdHlwZSk7
DQogCSAgICAgIH0NCiAJICB9DQotCWNhdGNoIChOb1N1Y2hGaWVsZEVycm9yIGUpDQotCSAgew0K
LQkgICAgZHVtcEVsZW1lbnRsbigiWFhYWCAiICsgZmllbGRfbmFtZSArICIgZG9lcyBub3QgZXhp
c3QuIik7DQotCSAgfQ0KICAgICAgIH0NCiAgIH0NCiANCkBAIC0xNjg5LDYgKzE2OTYsNyBAQA0K
ICAgLy8gcmV0dXJucyBhIG5ldyBpbnN0YW5jZSBvZiBSRUFMX0NMQVNTIHRoYXQgaGFzIGJlZW4g
Y29uc3RydWN0ZWQNCiAgIC8vIG9ubHkgdG8gdGhlIGxldmVsIG9mIENPTlNUUlVDVE9SX0NMQVNT
IChhIHN1cGVyIGNsYXNzIG9mIFJFQUxfQ0xBU1MpDQogICBwcml2YXRlIE9iamVjdCBuZXdPYmpl
Y3QgKENsYXNzIHJlYWxfY2xhc3MsIENsYXNzIGNvbnN0cnVjdG9yX2NsYXNzKQ0KKyAgICB0aHJv
d3MgQ2xhc3NOb3RGb3VuZEV4Y2VwdGlvbg0KICAgew0KICAgICB0cnkNCiAgICAgICB7DQpAQCAt
MTY5OCw3ICsxNzA2LDggQEANCiAgICAgICB9DQogICAgIGNhdGNoIChJbnN0YW50aWF0aW9uRXhj
ZXB0aW9uIGUpDQogICAgICAgew0KLQlyZXR1cm4gbnVsbDsNCisgICAgICAgIHRocm93IG5ldyBD
bGFzc05vdEZvdW5kRXhjZXB0aW9uDQorCQkoIkluc3RhbmNlIG9mICIgKyByZWFsX2NsYXNzICsg
IiBjb3VsZCBub3QgYmUgY3JlYXRlZCIpOw0KICAgICAgIH0NCiAgIH0NCiANCkBAIC0xNzMwLDcx
ICsxNzM5LDExIEBADQogICAgKi8NCiAgIHByaXZhdGUgc3RhdGljIG5hdGl2ZSBDbGFzc0xvYWRl
ciBjdXJyZW50Q2xhc3NMb2FkZXIgKFNlY3VyaXR5TWFuYWdlciBzbSk7DQogDQotICAvKioNCi0g
ICAqIFRoaXMgbWV0aG9kIHRyaWVzIHRvIGFjY2VzcyBhIHByZWNpc2UgZmllbGQgY2FsbGVkIGlu
IHRoZQ0KLSAgICogc3BlY2lmaWVkIGNsYXNzLiBCZWZvcmUgYWNjZXNzaW5nIHRoZSBmaWVsZCwg
aXQgdHJpZXMgdG8NCi0gICAqIGdhaW4gY29udHJvbCBvbiB0aGlzIGZpZWxkLiBJZiB0aGUgZmll
bGQgaXMgZWl0aGVyIGRlY2xhcmVkIGFzIA0KLSAgICogbm90IHBlcnNpc3RlbnQgb3IgdHJhbnNp
ZW50IHRoZW4gaXQgcmV0dXJucyBudWxsDQotICAgKiBpbW1lZGlhdGVseS4NCi0gICAqDQotICAg
KiBAcGFyYW0ga2xhc3MgQ2xhc3MgdG8gZ2V0IHRoZSBmaWVsZCBmcm9tLg0KLSAgICogQHBhcmFt
IG5hbWUgTmFtZSBvZiB0aGUgZmllbGQgdG8gYWNjZXNzLg0KLSAgICogQHJldHVybiBGaWVsZCBp
bnN0YW5jZSByZXByZXNlbnRpbmcgdGhlIHJlcXVlc3RlZCBmaWVsZC4NCi0gICAqIEB0aHJvd3Mg
Tm9TdWNoRmllbGRFeGNlcHRpb24gaWYgdGhlIGZpZWxkIGRvZXMgbm90IGV4aXN0Lg0KLSAgICov
DQotICBwcml2YXRlIEZpZWxkIGdldEZpZWxkKENsYXNzIGtsYXNzLCBTdHJpbmcgbmFtZSkNCi0g
ICAgdGhyb3dzIGphdmEubGFuZy5Ob1N1Y2hGaWVsZEV4Y2VwdGlvbg0KKyAgcHJpdmF0ZSB2b2lk
IGNhbGxSZWFkTWV0aG9kIChNZXRob2QgcmVhZE9iamVjdCwgQ2xhc3Mga2xhc3MsIE9iamVjdCBv
YmopIHRocm93cyBJT0V4Y2VwdGlvbg0KICAgew0KLSAgICBmaW5hbCBGaWVsZCBmID0ga2xhc3Mu
Z2V0RGVjbGFyZWRGaWVsZChuYW1lKTsNCi0gICAgT2JqZWN0U3RyZWFtRmllbGQgc2YgPSBsb29r
dXBDbGFzcyhrbGFzcykuZ2V0RmllbGQobmFtZSk7DQotICAgIA0KLSAgICBBY2Nlc3NDb250cm9s
bGVyLmRvUHJpdmlsZWdlZChuZXcgUHJpdmlsZWdlZEFjdGlvbigpDQotICAgICAgew0KLQlwdWJs
aWMgT2JqZWN0IHJ1bigpDQotCXsNCi0JICBmLnNldEFjY2Vzc2libGUodHJ1ZSk7DQotCSAgcmV0
dXJuIG51bGw7DQotCX0NCi0gICAgICB9KTsNCi0NCi0gICAgLyogV2UgZG8gbm90IHdhbnQgdG8g
bW9kaWZ5IHRyYW5zaWVudCBmaWVsZHMuIFRoZXkgc2hvdWxkDQotICAgICAqIGJlIGxlZnQgdG8g
MC4NCi0gICAgICogTi5CLjogTm90IHZhbGlkIGlmIHRoZSBmaWVsZCBpcyBpbiBzZXJpYWxQZXJz
aXN0ZW50RmllbGRzLiANCi0gICAgICovDQotICAgIGlmIChNb2RpZmllci5pc1RyYW5zaWVudChm
LmdldE1vZGlmaWVycygpKSAmJiAhc2YuaXNQZXJzaXN0ZW50KCkpDQotICAgICAgcmV0dXJuIG51
bGw7DQotICAgDQotICAgIHJldHVybiBmOw0KLSAgfQ0KLQ0KLSAgcHJpdmF0ZSBzdGF0aWMgTWV0
aG9kIGdldE1ldGhvZCAoQ2xhc3Mga2xhc3MsIFN0cmluZyBuYW1lLCBDbGFzcyBhcmdzW10pDQot
ICAgIHRocm93cyBqYXZhLmxhbmcuTm9TdWNoTWV0aG9kRXhjZXB0aW9uDQotICB7DQotICAgIGZp
bmFsIE1ldGhvZCBtID0ga2xhc3MuZ2V0RGVjbGFyZWRNZXRob2QobmFtZSwgYXJncyk7DQotICAg
IEFjY2Vzc0NvbnRyb2xsZXIuZG9Qcml2aWxlZ2VkKG5ldyBQcml2aWxlZ2VkQWN0aW9uKCkNCi0g
ICAgICB7DQotCXB1YmxpYyBPYmplY3QgcnVuKCkNCi0Jew0KLQkgIG0uc2V0QWNjZXNzaWJsZSh0
cnVlKTsNCi0JICByZXR1cm4gbnVsbDsNCi0JfQ0KLSAgICAgIH0pOw0KLSAgICByZXR1cm4gbTsN
Ci0gIH0NCi0NCi0gIHByaXZhdGUgdm9pZCBjYWxsUmVhZE1ldGhvZCAoT2JqZWN0IG9iaiwgT2Jq
ZWN0U3RyZWFtQ2xhc3Mgb3NjKSB0aHJvd3MgSU9FeGNlcHRpb24NCi0gIHsNCi0gICAgQ2xhc3Mg
a2xhc3MgPSBvc2MuZm9yQ2xhc3MoKTsNCiAgICAgdHJ5DQogICAgICAgew0KLQlDbGFzcyBjbGFz
c0FyZ3NbXSA9IHtPYmplY3RJbnB1dFN0cmVhbS5jbGFzc307DQotCU1ldGhvZCBtID0gZ2V0TWV0
aG9kIChrbGFzcywgInJlYWRPYmplY3QiLCBjbGFzc0FyZ3MpOw0KLQlPYmplY3QgYXJnc1tdID0g
e3RoaXN9Ow0KLQltLmludm9rZShvYmosIGFyZ3MpOw0KLSAgICAgIH0NCi0gICAgY2F0Y2ggKE5v
U3VjaE1ldGhvZEV4Y2VwdGlvbiBuc21lKQ0KLSAgICAgIHsNCi0JLy8gTm90aGluZy4NCisJcmVh
ZE9iamVjdC5pbnZva2Uob2JqLCBuZXcgT2JqZWN0W10geyB0aGlzIH0pOw0KICAgICAgIH0NCiAg
ICAgY2F0Y2ggKEludm9jYXRpb25UYXJnZXRFeGNlcHRpb24geCkNCiAgICAgICB7DQpAQCAtMTgy
MywyNjUgKzE3NzIsNyBAQA0KIA0KICAgcHJpdmF0ZSBuYXRpdmUgdm9pZCBjYWxsQ29uc3RydWN0
b3IgKENsYXNzIGNsYXp6LCBPYmplY3Qgb2JqKTsNCiANCi0gIC8qKg0KLSAgICogVGhpcyBtZXRo
b2Qgd3JpdGVzIGEgImJvb2xlYW4iIHZhbHVlIDxjb2RlPnZhbDwvY29kZT4gaW4gdGhlIHNwZWNp
ZmllZCBmaWVsZA0KLSAgICogb2YgdGhlIGluc3RhbmNlIDxjb2RlPm9iajwvY29kZT4gb2YgdGhl
IHR5cGUgPGNvZGU+a2xhc3M8L2NvZGU+Lg0KLSAgICoNCi0gICAqIEBwYXJhbSBvYmogSW5zdGFu
Y2UgdG8gc2V0dXAuDQotICAgKiBAcGFyYW0ga2xhc3MgQ2xhc3MgdHlwZSBvZiB0aGUgc3BlY2lm
aWVkIGluc3RhbmNlLg0KLSAgICogQHBhcmFtIGZpZWxkX25hbWUgTmFtZSBvZiB0aGUgZmllbGQg
aW4gdGhlIHNwZWNpZmllZCBjbGFzcyB0eXBlLg0KLSAgICogQHBhcmFtIHZhbCBUaGUgYm9vbGVh
biB2YWx1ZSB0byB3cml0ZSBpbnRvIHRoZSBmaWVsZC4NCi0gICAqIEB0aHJvd3MgSW52YWxpZENs
YXNzRXhjZXB0aW9uIGlmIHRoZSBzcGVjaWZpZWQgZmllbGQgaGFzIG5vdCB0aGUgcmVxdWlyZWQg
dHlwZS4NCi0gICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gaWYgdGhlcmUgaXMgbm8gZmllbGQgb2Yg
dGhhdCBuYW1lIGluIHRoZSBzcGVjaWZpZWQgY2xhc3MuDQotICAgKi8NCi0gIHByaXZhdGUgdm9p
ZCBzZXRCb29sZWFuRmllbGQoT2JqZWN0IG9iaiwgQ2xhc3Mga2xhc3MsIFN0cmluZyBmaWVsZF9u
YW1lLA0KLQkJCQlib29sZWFuIHZhbCkgdGhyb3dzIElPRXhjZXB0aW9uLCBJbnZhbGlkQ2xhc3NF
eGNlcHRpb24NCi0gIHsNCi0gICAgdHJ5DQotICAgICAgew0KLQlGaWVsZCBmID0gZ2V0RmllbGQo
a2xhc3MsIGZpZWxkX25hbWUpOw0KLQlmLnNldEJvb2xlYW4ob2JqLCB2YWwpOw0KLSAgICAgIH0N
Ci0gICAgY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2VwdGlvbiBfKQ0KLSAgICAgIHsNCi0JdGhy
b3cgbmV3IEludmFsaWRDbGFzc0V4Y2VwdGlvbigiaW5jb21wYXRpYmxlIGZpZWxkIHR5cGUgZm9y
ICIgKyBrbGFzcy5nZXROYW1lKCkgKyAiLiIgKyBmaWVsZF9uYW1lKTsNCi0gICAgICB9DQotICAg
IGNhdGNoIChFeGNlcHRpb24gXykNCi0gICAgICB7DQotICAgICAgfSAgICANCi0gIH0NCi0NCi0g
IC8qKg0KLSAgICogVGhpcyBtZXRob2Qgd3JpdGVzIGEgImJ5dGUiIHZhbHVlIDxjb2RlPnZhbDwv
Y29kZT4gaW4gdGhlIHNwZWNpZmllZCBmaWVsZA0KLSAgICogb2YgdGhlIGluc3RhbmNlIDxjb2Rl
Pm9iajwvY29kZT4gb2YgdGhlIHR5cGUgPGNvZGU+a2xhc3M8L2NvZGU+Lg0KLSAgICoNCi0gICAq
IEBwYXJhbSBvYmogSW5zdGFuY2UgdG8gc2V0dXAuDQotICAgKiBAcGFyYW0ga2xhc3MgQ2xhc3Mg
dHlwZSBvZiB0aGUgc3BlY2lmaWVkIGluc3RhbmNlLg0KLSAgICogQHBhcmFtIGZpZWxkX25hbWUg
TmFtZSBvZiB0aGUgZmllbGQgaW4gdGhlIHNwZWNpZmllZCBjbGFzcyB0eXBlLg0KLSAgICogQHBh
cmFtIHZhbCBUaGUgYnl0ZSB2YWx1ZSB0byB3cml0ZSBpbnRvIHRoZSBmaWVsZC4NCi0gICAqIEB0
aHJvd3MgSW52YWxpZENsYXNzRXhjZXB0aW9uIGlmIHRoZSBzcGVjaWZpZWQgZmllbGQgaGFzIG5v
dCB0aGUgcmVxdWlyZWQgdHlwZS4NCi0gICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gaWYgdGhlcmUg
aXMgbm8gZmllbGQgb2YgdGhhdCBuYW1lIGluIHRoZSBzcGVjaWZpZWQgY2xhc3MuDQotICAgKi8N
Ci0gIHByaXZhdGUgdm9pZCBzZXRCeXRlRmllbGQoT2JqZWN0IG9iaiwgQ2xhc3Mga2xhc3MsIFN0
cmluZyBmaWVsZF9uYW1lLA0KLQkJCSAgICAgYnl0ZSB2YWwpIHRocm93cyBJT0V4Y2VwdGlvbiwg
SW52YWxpZENsYXNzRXhjZXB0aW9uDQotICB7DQotICAgIHRyeQ0KLSAgICAgIHsNCi0JRmllbGQg
ZiA9IGdldEZpZWxkKGtsYXNzLCBmaWVsZF9uYW1lKTsNCi0JZi5zZXRCeXRlKG9iaiwgdmFsKTsN
Ci0gICAgICB9DQotICAgIGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gXykNCi0gICAg
ICB7DQotCXRocm93IG5ldyBJbnZhbGlkQ2xhc3NFeGNlcHRpb24oImluY29tcGF0aWJsZSBmaWVs
ZCB0eXBlIGZvciAiICsga2xhc3MuZ2V0TmFtZSgpICsgIi4iICsgZmllbGRfbmFtZSk7DQotICAg
ICAgfQ0KLSAgICBjYXRjaCAoRXhjZXB0aW9uIF8pDQotICAgICAgew0KLSAgICAgIH0gICAgDQot
ICB9DQotDQotICAvKioNCi0gICAqIFRoaXMgbWV0aG9kIHdyaXRlcyBhICJjaGFyYWN0ZXIiIHZh
bHVlIDxjb2RlPnZhbDwvY29kZT4gaW4gdGhlIHNwZWNpZmllZCBmaWVsZA0KLSAgICogb2YgdGhl
IGluc3RhbmNlIDxjb2RlPm9iajwvY29kZT4gb2YgdGhlIHR5cGUgPGNvZGU+a2xhc3M8L2NvZGU+
Lg0KLSAgICoNCi0gICAqIEBwYXJhbSBvYmogSW5zdGFuY2UgdG8gc2V0dXAuDQotICAgKiBAcGFy
YW0ga2xhc3MgQ2xhc3MgdHlwZSBvZiB0aGUgc3BlY2lmaWVkIGluc3RhbmNlLg0KLSAgICogQHBh
cmFtIGZpZWxkX25hbWUgTmFtZSBvZiB0aGUgZmllbGQgaW4gdGhlIHNwZWNpZmllZCBjbGFzcyB0
eXBlLg0KLSAgICogQHBhcmFtIHZhbCBUaGUgY2hhcmFjdGVyIHZhbHVlIHRvIHdyaXRlIGludG8g
dGhlIGZpZWxkLg0KLSAgICogQHRocm93cyBJbnZhbGlkQ2xhc3NFeGNlcHRpb24gaWYgdGhlIHNw
ZWNpZmllZCBmaWVsZCBoYXMgbm90IHRoZSByZXF1aXJlZCB0eXBlLg0KLSAgICogQHRocm93cyBJ
T0V4Y2VwdGlvbiBpZiB0aGVyZSBpcyBubyBmaWVsZCBvZiB0aGF0IG5hbWUgaW4gdGhlIHNwZWNp
ZmllZCBjbGFzcy4NCi0gICAqLw0KLSAgcHJpdmF0ZSB2b2lkIHNldENoYXJGaWVsZChPYmplY3Qg
b2JqLCBDbGFzcyBrbGFzcywgU3RyaW5nIGZpZWxkX25hbWUsDQotCQkJICAgICBjaGFyIHZhbCkg
dGhyb3dzIElPRXhjZXB0aW9uLCBJbnZhbGlkQ2xhc3NFeGNlcHRpb24NCi0gIHsNCi0gICAgdHJ5
DQotICAgICAgew0KLQlGaWVsZCBmID0gZ2V0RmllbGQoa2xhc3MsIGZpZWxkX25hbWUpOw0KLQlm
LnNldENoYXIob2JqLCB2YWwpOw0KLSAgICAgIH0NCi0gICAgY2F0Y2ggKElsbGVnYWxBcmd1bWVu
dEV4Y2VwdGlvbiBfKQ0KLSAgICAgIHsNCi0JdGhyb3cgbmV3IEludmFsaWRDbGFzc0V4Y2VwdGlv
bigiaW5jb21wYXRpYmxlIGZpZWxkIHR5cGUgZm9yICIgKyBrbGFzcy5nZXROYW1lKCkgKyAiLiIg
KyBmaWVsZF9uYW1lKTsNCi0gICAgICB9DQotICAgIGNhdGNoIChFeGNlcHRpb24gXykNCi0gICAg
ICB7DQotICAgICAgfSAgICANCi0gIH0NCi0NCi0gIC8qKg0KLSAgICogVGhpcyBtZXRob2Qgd3Jp
dGVzIGEgImRvdWJsZSIgdmFsdWUgPGNvZGU+dmFsPC9jb2RlPiBpbiB0aGUgc3BlY2lmaWVkIGZp
ZWxkDQotICAgKiBvZiB0aGUgaW5zdGFuY2UgPGNvZGU+b2JqPC9jb2RlPiBvZiB0aGUgdHlwZSA8
Y29kZT5rbGFzczwvY29kZT4uDQotICAgKg0KLSAgICogQHBhcmFtIG9iaiBJbnN0YW5jZSB0byBz
ZXR1cC4NCi0gICAqIEBwYXJhbSBrbGFzcyBDbGFzcyB0eXBlIG9mIHRoZSBzcGVjaWZpZWQgaW5z
dGFuY2UuDQotICAgKiBAcGFyYW0gZmllbGRfbmFtZSBOYW1lIG9mIHRoZSBmaWVsZCBpbiB0aGUg
c3BlY2lmaWVkIGNsYXNzIHR5cGUuDQotICAgKiBAcGFyYW0gdmFsIFRoZSBkb3VibGUgdmFsdWUg
dG8gd3JpdGUgaW50byB0aGUgZmllbGQuDQotICAgKiBAdGhyb3dzIEludmFsaWRDbGFzc0V4Y2Vw
dGlvbiBpZiB0aGUgc3BlY2lmaWVkIGZpZWxkIGhhcyBub3QgdGhlIHJlcXVpcmVkIHR5cGUuDQot
ICAgKiBAdGhyb3dzIElPRXhjZXB0aW9uIGlmIHRoZXJlIGlzIG5vIGZpZWxkIG9mIHRoYXQgbmFt
ZSBpbiB0aGUgc3BlY2lmaWVkIGNsYXNzLg0KLSAgICovDQotICBwcml2YXRlIHZvaWQgc2V0RG91
YmxlRmllbGQoT2JqZWN0IG9iaiwgQ2xhc3Mga2xhc3MsIFN0cmluZyBmaWVsZF9uYW1lLA0KLQkJ
CSAgICAgICBkb3VibGUgdmFsKSB0aHJvd3MgSU9FeGNlcHRpb24sIEludmFsaWRDbGFzc0V4Y2Vw
dGlvbg0KLSAgew0KLSAgICB0cnkNCi0gICAgICB7DQotCUZpZWxkIGYgPSBnZXRGaWVsZChrbGFz
cywgZmllbGRfbmFtZSk7DQotCWYuc2V0RG91YmxlKG9iaiwgdmFsKTsNCi0gICAgICB9DQotICAg
IGNhdGNoIChJbGxlZ2FsQXJndW1lbnRFeGNlcHRpb24gXykNCi0gICAgICB7DQotCXRocm93IG5l
dyBJbnZhbGlkQ2xhc3NFeGNlcHRpb24oImluY29tcGF0aWJsZSBmaWVsZCB0eXBlIGZvciAiICsg
a2xhc3MuZ2V0TmFtZSgpICsgIi4iICsgZmllbGRfbmFtZSk7DQotICAgICAgfQ0KLSAgICBjYXRj
aCAoRXhjZXB0aW9uIF8pDQotICAgICAgew0KLSAgICAgIH0gICAgDQotICB9DQotDQotICAvKioN
Ci0gICAqIFRoaXMgbWV0aG9kIHdyaXRlcyBhICJmbG9hdCIgdmFsdWUgPGNvZGU+dmFsPC9jb2Rl
PiBpbiB0aGUgc3BlY2lmaWVkIGZpZWxkDQotICAgKiBvZiB0aGUgaW5zdGFuY2UgPGNvZGU+b2Jq
PC9jb2RlPiBvZiB0aGUgdHlwZSA8Y29kZT5rbGFzczwvY29kZT4uDQotICAgKg0KLSAgICogQHBh
cmFtIG9iaiBJbnN0YW5jZSB0byBzZXR1cC4NCi0gICAqIEBwYXJhbSBrbGFzcyBDbGFzcyB0eXBl
IG9mIHRoZSBzcGVjaWZpZWQgaW5zdGFuY2UuDQotICAgKiBAcGFyYW0gZmllbGRfbmFtZSBOYW1l
IG9mIHRoZSBmaWVsZCBpbiB0aGUgc3BlY2lmaWVkIGNsYXNzIHR5cGUuDQotICAgKiBAcGFyYW0g
dmFsIFRoZSBmbG9hdCB2YWx1ZSB0byB3cml0ZSBpbnRvIHRoZSBmaWVsZC4NCi0gICAqIEB0aHJv
d3MgSW52YWxpZENsYXNzRXhjZXB0aW9uIGlmIHRoZSBzcGVjaWZpZWQgZmllbGQgaGFzIG5vdCB0
aGUgcmVxdWlyZWQgdHlwZS4NCi0gICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gaWYgdGhlcmUgaXMg
bm8gZmllbGQgb2YgdGhhdCBuYW1lIGluIHRoZSBzcGVjaWZpZWQgY2xhc3MuDQotICAgKi8NCi0g
IHByaXZhdGUgdm9pZCBzZXRGbG9hdEZpZWxkKE9iamVjdCBvYmosIENsYXNzIGtsYXNzLCBTdHJp
bmcgZmllbGRfbmFtZSwNCi0JCQkgICAgICBmbG9hdCB2YWwpIHRocm93cyBJT0V4Y2VwdGlvbiwg
SW52YWxpZENsYXNzRXhjZXB0aW9uDQotICB7DQotICAgIHRyeQ0KLSAgICAgIHsNCi0JRmllbGQg
ZiA9IGdldEZpZWxkKGtsYXNzLCBmaWVsZF9uYW1lKTsNCi0JZi5zZXRGbG9hdChvYmosIHZhbCk7
DQotICAgICAgfQ0KLSAgICBjYXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIF8pDQotICAg
ICAgew0KLQl0aHJvdyBuZXcgSW52YWxpZENsYXNzRXhjZXB0aW9uKCJpbmNvbXBhdGlibGUgZmll
bGQgdHlwZSBmb3IgIiArIGtsYXNzLmdldE5hbWUoKSArICIuIiArIGZpZWxkX25hbWUpOw0KLSAg
ICAgIH0NCi0gICAgY2F0Y2ggKEV4Y2VwdGlvbiBfKQ0KLSAgICAgIHsNCi0gICAgICB9ICAgIA0K
LSAgfQ0KLQ0KLSAgLyoqDQotICAgKiBUaGlzIG1ldGhvZCB3cml0ZXMgYW4gImludGVnZXIiIHZh
bHVlIDxjb2RlPnZhbDwvY29kZT4gaW4gdGhlIHNwZWNpZmllZCBmaWVsZA0KLSAgICogb2YgdGhl
IGluc3RhbmNlIDxjb2RlPm9iajwvY29kZT4gb2YgdGhlIHR5cGUgPGNvZGU+a2xhc3M8L2NvZGU+
Lg0KLSAgICoNCi0gICAqIEBwYXJhbSBvYmogSW5zdGFuY2UgdG8gc2V0dXAuDQotICAgKiBAcGFy
YW0ga2xhc3MgQ2xhc3MgdHlwZSBvZiB0aGUgc3BlY2lmaWVkIGluc3RhbmNlLg0KLSAgICogQHBh
cmFtIGZpZWxkX25hbWUgTmFtZSBvZiB0aGUgZmllbGQgaW4gdGhlIHNwZWNpZmllZCBjbGFzcyB0
eXBlLg0KLSAgICogQHBhcmFtIHZhbCBUaGUgaW50ZWdlciB2YWx1ZSB0byB3cml0ZSBpbnRvIHRo
ZSBmaWVsZC4NCi0gICAqIEB0aHJvd3MgSW52YWxpZENsYXNzRXhjZXB0aW9uIGlmIHRoZSBzcGVj
aWZpZWQgZmllbGQgaGFzIG5vdCB0aGUgcmVxdWlyZWQgdHlwZS4NCi0gICAqIEB0aHJvd3MgSU9F
eGNlcHRpb24gaWYgdGhlcmUgaXMgbm8gZmllbGQgb2YgdGhhdCBuYW1lIGluIHRoZSBzcGVjaWZp
ZWQgY2xhc3MuDQotICAgKi8NCi0gIHByaXZhdGUgdm9pZCBzZXRJbnRGaWVsZChPYmplY3Qgb2Jq
LCBDbGFzcyBrbGFzcywgU3RyaW5nIGZpZWxkX25hbWUsDQotCQkJICAgIGludCB2YWwpIHRocm93
cyBJT0V4Y2VwdGlvbiwgSW52YWxpZENsYXNzRXhjZXB0aW9uDQotICB7DQotICAgIHRyeQ0KLSAg
ICAgIHsNCi0JRmllbGQgZiA9IGdldEZpZWxkKGtsYXNzLCBmaWVsZF9uYW1lKTsNCi0JZi5zZXRJ
bnQob2JqLCB2YWwpOw0KLSAgICAgIH0NCi0gICAgY2F0Y2ggKElsbGVnYWxBcmd1bWVudEV4Y2Vw
dGlvbiBfKQ0KLSAgICAgIHsNCi0JdGhyb3cgbmV3IEludmFsaWRDbGFzc0V4Y2VwdGlvbigiaW5j
b21wYXRpYmxlIGZpZWxkIHR5cGUgZm9yICIgKyBrbGFzcy5nZXROYW1lKCkgKyAiLiIgKyBmaWVs
ZF9uYW1lKTsNCi0gICAgICB9DQotICAgIGNhdGNoIChFeGNlcHRpb24gXykNCi0gICAgICB7DQot
ICAgICAgfSAgICANCi0gIH0NCi0NCi0gIC8qKg0KLSAgICogVGhpcyBtZXRob2Qgd3JpdGVzIHRo
ZSBsb25nIHZhbHVlIDxjb2RlPnZhbDwvY29kZT4gaW4gdGhlIHNwZWNpZmllZCBmaWVsZA0KLSAg
ICogb2YgdGhlIGluc3RhbmNlIDxjb2RlPm9iajwvY29kZT4gb2YgdGhlIHR5cGUgPGNvZGU+a2xh
c3M8L2NvZGU+Lg0KLSAgICoNCi0gICAqIEBwYXJhbSBvYmogSW5zdGFuY2UgdG8gc2V0dXAuDQot
ICAgKiBAcGFyYW0ga2xhc3MgQ2xhc3MgdHlwZSBvZiB0aGUgc3BlY2lmaWVkIGluc3RhbmNlLg0K
LSAgICogQHBhcmFtIGZpZWxkX25hbWUgTmFtZSBvZiB0aGUgZmllbGQgaW4gdGhlIHNwZWNpZmll
ZCBjbGFzcyB0eXBlLg0KLSAgICogQHBhcmFtIHZhbCBUaGUgbG9uZyB2YWx1ZSB0byB3cml0ZSBp
bnRvIHRoZSBmaWVsZC4NCi0gICAqIEB0aHJvd3MgSW52YWxpZENsYXNzRXhjZXB0aW9uIGlmIHRo
ZSBzcGVjaWZpZWQgZmllbGQgaGFzIG5vdCB0aGUgcmVxdWlyZWQgdHlwZS4NCi0gICAqIEB0aHJv
d3MgSU9FeGNlcHRpb24gaWYgdGhlcmUgaXMgbm8gZmllbGQgb2YgdGhhdCBuYW1lIGluIHRoZSBz
cGVjaWZpZWQgY2xhc3MuDQotICAgKi8NCi0gIHByaXZhdGUgdm9pZCBzZXRMb25nRmllbGQoT2Jq
ZWN0IG9iaiwgQ2xhc3Mga2xhc3MsIFN0cmluZyBmaWVsZF9uYW1lLA0KLQkJCSAgICAgbG9uZyB2
YWwpIHRocm93cyBJT0V4Y2VwdGlvbiwgSW52YWxpZENsYXNzRXhjZXB0aW9uDQotICB7DQotICAg
IHRyeQ0KLSAgICAgIHsNCi0JRmllbGQgZiA9IGdldEZpZWxkKGtsYXNzLCBmaWVsZF9uYW1lKTsN
Ci0JZi5zZXRMb25nKG9iaiwgdmFsKTsNCi0gICAgICB9DQotICAgIGNhdGNoIChJbGxlZ2FsQXJn
dW1lbnRFeGNlcHRpb24gXykNCi0gICAgICB7DQotCXRocm93IG5ldyBJbnZhbGlkQ2xhc3NFeGNl
cHRpb24oImluY29tcGF0aWJsZSBmaWVsZCB0eXBlIGZvciAiICsga2xhc3MuZ2V0TmFtZSgpICsg
Ii4iICsgZmllbGRfbmFtZSk7DQotICAgICAgfQ0KLSAgICBjYXRjaCAoRXhjZXB0aW9uIF8pDQot
ICAgICAgew0KLSAgICAgIH0gICAgDQotICB9DQotDQotICAvKioNCi0gICAqIFRoaXMgbWV0aG9k
IHdyaXRlcyBhICJzaG9ydCIgdmFsdWUgPGNvZGU+dmFsPC9jb2RlPiBpbiB0aGUgc3BlY2lmaWVk
IGZpZWxkDQotICAgKiBvZiB0aGUgaW5zdGFuY2UgPGNvZGU+b2JqPC9jb2RlPiBvZiB0aGUgdHlw
ZSA8Y29kZT5rbGFzczwvY29kZT4uDQotICAgKg0KLSAgICogQHBhcmFtIG9iaiBJbnN0YW5jZSB0
byBzZXR1cC4NCi0gICAqIEBwYXJhbSBrbGFzcyBDbGFzcyB0eXBlIG9mIHRoZSBzcGVjaWZpZWQg
aW5zdGFuY2UuDQotICAgKiBAcGFyYW0gZmllbGRfbmFtZSBOYW1lIG9mIHRoZSBmaWVsZCBpbiB0
aGUgc3BlY2lmaWVkIGNsYXNzIHR5cGUuDQotICAgKiBAcGFyYW0gdmFsIFRoZSBzaG9ydCB2YWx1
ZSB0byB3cml0ZSBpbnRvIHRoZSBmaWVsZC4NCi0gICAqIEB0aHJvd3MgSW52YWxpZENsYXNzRXhj
ZXB0aW9uIGlmIHRoZSBzcGVjaWZpZWQgZmllbGQgaGFzIG5vdCB0aGUgcmVxdWlyZWQgdHlwZS4N
Ci0gICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gaWYgdGhlcmUgaXMgbm8gZmllbGQgb2YgdGhhdCBu
YW1lIGluIHRoZSBzcGVjaWZpZWQgY2xhc3MuDQotICAgKi8NCi0gIHByaXZhdGUgdm9pZCBzZXRT
aG9ydEZpZWxkKE9iamVjdCBvYmosIENsYXNzIGtsYXNzLCBTdHJpbmcgZmllbGRfbmFtZSwNCi0J
CQkgICAgICBzaG9ydCB2YWwpIHRocm93cyBJT0V4Y2VwdGlvbiwgSW52YWxpZENsYXNzRXhjZXB0
aW9uDQotICB7DQotICAgIHRyeQ0KLSAgICAgIHsNCi0JRmllbGQgZiA9IGdldEZpZWxkKGtsYXNz
LCBmaWVsZF9uYW1lKTsNCi0JZi5zZXRTaG9ydChvYmosIHZhbCk7DQotICAgICAgfQ0KLSAgICBj
YXRjaCAoSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uIF8pDQotICAgICAgew0KLQl0aHJvdyBuZXcg
SW52YWxpZENsYXNzRXhjZXB0aW9uKCJpbmNvbXBhdGlibGUgZmllbGQgdHlwZSBmb3IgIiArIGts
YXNzLmdldE5hbWUoKSArICIuIiArIGZpZWxkX25hbWUpOw0KLSAgICAgIH0NCi0gICAgY2F0Y2gg
KEV4Y2VwdGlvbiBfKQ0KLSAgICAgIHsNCi0gICAgICB9ICAgIA0KLSAgfQ0KLQ0KLSAgLyoqDQot
ICAgKiBUaGlzIG1ldGhvZCB3cml0ZXMgYW4gIm9iamVjdCIgdmFsdWUgPGNvZGU+dmFsPC9jb2Rl
PiBpbiB0aGUgc3BlY2lmaWVkIGZpZWxkDQotICAgKiBvZiB0aGUgaW5zdGFuY2UgPGNvZGU+b2Jq
PC9jb2RlPiBvZiB0aGUgdHlwZSA8Y29kZT5rbGFzczwvY29kZT4uDQotICAgKg0KLSAgICogQHBh
cmFtIG9iaiBJbnN0YW5jZSB0byBzZXR1cC4NCi0gICAqIEBwYXJhbSBrbGFzcyBDbGFzcyB0eXBl
IG9mIHRoZSBzcGVjaWZpZWQgaW5zdGFuY2UuDQotICAgKiBAcGFyYW0gZmllbGRfbmFtZSBOYW1l
IG9mIHRoZSBmaWVsZCBpbiB0aGUgc3BlY2lmaWVkIGNsYXNzIHR5cGUuDQotICAgKiBAcGFyYW0g
dmFsIFRoZSAib2JqZWN0IiB2YWx1ZSB0byB3cml0ZSBpbnRvIHRoZSBmaWVsZC4NCi0gICAqIEB0
aHJvd3MgSW52YWxpZENsYXNzRXhjZXB0aW9uIGlmIHRoZSBzcGVjaWZpZWQgZmllbGQgaGFzIG5v
dCB0aGUgcmVxdWlyZWQgdHlwZS4NCi0gICAqIEB0aHJvd3MgSU9FeGNlcHRpb24gaWYgdGhlcmUg
aXMgbm8gZmllbGQgb2YgdGhhdCBuYW1lIGluIHRoZSBzcGVjaWZpZWQgY2xhc3MuDQotICAgKi8N
Ci0gIHByaXZhdGUgdm9pZCBzZXRPYmplY3RGaWVsZChPYmplY3Qgb2JqLCBDbGFzcyBrbGFzcywg
U3RyaW5nIGZpZWxkX25hbWUsDQotCQkJICAgICAgIFN0cmluZyB0eXBlX2NvZGUsIE9iamVjdCB2
YWwpIHRocm93cyBJT0V4Y2VwdGlvbiwgSW52YWxpZENsYXNzRXhjZXB0aW9uDQotICB7DQotICAg
IHRyeQ0KLSAgICAgIHsNCi0gCUZpZWxkIGYgPSBnZXRGaWVsZChrbGFzcywgZmllbGRfbmFtZSk7
DQotCU9iamVjdFN0cmVhbUZpZWxkIG9mID0gbmV3IE9iamVjdFN0cmVhbUZpZWxkKGZpZWxkX25h
bWUsIGYuZ2V0VHlwZSgpKTsNCi0JDQotCWlmIChvZi5nZXRUeXBlU3RyaW5nKCkgPT0gbnVsbCB8
fA0KLQkgICAgIW9mLmdldFR5cGVTdHJpbmcoKS5lcXVhbHModHlwZV9jb2RlKSkNCi0gICAgICAg
ICAgdGhyb3cgbmV3IEludmFsaWRDbGFzc0V4Y2VwdGlvbigiaW5jb21wYXRpYmxlIGZpZWxkIHR5
cGUgZm9yICIgKyBrbGFzcy5nZXROYW1lKCkgKyAiLiIgKyBmaWVsZF9uYW1lKTsNCi0gCWYuc2V0
KG9iaiwgdmFsKTsNCi0gICAgICB9DQotICAgIGNhdGNoIChJbnZhbGlkQ2xhc3NFeGNlcHRpb24g
ZSkNCi0gICAgICB7DQotCXRocm93IGU7DQotICAgICAgfQ0KLSAgICBjYXRjaCAoRXhjZXB0aW9u
IF8pDQotICAgICAgew0KLSAgICAgIH0NCi0gIH0NCi0NCiAgIHByaXZhdGUgc3RhdGljIGZpbmFs
IGludCBCVUZGRVJfU0laRSA9IDEwMjQ7DQotICBwcml2YXRlIHN0YXRpYyBmaW5hbCBDbGFzc1td
IHJlYWRPYmplY3RQYXJhbXMgPSB7IE9iamVjdElucHV0U3RyZWFtLmNsYXNzIH07DQogDQogICBw
cml2YXRlIERhdGFJbnB1dFN0cmVhbSByZWFsSW5wdXRTdHJlYW07DQogICBwcml2YXRlIERhdGFJ
bnB1dFN0cmVhbSBkYXRhSW5wdXRTdHJlYW07DQpAQCAtMjEwMiwxOCArMTc5MywxNiBAQA0KICAg
cHJpdmF0ZSBIYXNodGFibGUgY2xhc3NMb29rdXBUYWJsZTsNCiAgIHByaXZhdGUgR2V0RmllbGQg
cHJlcmVhZEZpZWxkczsNCiANCi0gIHByaXZhdGUgc3RhdGljIGJvb2xlYW4gZHVtcDsNCisgIHBy
aXZhdGUgc3RhdGljIGJvb2xlYW4gZHVtcCA9IGZhbHNlICYmIENvbmZpZ3VyYXRpb24uREVCVUc7
DQogDQogICBwcml2YXRlIHZvaWQgZHVtcEVsZW1lbnQgKFN0cmluZyBtc2cpDQogICB7DQotICAg
IGlmIChDb25maWd1cmF0aW9uLkRFQlVHICYmIGR1bXApICANCi0gICAgICBTeXN0ZW0ub3V0LnBy
aW50KG1zZyk7DQorICAgIFN5c3RlbS5vdXQucHJpbnQobXNnKTsNCiAgIH0NCiAgIA0KICAgcHJp
dmF0ZSB2b2lkIGR1bXBFbGVtZW50bG4gKFN0cmluZyBtc2cpDQogICB7DQotICAgIGlmIChDb25m
aWd1cmF0aW9uLkRFQlVHICYmIGR1bXApDQotICAgICAgU3lzdGVtLm91dC5wcmludGxuKG1zZyk7
DQorICAgIFN5c3RlbS5vdXQucHJpbnRsbihtc2cpOw0KICAgfQ0KIA0KICAgc3RhdGljDQpJbmRl
eDogamF2YS9pby9PYmplY3RTdHJlYW1DbGFzcy5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTog
L2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZhL2lvL09iamVjdFN0cmVhbUNsYXNzLmph
dmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjI5DQpkaWZmIC11IC1yMS4yOSBPYmplY3RTdHJl
YW1DbGFzcy5qYXZhDQotLS0gamF2YS9pby9PYmplY3RTdHJlYW1DbGFzcy5qYXZhCTMwIERlYyAy
MDAzIDE1OjU3OjA1IC0wMDAwCTEuMjkNCisrKyBqYXZhL2lvL09iamVjdFN0cmVhbUNsYXNzLmph
dmEJMiBGZWIgMjAwNCAwOTo0OToxMyAtMDAwMA0KQEAgLTQ1LDkgKzQ1LDExIEBADQogaW1wb3J0
IGphdmEubGFuZy5yZWZsZWN0Lk1ldGhvZDsNCiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuTW9k
aWZpZXI7DQogaW1wb3J0IGphdmEubGFuZy5yZWZsZWN0LlByb3h5Ow0KK2ltcG9ydCBqYXZhLnNl
Y3VyaXR5LkFjY2Vzc0NvbnRyb2xsZXI7DQogaW1wb3J0IGphdmEuc2VjdXJpdHkuRGlnZXN0T3V0
cHV0U3RyZWFtOw0KIGltcG9ydCBqYXZhLnNlY3VyaXR5Lk1lc3NhZ2VEaWdlc3Q7DQogaW1wb3J0
IGphdmEuc2VjdXJpdHkuTm9TdWNoQWxnb3JpdGhtRXhjZXB0aW9uOw0KK2ltcG9ydCBqYXZhLnNl
Y3VyaXR5LlByaXZpbGVnZWRBY3Rpb247DQogaW1wb3J0IGphdmEuc2VjdXJpdHkuU2VjdXJpdHk7
DQogaW1wb3J0IGphdmEudXRpbC5BcnJheXM7DQogaW1wb3J0IGphdmEudXRpbC5Db21wYXJhdG9y
Ow0KQEAgLTE5MiwyOSArMTk0LDYgQEANCiAgICAgcmV0dXJuIChmbGFncyAmIE9iamVjdFN0cmVh
bUNvbnN0YW50cy5TQ19XUklURV9NRVRIT0QpICE9IDA7DQogICB9DQogDQotDQotICAvLyBSZXR1
cm5zIHRydWUgaWZmIHRoZSBjbGFzcyB0aGF0IHRoaXMgT2JqZWN0U3RyZWFtQ2xhc3MgcmVwcmVz
ZW50cw0KLSAgLy8gaGFzIHRoZSBmb2xsb3dpbmcgbWV0aG9kOg0KLSAgLy8NCi0gIC8vIHByaXZh
dGUgdm9pZCByZWFkT2JqZWN0IChPYmplY3RPdXRwdXRTdHJlYW0pDQotICAvLw0KLSAgLy8gVGhp
cyBtZXRob2QgaXMgdXNlZCBieSB0aGUgY2xhc3MgdG8gb3ZlcnJpZGUgZGVmYXVsdA0KLSAgLy8g
c2VyaWFsaXphdGlvbiBiZWhhdmlvci4NCi0gIGJvb2xlYW4gaGFzUmVhZE1ldGhvZCgpDQotICB7
DQotICAgIHRyeQ0KLSAgICAgIHsNCi0JQ2xhc3NbXSByZWFkT2JqZWN0UGFyYW1zID0geyBPYmpl
Y3RJbnB1dFN0cmVhbS5jbGFzcyB9Ow0KLQlmb3JDbGFzcygpLmdldERlY2xhcmVkTWV0aG9kKCJy
ZWFkT2JqZWN0IiwgcmVhZE9iamVjdFBhcmFtcyk7DQotCXJldHVybiB0cnVlOw0KLSAgICAgIH0N
Ci0gICAgY2F0Y2ggKE5vU3VjaE1ldGhvZEV4Y2VwdGlvbiBlKQ0KLSAgICAgIHsNCi0JcmV0dXJu
IGZhbHNlOw0KLSAgICAgIH0NCi0gIH0NCi0NCi0NCiAgIC8vIFJldHVybnMgdHJ1ZSBpZmYgdGhl
IGNsYXNzIHRoYXQgdGhpcyBPYmplY3RTdHJlYW1DbGFzcyByZXByZXNlbnRzDQogICAvLyBpbXBs
ZW1lbnRzIFNlcmlhbGl6YWJsZSBidXQgZG9lcyAqbm90KiBpbXBsZW1lbnQgRXh0ZXJuYWxpemFi
bGUuDQogICBib29sZWFuIGlzU2VyaWFsaXphYmxlKCkNCkBAIC0zMDYsNiArMjg1LDggQEANCiAg
IHsNCiAgICAgdGhpcy5jbGF6eiA9IGNsOw0KIA0KKyAgICBjYWNoZU1ldGhvZHMoKTsNCisNCiAg
ICAgbG9uZyBjbGFzc191aWQgPSBnZXRDbGFzc1VJRChjbCk7DQogICAgIGlmICh1aWQgPT0gMCkN
CiAgICAgICB1aWQgPSBjbGFzc191aWQ7DQpAQCAtNDUyLDYgKzQzMyw1MCBAQA0KICAgICAgIGZp
ZWxkc1tpXS5zZXRPZmZzZXQob2JqZWN0RmllbGRDb3VudCsrKTsNCiAgIH0NCiANCisgIHByaXZh
dGUgTWV0aG9kIGZpbmRNZXRob2QoTWV0aG9kW10gbWV0aG9kcywgU3RyaW5nIG5hbWUsIENsYXNz
W10gcGFyYW1zLA0KKwkJCSAgICBDbGFzcyByZXR1cm5UeXBlKQ0KKyAgew0KK291dGVyOg0KKyAg
ICBmb3IoaW50IGkgPSAwOyBpIDwgbWV0aG9kcy5sZW5ndGg7IGkrKykNCisgICAgew0KKwlpZiht
ZXRob2RzW2ldLmdldE5hbWUoKS5lcXVhbHMobmFtZSkgJiYNCisJICAgbWV0aG9kc1tpXS5nZXRS
ZXR1cm5UeXBlKCkgPT0gcmV0dXJuVHlwZSkNCisJew0KKwkgICAgQ2xhc3NbXSBtcCA9IG1ldGhv
ZHNbaV0uZ2V0UGFyYW1ldGVyVHlwZXMoKTsNCisJICAgIGlmKG1wLmxlbmd0aCA9PSBwYXJhbXMu
bGVuZ3RoKQ0KKwkgICAgew0KKwkJZm9yKGludCBqID0gMDsgaiA8IG1wLmxlbmd0aDsgaisrKQ0K
KwkJew0KKwkJICAgIGlmKG1wW2pdICE9IHBhcmFtc1tqXSkNCisJCSAgICB7DQorCQkJY29udGlu
dWUgb3V0ZXI7DQorCQkgICAgfQ0KKwkJfQ0KKwkJZmluYWwgTWV0aG9kIG0gPSBtZXRob2RzW2ld
Ow0KKwkJQWNjZXNzQ29udHJvbGxlci5kb1ByaXZpbGVnZWQobmV3IFByaXZpbGVnZWRBY3Rpb24o
KQ0KKwkJew0KKwkJICAgIHB1YmxpYyBPYmplY3QgcnVuKCkNCisJCSAgICB7DQorCQkJbS5zZXRB
Y2Nlc3NpYmxlKHRydWUpOw0KKwkJCXJldHVybiBudWxsOw0KKwkJICAgIH0NCisJCX0pOw0KKwkJ
cmV0dXJuIG07DQorCSAgICB9DQorCX0NCisgICAgfQ0KKyAgICByZXR1cm4gbnVsbDsNCisgIH0N
CisNCisgIHByaXZhdGUgdm9pZCBjYWNoZU1ldGhvZHMoKQ0KKyAgew0KKyAgICBNZXRob2RbXSBt
ZXRob2RzID0gZm9yQ2xhc3MoKS5nZXREZWNsYXJlZE1ldGhvZHMoKTsNCisgICAgcmVhZE9iamVj
dE1ldGhvZCA9IGZpbmRNZXRob2QobWV0aG9kcywgInJlYWRPYmplY3QiLA0KKwkJCQkgIG5ldyBD
bGFzc1tdIHsgT2JqZWN0SW5wdXRTdHJlYW0uY2xhc3MgfSwNCisJCQkJICBWb2lkLlRZUEUpOw0K
KyAgICByZWFkUmVzb2x2ZU1ldGhvZCA9IGZpbmRNZXRob2QobWV0aG9kcywgInJlYWRSZXNvbHZl
IiwNCisJCQkJICAgbmV3IENsYXNzWzBdLCBPYmplY3QuY2xhc3MpOw0KKyAgfQ0KIA0KICAgcHJp
dmF0ZSBPYmplY3RTdHJlYW1DbGFzcyhDbGFzcyBjbCkNCiAgIHsNCkBAIC00NjAsNiArNDg1LDcg
QEANCiAgICAgaXNQcm94eUNsYXNzID0gUHJveHkuaXNQcm94eUNsYXNzKGNsKTsNCiANCiAgICAg
Y2xhenogPSBjbDsNCisgICAgY2FjaGVNZXRob2RzKCk7DQogICAgIG5hbWUgPSBjbC5nZXROYW1l
KCk7DQogICAgIHNldEZsYWdzKGNsKTsNCiAgICAgc2V0RmllbGRzKGNsKTsNCkBAIC01MDgsOSAr
NTM0LDE2IEBADQogDQogICAgIHRyeQ0KICAgICAgIHsNCi0JRmllbGQgc2VyaWFsUGVyc2lzdGVu
dEZpZWxkcyA9DQorCWZpbmFsIEZpZWxkIHNlcmlhbFBlcnNpc3RlbnRGaWVsZHMgPQ0KIAkgIGNs
LmdldERlY2xhcmVkRmllbGQoInNlcmlhbFBlcnNpc3RlbnRGaWVsZHMiKTsNCi0Jc2VyaWFsUGVy
c2lzdGVudEZpZWxkcy5zZXRBY2Nlc3NpYmxlKHRydWUpOw0KKwlBY2Nlc3NDb250cm9sbGVyLmRv
UHJpdmlsZWdlZChuZXcgUHJpdmlsZWdlZEFjdGlvbigpDQorCXsNCisJICAgIHB1YmxpYyBPYmpl
Y3QgcnVuKCkNCisJICAgIHsNCisJCXNlcmlhbFBlcnNpc3RlbnRGaWVsZHMuc2V0QWNjZXNzaWJs
ZSh0cnVlKTsNCisJCXJldHVybiBudWxsOw0KKwkgICAgfQ0KKwl9KTsNCiAJaW50IG1vZGlmaWVy
cyA9IHNlcmlhbFBlcnNpc3RlbnRGaWVsZHMuZ2V0TW9kaWZpZXJzKCk7DQogDQogCWlmIChNb2Rp
Zmllci5pc1N0YXRpYyhtb2RpZmllcnMpDQpAQCAtNTUzLDEyICs1ODYsMjggQEANCiAgICAgZm9y
IChpbnQgZnJvbSA9IDAsIHRvID0gMDsgZnJvbSA8IGFsbF9maWVsZHMubGVuZ3RoOyBmcm9tKysp
DQogICAgICAgaWYgKGFsbF9maWVsZHNbZnJvbV0gIT0gbnVsbCkNCiAJew0KLQkgIEZpZWxkIGYg
PSBhbGxfZmllbGRzW2Zyb21dOw0KLQkgIGZpZWxkc1t0b10gPSBuZXcgT2JqZWN0U3RyZWFtRmll
bGQoZi5nZXROYW1lKCksIGYuZ2V0VHlwZSgpKTsNCisJICBmaW5hbCBGaWVsZCBmID0gYWxsX2Zp
ZWxkc1tmcm9tXTsNCisJICBBY2Nlc3NDb250cm9sbGVyLmRvUHJpdmlsZWdlZChuZXcgUHJpdmls
ZWdlZEFjdGlvbigpDQorCSAgew0KKwkgICAgICBwdWJsaWMgT2JqZWN0IHJ1bigpDQorCSAgICAg
IHsNCisJCSAgZi5zZXRBY2Nlc3NpYmxlKHRydWUpOw0KKwkJICByZXR1cm4gbnVsbDsNCisJICAg
ICAgfQ0KKwkgIH0pOw0KKwkgIGZpZWxkc1t0b10gPSBuZXcgT2JqZWN0U3RyZWFtRmllbGQoYWxs
X2ZpZWxkc1tmcm9tXSk7DQogCSAgdG8rKzsNCiAJfQ0KIA0KICAgICBBcnJheXMuc29ydChmaWVs
ZHMpOw0KKyAgICAvLyBNYWtlIHN1cmUgd2UgZG9uJ3QgaGF2ZSBhbnkgZHVwbGljYXRlIGZpZWxk
IG5hbWVzDQorICAgIC8vIChTdW4gSkRLIDEuNC4xLiB0aHJvd3MgYW4gSW50ZXJuYWwgRXJyb3Ig
YXMgd2VsbCkNCisgICAgZm9yIChpbnQgaSA9IDE7IGkgPCBmaWVsZHMubGVuZ3RoOyBpKyspDQor
ICAgICAgew0KKwlpZihmaWVsZHNbaSAtIDFdLmdldE5hbWUoKS5lcXVhbHMoZmllbGRzW2ldLmdl
dE5hbWUoKSkpDQorCSAgICB0aHJvdyBuZXcgSW50ZXJuYWxFcnJvcigiRHVwbGljYXRlIGZpZWxk
ICIgKyANCisJCQlmaWVsZHNbaV0uZ2V0TmFtZSgpICsgIiBpbiBjbGFzcyAiICsgY2wuZ2V0TmFt
ZSgpKTsNCisgICAgICB9DQogICAgIGNhbGN1bGF0ZU9mZnNldHMoKTsNCiAgIH0NCiANCkBAIC01
NzEsOCArNjIwLDE1IEBADQogCS8vIFVzZSBnZXREZWNsYXJlZEZpZWxkIHJhdGhlciB0aGFuIGdl
dEZpZWxkLCBzaW5jZSBzZXJpYWxWZXJzaW9uVUlEDQogCS8vIG1heSBub3QgYmUgcHVibGljIEFO
RCB3ZSBvbmx5IHdhbnQgdGhlIHNlcmlhbFZlcnNpb25VSUQgb2YgdGhpcw0KIAkvLyBjbGFzcywg
bm90IGEgc3VwZXJjbGFzcyBvciBpbnRlcmZhY2UuDQotCUZpZWxkIHN1aWQgPSBjbC5nZXREZWNs
YXJlZEZpZWxkKCJzZXJpYWxWZXJzaW9uVUlEIik7DQotCXN1aWQuc2V0QWNjZXNzaWJsZSh0cnVl
KTsNCisJZmluYWwgRmllbGQgc3VpZCA9IGNsLmdldERlY2xhcmVkRmllbGQoInNlcmlhbFZlcnNp
b25VSUQiKTsNCisJQWNjZXNzQ29udHJvbGxlci5kb1ByaXZpbGVnZWQobmV3IFByaXZpbGVnZWRB
Y3Rpb24oKQ0KKwl7DQorCSAgICBwdWJsaWMgT2JqZWN0IHJ1bigpDQorCSAgICB7DQorCQlzdWlk
LnNldEFjY2Vzc2libGUodHJ1ZSk7DQorCQlyZXR1cm4gbnVsbDsNCisJICAgIH0NCisJfSk7DQog
CWludCBtb2RpZmllcnMgPSBzdWlkLmdldE1vZGlmaWVycygpOw0KIA0KIAlpZiAoTW9kaWZpZXIu
aXNTdGF0aWMobW9kaWZpZXJzKQ0KQEAgLTc2OCw2ICs4MjQsMTMgQEANCiAgIC8vIHRoZXNlIGFy
ZSBhY2Nlc3NlZCBieSBPYmplY3RJbi9PdXRwdXRTdHJlYW0NCiAgIGludCBwcmltRmllbGRTaXpl
ID0gLTE7ICAvLyAtMSBpZiBub3QgeWV0IGNhbGN1bGF0ZWQNCiAgIGludCBvYmplY3RGaWVsZENv
dW50Ow0KKw0KKyAgTWV0aG9kIHJlYWRPYmplY3RNZXRob2Q7DQorICBNZXRob2QgcmVhZFJlc29s
dmVNZXRob2Q7DQorICBib29sZWFuIHJlYWxDbGFzc0lzU2VyaWFsaXphYmxlOw0KKyAgYm9vbGVh
biByZWFsQ2xhc3NJc0V4dGVybmFsaXphYmxlOw0KKyAgT2JqZWN0U3RyZWFtRmllbGRbXSBmaWVs
ZE1hcHBpbmc7DQorICBDbGFzcyBmaXJzdE5vblNlcmlhbGl6YWJsZVBhcmVudDsNCiANCiAgIGJv
b2xlYW4gaXNQcm94eUNsYXNzID0gZmFsc2U7DQogDQpJbmRleDogamF2YS9pby9PYmplY3RTdHJl
YW1GaWVsZC5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2Ns
YXNzcGF0aC9qYXZhL2lvL09iamVjdFN0cmVhbUZpZWxkLmphdmEsdg0KcmV0cmlldmluZyByZXZp
c2lvbiAxLjEyDQpkaWZmIC11IC1yMS4xMiBPYmplY3RTdHJlYW1GaWVsZC5qYXZhDQotLS0gamF2
YS9pby9PYmplY3RTdHJlYW1GaWVsZC5qYXZhCTI3IERlYyAyMDAzIDIyOjQ4OjU4IC0wMDAwCTEu
MTINCisrKyBqYXZhL2lvL09iamVjdFN0cmVhbUZpZWxkLmphdmEJMiBGZWIgMjAwNCAwOTo0OTox
MyAtMDAwMA0KQEAgLTM4LDYgKzM4LDggQEANCiANCiBwYWNrYWdlIGphdmEuaW87DQogDQoraW1w
b3J0IGphdmEubGFuZy5yZWZsZWN0LkZpZWxkOw0KK2ltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5N
b2RpZmllcjsNCiBpbXBvcnQgZ251LmphdmEubGFuZy5yZWZsZWN0LlR5cGVTaWduYXR1cmU7DQog
DQogLyoqDQpAQCAtNTQsNiArNTYsMTQgQEANCiAgIHByaXZhdGUgYm9vbGVhbiB1bnNoYXJlZDsN
CiAgIHByaXZhdGUgYm9vbGVhbiBwZXJzaXN0ZW50ID0gZmFsc2U7DQogICBwcml2YXRlIGJvb2xl
YW4gdG9zZXQgPSB0cnVlOw0KKyAgcHJpdmF0ZSBGaWVsZCBmaWVsZDsNCisNCisgIE9iamVjdFN0
cmVhbUZpZWxkIChGaWVsZCBmaWVsZCkNCisgIHsNCisgICAgdGhpcyAoZmllbGQuZ2V0TmFtZSgp
LCBmaWVsZC5nZXRUeXBlKCkpOw0KKyAgICB0aGlzLmZpZWxkID0gZmllbGQ7DQorICAgIHRvc2V0
ID0gIU1vZGlmaWVyLmlzRmluYWwoZmllbGQuZ2V0TW9kaWZpZXJzKCkpOw0KKyAgfQ0KIA0KICAg
LyoqDQogICAgKiBUaGlzIGNvbnN0cnVjdG9yIGNyZWF0ZXMgYW4gT2JqZWN0U3RyZWFtRmllbGQg
aW5zdGFuY2UgDQpAQCAtMTA1LDcgKzExNSw2IEBADQogICAgICAgfQ0KICAgICBjYXRjaChDbGFz
c05vdEZvdW5kRXhjZXB0aW9uIGUpDQogICAgICAgew0KLSAgICAgICAgdHlwZSA9IE9iamVjdC5j
bGFzczsgLy9GSVhNRTogPz8/DQogICAgICAgfQ0KICAgfQ0KICAgDQpAQCAtMTI4LDcgKzEzNyw2
IEBADQogICAgICAgfQ0KICAgICBjYXRjaChDbGFzc05vdEZvdW5kRXhjZXB0aW9uIGUpDQogICAg
ICAgew0KLSAgICAgICAgdHlwZSA9IE9iamVjdC5jbGFzczsgLy8gQUxTTyBGSVhNRSANCiAgICAg
ICB9DQogICB9DQogDQpAQCAtMTc2LDcgKzE4NCw3IEBADQogICBwdWJsaWMgU3RyaW5nIGdldFR5
cGVTdHJpbmcgKCkNCiAgIHsNCiAgICAgLy8gdXNlIGludGVybigpDQotICAgIGlmICh0aGlzLnR5
cGUuaXNQcmltaXRpdmUoKSkNCisgICAgaWYgKGlzUHJpbWl0aXZlKCkpDQogICAgICAgcmV0dXJu
IG51bGw7DQogICAgIHJldHVybiB0eXBlbmFtZS5pbnRlcm4oKTsNCiAgIH0NCkBAIC0yMjUsNyAr
MjMzLDcgQEANCiAgICAqLw0KICAgcHVibGljIGJvb2xlYW4gaXNQcmltaXRpdmUgKCkNCiAgIHsN
Ci0gICAgcmV0dXJuIHR5cGUuaXNQcmltaXRpdmUgKCk7DQorICAgIHJldHVybiB0eXBlbmFtZS5s
ZW5ndGgoKSA9PSAxOw0KICAgfQ0KIA0KICAgcHVibGljIGludCBjb21wYXJlVG8gKE9iamVjdCBv
KQ0KQEAgLTI5OSw1ICszMDcsMTEyIEBADQogICB7DQogICAgIHJldHVybiAiT2JqZWN0U3RyZWFt
RmllbGQ8ICIgKyB0eXBlICsgIiAiICsgbmFtZSArICIgPiI7DQogICB9DQotfQ0KIA0KKyAgZmlu
YWwgdm9pZCBzZXRCb29sZWFuRmllbGQoT2JqZWN0IG9iaiwgYm9vbGVhbiB2YWwpDQorICB7DQor
ICAgICAgdHJ5DQorICAgICAgew0KKwkgIGZpZWxkLnNldEJvb2xlYW4ob2JqLCB2YWwpOw0KKyAg
ICAgIH0NCisgICAgICBjYXRjaChJbGxlZ2FsQWNjZXNzRXhjZXB0aW9uIHgpDQorICAgICAgew0K
KwkgIHRocm93IG5ldyBJbnRlcm5hbEVycm9yKHguZ2V0TWVzc2FnZSgpKTsNCisgICAgICB9DQor
ICB9DQorDQorICBmaW5hbCB2b2lkIHNldEJ5dGVGaWVsZChPYmplY3Qgb2JqLCBieXRlIHZhbCkN
CisgIHsNCisgICAgICB0cnkNCisgICAgICB7DQorCSAgZmllbGQuc2V0Qnl0ZShvYmosIHZhbCk7
DQorICAgICAgfQ0KKyAgICAgIGNhdGNoKElsbGVnYWxBY2Nlc3NFeGNlcHRpb24geCkNCisgICAg
ICB7DQorCSAgdGhyb3cgbmV3IEludGVybmFsRXJyb3IoeC5nZXRNZXNzYWdlKCkpOw0KKyAgICAg
IH0NCisgIH0NCisNCisgIGZpbmFsIHZvaWQgc2V0Q2hhckZpZWxkKE9iamVjdCBvYmosIGNoYXIg
dmFsKQ0KKyAgew0KKyAgICAgIHRyeQ0KKyAgICAgIHsNCisJICBmaWVsZC5zZXRDaGFyKG9iaiwg
dmFsKTsNCisgICAgICB9DQorICAgICAgY2F0Y2goSWxsZWdhbEFjY2Vzc0V4Y2VwdGlvbiB4KQ0K
KyAgICAgIHsNCisJICB0aHJvdyBuZXcgSW50ZXJuYWxFcnJvcih4LmdldE1lc3NhZ2UoKSk7DQor
ICAgICAgfQ0KKyAgfQ0KKw0KKyAgZmluYWwgdm9pZCBzZXRTaG9ydEZpZWxkKE9iamVjdCBvYmos
IHNob3J0IHZhbCkNCisgIHsNCisgICAgICB0cnkNCisgICAgICB7DQorCSAgZmllbGQuc2V0U2hv
cnQob2JqLCB2YWwpOw0KKyAgICAgIH0NCisgICAgICBjYXRjaChJbGxlZ2FsQWNjZXNzRXhjZXB0
aW9uIHgpDQorICAgICAgew0KKwkgIHRocm93IG5ldyBJbnRlcm5hbEVycm9yKHguZ2V0TWVzc2Fn
ZSgpKTsNCisgICAgICB9DQorICB9DQorDQorICBmaW5hbCB2b2lkIHNldEludEZpZWxkKE9iamVj
dCBvYmosIGludCB2YWwpDQorICB7DQorICAgICAgdHJ5DQorICAgICAgew0KKwkgIGZpZWxkLnNl
dEludChvYmosIHZhbCk7DQorICAgICAgfQ0KKyAgICAgIGNhdGNoKElsbGVnYWxBY2Nlc3NFeGNl
cHRpb24geCkNCisgICAgICB7DQorCSAgdGhyb3cgbmV3IEludGVybmFsRXJyb3IoeC5nZXRNZXNz
YWdlKCkpOw0KKyAgICAgIH0NCisgIH0NCisNCisgIGZpbmFsIHZvaWQgc2V0TG9uZ0ZpZWxkKE9i
amVjdCBvYmosIGxvbmcgdmFsKQ0KKyAgew0KKyAgICAgIHRyeQ0KKyAgICAgIHsNCisJICBmaWVs
ZC5zZXRMb25nKG9iaiwgdmFsKTsNCisgICAgICB9DQorICAgICAgY2F0Y2goSWxsZWdhbEFjY2Vz
c0V4Y2VwdGlvbiB4KQ0KKyAgICAgIHsNCisJICB0aHJvdyBuZXcgSW50ZXJuYWxFcnJvcih4Lmdl
dE1lc3NhZ2UoKSk7DQorICAgICAgfQ0KKyAgfQ0KKw0KKyAgZmluYWwgdm9pZCBzZXRGbG9hdEZp
ZWxkKE9iamVjdCBvYmosIGZsb2F0IHZhbCkNCisgIHsNCisgICAgICB0cnkNCisgICAgICB7DQor
CSAgZmllbGQuc2V0RmxvYXQob2JqLCB2YWwpOw0KKyAgICAgIH0NCisgICAgICBjYXRjaChJbGxl
Z2FsQWNjZXNzRXhjZXB0aW9uIHgpDQorICAgICAgew0KKwkgIHRocm93IG5ldyBJbnRlcm5hbEVy
cm9yKHguZ2V0TWVzc2FnZSgpKTsNCisgICAgICB9DQorICB9DQorDQorICBmaW5hbCB2b2lkIHNl
dERvdWJsZUZpZWxkKE9iamVjdCBvYmosIGRvdWJsZSB2YWwpDQorICB7DQorICAgICAgdHJ5DQor
ICAgICAgew0KKwkgIGZpZWxkLnNldERvdWJsZShvYmosIHZhbCk7DQorICAgICAgfQ0KKyAgICAg
IGNhdGNoKElsbGVnYWxBY2Nlc3NFeGNlcHRpb24geCkNCisgICAgICB7DQorCSAgdGhyb3cgbmV3
IEludGVybmFsRXJyb3IoeC5nZXRNZXNzYWdlKCkpOw0KKyAgICAgIH0NCisgIH0NCisNCisgIGZp
bmFsIHZvaWQgc2V0T2JqZWN0RmllbGQoT2JqZWN0IG9iaiwgT2JqZWN0IHZhbCkNCisgIHsNCisg
ICAgdHJ5DQorICAgICAgew0KKwlmaWVsZC5zZXQob2JqLCB2YWwpOw0KKyAgICAgIH0NCisgICAg
Y2F0Y2goSWxsZWdhbEFjY2Vzc0V4Y2VwdGlvbiB4KQ0KKyAgICAgIHsNCisJdGhyb3cgbmV3IElu
dGVybmFsRXJyb3IoeC5nZXRNZXNzYWdlKCkpOw0KKyAgICAgIH0NCisgIH0NCit9DQo=

------_=_NextPart_001_01C3E977.48A09F80--



From MAILER-DAEMON Mon Feb 02 05:35:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AnbQc-00049p-Pj
	for mharc-commit-classpath@gnu.org; Mon, 02 Feb 2004 05:35:42 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AnbQU-0003zS-5Y
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:35:34 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AnbPp-0003gE-7p
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:35:24 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AnbMZ-0001jO-CY
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 05:31:31 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Mon, 2 Feb 2004 11:31:24 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C84A@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: java/lang/Thread.java
Thread-Index: AcPpd7SfZpa3/YaRRfOA3JgUG/Jbiw==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: <commit-classpath@gnu.org>
Subject: FYI: Patch: java/lang/Thread.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2004 10:35:40 -0000

Hi,

I committed a patch to allow the daemon state of dead threads to be
changed. The documentation is a little ambiguous on this, but the Sun
JDK allows it and there is no harm in it.

Regards,
Jeroen

2004-02-02  Jeroen Frijters  <jeroen@frijters.net>

        * java/lang/Thread.java (setDaemon): Allow daemon state to be
        changed for dead threads.

Index: java/lang/Thread.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/classpath/classpath/java/lang/Thread.java,v
retrieving revision 1.3
diff -u -r1.3 Thread.java
--- java/lang/Thread.java	28 Jan 2004 19:38:24 -0000	1.3
+++ java/lang/Thread.java	2 Feb 2004 10:28:28 -0000
@@ -633,7 +633,7 @@
    */
   public final synchronized void setDaemon(boolean daemon)
   {
-    if (vmThread !=3D null || group =3D=3D null)
+    if (vmThread !=3D null)
       throw new IllegalThreadStateException();
     checkAccess();
     this.daemon =3D daemon;



From MAILER-DAEMON Mon Feb 02 16:08:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AnlJC-0001X8-Of
	for mharc-commit-classpath@gnu.org; Mon, 02 Feb 2004 16:08:42 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AnlJA-0001WM-1M
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 16:08:40 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AnlIc-0001Kp-P3
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 16:08:38 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AnlIb-0001K9-Ud
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 16:08:06 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 9730E62354
	for <commit-classpath@gnu.org>; Mon,  2 Feb 2004 21:08:04 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 26165-08 for <commit-classpath@gnu.org>;
	Mon,  2 Feb 2004 21:07:59 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-176.adsl.solnet.ch
	[212.41.94.176])
	by mail01.solnet.ch (Postfix) with ESMTP id 1C9FC625D7
	for <commit-classpath@gnu.org>; Mon,  2 Feb 2004 21:07:52 +0000 (GMT)
Received: from nbprr (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP id 3E3664D5F0
	for <commit-classpath@gnu.org>; Mon,  2 Feb 2004 22:07:19 +0100 (CET)
Date: Mon, 02 Feb 2004 22:08:37 +0100
From: Patrik Reali <reali@acm.org>
To: Classpath Commits <commit-classpath@gnu.org>
Message-ID: <7253229.1075759717@[192.168.1.3]>
X-Mailer: Mulberry/3.1.0 (Win32)
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="==========B607BFDF64BECA94F647=========="
X-Virus-Scanned: by SolNet
Subject: doc/www.gnu.org/home.wml: link to meeting added
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2004 21:08:40 -0000

--==========B607BFDF64BECA94F647==========
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi!

I've added a link to the Free Java Developers Meeting at  FOSDEM in 
Brussels.

-Patrik
--==========B607BFDF64BECA94F647==========
Content-Type: text/plain; charset=iso-8859-1; name="diff.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename="diff.txt"; size=706

Index: =
home.wml=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DRCS file: =
/cvsroot/classpath/classpath/doc/www.gnu.org/home.wml,vretrieving revision =
1.35diff -u -r1.35 home.wml--- home.wml	29 Nov 2003 09:38:10 -0000	1.35+++ =
home.wml	2 Feb 2004 21:03:19 -0000@@ -4,6 +4,14 @@ <subject "GNU =
Classpath">  <box>+<boxitem>+<strong>Upcoming =
Events:</strong><br>+<ul>+<li>[21+22 Feb. 2004] <createlink =
url=3D"http://www.fosdem.org/2004/index/dev_room_java" name=3D"Free Java =
Developers Meeting"> at the upcoming <createlink =
url=3D"http://www.fosdem.org" name=3D"FOSDEM"> in =
Brussels.+</ul>+<br><br><br>+</boxitem>+ <boxtitle><a =
name=3D"home">Classpath::Home</a></boxtitle>  <boxitem>
--==========B607BFDF64BECA94F647==========--




From MAILER-DAEMON Mon Feb 02 17:03:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Anm9o-0000w6-OD
	for mharc-commit-classpath@gnu.org; Mon, 02 Feb 2004 17:03:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Anm9k-0000ur-Gm
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 17:03:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Anm94-0000nE-GR
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 17:02:49 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Anm93-0000mp-MQ
	for commit-classpath@gnu.org; Mon, 02 Feb 2004 17:02:17 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 9D80262319
	for <commit-classpath@gnu.org>; Mon,  2 Feb 2004 22:02:16 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 34211-04 for <commit-classpath@gnu.org>;
	Mon,  2 Feb 2004 22:02:15 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-176.adsl.solnet.ch
	[212.41.94.176])
	by mail01.solnet.ch (Postfix) with ESMTP id B953660C7E
	for <commit-classpath@gnu.org>; Mon,  2 Feb 2004 22:02:07 +0000 (GMT)
Received: from nbprr (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP id 9F158665F8
	for <commit-classpath@gnu.org>; Mon,  2 Feb 2004 23:01:42 +0100 (CET)
Date: Mon, 02 Feb 2004 23:03:01 +0100
From: Patrik Reali <reali@acm.org>
To: Classpath Commits <commit-classpath@gnu.org>
Message-ID: <10516201.1075762980@[192.168.1.3]>
X-Mailer: Mulberry/3.1.0 (Win32)
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="==========6F9F0EB2F918FCD1C0B7=========="
X-Virus-Scanned: by SolNet
Subject: [WWW] FAQ added to site
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Feb 2004 22:03:02 -0000

--==========6F9F0EB2F918FCD1C0B7==========
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

I've added the FAQ with a few entries to populate it. The layout is still 
not perfect, but that's a start and allows to store this information 
somewhere.

-Patrik
--==========6F9F0EB2F918FCD1C0B7==========
Content-Type: text/plain; charset=iso-8859-1; name="diff.txt"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename="diff.txt"; size=6412

Index: =
include/layout.wml=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DRCS file: =
/cvsroot/classpath/classpath/doc/www.gnu.org/include/layout.wml,vretrieving =
revision 1.1diff -u -r1.1 layout.wml--- include/layout.wml	27 Nov 2003 =
14:49:58 -0000	1.1+++ include/layout.wml	2 Feb 2004 21:18:37 -0000@@ -89,7 =
+89,7 @@ </tr>  <tr>-<td class=3D"menutable">+<td class=3D"menutable" =
valign=3D"top">  ## # Menu@@ -102,6 +102,7 @@ <menuitem><createlink =
name=3D"License" url=3D"license.html"></menuitem> <menuitem><createlink =
name=3D"Team" =
url=3D"http://savannah.gnu.org/project/memberlist.php?group_id=3D85"></menui=
tem> <menuitem><createlink name=3D"Download" =
url=3D"downloads/downloads.html"></menuitem>+<menuitem><createlink =
name=3D"FAQ" url=3D"faq/faq.html"></menuitem>  <menutitle>Success =
Stories</menutitle> <menuitem><createlink name=3D"JVMs" =
url=3D"stories.html#jvm"></menuitem>Index: =
faq/faq.wml=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3DRCS file: =
/cvsroot/classpath/classpath/doc/www.gnu.org/faq/faq.wml,vretrieving =
revision 1.1diff -u -r1.1 faq.wml--- faq/faq.wml	27 Nov 2003 14:49:58 =
-0000	1.1+++ faq/faq.wml	2 Feb 2004 21:18:38 -0000@@ -31,6 +31,7 @@ =
	<set-var __FAQCNT=3D1> 	<boxitem>%body</boxitem> {#FAQINDEX#:+		<br> =
		</boxitem> :#FAQINDEX#} 	<increment __SECCNT>@@ -41,7 +42,7 @@ <preserve =
question> <set-var %attributes> {#FAQINDEX#:-	<h3><a =
href=3D"faq/faq.html#faq<get-var __SECCNT>_<get-var __FAQCNT>"><get-var =
__SECCNT>.<get-var __FAQCNT> <get-var question></a></h3>+	<strong><a =
href=3D"faq/faq.html#faq<get-var __SECCNT>_<get-var __FAQCNT>"><get-var =
__SECCNT>.<get-var __FAQCNT> <get-var question></a></strong><br> =
:#FAQINDEX#} 	<h3><a name=3D"faq<get-var __SECCNT>_<get-var =
__FAQCNT>"><get-var __SECCNT>.<get-var __FAQCNT> <get-var =
question></a></h3> 	%body@@ -61,9 +62,115 @@ <faq-section =
name=3D"licensing">  <faq question=3D"Under which licence is GNU Classpath =
released?">-GNU Classpath is licensed under the GPL plus a special =
exception. See <createlink name=3D"license" url=3D"../license.html">.+GNU =
Classpath is licensed under the GPL plus a special =
exception:++<blockquote>+<p>+<code>+Linking this library statically or =
dynamically with other modules is+making a combined work based on this =
library.  Thus, the terms and+conditions of the GNU General Public License =
cover the whole+combination.+</code>+</p>+<p>+<code>+As a special =
exception, the copyright holders of this library give you+permission to =
link this library with independent modules to produce an+executable, =
regardless of the license terms of these independent+modules, and to copy =
and distribute the resulting executable under+terms of your choice, =
provided that you also meet, for each linked+independent module, the terms =
and conditions of the license of that+module.  An independent module is a =
module which is not derived from+or based on this library.  If you modify =
this library, you may extend+this exception to your version of the library, =
but you are not+obligated to do so.  If you do not wish to do so, delete =
this+exception statement from your =
version.+</code>+</p>+</blockquote>++</faq>++<faq question=3D"Where can I =
find more about the GPL?">+Please check the FSF FAQ on the GNU GPL: =
<createlink name=3D"http://www.fsf.org/licenses/gpl-faq.html" =
url=3D"http://www.fsf.org/licenses/gpl-faq.html">. </faq>  </faq-section> =
+<faq-section name=3D"Classpath Development">+<faq question=3D"Why do I =
have to give the copyright to the FSF?">+Some contributors of Classpath =
might be annoyed if their work was being+used under conditions that are not =
according to the terms of the license.+However, enforcing the license in =
court (if this was ever needed) would+be easier if the Free Software =
Foundation can claim to speak in the name+of all authors. For this reason, =
and for others that are specific to the+intellectual property system of the =
United States, GNU projects tend to+be a bit picky about getting signatures =
from all contributors. Please do+not see this as a personal =
offence.++<p>See also <a =
href=3D"http://www.gnu.org/licenses/why-assign.html">http://www.gnu.org/lice=
nses/why-assign.html</a>.+</p>++<p>For getting the assignment form, please =
send an e-mail with your name (as+it appears in your passport) and your =
current postal address to the+maintainer of GNU Classpath, Mark Wielaard =
<mark@klomp.org>.+</p>+</faq>+</faq-section>++<faq-section =
name=3D"Varia">+<faq question=3D"How to generate API Documentation with =
gjdoc/libxmlj?">++Beware: generating the complete API Documentation =
non-trivial and the generation of a full tree takes more then one and half =
hour (on a 1.4 Ghz Athlon),+150+ MB of memory, at least 25MB of tmp =
storage, and at least+twice so much in your obj build =
dir.++<ol>+<br><li>install gcj 3.3.2 (or higher)<br>+<code>+gjdoc CVS =
:pserver:anoncvs@subversions.gnu.org:/cvsroot/cp-tools module =
gjdoc+</code>+<br><li>install libxmlj<br>+<code>+libxmlj CVS =
:pserver:anoncvs@subversions.gnu.org:/cvsroot/classpathx module =
libxmlj<br>+make && make install+</code>++<br><li>For gjdoc add at the =
start of gnu/classpath/tools/gjdoc/Main.java (main):<br>++<code>+  =
System.setProperty("javax.xml.transform.TransformerFactory",+            =
"gnu.xml.libxmlj.transform.TransformerFactoryImpl");+</code>++<br><li>There =
is a ant build.xml file, but you can also compile it all by hand together =
with the external/jaxp/source files from Classpath which can be copied in =
the src direcrory as follows:<br>++<code>+  find * -name \*.java | xargs =
gcj -O2 -g -o gjdoc \<br>+  =
--main=3Dgnu.classpath.tools.gjdoc.Main+</code>++<br><li>Create a simple =
gjdoc script and put it in your PATH:<br>++<code>+  #!/bin/sh<br>+  =
CLASSPATH=3D/home/mark/src/libxmlj:/home/mark/src/gjdoc/src/resources =
\<br>+  LD_LIBRARY_PATH=3D/usr/local/libxmlj/lib \<br>+  =
/home/mark/src/gjdoc/src/gjdoc $*+</code>++<br><li>Configure classpah with =
--enable-gjdoc.+<br><li>Type make and go get yourself some coffe, take a =
shower and do some work in the garden.+</ol>++<p>There is one catch. The =
above setup is completely broken for some HTML+entities (see [bugs #4823] =
HTML entities such as auml and nbsp should be+put back in the API doc). So =
if you have  spectacular and mysterious+crashes then make sure that your =
java source files don't contain such+entities.+++</faq>+</faq-section> =
</box>
--==========6F9F0EB2F918FCD1C0B7==========--




From MAILER-DAEMON Tue Feb 03 05:11:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AnxWR-0005aY-86
	for mharc-commit-classpath@gnu.org; Tue, 03 Feb 2004 05:11:11 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AnxWN-0005Yb-IW
	for commit-classpath@gnu.org; Tue, 03 Feb 2004 05:11:07 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AnxVp-0005M0-4x
	for commit-classpath@gnu.org; Tue, 03 Feb 2004 05:11:05 -0500
Received: from [217.8.192.21] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24)
	id 1AnxV8-0005AQ-Vm; Tue, 03 Feb 2004 05:09:51 -0500
Received: from [217.114.112.56] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 541320; Tue, 03 Feb 2004 11:15:09 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: Classpath Commits <commit-classpath@gnu.org>
Date: Tue, 3 Feb 2004 11:09:47 +0100
Message-Id: <20040203100947.2197@smtp.mail.ch.easynet.net>
In-Reply-To: <10516201.1075762980@[192.168.1.3]>
References: <10516201.1075762980@[192.168.1.3]>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: GNU Classpath <classpath@gnu.org>
Subject: Re: [WWW] FAQ added to site
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Feb 2004 10:11:09 -0000

Patrik Reali <reali@acm.org> wrote on Mon, 2 Feb 2004 23:03:01 +0100 [to
classpath-commit]:

>I've added the FAQ with a few entries to populate it. The layout is still 
>not perfect, but that's a start and allows to store this information 
>somewhere.

Last summer, I had started a Classpath FAQ with some preliminary content.
I had sent it to the classpath@gnu.org list, but did not get much feed-
back. Feel free to copy/change things from the old draft, in case it
turns out to be useful to you.

<http://www.dandelis.ch/cpfaq.html>

-- Sascha

Sascha Brawer, brawer@dandelis.ch, http://www.dandelis.ch/people/brawer/ 





From MAILER-DAEMON Tue Feb 03 12:06:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ao40B-0004Gn-JX
	for mharc-commit-classpath@gnu.org; Tue, 03 Feb 2004 12:06:19 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ao407-0004FS-JE
	for commit-classpath@gnu.org; Tue, 03 Feb 2004 12:06:15 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ao3zU-00041y-CW
	for commit-classpath@gnu.org; Tue, 03 Feb 2004 12:06:07 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ao3zT-00041G-Fm
	for commit-classpath@gnu.org; Tue, 03 Feb 2004 12:05:35 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i13H5Ub13905
	for <commit-classpath@gnu.org>; Tue, 3 Feb 2004 12:05:31 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i13H5Ua28228
	for <commit-classpath@gnu.org>; Tue, 3 Feb 2004 12:05:30 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i13H5TXd018655
	for <commit-classpath@gnu.org>; Tue, 3 Feb 2004 12:05:30 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-RReMvh/Sh+sIPpJ2X6Av"
Message-Id: <1075827929.13353.5.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 03 Feb 2004 12:05:29 -0500
Subject: Patch: FYI: add deprecated method section to hacking.texinfo
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Feb 2004 17:06:17 -0000


--=-RReMvh/Sh+sIPpJ2X6Av
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

I committed the attached patch.

Tom

2004-02-03  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* doc/hacking.texinfo (Serialization): Add section header.
	(Deprecated Methods): New section.


--=-RReMvh/Sh+sIPpJ2X6Av
Content-Disposition: attachment; filename=hacking-doc.patch
Content-Type: text/x-patch; name=hacking-doc.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1865
diff -u -r1.1865 ChangeLog
--- ChangeLog	2 Feb 2004 10:29:58 -0000	1.1865
+++ ChangeLog	3 Feb 2004 16:58:46 -0000
@@ -1,3 +1,8 @@
+2004-02-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* doc/hacking.texinfo (Serialization): Add section header.
+	(Deprecated Methods): New section.
+
 2004-02-02  Jeroen Frijters  <jeroen@frijters.net>
 
 	* java/lang/Thread.java (setDaemon): Allow daemon state to be
Index: doc/hacking.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/hacking.texinfo,v
retrieving revision 1.18
diff -u -r1.18 hacking.texinfo
--- doc/hacking.texinfo	1 Feb 2004 16:46:37 -0000	1.18
+++ doc/hacking.texinfo	3 Feb 2004 16:58:46 -0000
@@ -59,7 +59,7 @@
 * Programming Tools::           A list of tools you will need for hacking
 * Programming Standards::       Standards to use when writing code for Classpath
 * Programming Goals::           What to consider when writing code for Classpath
-* API Compatibility::           
+* API Compatibility::           How to handle serialization and deprecated methods
 * Specification Sources::       Where to find the Java class library specs
 * Naming Conventions::          How files and directories are named in Classpath
 * Character Conversions::       Working on Character conversions
@@ -614,6 +614,10 @@
 @comment  node-name,  next,  previous,  up
 @chapter API Compatibility
 
+@node Serialization, Deprecated Methods, , API Compatibility
+@comment  node-name,  next,  previous,  up
+@section Serialization
+
 Sun has produced documentation concerning much of the information
 needed to make Classpath serializable compatible with Sun
 implementations.  Part of doing this is to make sure that every class
@@ -638,6 +642,52 @@
 information about unknown serialized formats by writing these in XML
 instead.  Japitools is also the primary means of checking API
 compatibility for GNU Classpath with Sun's Java Platform.
+
+@node Deprecated Methods, , Serialization, API Compatibility
+@comment  node-name,  next,  previous,  up
+@section Deprecated Methods
+
+Sun has a practice of creating ``alias'' methods, where a public or
+protected method is deprecated in favor of a new one that has the same
+function but a different name.  Sun's reasons for doing this vary; as
+an example, the original name may contain a spelling error or it may
+not follow Java naming conventions.
+
+Unfortunately, this practice complicates class library code that calls
+these aliased methods.  Library code must still call the deprecated
+method so that old client code that overrides it continues to work.
+But library code must also call the new version, because new code is
+expected to override the new method.
+
+The correct way to handle this (and the way Sun does it) may seem
+counterintuitive because it means that new code is less efficient than
+old code: the new method must call the deprecated method, and throughout
+the library code calls to the old method must be replaced with calls to
+the new one.
+
+Take the example of a newly-written container laying out a component and
+wanting to know its preferred size.  The Component class has a
+deprecated preferredSize method and a new method, getPreferredSize. 
+Assume that the container is laying out an old component that overrides
+preferredSize and a new component that overrides getPreferredSize.  If
+the container calls getPreferredSize and the default implementation of
+getPreferredSize calls preferredSize, then the old component will have
+its preferredSize method called and new code will have its
+getPreferredSize method called.
+
+Even using this calling scheme, an old component may still be laid out
+improperly if it implements a method, getPreferredSize, that has the
+same signature as the new Component.getPreferredSize.  But that is a
+general problem -- adding new public or protected methods to a
+widely-used class that calls those methods internally is risky, because
+existing client code may have already declared methods with the same
+signature.
+
+The solution may still seem counterintuitive -- why not have the
+deprecated method call the new method, then have the library always call
+the old method?  One problem with that, using the preferred size example
+again, is that new containers, which will use the non-deprecated
+getPreferredSize, will not get the preferred size of old components.
 
 @node Specification Sources, Naming Conventions, API Compatibility, Top
 @comment node-name, next, previous, up

--=-RReMvh/Sh+sIPpJ2X6Av--




From MAILER-DAEMON Tue Feb 03 12:20:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ao4ED-0001lu-Bd
	for mharc-commit-classpath@gnu.org; Tue, 03 Feb 2004 12:20:49 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ao4E7-0001jR-PS
	for commit-classpath@gnu.org; Tue, 03 Feb 2004 12:20:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ao4DX-0001Yc-3D
	for commit-classpath@gnu.org; Tue, 03 Feb 2004 12:20:38 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ao4Cl-00017g-Ek
	for commit-classpath@gnu.org; Tue, 03 Feb 2004 12:19:19 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i13HJDb22896
	for <commit-classpath@gnu.org>; Tue, 3 Feb 2004 12:19:13 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i13HJCa01610
	for <commit-classpath@gnu.org>; Tue, 3 Feb 2004 12:19:13 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i13HJCXd019073
	for <commit-classpath@gnu.org>; Tue, 3 Feb 2004 12:19:12 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-1ynGAz+hwDIQD+CoOHQG"
Message-Id: <1075828752.13353.8.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 03 Feb 2004 12:19:12 -0500
Subject: Patch: FYI: fix handling of AWT alias methods
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Feb 2004 17:20:45 -0000


--=-1ynGAz+hwDIQD+CoOHQG
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

I committed the attached patch.

Tom

2004-02-03  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkListPeer.java,
	java/awt/BorderLayout.java, java/awt/CardLayout.java,
	java/awt/CheckboxGroup.java, java/awt/Choice.java,
	java/awt/Component.java, java/awt/Container.java,
	java/awt/FontMetrics.java, java/awt/GridBagLayout.java,
	java/awt/LayoutManager2.java, java/awt/List.java,
	java/awt/Menu.java, java/awt/MenuBar.java,
	java/awt/MenuItem.java, java/awt/Polygon.java,
	java/awt/Rectangle.java, java/awt/ScrollPane.java,
	java/awt/Scrollbar.java, java/awt/TextArea.java,
	java/awt/TextField.java,
	java/awt/image/renderable/RenderContext.java,
	javax/swing/JApplet.java: Fix handling of alias methods, where a
	method has been deprecated in favour of a new one with the same
	funtion but a different name.  Put the method implementation in
	the deprecated method and have the new method call the
	deprecated one.  Make all other code call the new method.


--=-1ynGAz+hwDIQD+CoOHQG
Content-Disposition: attachment; filename=fix-aliases.patch
Content-Type: text/x-patch; name=fix-aliases.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: gnu/java/awt/peer/gtk/GtkListPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkListPeer.java,v
retrieving revision 1.6
diff -u -r1.6 GtkListPeer.java
--- gnu/java/awt/peer/gtk/GtkListPeer.java	17 Dec 2003 18:02:56 -0000	1.6
+++ gnu/java/awt/peer/gtk/GtkListPeer.java	2 Feb 2004 17:41:48 -0000
@@ -85,18 +85,12 @@
   
   public Dimension getMinimumSize (int rows)
   {
-    int dims[] = new int[2];
-
-    getSize (rows, dims);
-    return (new Dimension (dims[0], dims[1]));
+    return minimumSize (rows);
   }
 
   public Dimension getPreferredSize (int rows)
   {
-    int dims[] = new int[2];
-
-    getSize (rows, dims);
-    return (new Dimension (dims[0], dims[1]));
+    return preferredSize (rows);
   }
   
   public native int[] getSelectedIndexes ();
@@ -104,12 +98,18 @@
 
   public Dimension minimumSize (int rows)
   {
-    return (getMinimumSize (rows));
+    int dims[] = new int[2];
+
+    getSize (rows, dims);
+    return new Dimension (dims[0], dims[1]);
   }
 
   public Dimension preferredSize (int rows)
   {
-    return (getPreferredSize (rows));
+    int dims[] = new int[2];
+
+    getSize (rows, dims);
+    return new Dimension (dims[0], dims[1]);
   }
 
   public void removeAll ()
Index: java/awt/BorderLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/BorderLayout.java,v
retrieving revision 1.10
diff -u -r1.10 BorderLayout.java
--- java/awt/BorderLayout.java	10 Nov 2002 23:11:21 -0000	1.10
+++ java/awt/BorderLayout.java	2 Feb 2004 17:41:48 -0000
@@ -349,7 +349,28 @@
   if (constraints != null && ! (constraints instanceof String))
     throw new IllegalArgumentException("Constraint must be a string");
 
-  String str = (String)constraints;
+  addLayoutComponent((String) constraints, component);
+}
+
+/*************************************************************************/
+
+/**
+  * Adds a component to the layout in the specified constraint position, 
+  * which must be one of the string constants defined in this class.
+  *
+  * @param constraints The constraint string.
+  * @param component The component to add.
+  *
+  * @exception IllegalArgumentException If the constraint object is not
+  * one of the specified constants in this class.
+  *
+  * @deprecated This method is deprecated in favor of
+  * <code>addLayoutComponent(Component, Object)</code>.
+  */
+public void
+addLayoutComponent(String constraints, Component component)
+{
+  String str = constraints;
 
   if (str == null || str.equals(CENTER))
     center = component;
@@ -371,27 +392,6 @@
     lastItem = component;
   else
     throw new IllegalArgumentException("Constraint value not valid: " + str);
-}
-
-/*************************************************************************/
-
-/**
-  * Adds a component to the layout in the specified constraint position, 
-  * which must be one of the string constants defined in this class.
-  *
-  * @param constraints The constraint string.
-  * @param component The component to add.
-  *
-  * @exception IllegalArgumentException If the constraint object is not
-  * one of the specified constants in this class.
-  *
-  * @deprecated This method is deprecated in favor of
-  * <code>addLayoutComponent(Component, Object)</code>.
-  */
-public void
-addLayoutComponent(String constraints, Component component)
-{
-  addLayoutComponent(component, constraints);
 }
 
 /*************************************************************************/
Index: java/awt/CardLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/CardLayout.java,v
retrieving revision 1.8
diff -u -r1.8 CardLayout.java
--- java/awt/CardLayout.java	15 Jan 2003 22:47:04 -0000	1.8
+++ java/awt/CardLayout.java	2 Feb 2004 17:41:48 -0000
@@ -90,7 +90,7 @@
     if (! (constraints instanceof String))
       throw new IllegalArgumentException ("Object " + constraints
 					  + " is not a string");
-    tab.put (constraints, comp);
+    addLayoutComponent ((String) constraints, comp);
   }
 
   /** Add a new component to the layout.  The name can be used later
@@ -102,7 +102,7 @@
    */
   public void addLayoutComponent (String name, Component comp)
   {
-    addLayoutComponent (comp, name);
+    tab.put (name, comp);
   }
 
   /** Cause the first component in the container to be displayed.
Index: java/awt/CheckboxGroup.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/CheckboxGroup.java,v
retrieving revision 1.4
diff -u -r1.4 CheckboxGroup.java
--- java/awt/CheckboxGroup.java	22 Jan 2002 22:40:04 -0000	1.4
+++ java/awt/CheckboxGroup.java	2 Feb 2004 17:41:48 -0000
@@ -95,8 +95,8 @@
 public Checkbox
 getSelectedCheckbox()
 {
-  return(selectedCheckbox);
-} 
+  return getCurrent ();
+}
 
 /*************************************************************************/
 
@@ -126,17 +126,7 @@
 public void
 setSelectedCheckbox(Checkbox selectedCheckbox)
 {
-  if (this.selectedCheckbox != null)
-    {
-      if (this.selectedCheckbox.getCheckboxGroup() != this)
-        return;
-
-      this.selectedCheckbox.setState(false);
-    }
-
-  this.selectedCheckbox = selectedCheckbox;
-  if (selectedCheckbox != null)
-    selectedCheckbox.setState(true);
+  setCurrent (selectedCheckbox);
 }
 
 /*************************************************************************/
@@ -153,7 +143,17 @@
 public void
 setCurrent(Checkbox selectedCheckbox)
 {
-  setSelectedCheckbox(selectedCheckbox);
+  if (this.selectedCheckbox != null)
+    {
+      if (this.selectedCheckbox.getCheckboxGroup() != this)
+        return;
+
+      this.selectedCheckbox.setState(false);
+    }
+
+  this.selectedCheckbox = selectedCheckbox;
+  if (selectedCheckbox != null)
+    selectedCheckbox.setState(true);
 }
 
 /*************************************************************************/
Index: java/awt/Choice.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Choice.java,v
retrieving revision 1.13
diff -u -r1.13 Choice.java
--- java/awt/Choice.java	5 Jan 2004 21:18:06 -0000	1.13
+++ java/awt/Choice.java	2 Feb 2004 17:41:48 -0000
@@ -111,7 +111,7 @@
 public int
 getItemCount()
 {
-  return(pItems.size());
+  return countItems ();
 }
 
 /*************************************************************************/
Index: java/awt/Component.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Component.java,v
retrieving revision 1.34
diff -u -r1.34 Component.java
--- java/awt/Component.java	26 Jan 2004 21:55:41 -0000	1.34
+++ java/awt/Component.java	2 Feb 2004 17:41:48 -0000
@@ -779,9 +779,7 @@
    */
   public void setEnabled(boolean b)
   {
-    this.enabled = b;
-    if (peer != null)
-      peer.setEnabled(b);
+    enable (b);
   }
 
   /**
@@ -791,7 +789,9 @@
    */
   public void enable()
   {
-    setEnabled(true);
+    this.enabled = true;
+    if (peer != null)
+      peer.setEnabled (true);
   }
 
   /**
@@ -802,7 +802,10 @@
    */
   public void enable(boolean b)
   {
-    setEnabled(b);
+    if (b)
+      enable ();
+    else
+      disable ();
   }
 
   /**
@@ -812,7 +815,9 @@
    */
   public void disable()
   {
-    setEnabled(false);
+    this.enabled = false;
+    if (peer != null)
+      peer.setEnabled (false);
   }
 
   /**
@@ -856,10 +861,7 @@
     // Inspection by subclassing shows that Sun's implementation calls
     // show(boolean) which then calls show() or hide(). It is the show()
     // method that is overriden in subclasses like Window.
-    if (b)
-      show();
-    else
-      hide();
+    show (b);
   }
 
   /**
@@ -887,7 +889,10 @@
    */
   public void show(boolean b)
   {
-    setVisible(b);
+    if (b)
+      show ();
+    else
+      hide ();
   }
 
   /**
@@ -1083,7 +1088,7 @@
    */
   public Point getLocation()
   {
-    return new Point(x, y);
+    return location ();
   }
 
   /**
@@ -1110,7 +1115,7 @@
    */
   public Point location()
   {
-    return getLocation();
+    return new Point (x, y);
   }
 
   /**
@@ -1125,13 +1130,7 @@
    */
   public void setLocation(int x, int y)
   {
-    if (this.x == x && this.y == y)
-      return;
-    invalidate();
-    this.x = x;
-    this.y = y;
-    if (peer != null)
-      peer.setBounds(x, y, width, height);
+    move (x, y);
   }
 
   /**
@@ -1145,7 +1144,13 @@
    */
   public void move(int x, int y)
   {
-    setLocation(x, y);
+    if (this.x == x && this.y == y)
+      return;
+    invalidate ();
+    this.x = x;
+    this.y = y;
+    if (peer != null)
+      peer.setBounds (x, y, width, height);
   }
 
   /**
@@ -1173,7 +1178,7 @@
    */
   public Dimension getSize()
   {
-    return new Dimension(width, height);
+    return size ();
   }
 
   /**
@@ -1184,7 +1189,7 @@
    */
   public Dimension size()
   {
-    return getSize();
+    return new Dimension (width, height);
   }
 
   /**
@@ -1197,13 +1202,7 @@
    */
   public void setSize(int width, int height)
   {
-    if (this.width == width && this.height == height)
-      return;
-    invalidate();
-    this.width = width;
-    this.height = height;
-    if (peer != null)
-      peer.setBounds(x, y, width, height);
+    resize (width, height);
   }
 
   /**
@@ -1215,7 +1214,13 @@
    */
   public void resize(int width, int height)
   {
-    setSize(width, height);
+    if (this.width == width && this.height == height)
+      return;
+    invalidate ();
+    this.width = width;
+    this.height = height;
+    if (peer != null)
+      peer.setBounds (x, y, width, height);
   }
 
   /**
@@ -1229,7 +1234,7 @@
    */
   public void setSize(Dimension d)
   {
-    setSize(d.width, d.height);
+    resize (d);
   }
 
   /**
@@ -1241,7 +1246,7 @@
    */
   public void resize(Dimension d)
   {
-    setSize(d.width, d.height);
+    resize (d.width, d.height);
   }
 
   /**
@@ -1256,7 +1261,7 @@
    */
   public Rectangle getBounds()
   {
-    return new Rectangle(x, y, width, height);
+    return bounds ();
   }
 
   /**
@@ -1269,7 +1274,7 @@
    */
   public Rectangle bounds()
   {
-    return getBounds();
+    return new Rectangle (x, y, width, height);
   }
 
   /**
@@ -1289,15 +1294,7 @@
    */
   public void setBounds(int x, int y, int w, int h)
   {
-    if (this.x == x && this.y == y && width == w && height == h)
-      return;
-    invalidate();
-    this.x = x;
-    this.y = y;
-    width = w;
-    height = h;
-    if (peer != null)
-      peer.setBounds(x, y, w, h);
+    reshape (x, y, w, h);
   }
 
   /**
@@ -1306,13 +1303,22 @@
    *
    * @param x the X coordinate of the upper left corner of the rectangle
    * @param y the Y coordinate of the upper left corner of the rectangle
-   * @param w the width of the rectangle
-   * @param h the height of the rectangle
+   * @param width the width of the rectangle
+   * @param height the height of the rectangle
    * @deprecated use {@link #setBounds(int, int, int, int)} instead
    */
   public void reshape(int x, int y, int width, int height)
   {
-    setBounds(x, y, width, height);
+    if (this.x == x && this.y == y
+        && this.width == width && this.height == height)
+      return;
+    invalidate ();
+    this.x = x;
+    this.y = y;
+    this.width = width;
+    this.height = height;
+    if (peer != null)
+      peer.setBounds (x, y, width, height);
   }
 
   /**
@@ -1329,7 +1335,7 @@
    */
   public void setBounds(Rectangle r)
   {
-    setBounds(r.x, r.y, r.width, r.height);
+    setBounds (r.x, r.y, r.width, r.height);
   }
 
   /**
@@ -1560,7 +1566,7 @@
    */
   public void doLayout()
   {
-    // nothing to do unless we're a container
+    layout ();
   }
 
   /**
@@ -1571,7 +1577,7 @@
    */
   public void layout()
   {
-    doLayout();
+    // Nothing to do unless we're a container.
   }
 
   /**
@@ -2076,7 +2082,7 @@
    */
   public boolean contains(int x, int y)
   {
-    return x >= 0 && y >= 0 && x < width && y < height;
+    return inside (x, y);
   }
 
   /**
@@ -2090,7 +2096,7 @@
    */
   public boolean inside(int x, int y)
   {
-    return contains(x, y);
+    return x >= 0 && y >= 0 && x < width && y < height;
   }
 
   /**
@@ -2105,7 +2111,7 @@
    */
   public boolean contains(Point p)
   {
-    return contains(p.x, p.y);
+    return contains (p.x, p.y);
   }
 
   /**
@@ -2120,7 +2126,7 @@
    */
   public Component getComponentAt(int x, int y)
   {
-    return contains(x, y) ? this : null;
+    return locate (x, y);
   }
 
   /**
@@ -2135,7 +2141,7 @@
    */
   public Component locate(int x, int y)
   {
-    return getComponentAt(x, y);
+    return contains (x, y) ? this : null;
   }
 
   /**
@@ -2151,7 +2157,7 @@
    */
   public Component getComponentAt(Point p)
   {
-    return getComponentAt(p.x, p.y);
+    return getComponentAt (p.x, p.y);
   }
 
   /**
Index: java/awt/Container.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Container.java,v
retrieving revision 1.32
diff -u -r1.32 Container.java
--- java/awt/Container.java	26 Jan 2004 21:55:41 -0000	1.32
+++ java/awt/Container.java	2 Feb 2004 17:41:48 -0000
@@ -106,7 +106,7 @@
    */
   public int getComponentCount()
   {
-    return ncomponents;
+    return countComponents ();
   }
 
   /**
@@ -118,7 +118,7 @@
    */
   public int countComponents()
   {
-    return getComponentCount();
+    return ncomponents;
   }
 
   /**
@@ -186,10 +186,7 @@
    */
   public Insets getInsets()
   {
-    if (peer == null)
-      return new Insets(0, 0, 0, 0);
-    
-    return ((ContainerPeer) peer).getInsets();
+    return insets ();
   }
 
   /**
@@ -201,7 +198,10 @@
    */
   public Insets insets()
   {
-    return getInsets();
+    if (peer == null)
+      return new Insets (0, 0, 0, 0);
+
+    return ((ContainerPeer) peer).getInsets ();
   }
 
   /**
@@ -463,8 +463,7 @@
    */
   public void doLayout()
   {
-    if (layoutMgr != null)
-      layoutMgr.layoutContainer(this);
+    layout ();
   }
 
   /**
@@ -474,7 +473,8 @@
    */
   public void layout()
   {
-    doLayout();
+    if (layoutMgr != null)
+      layoutMgr.layoutContainer (this);
   }
 
   /**
@@ -555,7 +555,7 @@
    */
   public Dimension getPreferredSize()
   {
-      return preferredSize();
+    return preferredSize ();
   }
 
   /**
@@ -567,10 +567,10 @@
    */
   public Dimension preferredSize()
   {
-      if (layoutMgr != null)
-	  return layoutMgr.preferredLayoutSize(this);
-      else
-	  return super.preferredSize();
+    if (layoutMgr != null)
+      return layoutMgr.preferredLayoutSize (this);
+    else
+      return super.preferredSize ();
   }
 
   /**
@@ -580,7 +580,7 @@
    */
   public Dimension getMinimumSize()
   {
-      return minimumSize();
+    return minimumSize ();
   }
 
   /**
@@ -592,10 +592,10 @@
    */
   public Dimension minimumSize()
   {
-      if (layoutMgr != null)
-	  return layoutMgr.minimumLayoutSize(this);
-      else
-	  return super.minimumSize();
+    if (layoutMgr != null)
+      return layoutMgr.minimumLayoutSize (this);
+    else
+      return super.minimumSize ();
   }
 
   /**
@@ -833,23 +833,7 @@
    */
   public Component getComponentAt(int x, int y)
   {
-    synchronized (getTreeLock ())
-      {
-        if (! contains(x, y))
-          return null;
-        for (int i = 0; i < ncomponents; ++i)
-          {
-            // Ignore invisible children...
-            if (!component[i].isVisible())
-              continue;
-
-            int x2 = x - component[i].x;
-            int y2 = y - component[i].y;
-            if (component[i].contains(x2, y2))
-              return component[i];
-          }
-        return this;
-      }
+    return locate (x, y);
   }
 
   /**
@@ -869,7 +853,23 @@
    */
   public Component locate(int x, int y)
   {
-    return getComponentAt(x, y);
+    synchronized (getTreeLock ())
+      {
+        if (!contains (x, y))
+          return null;
+        for (int i = 0; i < ncomponents; ++i)
+          {
+            // Ignore invisible children...
+            if (!component[i].isVisible ())
+              continue;
+
+            int x2 = x - component[i].x;
+            int y2 = y - component[i].y;
+            if (component[i].contains (x2, y2))
+              return component[i];
+          }
+        return this;
+      }
   }
 
   /**
@@ -886,7 +886,7 @@
    */
   public Component getComponentAt(Point p)
   {
-    return getComponentAt(p.x, p.y);
+    return getComponentAt (p.x, p.y);
   }
 
   public Component findComponentAt(int x, int y)
Index: java/awt/FontMetrics.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/FontMetrics.java,v
retrieving revision 1.4
diff -u -r1.4 FontMetrics.java
--- java/awt/FontMetrics.java	22 Jan 2002 22:58:08 -0000	1.4
+++ java/awt/FontMetrics.java	2 Feb 2004 17:41:48 -0000
@@ -195,7 +195,7 @@
 public int
 getMaxDescent()
 {
-  return(getDescent());
+  return getMaxDecent ();
 }
 
 /*************************************************************************/
@@ -212,7 +212,7 @@
 public int
 getMaxDecent()
 {
-  return(getMaxDescent());
+  return getDescent ();
 }
 
 /*************************************************************************/
Index: java/awt/GridBagLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/GridBagLayout.java,v
retrieving revision 1.6
diff -u -r1.6 GridBagLayout.java
--- java/awt/GridBagLayout.java	14 Nov 2003 22:44:29 -0000	1.6
+++ java/awt/GridBagLayout.java	2 Feb 2004 17:41:48 -0000
@@ -149,7 +149,7 @@
 
     public void layoutContainer (Container parent)
     {
-	arrangeGrid (parent);
+      arrangeGrid (parent);
     }
 
     public float getLayoutAlignmentX (Container target)
@@ -302,7 +302,8 @@
      */
     protected void AdjustForGravity (GridBagConstraints gbc, Rectangle rect)
     {
-	adjustForGravity (gbc, rect);
+      // FIXME
+      throw new Error ("Not implemented");
     }
 
     /**
@@ -310,7 +311,115 @@
      */
     protected void ArrangeGrid (Container parent)
     {
-	arrangeGrid (parent);
+      Component[] components = parent.getComponents();
+
+      if (components.length == 0)
+        return;
+
+      GridBagLayoutInfo info = getLayoutInfo (parent, PREFERREDSIZE);
+      if (info.cols == 0 && info.rows == 0)
+        return;
+      layoutInfo = info;
+
+      // DEBUG
+      //dumpLayoutInfo (layoutInfo);
+    
+      for(int i = 0; i < components.length; i++)
+	{
+          Component component = components [i];
+		
+          // If component is not visible we dont have to care about it.
+          if (!component.isVisible())
+            continue;
+		
+          GridBagConstraints constraints = lookupConstraints (component);
+
+          int cellx = sumIntArray(layoutInfo.colWidths, constraints.gridx);
+          int celly = sumIntArray(layoutInfo.rowHeights, constraints.gridy);
+          int cellw = sumIntArray(layoutInfo.colWidths,
+                                  constraints.gridx + constraints.gridwidth) - cellx;
+          int cellh = sumIntArray(layoutInfo.rowHeights,
+                                  constraints.gridy + constraints.gridheight) - celly;
+
+          Insets insets = constraints.insets;
+          if (insets != null)
+	    {
+              cellx += insets.left;
+              celly += insets.top;
+              cellw -= insets.left + insets.right;
+              cellh -= insets.top + insets.bottom;
+	    }
+
+          Dimension dim = component.getPreferredSize();
+
+          // Note: Documentation says that padding is added on both sides, but
+          // visual inspection shows that the Sun implementation only adds it
+          // once, so we do the same.
+          dim.width += constraints.ipadx;
+          dim.height += constraints.ipady;
+
+          switch(constraints.fill)
+	    {
+            case GridBagConstraints.HORIZONTAL:
+              dim.width = cellw;
+              break;
+            case GridBagConstraints.VERTICAL:
+              dim.height = cellh;
+              break;
+            case GridBagConstraints.BOTH:
+              dim.width = cellw;
+              dim.height = cellh;
+              break;
+	    }
+
+          int x;
+          int y;
+
+          switch(constraints.anchor)
+	    {
+            case GridBagConstraints.NORTH:
+              x = cellx + (cellw - dim.width) / 2;
+              y = celly;
+              break;
+            case GridBagConstraints.SOUTH:
+              x = cellx + (cellw - dim.width) / 2;
+              y = celly + cellh - dim.height;
+              break;
+            case GridBagConstraints.WEST:
+              x = cellx;
+              y = celly + (cellh - dim.height) / 2;
+              break;
+            case GridBagConstraints.EAST:
+              x = cellx + cellw - dim.width;
+              y = celly + (cellh - dim.height) / 2;
+              break;
+            case GridBagConstraints.NORTHEAST:
+              x = cellx + cellw - dim.width;
+              y = celly;
+              break;
+            case GridBagConstraints.NORTHWEST:
+              x = cellx;
+              y = celly;
+              break;
+            case GridBagConstraints.SOUTHEAST:
+              x = cellx + cellw - dim.width;
+              y = celly + cellh - dim.height;
+              break;
+            case GridBagConstraints.SOUTHWEST:
+              x = cellx;
+              y = celly + cellh - dim.height;
+              break;
+            default:
+              x = cellx + (cellw - dim.width) / 2;
+              y = celly + (cellh - dim.height) / 2;
+              break;
+	    }
+
+          component.setBounds(layoutInfo.pos_x + x, layoutInfo.pos_y + y, dim.width, dim.height);
+	}
+
+      // DEBUG
+      //dumpLayoutInfo (layoutInfo);
     }
 
     /**
@@ -318,7 +427,160 @@
      */
     protected GridBagLayoutInfo GetLayoutInfo (Container parent, int sizeflag)
     {
-	return getLayoutInfo (parent, sizeflag);
+      if (sizeflag != MINSIZE && sizeflag != PREFERREDSIZE)
+        throw new IllegalArgumentException();
+
+      Dimension parentDim = parent.getSize ();
+      Insets parentInsets = parent.getInsets ();
+      parentDim.width -= parentInsets.left + parentInsets.right;
+      parentDim.height -= parentInsets.top + parentInsets.bottom;
+   
+      int x = 0;
+      int y = 0;
+      int max_x = 0;
+      int max_y = 0;
+
+      // first we figure out how many rows/columns
+      Component[] components = parent.getComponents();
+      for (int i = 0; i < components.length; i++)
+	{
+          Component component = components [i];
+		
+          // If component is not visible we dont have to care about it.
+          if (!component.isVisible())
+            continue;
+		
+          GridBagConstraints constraints = lookupConstraints (component);
+		
+          if(constraints.gridx == GridBagConstraints.RELATIVE)
+            constraints.gridx = x;
+
+          if(constraints.gridy == GridBagConstraints.RELATIVE)
+            constraints.gridy = y;
+		
+          max_x = Math.max(max_x, 
+                           constraints.gridx + Math.max(1, constraints.gridwidth));
+          max_y = Math.max(max_y,
+                           constraints.gridy + Math.max(1, constraints.gridheight));
+
+          if(constraints.gridwidth == GridBagConstraints.REMAINDER)
+	    {
+              x = 0;
+              y++;
+	    }
+          else
+	    {
+              x = constraints.gridx + Math.max(1, constraints.gridwidth);
+              y = constraints.gridy;
+	    }
+	}
+	
+      GridBagLayoutInfo info = new GridBagLayoutInfo(max_x, max_y);
+
+      for (x = 0; x <= max_x; x++)
+	{
+          if(columnWidths != null && columnWidths.length > x)
+	    {
+              info.colWidths[x] = columnWidths[x];
+	    }
+          if(columnWeights != null && columnWeights.length > x)
+	    {
+              info.colWeights[x] = columnWeights[x];
+	    }
+          for (int i = 0; i < components.length; i++)
+	    {
+              Component component = components [i];
+			
+              // If component is not visible we dont have to care about it.
+              if (!component.isVisible())
+                continue;
+			
+              GridBagConstraints constraints = lookupConstraints (component);
+
+              // first we fix up any REMAINDER cells
+              if(constraints.gridwidth == GridBagConstraints.REMAINDER)
+		{
+                  constraints.gridwidth = max_x - constraints.gridx;
+		}
+              if(constraints.gridheight == GridBagConstraints.REMAINDER)
+		{
+                  constraints.gridheight = max_y - constraints.gridy;
+		}
+
+              if(constraints.gridx + constraints.gridwidth - 1 == x)
+		{
+                  int width = (sizeflag == PREFERREDSIZE) ?
+                    component.getPreferredSize().width :
+                    component.getMinimumSize().width;
+                  if(constraints.insets != null)
+		    {
+                      width += constraints.insets.left + constraints.insets.right;
+		    }
+                  width += constraints.ipadx;
+                  for(int w = 1; w < constraints.gridwidth; w++)
+		    {
+                      width -= info.colWidths[x - w];
+		    }
+                  info.colWidths[x] = Math.max(info.colWidths[x], width);
+                  info.colWeights[x] =
+                    Math.max(info.colWeights[x], constraints.weightx);
+		}
+	    }
+	}
+
+      for (y = 0; y <= max_y; y++)
+	{
+          if(rowHeights != null && rowHeights.length > y)
+	    {
+              info.rowHeights[y] = rowHeights[y];
+	    }
+          if(rowWeights != null && rowWeights.length > y)
+	    {
+              info.rowWeights[y] = rowWeights[y];
+	    }
+          for (int i = 0; i < components.length; i++)
+	    {
+              Component component = components [i];
+			
+              // If component is not visible we dont have to care about it.
+              if (!component.isVisible())
+                continue;
+			
+              GridBagConstraints constraints = lookupConstraints (component);
+
+              if(constraints.gridy + constraints.gridheight - 1 == y)
+		{
+                  int height = (sizeflag == PREFERREDSIZE) ?
+                    component.getPreferredSize().height :
+                    component.getMinimumSize().height;
+                  if(constraints.insets != null)
+		    {
+                      height += constraints.insets.top + constraints.insets.bottom;
+		    } 
+                  height += constraints.ipady;
+                  for(int h = 1; h < constraints.gridheight; h++)
+		    {
+                      height -= info.rowHeights[y - h];
+		    }
+                  info.rowHeights[y] = Math.max(info.rowHeights[y], height);
+                  info.rowWeights[y] =
+                    Math.max(info.rowWeights[y], constraints.weighty);
+		}
+	    }
+	}
+
+      calcCellSizes (info.colWidths, info.colWeights, parentDim.width);
+      calcCellSizes (info.rowHeights, info.rowWeights, parentDim.height);
+
+      int totalWidth = sumIntArray(info.colWidths);
+      int totalHeight = sumIntArray(info.rowHeights);
+      info.pos_x = parentInsets.left + (parentDim.width - totalWidth) / 2;
+      info.pos_y = parentInsets.top + (parentDim.height - totalHeight) / 2;
+
+      // DEBUG
+      //dumpLayoutInfo (info);
+
+      return info;
     }
 
     /**
@@ -326,7 +588,13 @@
      */
     protected Dimension GetMinSize (Container parent, GridBagLayoutInfo info)
     {
-	return getMinSize (parent, info);
+      if (parent == null || info == null)
+        return new Dimension (0, 0);
+
+      Insets insets = parent.getInsets();
+      int width = sumIntArray (info.colWidths) + insets.left + insets.right;
+      int height = sumIntArray (info.rowHeights) + insets.top + insets.bottom;
+      return new Dimension (width, height);
     }
 
     /**
@@ -334,13 +602,7 @@
      */
     protected Dimension getMinSize (Container parent, GridBagLayoutInfo info)
     {
-	if (parent == null || info == null)
-	    return new Dimension (0, 0);
-
-	Insets insets = parent.getInsets();
-	int width = sumIntArray (info.colWidths) + insets.left + insets.right;
-	int height = sumIntArray (info.rowHeights) + insets.top + insets.bottom;
-	return new Dimension (width, height);
+      return GetMinSize (parent, info);
     }
 
     private void calcCellSizes (int[] sizes, double[] weights, int range)
@@ -404,116 +666,7 @@
      */
     protected void arrangeGrid (Container parent)
     {
-	Component[] components = parent.getComponents();
-
-	if (components.length == 0)
-	    return;
-
-	GridBagLayoutInfo info = getLayoutInfo (parent, PREFERREDSIZE);
-	if (info.cols == 0 && info.rows == 0)
-	    return;
-	layoutInfo = info;
-
-	// DEBUG
-	//dumpLayoutInfo (layoutInfo);
-    
-	for(int i = 0; i < components.length; i++)
-	{
-	    Component component = components [i];
-		
-	    // If component is not visible we dont have to care about it.
-	    if (!component.isVisible())
-		continue;
-		
-	    GridBagConstraints constraints = lookupConstraints (component);
-
-	    int cellx = sumIntArray(layoutInfo.colWidths, constraints.gridx);
-	    int celly = sumIntArray(layoutInfo.rowHeights, constraints.gridy);
-	    int cellw = sumIntArray(layoutInfo.colWidths,
-		constraints.gridx + constraints.gridwidth) - cellx;
-	    int cellh = sumIntArray(layoutInfo.rowHeights,
-		constraints.gridy + constraints.gridheight) - celly;
-
-	    Insets insets = constraints.insets;
-	    if (insets != null)
-	    {
-		cellx += insets.left;
-		celly += insets.top;
-		cellw -= insets.left + insets.right;
-		cellh -= insets.top + insets.bottom;
-	    }
-
-	    Dimension dim = component.preferredSize();
-
-	    // Note: Documentation says that padding is added on both sides, but
-	    // visual inspection shows that the Sun implementation only adds it
-	    // once, so we do the same.
-	    dim.width += constraints.ipadx;
-	    dim.height += constraints.ipady;
-
-	    switch(constraints.fill)
-	    {
-		case GridBagConstraints.HORIZONTAL:
-		    dim.width = cellw;
-		    break;
-		case GridBagConstraints.VERTICAL:
-		    dim.height = cellh;
-		    break;
-		case GridBagConstraints.BOTH:
-		    dim.width = cellw;
-		    dim.height = cellh;
-		    break;
-	    }
-
-	    int x;
-	    int y;
-
-	    switch(constraints.anchor)
-	    {
-		case GridBagConstraints.NORTH:
-		    x = cellx + (cellw - dim.width) / 2;
-		    y = celly;
-		    break;
-		case GridBagConstraints.SOUTH:
-		    x = cellx + (cellw - dim.width) / 2;
-		    y = celly + cellh - dim.height;
-		    break;
-		case GridBagConstraints.WEST:
-		    x = cellx;
-		    y = celly + (cellh - dim.height) / 2;
-		    break;
-		case GridBagConstraints.EAST:
-		    x = cellx + cellw - dim.width;
-		    y = celly + (cellh - dim.height) / 2;
-		    break;
-		case GridBagConstraints.NORTHEAST:
-		    x = cellx + cellw - dim.width;
-		    y = celly;
-		    break;
-		case GridBagConstraints.NORTHWEST:
-		    x = cellx;
-		    y = celly;
-		    break;
-		case GridBagConstraints.SOUTHEAST:
-		    x = cellx + cellw - dim.width;
-		    y = celly + cellh - dim.height;
-		    break;
-		case GridBagConstraints.SOUTHWEST:
-		    x = cellx;
-		    y = celly + cellh - dim.height;
-		    break;
-		default:
-		    x = cellx + (cellw - dim.width) / 2;
-		    y = celly + (cellh - dim.height) / 2;
-		    break;
-	    }
-
-	    component.setBounds(layoutInfo.pos_x + x, layoutInfo.pos_y + y, dim.width, dim.height);
-	}
-    
-	// DEBUG
-	//dumpLayoutInfo (layoutInfo);
-
+      ArrangeGrid (parent);
     }
 
     /**
@@ -521,160 +674,7 @@
      */
     protected GridBagLayoutInfo getLayoutInfo (Container parent, int sizeflag)
     {
-	if (sizeflag != MINSIZE && sizeflag != PREFERREDSIZE)
-	    throw new IllegalArgumentException();
-
-	Dimension parentDim = parent.size();
-	Insets parentInsets = parent.insets();
-	parentDim.width -= parentInsets.left + parentInsets.right;
-	parentDim.height -= parentInsets.top + parentInsets.bottom;
-   
-	int x = 0;
-	int y = 0;
-	int max_x = 0;
-	int max_y = 0;
-
-	// first we figure out how many rows/columns
-	Component[] components = parent.getComponents();
-	for (int i = 0; i < components.length; i++)
-	{
-	    Component component = components [i];
-		
-	    // If component is not visible we dont have to care about it.
-	    if (!component.isVisible())
-		continue;
-		
-	    GridBagConstraints constraints = lookupConstraints (component);
-		
-	    if(constraints.gridx == GridBagConstraints.RELATIVE)
-		constraints.gridx = x;
-
-	    if(constraints.gridy == GridBagConstraints.RELATIVE)
-		constraints.gridy = y;
-		
-	    max_x = Math.max(max_x, 
-		constraints.gridx + Math.max(1, constraints.gridwidth));
-	    max_y = Math.max(max_y,
-		constraints.gridy + Math.max(1, constraints.gridheight));
-
-	    if(constraints.gridwidth == GridBagConstraints.REMAINDER)
-	    {
-		x = 0;
-		y++;
-	    }
-	    else
-	    {
-		x = constraints.gridx + Math.max(1, constraints.gridwidth);
-		y = constraints.gridy;
-	    }
-	}
-	
-	GridBagLayoutInfo info = new GridBagLayoutInfo(max_x, max_y);
-
-	for (x = 0; x <= max_x; x++)
-	{
-	    if(columnWidths != null && columnWidths.length > x)
-	    {
-		info.colWidths[x] = columnWidths[x];
-	    }
-	    if(columnWeights != null && columnWeights.length > x)
-	    {
-		info.colWeights[x] = columnWeights[x];
-	    }
-	    for (int i = 0; i < components.length; i++)
-	    {
-		Component component = components [i];
-			
-		// If component is not visible we dont have to care about it.
-		if (!component.isVisible())
-		    continue;
-			
-		GridBagConstraints constraints = lookupConstraints (component);
-
-		// first we fix up any REMAINDER cells
-		if(constraints.gridwidth == GridBagConstraints.REMAINDER)
-		{
-		    constraints.gridwidth = max_x - constraints.gridx;
-		}
-		if(constraints.gridheight == GridBagConstraints.REMAINDER)
-		{
-		    constraints.gridheight = max_y - constraints.gridy;
-		}
-
-		if(constraints.gridx + constraints.gridwidth - 1 == x)
-		{
-		    int width = (sizeflag == PREFERREDSIZE) ?
-			component.preferredSize().width :
-			component.minimumSize().width;
-		    if(constraints.insets != null)
-		    {
-			width += constraints.insets.left + constraints.insets.right;
-		    }
-		    width += constraints.ipadx;
-		    for(int w = 1; w < constraints.gridwidth; w++)
-		    {
-			width -= info.colWidths[x - w];
-		    }
-		    info.colWidths[x] = Math.max(info.colWidths[x], width);
-		    info.colWeights[x] =
-			Math.max(info.colWeights[x], constraints.weightx);
-		}
-	    }
-	}
-
-	for (y = 0; y <= max_y; y++)
-	{
-	    if(rowHeights != null && rowHeights.length > y)
-	    {
-		info.rowHeights[y] = rowHeights[y];
-	    }
-	    if(rowWeights != null && rowWeights.length > y)
-	    {
-		info.rowWeights[y] = rowWeights[y];
-	    }
-	    for (int i = 0; i < components.length; i++)
-	    {
-		Component component = components [i];
-			
-		// If component is not visible we dont have to care about it.
-		if (!component.isVisible())
-		    continue;
-			
-		GridBagConstraints constraints = lookupConstraints (component);
-
-		if(constraints.gridy + constraints.gridheight - 1 == y)
-		{
-		    int height = (sizeflag == PREFERREDSIZE) ?
-			component.preferredSize().height :
-			component.minimumSize().height;
-		    if(constraints.insets != null)
-		    {
-			height += constraints.insets.top + constraints.insets.bottom;
-		    } 
-		    height += constraints.ipady;
-		    for(int h = 1; h < constraints.gridheight; h++)
-		    {
-			height -= info.rowHeights[y - h];
-		    }
-		    info.rowHeights[y] = Math.max(info.rowHeights[y], height);
-		    info.rowWeights[y] =
-			Math.max(info.rowWeights[y], constraints.weighty);
-		}
-	    }
-	}
-
-	calcCellSizes (info.colWidths, info.colWeights, parentDim.width);
-	calcCellSizes (info.rowHeights, info.rowWeights, parentDim.height);
-
-	int totalWidth = sumIntArray(info.colWidths);
-	int totalHeight = sumIntArray(info.rowHeights);
-	info.pos_x = parentInsets.left + (parentDim.width - totalWidth) / 2;
-	info.pos_y = parentInsets.top + (parentDim.height - totalHeight) / 2;
-
-	// DEBUG
-	//dumpLayoutInfo (info);
-
-	return info;
+      return GetLayoutInfo (parent, sizeflag);
     }
 
     /**
@@ -682,7 +682,6 @@
      */
     protected void adjustForGravity (GridBagConstraints gbc, Rectangle rect)
     {
-	// FIXME
-	throw new Error ("Not implemented");
+      AdjustForGravity (gbc, rect);
     }
 }
Index: java/awt/LayoutManager2.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/LayoutManager2.java,v
retrieving revision 1.6
diff -u -r1.6 LayoutManager2.java
--- java/awt/LayoutManager2.java	9 Aug 2002 04:26:14 -0000	1.6
+++ java/awt/LayoutManager2.java	2 Feb 2004 17:41:48 -0000
@@ -52,12 +52,12 @@
 {
   /**
    * Adds the specified component to the layout, with the specified
-   * constraint object.
+   * constraints object.
    *
    * @param component the component to add
-   * @param constraint the constraint to satisfy
+   * @param constraints the constraints to satisfy
    */
-  void addLayoutComponent(Component component, Object contraint);
+  void addLayoutComponent(Component component, Object contraints);
 
   /**
    * Determines the maximum size of the specified target container.
Index: java/awt/List.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/List.java,v
retrieving revision 1.16
diff -u -r1.16 List.java
--- java/awt/List.java	19 Dec 2003 02:53:36 -0000	1.16
+++ java/awt/List.java	2 Feb 2004 17:41:48 -0000
@@ -175,7 +175,7 @@
 public int
 getItemCount()
 {
-  return(items.size());
+  return countItems ();
 }
 
 /*************************************************************************/
@@ -191,7 +191,7 @@
 public int
 countItems()
 {
-  return(getItemCount());
+  return items.size ();
 }
 
 /*************************************************************************/
@@ -249,7 +249,7 @@
 public boolean
 isMultipleMode()
 {
-  return(multipleMode);
+  return allowsMultipleSelections ();
 }
 
 /*************************************************************************/
@@ -266,7 +266,7 @@
 public boolean
 allowsMultipleSelections()
 {
-  return(multipleMode);
+  return multipleMode;
 }
 
 /*************************************************************************/
@@ -281,12 +281,7 @@
 public void
 setMultipleMode(boolean multipleMode)
 {
-  this.multipleMode = multipleMode;
-  if (peer != null)
-    {
-      ListPeer l = (ListPeer) peer;
-      l.setMultipleMode (multipleMode);
-    }
+  setMultipleSelections (multipleMode);
 }
 
 /*************************************************************************/
@@ -303,7 +298,11 @@
 public void
 setMultipleSelections(boolean multipleMode)
 {
-  setMultipleMode(multipleMode);
+  this.multipleMode = multipleMode;
+
+  ListPeer peer = (ListPeer) getPeer ();
+  if (peer != null)
+    peer.setMultipleMode (multipleMode);
 }
 
 /*************************************************************************/
@@ -316,7 +315,7 @@
 public Dimension
 getMinimumSize()
 {
-  return(getMinimumSize(rows));
+  return getMinimumSize (getRows ());
 }
 
 /*************************************************************************/
@@ -332,7 +331,7 @@
 public Dimension
 minimumSize()
 {
-  return(getMinimumSize(rows));
+  return minimumSize (getRows ());
 }
 
 /*************************************************************************/
@@ -348,11 +347,7 @@
 public Dimension
 getMinimumSize(int rows)
 {
-  ListPeer lp = (ListPeer)getPeer();
-  if (lp != null)
-    return(lp.minimumSize(rows));
-  else
-    return(new Dimension(0,0));
+  return minimumSize (rows);
 }
 
 /*************************************************************************/
@@ -371,7 +366,11 @@
 public Dimension
 minimumSize(int rows)
 {
-  return(getMinimumSize(rows));
+  ListPeer peer = (ListPeer) getPeer ();
+  if (peer != null)
+    return peer.minimumSize (rows);
+  else
+    return new Dimension (0, 0);
 }
 
 /*************************************************************************/
@@ -384,7 +383,7 @@
 public Dimension
 getPreferredSize()
 {
-  return(getPreferredSize(rows));
+  return getPreferredSize (getRows ());
 }
 
 /*************************************************************************/
@@ -400,7 +399,7 @@
 public Dimension
 preferredSize()
 {
-  return(getPreferredSize(rows));
+  return preferredSize (getRows ());
 }
 
 /*************************************************************************/
@@ -416,11 +415,7 @@
 public Dimension
 getPreferredSize(int rows)
 {
-  ListPeer lp = (ListPeer)getPeer();
-  if (lp != null)
-    return(lp.preferredSize(rows));
-  else
-    return(new Dimension(0,0));
+  return preferredSize (rows);
 }
 
 /*************************************************************************/
@@ -439,7 +434,11 @@
 public Dimension
 preferredSize(int rows)
 {
-  return(getPreferredSize(rows));
+  ListPeer peer = (ListPeer) getPeer ();
+  if (peer != null)
+    return peer.preferredSize (rows);
+  else
+    return new Dimension (0, 0);
 }
 
 /*************************************************************************/
@@ -452,7 +451,7 @@
 public void
 add(String item)
 {
-  add(item, -1);
+  add (item, -1);
 }
 
 /*************************************************************************/
@@ -467,7 +466,7 @@
 public void
 addItem(String item)
 {
-  addItem(item, -1);
+  addItem (item, -1);
 }
 
 /*************************************************************************/
@@ -484,16 +483,7 @@
 public void
 add(String item, int index)
 {
-  if ((index == -1) || (index >= items.size()))
-    items.addElement(item);
-  else
-    items.insertElementAt(item, index);
-
-  if (peer != null)
-    {
-      ListPeer l = (ListPeer) peer;
-      l.add (item, index);
-    }
+  addItem (item, index);
 }
 
 /*************************************************************************/
@@ -512,7 +502,14 @@
 public void
 addItem(String item, int index)
 {
-  add(item, index);
+  if ((index == -1) || (index >= items.size ()))
+    items.addElement (item);
+  else
+    items.insertElementAt (item, index);
+
+  ListPeer peer = (ListPeer) getPeer ();
+  if (peer != null)
+    peer.add (item, index);
 }
 
 /*************************************************************************/
@@ -529,7 +526,11 @@
 public void
 delItem(int index) throws IllegalArgumentException
 {
-  remove(index);
+  items.removeElementAt (index);
+
+  ListPeer peer = (ListPeer) getPeer ();
+  if (peer != null)
+    peer.delItems (index, index);
 }
 
 /*************************************************************************/
@@ -544,12 +545,7 @@
 public void
 remove(int index) throws IllegalArgumentException
 {
-  items.removeElementAt (index);
-  if (peer != null)
-    {
-      ListPeer l = (ListPeer) peer;
-      l.delItems (index, index);
-    }
+  delItem (index);
 }
 
 /*************************************************************************/
@@ -613,12 +609,7 @@
 public synchronized void
 removeAll()
 {
-  items.clear();
-  if (peer != null)
-    {
-      ListPeer l = (ListPeer) peer;
-      l.removeAll ();
-    }
+  clear ();
 }
 
 /*************************************************************************/
@@ -631,7 +622,11 @@
 public void
 clear()
 {
-  removeAll();
+  items.clear();
+
+  ListPeer peer = (ListPeer) getPeer ();
+  if (peer != null)
+    peer.removeAll ();
 }
 
 /*************************************************************************/
@@ -782,13 +777,7 @@
 public boolean
 isIndexSelected(int index)
 {
-  int[] indexes = getSelectedIndexes();
-
-  for (int i = 0; i < indexes.length; i++)
-    if (indexes[i] == index)
-      return(true);
-
-  return(false);
+  return isSelected (index);
 }
 
 /*************************************************************************/
@@ -807,7 +796,13 @@
 public boolean
 isSelected(int index)
 {
-  return(isIndexSelected(index));
+  int[] indexes = getSelectedIndexes ();
+
+  for (int i = 0; i < indexes.length; i++)
+    if (indexes[i] == index)
+      return true;
+
+  return false;
 }
 
 /*************************************************************************/
Index: java/awt/Menu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Menu.java,v
retrieving revision 1.15
diff -u -r1.15 Menu.java
--- java/awt/Menu.java	27 Jan 2004 19:29:56 -0000	1.15
+++ java/awt/Menu.java	2 Feb 2004 17:41:48 -0000
@@ -171,7 +171,7 @@
 public int
 getItemCount()
 {
-  return(items.size());
+  return countItems ();
 }
 
 /**
@@ -183,7 +183,7 @@
  */
 public int countItems ()
 {
-  return getItemCount ();
+  return items.size ();
 }
  
 /*************************************************************************/
Index: java/awt/MenuBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/MenuBar.java,v
retrieving revision 1.12
diff -u -r1.12 MenuBar.java
--- java/awt/MenuBar.java	27 Jan 2004 19:29:56 -0000	1.12
+++ java/awt/MenuBar.java	2 Feb 2004 17:41:48 -0000
@@ -219,8 +219,7 @@
 public int
 getMenuCount()
 {
-  // FIXME: How does the help menu fit in here?
-  return(menus.size());
+  return countMenus ();
 }
 
 /*************************************************************************/
@@ -235,7 +234,8 @@
 public int
 countMenus()
 {
-  return(getMenuCount());
+  // FIXME: How does the help menu fit in here?
+  return menus.size ();
 }
 
 /*************************************************************************/
Index: java/awt/MenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/MenuItem.java,v
retrieving revision 1.15
diff -u -r1.15 MenuItem.java
--- java/awt/MenuItem.java	19 Jan 2004 14:27:45 -0000	1.15
+++ java/awt/MenuItem.java	2 Feb 2004 17:41:48 -0000
@@ -202,15 +202,7 @@
 public synchronized void
 setEnabled(boolean enabled)
 {
-  if (enabled == this.enabled)
-    return;
-
-  this.enabled = enabled;
-  if (peer != null)
-    {
-      MenuItemPeer mp = (MenuItemPeer) peer;
-      mp.setEnabled (enabled);
-    }
+  enable (enabled);
 }
 
 /*************************************************************************/
@@ -226,7 +218,10 @@
 public void
 enable(boolean enabled)
 {
-  setEnabled(enabled);
+  if (enabled)
+    enable ();
+  else
+    disable ();
 }
 
 /*************************************************************************/
@@ -239,7 +234,12 @@
 public void
 enable()
 {
-  setEnabled(true);
+  if (enabled)
+    return;
+
+  this.enabled = true;
+  if (peer != null)
+    ((MenuItemPeer) peer).setEnabled (true);
 }
 
 /*************************************************************************/
@@ -252,7 +252,12 @@
 public void
 disable()
 {
-  setEnabled(false);
+  if (!enabled)
+    return;
+
+  this.enabled = false;
+  if (peer != null)
+    ((MenuItemPeer) peer).setEnabled (false);
 }
 
 /*************************************************************************/
Index: java/awt/Polygon.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Polygon.java,v
retrieving revision 1.3
diff -u -r1.3 Polygon.java
--- java/awt/Polygon.java	8 Dec 2003 22:59:51 -0000	1.3
+++ java/awt/Polygon.java	2 Feb 2004 17:41:48 -0000
@@ -258,10 +258,24 @@
    */
   public Rectangle getBounds()
   {
+    return getBoundingBox ();
+  }
+
+  /**
+   * Returns the bounding box of this polygon. This is the smallest
+   * rectangle with sides parallel to the X axis that will contain this
+   * polygon.
+   *
+   * @return the bounding box for this polygon
+   * @see #getBounds2D()
+   * @deprecated use {@link #getBounds()} instead
+   */
+  public Rectangle getBoundingBox()
+  {
     if (bounds == null)
       {
         if (npoints == 0)
-          return bounds = new Rectangle();
+          return bounds = new Rectangle ();
         int i = npoints - 1;
         int minx = xpoints[i];
         int maxx = minx;
@@ -280,23 +294,9 @@
             else if (y > maxy)
               maxy = y;
           }
-        bounds = new Rectangle(minx, maxy, maxx - minx, maxy - miny);
+        bounds = new Rectangle (minx, maxy, maxx - minx, maxy - miny);
       }
     return bounds;
-  }
-
-  /**
-   * Returns the bounding box of this polygon. This is the smallest
-   * rectangle with sides parallel to the X axis that will contain this
-   * polygon.
-   *
-   * @return the bounding box for this polygon
-   * @see #getBounds2D()
-   * @deprecated use {@link #getBounds()} instead
-   */
-  public Rectangle getBoundingBox()
-  {
-    return getBounds();
   }
 
   /**
Index: java/awt/Rectangle.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Rectangle.java,v
retrieving revision 1.11
diff -u -r1.11 Rectangle.java
--- java/awt/Rectangle.java	5 Jun 2003 19:58:39 -0000	1.11
+++ java/awt/Rectangle.java	2 Feb 2004 17:41:48 -0000
@@ -281,10 +281,7 @@
    */
   public void setBounds(Rectangle r)
   {
-    x = r.x;
-    y = r.y;
-    width = r.width;
-    height = r.height;
+    setBounds (r.x, r.y, r.width, r.height);
   }
 
   /**
@@ -298,10 +295,7 @@
    */
   public void setBounds(int x, int y, int width, int height)
   {
-    this.x = x;
-    this.y = y;
-    this.width = width;
-    this.height = height;
+    reshape (x, y, width, height);
   }
 
   /**
@@ -333,7 +327,10 @@
    */
   public void reshape(int x, int y, int width, int height)
   {
-    setBounds(x, y, width, height);
+    this.x = x;
+    this.y = y;
+    this.width = width;
+    this.height = height;
   }
 
   /**
@@ -360,8 +357,7 @@
    */
   public void setLocation(Point p)
   {
-    this.x = p.x;
-    this.y = p.y;
+    setLocation (p.x, p.y);
   }
 
   /**
@@ -374,8 +370,7 @@
    */
   public void setLocation(int x, int y)
   {
-    this.x = x;
-    this.y = y;
+    move (x, y);
   }
 
   /**
@@ -388,7 +383,8 @@
    */
   public void move(int x, int y)
   {
-    setLocation(x, y);
+    this.x = x;
+    this.y = y;
   }
 
   /**
@@ -426,8 +422,7 @@
    */
   public void setSize(Dimension d)
   {
-    width = d.width;
-    height = d.height;
+    setSize (d.width, d.height);
   }
 
   /**
@@ -439,8 +434,7 @@
    */
   public void setSize(int width, int height)
   {
-    this.width = width;
-    this.height = height;
+    resize (width, height);
   }
 
   /**
@@ -452,7 +446,8 @@
    */
   public void resize(int width, int height)
   {
-    setSize(width, height);
+    this.width = width;
+    this.height = height;
   }
 
   /**
@@ -469,9 +464,7 @@
    */
   public boolean contains(Point p)
   {
-    return width > 0 && height > 0
-      && p.x >= x && p.x < x + width
-      && p.y >= y && p.y < y + height;
+    return contains (p.x, p.y);
   }
 
   /**
@@ -487,9 +480,7 @@
    */
   public boolean contains(int x, int y)
   {
-    return width > 0 && height > 0
-      && x >= this.x && x < this.x + width
-      && y >= this.y && y < this.y + height;
+    return inside (x, y);
   }
 
   /**
@@ -504,9 +495,7 @@
    */
   public boolean contains(Rectangle r)
   {
-    return width > 0 && height > 0 && r.width > 0 && r.height > 0
-      && r.x >= x && r.x + r.width <= x + width
-      && r.y >= y && r.y + r.height <= y + height;
+    return contains (r.x, r.y, r.width, r.height);
   }
 
   /**
@@ -537,7 +526,9 @@
    */
   public boolean inside(int x, int y)
   {
-    return contains(x, y);
+    return width > 0 && height > 0
+      && x >= this.x && x < this.x + width
+      && y >= this.y && y < this.y + height;
   }
 
   /**
Index: java/awt/ScrollPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/ScrollPane.java,v
retrieving revision 1.14
diff -u -r1.14 ScrollPane.java
--- java/awt/ScrollPane.java	5 Jan 2004 21:35:32 -0000	1.14
+++ java/awt/ScrollPane.java	2 Feb 2004 17:41:48 -0000
@@ -446,10 +446,25 @@
 public void
 doLayout()
 {
-  Component[] list = getComponents();
+  layout ();
+}
+
+/*************************************************************************/
+
+/**
+  * Lays out this component.  This consists of resizing the sole child
+  * component to its perferred size.
+  *
+  * @deprecated This method is deprecated in favor of
+  * <code>doLayout()</code>.
+  */
+public void
+layout()
+{
+  Component[] list = getComponents ();
   if ((list != null) && (list.length > 0))
     {
-      Dimension dim = list[0].getPreferredSize();
+      Dimension dim = list[0].getPreferredSize ();
       Dimension vp = getViewportSize ();
 
       if (dim.width < vp.width)
@@ -462,31 +477,16 @@
       if (peer != null)
 	peer.childResized (dim.width, dim.height);
 
-      list[0].resize (dim);
+      list[0].setSize (dim);
 
-      Point p = getScrollPosition();
+      Point p = getScrollPosition ();
       if (p.x > dim.width)
         p.x = dim.width;
       if (p.y > dim.height)
         p.y = dim.height;
 
-      setScrollPosition(p);
+      setScrollPosition (p);
     }
-}
-
-/*************************************************************************/
-
-/**
-  * Lays out this component.  This consists of resizing the sole child
-  * component to its perferred size.
-  *
-  * @deprecated This method is deprecated in favor of
-  * <code>doLayout()</code>.
-  */
-public void
-layout()
-{
-  doLayout();
 }
 
 /*************************************************************************/
Index: java/awt/Scrollbar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Scrollbar.java,v
retrieving revision 1.15
diff -u -r1.15 Scrollbar.java
--- java/awt/Scrollbar.java	5 Jun 2003 19:58:39 -0000	1.15
+++ java/awt/Scrollbar.java	2 Feb 2004 17:41:49 -0000
@@ -333,7 +333,7 @@
 public int
 getVisibleAmount()
 {
-  return(visibleAmount);
+  return getVisible ();
 }
 
 /*************************************************************************/
@@ -350,7 +350,7 @@
 public int
 getVisible()
 {
-  return(getVisibleAmount());
+  return visibleAmount;
 }
 
 /*************************************************************************/
@@ -438,7 +438,7 @@
 public int
 getUnitIncrement()
 {
-  return(lineIncrement);
+  return getLineIncrement ();
 }
 
 /*************************************************************************/
@@ -455,7 +455,7 @@
 public int
 getLineIncrement()
 {
-  return(lineIncrement);
+  return lineIncrement;
 }
 
 /*************************************************************************/
@@ -469,26 +469,7 @@
 public synchronized void
 setUnitIncrement(int unitIncrement)
 {
-  if (unitIncrement < 0)
-    throw new IllegalArgumentException("Unit increment less than zero.");
-
-  int range = maximum - minimum;
-  if (unitIncrement > range)
-    {
-      if (range == 0)
-        unitIncrement = 1;
-      else
-        unitIncrement = range;
-    }
-
-  if (unitIncrement == lineIncrement)
-    return;
-
-  lineIncrement = unitIncrement;
-
-  ScrollbarPeer sp = (ScrollbarPeer)getPeer();
-  if (sp != null)
-    sp.setLineIncrement(lineIncrement);
+  setLineIncrement (unitIncrement);
 }
 
 /*************************************************************************/
@@ -505,7 +486,26 @@
 public void
 setLineIncrement(int lineIncrement)
 {
-  setUnitIncrement(lineIncrement);
+  if (lineIncrement < 0)
+    throw new IllegalArgumentException ("Unit increment less than zero.");
+
+  int range = maximum - minimum;
+  if (lineIncrement > range)
+    {
+      if (range == 0)
+        lineIncrement = 1;
+      else
+        lineIncrement = range;
+    }
+
+  if (lineIncrement == this.lineIncrement)
+    return;
+
+  this.lineIncrement = lineIncrement;
+
+  ScrollbarPeer sp = (ScrollbarPeer) getPeer ();
+  if (sp != null)
+    sp.setLineIncrement (this.lineIncrement);
 }
 
 /*************************************************************************/
@@ -519,7 +519,7 @@
 public int
 getBlockIncrement()
 {
-  return(pageIncrement);
+  return getPageIncrement ();
 }
 
 /*************************************************************************/
@@ -536,7 +536,7 @@
 public int
 getPageIncrement()
 {
-  return(pageIncrement);
+  return pageIncrement;
 }
 
 /*************************************************************************/
@@ -550,26 +550,7 @@
 public synchronized void
 setBlockIncrement(int blockIncrement)
 {
-  if (blockIncrement < 0)
-    throw new IllegalArgumentException("Block increment less than zero.");
-
-  int range = maximum - minimum;
-  if (blockIncrement > range)
-    {
-      if (range == 0)
-        blockIncrement = 1;
-      else
-        blockIncrement = range;
-    }
-
-  if (blockIncrement == pageIncrement)
-    return;
-
-  pageIncrement = blockIncrement;
-
-  ScrollbarPeer sp = (ScrollbarPeer)getPeer();
-  if (sp != null)
-    sp.setPageIncrement(pageIncrement);
+  setPageIncrement (pageIncrement);
 }
 
 /*************************************************************************/
@@ -586,7 +567,26 @@
 public void
 setPageIncrement(int pageIncrement)
 {
-  setBlockIncrement(pageIncrement);
+  if (pageIncrement < 0)
+    throw new IllegalArgumentException ("Block increment less than zero.");
+
+  int range = maximum - minimum;
+  if (pageIncrement > range)
+    {
+      if (range == 0)
+        pageIncrement = 1;
+      else
+        pageIncrement = range;
+    }
+
+  if (pageIncrement == this.pageIncrement)
+    return;
+
+  this.pageIncrement = pageIncrement;
+
+  ScrollbarPeer sp = (ScrollbarPeer) getPeer ();
+  if (sp != null)
+    sp.setPageIncrement (this.pageIncrement);
 }
 
 /*************************************************************************/
Index: java/awt/TextArea.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/TextArea.java,v
retrieving revision 1.9
diff -u -r1.9 TextArea.java
--- java/awt/TextArea.java	25 Jan 2004 18:36:04 -0000	1.9
+++ java/awt/TextArea.java	2 Feb 2004 17:41:49 -0000
@@ -288,13 +288,7 @@
    */
   public Dimension getMinimumSize (int rows, int columns)
   {
-    TextAreaPeer peer = (TextAreaPeer) getPeer ();
-
-    // Sun returns Dimension (0,0) in this case.
-    if (peer == null)
-      return new Dimension (0, 0);
-
-    return peer.getMinimumSize (rows, columns);
+    return minimumSize (rows, columns);
   }
 
   /**
@@ -311,7 +305,7 @@
    */
   public Dimension minimumSize ()
   {
-    return getMinimumSize (getRows (), getColumns ());
+    return minimumSize (getRows (), getColumns ());
   }
 
   /**
@@ -333,7 +327,13 @@
    */
   public Dimension minimumSize (int rows, int columns)
   {
-    return getMinimumSize (rows, columns);
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+
+    // Sun returns Dimension (0,0) in this case.
+    if (peer == null)
+      return new Dimension (0, 0);
+
+    return peer.getMinimumSize (rows, columns);
   }
 
   /**
@@ -366,13 +366,7 @@
    */
   public Dimension getPreferredSize (int rows, int columns)
   {
-    TextAreaPeer peer = (TextAreaPeer) getPeer ();
-
-    // Sun returns Dimension (0,0) in this case.
-    if (peer == null)
-      return new Dimension (0, 0);
-
-    return peer.getPreferredSize (rows, columns);
+    return preferredSize (rows, columns);
   }
 
   /**
@@ -389,7 +383,7 @@
    */
   public Dimension preferredSize ()
   {
-    return getPreferredSize (getRows (), getColumns ());
+    return preferredSize (getRows (), getColumns ());
   }
 
   /**
@@ -411,7 +405,13 @@
    */
   public Dimension preferredSize (int rows, int columns)
   {
-    return getPreferredSize (rows, columns);
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+
+    // Sun returns Dimension (0,0) in this case.
+    if (peer == null)
+      return new Dimension (0, 0);
+
+    return peer.getPreferredSize (rows, columns);
   }
 
   /**
@@ -440,59 +440,59 @@
   /**
    * Append the specified text to the end of the current text.
    *
-   * @param text The text to append.
+   * @param str The text to append.
    */
   public void append (String str)
   {
-    TextAreaPeer peer = (TextAreaPeer) getPeer ();
-    if (peer == null)
-      return;
-
-    peer.insert (str, peer.getText().length ());
+    appendText (str);
   }
 
   /**
    * Append the specified text to the end of the current text.
    *
-   * @param text The text to append.
+   * @param str The text to append.
    *
    * @deprecated This method is deprecated in favor of
    * <code>append ()</code>.
    */
-  public void appendText (String text)
+  public void appendText (String str)
   {
-    append (text);
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+    if (peer == null)
+      return;
+
+    peer.insert (str, peer.getText().length ());
   }
 
   /**
    * Insert the specified text at the specified position.  The first
    * character in the text area is at position zero.
    *
-   * @param text The text to insert.
+   * @param str The text to insert.
    * @param pos The position at which to insert text.
    */
-  public void insert (String text, int pos)
+  public void insert (String str, int pos)
   {
-    TextAreaPeer peer = (TextAreaPeer) getPeer ();
-    if (peer == null)
-      return;
-
-    peer.insert (text, pos);
+    insertText (str, pos);
   }
 
   /**
    * Insert the specified text at the specified position.  The first
    * character in the text area is at position zero.
    *
-   * @param text The text to insert.
+   * @param str The text to insert.
    * @param pos The position at which to insert text.
    *
-   * @deprecated This method is depcreated in favor of
+   * @deprecated This method is deprecated in favor of
    * <code>insert ()</code>.
    */
-  public void insertText (String text, int pos)
+  public void insertText (String str, int pos)
   {
-    insert (text, pos);
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+    if (peer == null)
+      return;
+
+    peer.insert (str, pos);
   }
 
   /**
@@ -503,17 +503,13 @@
    * length of the replacement text may differ from the length of the
    * text that is replaced.
    *
-   * @param text The new text for the range.
+   * @param str The new text for the range.
    * @param start The start position of the replacement range.
    * @param end The end position of the replacement range.
    */
-  public void replaceRange (String text, int start, int end)
+  public void replaceRange (String str, int start, int end)
   {
-    TextAreaPeer peer = (TextAreaPeer) getPeer ();
-    if (peer == null)
-      return;
-
-    peer.replaceRange (text, start, end);
+    replaceText (str, start, end);
   }
 
   /**
@@ -524,16 +520,20 @@
    * length of the replacement text may differ from the length of the
    * text that is replaced.
    *
-   * @param text The new text for the range.
+   * @param str The new text for the range.
    * @param start The start position of the replacement range.
    * @param end The end position of the replacement range.
    *
    * @deprecated This method is deprecated in favor of
    * <code>replaceRange ()</code>.
    */
-  public void replaceText (String text, int start, int end)
+  public void replaceText (String str, int start, int end)
   {
-    replaceRange (text, start, end);
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+    if (peer == null)
+      return;
+
+    peer.replaceRange (str, start, end);
   }
 
   /**
Index: java/awt/TextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/TextField.java,v
retrieving revision 1.8
diff -u -r1.8 TextField.java
--- java/awt/TextField.java	5 Jun 2003 19:58:39 -0000	1.8
+++ java/awt/TextField.java	2 Feb 2004 17:41:49 -0000
@@ -212,11 +212,7 @@
 public void
 setEchoChar(char echoChar)
 {
-  this.echoChar = echoChar;
-
-  TextFieldPeer tfp = (TextFieldPeer)getPeer();
-  if (tfp != null)
-    tfp.setEchoChar(echoChar);
+  setEchoCharacter (echoChar);
 }
 
 /*************************************************************************/
@@ -233,7 +229,11 @@
 public void
 setEchoCharacter(char echoChar)
 {
-  setEchoChar(echoChar);
+  this.echoChar = echoChar;
+
+  TextFieldPeer peer = (TextFieldPeer) getPeer ();
+  if (peer != null)
+    peer.setEchoChar (echoChar);
 }
 
 /*************************************************************************/
@@ -264,7 +264,7 @@
 public Dimension
 getMinimumSize()
 {
-  return(getMinimumSize(getColumns()));
+  return getMinimumSize (getColumns ());
 }
 
 /*************************************************************************/
@@ -278,11 +278,7 @@
 public Dimension
 getMinimumSize(int columns)
 {
-  TextFieldPeer tfp = (TextFieldPeer)getPeer();
-  if (tfp == null)
-    return(null); // FIXME: What do we do if there is no peer?
-
-  return(tfp.getMinimumSize(columns));
+  return minimumSize (columns);
 }
 
 /*************************************************************************/
@@ -292,13 +288,13 @@
   *
   * @return The minimum size for this text field.
   *
-  * @deprecated This method is depcreated in favor of
+  * @deprecated This method is deprecated in favor of
   * <code>getMinimumSize()</code>.
   */
 public Dimension
 minimumSize()
 {
-  return(getMinimumSize(getColumns()));
+  return minimumSize (getColumns ());
 }
 
 /*************************************************************************/
@@ -315,7 +311,11 @@
 public Dimension
 minimumSize(int columns)
 {
-  return(getMinimumSize(columns));
+  TextFieldPeer peer = (TextFieldPeer) getPeer ();
+  if (peer == null)
+    return null; // FIXME: What do we do if there is no peer?
+
+  return peer.getMinimumSize (columns);
 }
 
 /*************************************************************************/
@@ -328,7 +328,7 @@
 public Dimension
 getPreferredSize()
 {
-  return(getPreferredSize(getColumns()));
+  return getPreferredSize (getColumns ());
 }
 
 /*************************************************************************/
@@ -342,12 +342,7 @@
 public Dimension
 getPreferredSize(int columns)
 {
-  TextFieldPeer tfp = (TextFieldPeer)getPeer();
-  if (tfp == null)
-    {
-      return new Dimension(0, 0);
-    }
-  return(tfp.getPreferredSize(columns));
+  return preferredSize (columns);
 }
 
 /*************************************************************************/
@@ -363,7 +358,7 @@
 public Dimension
 preferredSize()
 {
-  return(getPreferredSize(getColumns()));
+  return preferredSize (getColumns ());
 }
 
 /*************************************************************************/
@@ -380,7 +375,11 @@
 public Dimension
 preferredSize(int columns)
 {
-  return(getPreferredSize(columns));
+  TextFieldPeer peer = (TextFieldPeer) getPeer ();
+  if (peer == null)
+    return new Dimension (0, 0);
+
+  return peer.getPreferredSize (columns);
 }
 
 /*************************************************************************/
Index: java/awt/image/renderable/RenderContext.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/renderable/RenderContext.java,v
retrieving revision 1.1
diff -u -r1.1 RenderContext.java
--- java/awt/image/renderable/RenderContext.java	9 Aug 2002 04:29:59 -0000	1.1
+++ java/awt/image/renderable/RenderContext.java	2 Feb 2004 17:41:49 -0000
@@ -87,24 +87,24 @@
 
   public void preConcatenateTransform(AffineTransform pre)
   {
-    xform.preConcatenate(pre);
+    preConcetenateTransform (pre);
   }
 
-  /** @deprecated Sun can't spell concatenate */
+  /** @deprecated */
   public void preConcetenateTransform(AffineTransform pre)
   {
-    preConcetenateTransform(pre);
+    xform.preConcatenate (pre);
   }
 
   public void concatenateTransform(AffineTransform post)
   {
-    xform.concatenate(post);
+    concetenateTransform (post);
   }
 
-  /** @deprecated Sun can't spell concatenate */
+  /** @deprecated */
   public void concetenateTransform(AffineTransform post)
   {
-    concatenateTransform(post);
+    xform.concatenate (post);
   }
 
   public AffineTransform getTransform()
Index: javax/swing/JApplet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JApplet.java,v
retrieving revision 1.2
diff -u -r1.2 JApplet.java
--- javax/swing/JApplet.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JApplet.java	2 Feb 2004 17:41:50 -0000
@@ -80,7 +80,7 @@
   public Dimension getPreferredSize()
   {
     Dimension d = super.getPreferredSize();
-    System.out.println("JFrame.getPrefSize(): " + d + " , comp="+countComponents() + ", layout=" + getLayout());
+    System.out.println("JFrame.getPrefSize(): " + d + " , comp="+ getComponentCount () + ", layout=" + getLayout());
     return d;
   }
 

--=-1ynGAz+hwDIQD+CoOHQG--




From MAILER-DAEMON Wed Feb 04 02:55:58 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AoHt7-0007Nk-9R
	for mharc-commit-classpath@gnu.org; Wed, 04 Feb 2004 02:55:57 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AoHt2-0007LW-SR
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 02:55:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AoHsW-0007ED-Qj
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 02:55:51 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AoHsW-0007E2-9g
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 02:55:20 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-158.ewetel.net
	[80.228.95.158])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i147tHVM027250
	for <commit-classpath@gnu.org>; Wed, 4 Feb 2004 08:55:17 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AoHsT-0008KK-00
	for <commit-classpath@gnu.org>; Wed, 04 Feb 2004 08:55:17 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 4 Feb 2004 08:59:05 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_JZKIAE/Sl23nIQS"
Message-Id: <200402040859.05904.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.util.zip
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Feb 2004 07:55:54 -0000


--Boundary-00=_JZKIAE/Sl23nIQS
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge java.util.zip a little bit 
more with libgcj.


Michael


2004-02-04  Michael Koch  <konqueror@gmx.de>

	* java/util/zip/Deflater.java,
	java/util/zip/DeflaterOutputStream.java,
	java/util/zip/GZIPInputStream.java,
	java/util/zip/GZIPOutputStream.java:
	Merged class head with libgcj.


--Boundary-00=_JZKIAE/Sl23nIQS
Content-Type: text/x-diff;
  charset="us-ascii";
  name="zip.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="zip.diff"

Index: java/util/zip/Deflater.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/Deflater.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Deflater.java
--- java/util/zip/Deflater.java	22 Jan 2002 22:27:02 -0000	1.3
+++ java/util/zip/Deflater.java	4 Feb 2004 07:52:16 -0000
@@ -1,5 +1,5 @@
-/* java.util.zip.Deflater
-   Copyright (C) 2001 Free Software Foundation, Inc.
+/* Deflater.java - Compress a data stream
+   Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,7 +46,7 @@
  * to the split of deflate and setInput.
  *
  * @author Jochen Hoenicke
- * @date Jan 5, 2000 
+ * @author Tom Tromey
  */
 public class Deflater
 {
Index: java/util/zip/DeflaterOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterOutputStream.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 DeflaterOutputStream.java
--- java/util/zip/DeflaterOutputStream.java	21 May 2003 12:20:58 -0000	1.4
+++ java/util/zip/DeflaterOutputStream.java	4 Feb 2004 07:52:16 -0000
@@ -1,5 +1,5 @@
-/* java.util.zip.DeflaterOutputStream
-   Copyright (C) 2001 Free Software Foundation, Inc.
+/* DeflaterOutputStream.java - Output filter for compressing.
+   Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: java/util/zip/GZIPInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/GZIPInputStream.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 GZIPInputStream.java
--- java/util/zip/GZIPInputStream.java	21 May 2003 12:20:58 -0000	1.6
+++ java/util/zip/GZIPInputStream.java	4 Feb 2004 07:52:16 -0000
@@ -1,5 +1,5 @@
-/* java.util.zip.GZIPInputStream
-   Copyright (C) 2001 Free Software Foundation, Inc.
+/* GZIPInputStream.java - Input filter for reading gzip file
+   Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,6 +46,7 @@
  * The "GZIP" format is described in RFC 1952.
  *
  * @author John Leuner
+ * @author Tom Tromey
  * @since JDK 1.1
  */
 public class GZIPInputStream
@@ -126,12 +117,10 @@
    *
    * @param in The stream to read compressed data from 
    *           (in GZIP format).
-   *
    * @param size The size of the buffer to use.
    *
    * @throws IOException if an error occurs during an I/O operation.
-   *
-   * @throws java.lang.IllegalArgumentException if <code>size</code>
+   * @throws IllegalArgumentException if <code>size</code>
    *         is less than or equal to 0.
    */
   public GZIPInputStream(InputStream in, int size)
@@ -150,6 +138,7 @@
   public void close()
     throws IOException
   {
+    // Nothing to do here.
     super.close();
   }
 
@@ -162,10 +150,8 @@
    *
    * @param buf the buffer into which the uncompressed data will
    *            be stored.
-   *
    * @param offset the offset indicating where in <code>buf</code>
    *               the uncompressed data should be placed.
-   *
    * @param len the number of uncompressed bytes to be read.
    */
   public int read(byte[] buf, int offset, int len) throws IOException
Index: java/util/zip/GZIPOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/GZIPOutputStream.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 GZIPOutputStream.java
--- java/util/zip/GZIPOutputStream.java	21 May 2003 12:20:58 -0000	1.5
+++ java/util/zip/GZIPOutputStream.java	4 Feb 2004 07:52:16 -0000
@@ -1,4 +1,4 @@
-/* java.util.zip.GZIPOutputStream
+/* GZIPOutputStream.java - Create a file in gzip format
    Copyright (C) 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.

--Boundary-00=_JZKIAE/Sl23nIQS--




From MAILER-DAEMON Wed Feb 04 03:30:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AoIKR-0004EZ-KB
	for mharc-commit-classpath@gnu.org; Wed, 04 Feb 2004 03:24:11 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AoIKE-0004DD-J7
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 03:23:58 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AoIJi-00042J-56
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 03:23:57 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AoIJh-00041T-CH
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 03:23:25 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-158.ewetel.net
	[80.228.95.158])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i148NNVM008460
	for <commit-classpath@gnu.org>; Wed, 4 Feb 2004 09:23:23 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AoIJf-0008Rg-00
	for <commit-classpath@gnu.org>; Wed, 04 Feb 2004 09:23:23 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 4 Feb 2004 09:27:11 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_fzKIAKs7l0f/Zoo"
Message-Id: <200402040927.11904.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: build system
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Feb 2004 08:23:59 -0000


--Boundary-00=_fzKIAKs7l0f/Zoo
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited a little patch to make --disable-java work and to 
cleanup configure.ac a bit.


Michael


2004-02-04  Michael Koch  <konqueror@gmx.de>

	* configure.ac: No need to call AC_PROG_MAKE_SET explicitely.
	Define conditiional for building glibj.zip. Simplified GTK checks.
	* lib/Makefile.am: Build glibj.zip conditionally.
	* native/jni/gtk-peer/Makefile.am: Removed references of GTHREAD_*
	and LIBART_*, all is now in GTK_*.


--Boundary-00=_fzKIAKs7l0f/Zoo
Content-Type: text/x-diff;
  charset="us-ascii";
  name="make.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="make.diff"

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.4
diff -u -b -B -r1.4 configure.ac
--- configure.ac	1 Feb 2004 16:57:24 -0000	1.4
+++ configure.ac	4 Feb 2004 08:21:06 -0000
@@ -19,9 +19,6 @@
 AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)
 
-dnl required if SUBDIRS is used
-AC_PROG_MAKE_SET
-
 AC_ARG_ENABLE([java],
               [AS_HELP_STRING(--enable-java,compile Java source [default=yes])],
               [case "${enableval}" in 
@@ -30,6 +27,7 @@
                  *) COMPILE_JAVA=yes ;;
                esac],
               [COMPILE_JAVA=yes])
+AM_CONDITIONAL(BUILD_GLIBJ_ZIP, test "x${COMPILE_JAVA}" = xyes)
 
 AC_ARG_ENABLE([jni],
               [AS_HELP_STRING(--enable-jni,compile JNI source [default=yes])],
@@ -122,17 +120,9 @@
 
   dnl Check for AWT related gthread/gtk/libart_lgpl
   if test "x${COMPILE_GTK_PEER}" = xyes; then
-     PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.2)
-     AC_SUBST(GTHREAD_CFLAGS)
-     AC_SUBST(GTHREAD_LIBS)
-
-     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
+     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2 gthread >= 2.2 libart-2.0)
      AC_SUBST(GTK_CFLAGS)
      AC_SUBST(GTK_LIBS)
-
-     PKG_CHECK_MODULES(LIBART, libart-2.0)
-     AC_SUBST(LIBART_CFLAGS)
-     AC_SUBST(LIBART_LIBS)
   fi
 
 fi
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.53
diff -u -b -B -r1.53 Makefile.am
--- lib/Makefile.am	30 Jan 2004 21:37:09 -0000	1.53
+++ lib/Makefile.am	4 Feb 2004 08:21:07 -0000
@@ -72,7 +72,7 @@
 
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB)
 
-
+if BUILD_GLIBJ_ZIP
 if HAVE_ZIP
 dist_pkgdata_DATA = glibj.zip
 noinst_DATA = genclasses
@@ -93,6 +93,8 @@
 	rm -rf $(DESTDIR)$(pkgdatadir)/java
 	rm -rf $(DESTDIR)$(pkgdatadir)/javax
 	rm -rf $(DESTDIR)$(pkgdatadir)/org
+
+endif # BUILD_GLIBJ_ZIP
 
 .PHONY: genclasses
 
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.5
diff -u -b -B -r1.5 Makefile.am
--- native/jni/gtk-peer/Makefile.am	1 Feb 2004 16:57:24 -0000	1.5
+++ native/jni/gtk-peer/Makefile.am	4 Feb 2004 08:21:07 -0000
@@ -35,12 +35,10 @@
 			gtkpeer.h 
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo
-libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTHREAD_LIBS@ @GTK_LIBS@ @LIBART_LIBS@
+libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTK_LIBS@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
-	   @GTHREAD_CFLAGS@ \
 	   @GTK_CFLAGS@ \
-	   @LIBART_CFLAGS@ \
 	   -I$(top_srcdir)/native/jni/classpath \
            -I$(top_srcdir)/include \
 	   -I$(top_builddir)/include

--Boundary-00=_fzKIAKs7l0f/Zoo--




From MAILER-DAEMON Wed Feb 04 03:47:57 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AoIhR-0002zR-8a
	for mharc-commit-classpath@gnu.org; Wed, 04 Feb 2004 03:47:57 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AoIhO-0002xr-Nz
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 03:47:54 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AoIgq-0002jw-Gn
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 03:47:51 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AoIgp-0002je-TN
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 03:47:20 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-158.ewetel.net
	[80.228.95.158])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i148lI1h022208
	for <commit-classpath@gnu.org>; Wed, 4 Feb 2004 09:47:18 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AoIgn-0008SX-00
	for <commit-classpath@gnu.org>; Wed, 04 Feb 2004 09:47:17 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 4 Feb 2004 09:51:06 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_6JLIAwVmEiboWKo"
Message-Id: <200402040951.06758.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.Thread
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Feb 2004 08:47:56 -0000


--Boundary-00=_6JLIAwVmEiboWKo
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge java.lang.Thread more with 
libgcj.


Michael


2004-02-04  Michael Koch  <konqueror@gmx.de>

	* java/lang/Thread.java
	(Thread): Merged extensive javadoc from libgcj.
	(setName): Do explicit null pointer check.
	(toString): Reformated. Simplified javadoc.


--Boundary-00=_6JLIAwVmEiboWKo
Content-Type: text/x-diff;
  charset="us-ascii";
  name="thread.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="thread.diff"

Index: java/lang/Thread.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Thread.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 Thread.java
--- java/lang/Thread.java	2 Feb 2004 10:29:58 -0000	1.4
+++ java/lang/Thread.java	4 Feb 2004 08:44:37 -0000
@@ -131,11 +131,51 @@
   private static int numAnonymousThreadsCreated = 0;
 
   /**
-   * Allocate a new Thread object, as if by
-   * <code>Thread(null, null, <i>fake name</i>)</code>, where the fake name
-   * is "Thread-" + <i>unique integer</i>.
+   * Allocates a new <code>Thread</code> object. This constructor has
+   * the same effect as <code>Thread(null, null,</code>
+   * <i>gname</i><code>)</code>, where <b><i>gname</i></b> is
+   * a newly generated name. Automatically generated names are of the
+   * form <code>"Thread-"+</code><i>n</i>, where <i>n</i> is an integer.
+   * <p>
+   * Threads created this way must have overridden their
+   * <code>run()</code> method to actually do anything.  An example
+   * illustrating this method being used follows:
+   * <p><blockquote><pre>
+   *     import java.lang.*;
+   *
+   *     class plain01 implements Runnable {
+   *         String name;
+   *         plain01() {
+   *             name = null;
+   *         }
+   *         plain01(String s) {
+   *             name = s;
+   *         }
+   *         public void run() {
+   *             if (name == null)
+   *                 System.out.println("A new thread created");
+   *             else
+   *                 System.out.println("A new thread with name " + name +
+   *                                    " created");
+   *         }
+   *     }
+   *     class threadtest01 {
+   *         public static void main(String args[] ) {
+   *             int failed = 0 ;
+   *
+   *             <b>Thread t1 = new Thread();</b>
+   *             if (t1 != null)
+   *                 System.out.println("new Thread() succeed");
+   *             else {
+   *                 System.out.println("new Thread() failed");
+   *                 failed++;
+   *             }
+   *         }
+   *     }
+   * </pre></blockquote>
    *
-   * @see #Thread(ThreadGroup, Runnable, String)
+   * @see     java.lang.Thread#Thread(java.lang.ThreadGroup,
+   *          java.lang.Runnable, java.lang.String)
    */
   public Thread()
   {
@@ -694,8 +734,10 @@
   public final synchronized void setName(String name)
   {
     checkAccess();
-    // Use toString hack to detect null.
-    name = name.toString();
+    // The Class Libraries book says ``threadName cannot be null''.  I
+    // take this to mean NullPointerException.
+    if (name == null)
+      throw new NullPointerException();
     VMThread t = vmThread;
     if (t != null)
 	t.setName(name);
@@ -899,18 +941,15 @@
   }
 
   /**
-   * Return a human-readable String representing this Thread. The format of
-   * the string is:<br>
-   * <code>"Thread[" + getName() + ',' + getPriority() + ','
-   *  + (getThreadGroup() == null ? "" : getThreadGroup().getName())
-   + ']'</code>.
+   * Returns a string representation of this thread, including the
+   * thread's name, priority, and thread group.
    *
    * @return a human-readable String representing this Thread
    */
   public String toString()
   {
-    return ("Thread[" + name + "," + priority + "," + 
-	    (group == null ? "" : group.getName()) + "]");
+    return ("Thread[" + name + "," + priority + ","
+	    + (group == null ? "" : group.getName()) + "]");
   }
 
   /**

--Boundary-00=_6JLIAwVmEiboWKo--




From MAILER-DAEMON Wed Feb 04 04:04:25 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AoIxM-0006NF-K2
	for mharc-commit-classpath@gnu.org; Wed, 04 Feb 2004 04:04:24 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AoIxJ-0006IV-8L
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 04:04:21 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AoIwd-0005lL-6H
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 04:04:10 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AoIwc-0005ji-Gp
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 04:03:38 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-158.ewetel.net
	[80.228.95.158])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i1493al1023917
	for <commit-classpath@gnu.org>; Wed, 4 Feb 2004 10:03:36 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AoIwa-00007i-00
	for <commit-classpath@gnu.org>; Wed, 04 Feb 2004 10:03:36 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 4 Feb 2004 10:07:24 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_MZLIAupdOi2e/Bb"
Message-Id: <200402041007.24438.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: hacking.texinfo
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Feb 2004 09:04:23 -0000


--Boundary-00=_MZLIAupdOi2e/Bb
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to fix a little bug in configure.ac I 
just introduced and to add a menu in doc/hacking.texinfo to make 
makeinfo shutup.


Michael


2004-02-04  Michael Koch  <konqueror@gmx.de>

	* configure.ac: Fixed little bug (s/gthread/gthread-2.0/).
	* doc/hacking.texinfo (API Compatibility): Added menu to make makeinfo 
silent.


--Boundary-00=_MZLIAupdOi2e/Bb
Content-Type: text/x-diff;
  charset="us-ascii";
  name="texinfo.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="texinfo.diff"

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.5
diff -u -b -B -r1.5 configure.ac
--- configure.ac	4 Feb 2004 08:21:59 -0000	1.5
+++ configure.ac	4 Feb 2004 09:00:55 -0000
@@ -120,7 +120,7 @@
 
   dnl Check for AWT related gthread/gtk/libart_lgpl
   if test "x${COMPILE_GTK_PEER}" = xyes; then
-     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2 gthread >= 2.2 libart-2.0)
+     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2 gthread-2.0 >= 2.2 libart-2.0)
      AC_SUBST(GTK_CFLAGS)
      AC_SUBST(GTK_LIBS)
   fi
Index: doc/hacking.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/hacking.texinfo,v
retrieving revision 1.19
diff -u -b -B -r1.19 hacking.texinfo
--- doc/hacking.texinfo	3 Feb 2004 17:00:26 -0000	1.19
+++ doc/hacking.texinfo	4 Feb 2004 09:00:56 -0000
@@ -614,6 +614,11 @@
 @comment  node-name,  next,  previous,  up
 @chapter API Compatibility
 
+@menu
+* Serialization::		Serialization
+* Deprecated Methods::		Deprecated methods
+@end menu
+
 @node Serialization, Deprecated Methods, , API Compatibility
 @comment  node-name,  next,  previous,  up
 @section Serialization

--Boundary-00=_MZLIAupdOi2e/Bb--




From MAILER-DAEMON Wed Feb 04 16:16:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AoUNs-00059T-KV
	for mharc-commit-classpath@gnu.org; Wed, 04 Feb 2004 16:16:32 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AoUNX-0004tE-UB
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 16:16:12 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AoUMS-0003lb-9q
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 16:15:37 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AoUMO-0003gE-3V
	for commit-classpath@gnu.org; Wed, 04 Feb 2004 16:15:00 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-158.ewetel.net
	[80.228.95.158])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i14LEvl1004446
	for <commit-classpath@gnu.org>; Wed, 4 Feb 2004 22:14:58 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AoUML-0002DF-00
	for <commit-classpath@gnu.org>; Wed, 04 Feb 2004 22:14:57 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 4 Feb 2004 22:18:44 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_0GWIAuxk2KQIgCr"
Message-Id: <200402042218.45165.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: pkg.m4
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Feb 2004 21:16:28 -0000


--Boundary-00=_0GWIAuxk2KQIgCr
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to add pkg.m4. This file is needed 
when building from CVS and pkg-config is not installed on the build 
host.


Michael


2004-02-04  Michael Koch  <konqueror@gmx.de>

	* pkg.m4: New file.


--Boundary-00=_0GWIAuxk2KQIgCr
Content-Type: text/x-diff;
  charset="us-ascii";
  name="pkgconfig.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="pkgconfig.diff"

Index: pkg.m4
===================================================================
RCS file: pkg.m4
diff -N pkg.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ pkg.m4	4 Feb 2004 21:12:17 -0000
@@ -0,0 +1,57 @@
+
+dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
+dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
+dnl also defines GSTUFF_PKG_ERRORS on error
+AC_DEFUN([PKG_CHECK_MODULES], [
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        AC_MSG_CHECKING(for $2)
+
+        if $PKG_CONFIG --exists "$2" ; then
+            AC_MSG_RESULT(yes)
+            succeeded=yes
+
+            AC_MSG_CHECKING($1_CFLAGS)
+            $1_CFLAGS=`$PKG_CONFIG --cflags "$2"`
+            AC_MSG_RESULT($$1_CFLAGS)
+
+            AC_MSG_CHECKING($1_LIBS)
+            $1_LIBS=`$PKG_CONFIG --libs "$2"`
+            AC_MSG_RESULT($$1_LIBS)
+        else
+            $1_CFLAGS=""
+            $1_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+            ifelse([$4], ,echo $$1_PKG_ERRORS,)
+        fi
+
+        AC_SUBST($1_CFLAGS)
+        AC_SUBST($1_LIBS)
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
+

--Boundary-00=_0GWIAuxk2KQIgCr--




From MAILER-DAEMON Thu Feb 05 02:13:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AodhK-0005vQ-Rl
	for mharc-commit-classpath@gnu.org; Thu, 05 Feb 2004 02:13:14 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AodhG-0005uY-3g
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 02:13:10 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aodgk-0005dq-JX
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 02:13:09 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aodgk-0005dn-08
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 02:12:38 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-051.ewetel.net
	[80.228.95.51])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i157CYVM009734
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 08:12:34 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Aodgg-0003bo-00
	for <commit-classpath@gnu.org>; Thu, 05 Feb 2004 08:12:34 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 5 Feb 2004 08:16:22 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_G3eIARuUg2PNyLe"
Message-Id: <200402050816.22813.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: package descriptions
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2004 07:13:10 -0000


--Boundary-00=_G3eIARuUg2PNyLe
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to add some package.html files. This 
fixes some gjdoc warnings.


Michael


2004-02-05  Michael Koch  <konqueror@gmx.de>

	* javax/naming/directory/Makefile.am,
	javax/naming/event/Makefile.am,
	javax/naming/ldap/Makefile.am,
	javax/naming/spi/Makefile.am,
	javax/rmi/CORBA/Makefile.am,
	javax/rmi/Makefile.am,
	javax/security/auth/x500/Makefile.am,
	javax/transaction/Makefile.am,
	javax/transaction/xa/Makefile.am
	(EXTRA_DIST): Added package.html.
	* javax/naming/directory/package.html,
	javax/naming/event/package.html,
	javax/naming/ldap/package.html,
	javax/naming/spi/package.html,
	javax/rmi/CORBA/package.html,
	javax/rmi/package.html,
	javax/security/auth/x500/package.html,
	javax/transaction/package.html,
	javax/transaction/xa/package.html: New files.


--Boundary-00=_G3eIARuUg2PNyLe
Content-Type: text/x-diff;
  charset="us-ascii";
  name="docs.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="docs.diff"

Index: javax/naming/directory/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/directory/Makefile.am,v
retrieving revision 1.2
diff -u -b -B -r1.2 Makefile.am
--- javax/naming/directory/Makefile.am	24 Dec 2002 05:35:22 -0000	1.2
+++ javax/naming/directory/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -18,4 +18,5 @@
 NoSuchAttributeException.java \
 SchemaViolationException.java \
 SearchControls.java \
-SearchResult.java
+SearchResult.java \
+package.html
Index: javax/naming/directory/package.html
===================================================================
RCS file: javax/naming/directory/package.html
diff -N javax/naming/directory/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/naming/directory/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.naming.directory package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.naming.directory</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: javax/naming/event/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/event/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- javax/naming/event/Makefile.am	24 Dec 2002 05:35:22 -0000	1.1
+++ javax/naming/event/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -5,4 +5,5 @@
 NamingEvent.java \
 NamingExceptionEvent.java \
 NamingListener.java \
-ObjectChangeListener.java
+ObjectChangeListener.java \
+package.html
Index: javax/naming/event/package.html
===================================================================
RCS file: javax/naming/event/package.html
diff -N javax/naming/event/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/naming/event/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.naming.event package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.naming.event</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: javax/naming/ldap/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/ldap/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- javax/naming/ldap/Makefile.am	24 Dec 2002 05:35:22 -0000	1.1
+++ javax/naming/ldap/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -9,4 +9,5 @@
 LdapReferralException.java \
 UnsolicitedNotificationEvent.java \
 UnsolicitedNotification.java \
-UnsolicitedNotificationListener.java
+UnsolicitedNotificationListener.java \
+package.html
Index: javax/naming/ldap/package.html
===================================================================
RCS file: javax/naming/ldap/package.html
diff -N javax/naming/ldap/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/naming/ldap/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.naming.ldap package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.naming.ldap</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: javax/naming/spi/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/Makefile.am,v
retrieving revision 1.2
diff -u -b -B -r1.2 Makefile.am
--- javax/naming/spi/Makefile.am	24 Dec 2002 05:35:22 -0000	1.2
+++ javax/naming/spi/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -10,4 +10,5 @@
 ObjectFactory.java \
 ResolveResult.java \
 Resolver.java \
-StateFactory.java
+StateFactory.java \
+package.html
Index: javax/naming/spi/package.html
===================================================================
RCS file: javax/naming/spi/package.html
diff -N javax/naming/spi/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/naming/spi/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.naming.spi package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.naming.spi</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: javax/rmi/CORBA/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- javax/rmi/CORBA/Makefile.am	31 Oct 2002 18:35:23 -0000	1.1
+++ javax/rmi/CORBA/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -10,4 +10,5 @@
 Tie.java \
 Util.java \
 UtilDelegate.java \
-ValueHandler.java
+ValueHandler.java \
+package.html
Index: javax/rmi/CORBA/package.html
===================================================================
RCS file: javax/rmi/CORBA/package.html
diff -N javax/rmi/CORBA/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/rmi/CORBA/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.rmi.CORBA package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.rmi.CORBA</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: javax/rmi/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- javax/rmi/Makefile.am	31 Oct 2002 18:35:23 -0000	1.1
+++ javax/rmi/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -5,4 +5,5 @@
 EXTRA_DIST = \
 BAD_OPERATION.java \
 ORB.java \
-PortableRemoteObject.java
+PortableRemoteObject.java \
+package.html
Index: javax/rmi/package.html
===================================================================
RCS file: javax/rmi/package.html
diff -N javax/rmi/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/rmi/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.rmi package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.rmi</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: javax/security/auth/x500/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/security/auth/x500/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- javax/security/auth/x500/Makefile.am	23 Apr 2003 23:18:26 -0000	1.1
+++ javax/security/auth/x500/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -1,2 +1,3 @@
 EXTRA_DIST = \
-X500Principal.java
+X500Principal.java \
+package.html
Index: javax/security/auth/x500/package.html
===================================================================
RCS file: javax/security/auth/x500/package.html
diff -N javax/security/auth/x500/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/security/auth/x500/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.security.auth.x500 package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.security.auth.x500</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: javax/transaction/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/transaction/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- javax/transaction/Makefile.am	26 Nov 2002 22:45:56 -0000	1.1
+++ javax/transaction/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -16,4 +16,5 @@
 TransactionManager.java \
 TransactionRequiredException.java \
 TransactionRolledbackException.java \
-UserTransaction.java
+UserTransaction.java \
+package.html
Index: javax/transaction/package.html
===================================================================
RCS file: javax/transaction/package.html
diff -N javax/transaction/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/transaction/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.transaction package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.transaction</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>
Index: javax/transaction/xa/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/transaction/xa/Makefile.am,v
retrieving revision 1.2
diff -u -b -B -r1.2 Makefile.am
--- javax/transaction/xa/Makefile.am	24 Dec 2002 05:35:23 -0000	1.2
+++ javax/transaction/xa/Makefile.am	5 Feb 2004 07:09:34 -0000
@@ -3,5 +3,5 @@
 EXTRA_DIST = \
 XAException.java \
 XAResource.java \
-Xid.java
-
+Xid.java \
+package.html
Index: javax/transaction/xa/package.html
===================================================================
RCS file: javax/transaction/xa/package.html
diff -N javax/transaction/xa/package.html
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/transaction/xa/package.html	5 Feb 2004 07:09:34 -0000
@@ -0,0 +1,46 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!-- package.html - describes classes in javax.transaction.xa package.
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. -->
+
+<html>
+<head><title>GNU Classpath - javax.transaction.xa</title></head>
+
+<body>
+<p></p>
+
+</body>
+</html>

--Boundary-00=_G3eIARuUg2PNyLe--




From MAILER-DAEMON Thu Feb 05 13:52:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aoobn-0003FJ-0x
	for mharc-commit-classpath@gnu.org; Thu, 05 Feb 2004 13:52:15 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aoobc-0003DQ-EI
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 13:52:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aoob2-0002sa-TV
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 13:52:01 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aooan-0002lW-2e
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 13:51:13 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-93-098.ewetel.net
	[80.228.93.98])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i15Ip6qM011364;
	Thu, 5 Feb 2004 19:51:06 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Aooag-0006fd-00; Thu, 05 Feb 2004 19:51:06 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Thu, 5 Feb 2004 19:54:55 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_/FpIA/KpFXVUdPt"
Message-Id: <200402051954.55343.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: javax.swing
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2004 18:52:05 -0000


--Boundary-00=_/FpIA/KpFXVUdPt
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I commited the attached patch to libgcj trunk and classpath to fix some 
javax.swing issues.


Michael


2004-02-05  Michael Koch  <konqueror@gmx.de>

	* javax/swing/AbstractCellEditor.java
	(getCellEditorValue): Removed.
	* javax/swing/Box.java: Reformated.
	(serialVersionUID): New field.
	* javax/swing/ButtonGroup.java:
	Removed some weird whitespace.
	* javax/swing/CellEditor.java: Reformated.
	* javax/swing/CellRendererPane.java
	(serialVersionUID): New field.
	(AccessibleCellRendererPaneserialVersionUID): New field.
	* javax/swing/DefaultListModel.java
	(serialVersionUID): New field.
	* javax/swing/JEditorPane.java
	(serialVersionUID): New field.
	(setPage): Throws IOException.
	(addHyperlinkListener): Implemented.
	(removeHyperlinkListener): Implemented.
	(getHyperlinkListener): New method.
	* javax/swing/JFileChooser.java
	(serialVersionUID): New field.
	(AccessibleJFileChooser.serialVersionUID): New field.
	(addActionListener): Implemented.
	(removeActionListener): Implemented.
	(getActionListeners): New method.
	* javax/swing/JFormattedTextField.java
	(serialVersionUID): New field.
	(AbstractFormatter.serialVersionUID): New field.
	(clone): Throws CloneNotSupportedException
	(setEditValid): Add missing argument.
	(stringToValue): Throws ParseExcpetion.
	(valueToString): Throws ParseException.
	(commitEdit): Throws ParseException.
	* javax/swing/JLabel.java
	(serialVersionUID): New field.
	* javax/swing/JList.java
	(serialVersionUID): New field.
	(addListSelectionListener): Reformated.
	(removeListSelectionListener): Reformated.
	(getListSelectionListeners): New method.
	* javax/swing/colorchooser/AbstractColorChooserPanel.java:
	Reformated.
	(serialVersionUID): New field.
	* javax/swing/table/AbstractTableModel.java
	(getValueAt): Removed.
	(getColumnCount): Removed.
	(getRowCount): Removed.


--Boundary-00=_/FpIA/KpFXVUdPt
Content-Type: text/x-diff;
  charset="us-ascii";
  name="swing.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="swing.diff"

Index: javax/swing/AbstractCellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractCellEditor.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 AbstractCellEditor.java
--- javax/swing/AbstractCellEditor.java	27 Jan 2004 18:55:11 -0000	1.5
+++ javax/swing/AbstractCellEditor.java	5 Feb 2004 18:48:27 -0000
@@ -104,12 +104,6 @@
 		// TODO
 	} // cancelCellEditing()
 
-	/**
-	 * getCellEditorValue
-	 * @returns Object
-	 */
-	public abstract Object getCellEditorValue();
-
   /**
    * addCellEditorListener
    *
Index: javax/swing/Box.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Box.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 Box.java
--- javax/swing/Box.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/Box.java	5 Feb 2004 18:48:27 -0000
@@ -47,9 +47,10 @@
  */
 public class Box extends JComponent implements Accessible
 {
-    Box(int a)
+  private static final long serialVersionUID = 1525417495883046342L;
+  
+  public Box(int a)
     {
-        setLayout(new BoxLayout(this, 
-				a));	
+    setLayout(new BoxLayout(this, a));	
     }
 }
Index: javax/swing/ButtonGroup.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ButtonGroup.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 ButtonGroup.java
Index: javax/swing/CellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/CellEditor.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 CellEditor.java
--- javax/swing/CellEditor.java	9 Jan 2004 10:18:47 -0000	1.3
+++ javax/swing/CellEditor.java	5 Feb 2004 18:48:27 -0000
@@ -45,12 +45,8 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public interface CellEditor {
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
+public interface CellEditor
+{
 	/**
 	 * getCellEditorValue
 	 * @returns Object
Index: javax/swing/CellRendererPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/CellRendererPane.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 CellRendererPane.java
--- javax/swing/CellRendererPane.java	9 Jan 2004 10:18:47 -0000	1.2
+++ javax/swing/CellRendererPane.java	5 Feb 2004 18:48:27 -0000
@@ -52,7 +52,9 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public class CellRendererPane extends Container implements Accessible {
+public class CellRendererPane extends Container implements Accessible
+{
+  private static final long serialVersionUID = -7642183829532984273L;
 
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
@@ -62,6 +64,8 @@
 	 * AccessibleCellRendererPane
 	 */
 	protected class AccessibleCellRendererPane extends AccessibleAWTContainer {
+
+          private static final long serialVersionUID = 7300340301783504481L;
 
 		//-------------------------------------------------------------
 		// Initialization ---------------------------------------------
Index: javax/swing/DefaultListModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultListModel.java
--- javax/swing/DefaultListModel.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/DefaultListModel.java	5 Feb 2004 18:48:28 -0000
@@ -50,6 +50,7 @@
  */
 public class DefaultListModel extends AbstractListModel
 {
+  private static final long serialVersionUID = 2315945659722172272L;
 
 	//-------------------------------------------------------------
 	// Variables --------------------------------------------------
Index: javax/swing/JEditorPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JEditorPane.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JEditorPane.java
--- javax/swing/JEditorPane.java	28 Jan 2004 19:37:59 -0000	1.3
+++ javax/swing/JEditorPane.java	5 Feb 2004 18:48:28 -0000
@@ -52,6 +52,8 @@
 
 public class JEditorPane extends JTextComponent
 {
+  private static final long serialVersionUID = 3140472492599046285L;
+
     URL page_url;
     EditorKit kit;
     String ctype = "text/plain";
@@ -82,9 +84,6 @@
 	setPage(url);
     }
 
-    void addHyperlinkListener(HyperlinkListener listener)
-    {  }
-    
     protected  EditorKit createDefaultEditorKit()
     {	return new PlainEditorKit();    }
     
@@ -174,11 +173,6 @@
 	//Establishes the default bindings of type to classname.  
     }
     
-    void removeHyperlinkListener(HyperlinkListener listener)
-    {
-	//Removes a hyperlink listener.  
-    }
-    
     void replaceSelection(String content)
     {
 	//Replaces the currently selected content with new content represented by the given string. 
@@ -210,11 +204,13 @@
     }
   
   void setPage(String url)
+    throws IOException
     {
 	//  Sets the current URL being displayed.  
     }
     
     void setPage(URL page)
+    throws IOException
     {
 	//    Sets the current URL being displayed.  
     }
@@ -223,4 +219,23 @@
     {	
 	super.setText(t);
     }
+
+  public void addHyperlinkListener(HyperlinkListener listener)
+  {
+    listenerList.add (HyperlinkListener.class, listener);
+  }
+    
+  public void removeHyperlinkListener (HyperlinkListener listener)
+  {
+    listenerList.remove (HyperlinkListener.class, listener);
+  }
+
+  /**
+   * @since 1.4
+   */
+  public HyperlinkListener[] getHyperlinkListeners()
+  {
+    return (HyperlinkListener[]) getListeners (HyperlinkListener.class);
+  }
+    
 } // class JEditorPane
Index: javax/swing/JFileChooser.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFileChooser.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JFileChooser.java
--- javax/swing/JFileChooser.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JFileChooser.java	5 Feb 2004 18:48:28 -0000
@@ -59,6 +59,8 @@
  */
 public class JFileChooser extends JComponent implements Accessible {
 
+  private static final long serialVersionUID = 3162921138695327837L;
+
 	//-------------------------------------------------------------
 	// Classes ----------------------------------------------------
 	//-------------------------------------------------------------
@@ -68,6 +70,8 @@
 	 */
 	protected class AccessibleJFileChooser extends AccessibleJComponent {
 
+          private static final long serialVersionUID = 3318922050345221200L;
+
 		//-------------------------------------------------------------
 		// Variables --------------------------------------------------
 		//-------------------------------------------------------------
@@ -906,17 +910,24 @@
 	 * addActionListener
 	 * @param listener TODO
 	 */
-	public void addActionListener(ActionListener listener) {
-		// TODO
-	} // addActionListener()
+	public void addActionListener(ActionListener listener)
+	{
+		listenerList.add (ActionListener.class, listener);
+	}
 
 	/**
 	 * removeActionListener
 	 * @param listener TODO
 	 */
-	public void removeActionListener(ActionListener listener) {
-		// TODO
-	} // removeActionListener()
+	public void removeActionListener(ActionListener listener)
+	{
+		listenerList.remove (ActionListener.class, listener);
+	}
+
+	public ActionListener[] getActionListeners()
+	{
+		return (ActionListener[]) listenerList.getListeners (ActionListener.class);
+	}
 
 	/**
 	 * fireActionPerformed
Index: javax/swing/JFormattedTextField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JFormattedTextField.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JFormattedTextField.java
--- javax/swing/JFormattedTextField.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JFormattedTextField.java	5 Feb 2004 18:48:28 -0000
@@ -52,14 +52,19 @@
  */
 public class JFormattedTextField extends JTextField
 {
+  private static final long serialVersionUID = 2889768923115424035L;
+
   public abstract static class AbstractFormatter implements Serializable
   {
+    private static final long serialVersionUID = -5193212041738979680L;
+    
     public AbstractFormatter ()
     {
       //Do nothing here.
     }
 
     protected Object clone ()
+      throws CloneNotSupportedException
     {
       throw new InternalError ("not implemented");
     }
@@ -99,14 +104,16 @@
       throw new InternalError ("not implemented");
     }
 
-    protected void setEditValid ()
+    protected void setEditValid (boolean valid)
     {
       throw new InternalError ("not implemented");
     }
 
-    public abstract Object stringToValue (String text);
+    public abstract Object stringToValue (String text)
+      throws ParseException;
 
-    public abstract String valueToString (Object value);
+    public abstract String valueToString (Object value)
+      throws ParseException;
   }
   
   public abstract static class AbstractFormatterFactory
@@ -155,6 +162,7 @@
   }
 
   public void commitEdit ()
+    throws ParseException
   {
     throw new InternalError ("not implemented");
   }
Index: javax/swing/JLabel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JLabel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JLabel.java
--- javax/swing/JLabel.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JLabel.java	5 Feb 2004 18:48:28 -0000
@@ -46,6 +46,8 @@
 
 public class JLabel extends JComponent implements Accessible, SwingConstants
 {
+  private static final long serialVersionUID = 5496508283662221534L;
+  
     String text;
     Icon icon;
     int gap;
Index: javax/swing/JList.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JList.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JList.java
--- javax/swing/JList.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JList.java	5 Feb 2004 18:48:28 -0000
@@ -51,6 +51,8 @@
 
 public class JList extends JComponent implements Accessible, Scrollable
 {
+  private static final long serialVersionUID = 4406629526391098046L;
+
     Color select_back, select_fore;
     ListCellRenderer render;
     int visibles = 8;
@@ -105,10 +107,23 @@
 	repaint();
     }
 
-    void addListSelectionListener(ListSelectionListener listener)
-    { sel_model.addListSelectionListener(listener);    }
-    void removeListSelectionListener(ListSelectionListener listener)
-    { sel_model.removeListSelectionListener(listener);    }
+  public void addListSelectionListener (ListSelectionListener listener)
+  {
+    sel_model.addListSelectionListener (listener);
+  }
+  
+  public void removeListSelectionListener (ListSelectionListener listener)
+  {
+    sel_model.removeListSelectionListener (listener);
+  }
+
+  /**
+   * @since 1.4
+   */
+  public ListSelectionListener[] getListSelectionListeners()
+  {
+    throw new Error ("not implemented");
+  }
 
     void setSelectionMode(int a)
     {  sel_model.setSelectionMode(a);   }
Index: javax/swing/colorchooser/AbstractColorChooserPanel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AbstractColorChooserPanel.java
--- javax/swing/colorchooser/AbstractColorChooserPanel.java	11 Jun 2003 13:20:40 -0000	1.2
+++ javax/swing/colorchooser/AbstractColorChooserPanel.java	5 Feb 2004 18:48:28 -0000
@@ -49,22 +49,15 @@
  * @author	Andrew Selkirk
  * @version	1.0
  */
-public abstract class AbstractColorChooserPanel extends JPanel {
-
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
+public abstract class AbstractColorChooserPanel extends JPanel
+{
+  private static final long serialVersionUID = -977469671210173863L;
 
 	/**
 	 * chooser
 	 */
 	private JColorChooser chooser;
 
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * Constructor AbstractColorChooserPanel
 	 */
@@ -72,11 +65,6 @@
 		// TODO
 	} // AbstractColorChooserPanel()
 
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * getDisplayName
 	 * @returns String
Index: javax/swing/table/AbstractTableModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/table/AbstractTableModel.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 AbstractTableModel.java
--- javax/swing/table/AbstractTableModel.java	8 Oct 2003 15:29:52 -0000	1.5
+++ javax/swing/table/AbstractTableModel.java	5 Feb 2004 18:48:28 -0000
@@ -271,25 +270,4 @@
   {
     return listenerList.getListeners (listenerType);
   }
-
-  /**
-   * getValueAt
-   * @param value0 TODO
-   * @param value1 TODO
-   * @return Object
-   */
-  public abstract Object getValueAt (int row, int column);
-
-  /**
-   * getColumnCount
-   * @return int
-   */
-  public abstract int getColumnCount();
-
-  /**
-   * getRowCount
-   * @return int
-   */
-  public abstract int getRowCount();
-
-} // AbstractTableModel
+}

--Boundary-00=_/FpIA/KpFXVUdPt--




From MAILER-DAEMON Thu Feb 05 15:16:32 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AopvM-0006yZ-8i
	for mharc-commit-classpath@gnu.org; Thu, 05 Feb 2004 15:16:32 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AopvI-0006xH-LF
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 15:16:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aopum-0006qK-Em
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 15:16:27 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aopdx-0003v4-Qb
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 14:58:33 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i15JwRb05276
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 14:58:27 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i15JwPa25895
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 14:58:25 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i15JwOXd005446
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 14:58:24 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-RBlCjRyDNGX6tniK/3b/"
Message-Id: <1076011104.19538.2.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Thu, 05 Feb 2004 14:58:24 -0500
Subject: Patch: FYI: Scrollbar and GtkScrollbarPeer fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2004 20:16:29 -0000


--=-RBlCjRyDNGX6tniK/3b/
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

I've committed the attached patch.

Tom

2004-02-05  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/awt/Scrollbar.java (next_scrollbar_number): New field.
	(Scrollbar (int, int, int, int, int)): Make default page
	increment 10.
	(setValues): Only call peer.setValues if one of the values has
	changed.
	(generateName): New method.
	(getUniqueLong): New method.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
	(range_scrollbar): Remove structure.
	(post_adjustment_event): Remove function.
	(post_change_event): Accept jobject argument.
	(create): Cast jints to gdoubles.  Round scrollbar values to the
	nearest integer.  Clamp min, max and value settings.
	(connectJObject): Connect hook to widget->window.
	(connectSignals): Remove range_scrollbar structure variables.
	Remove "move-slider" connection.  Pass global peer reference to
	"value-changed" callback.
	(setLineIncrement): Cast jint value to gdouble.
	(setPageIncrement): Likewise.
	(setValues): Likewise.  Clamp min, max and value settings.


--=-RBlCjRyDNGX6tniK/3b/
Content-Disposition: attachment; filename=scrollbar-fixes.patch
Content-Type: text/x-patch; name=scrollbar-fixes.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: java/awt/Scrollbar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Scrollbar.java,v
retrieving revision 1.16
diff -u -r1.16 Scrollbar.java
--- java/awt/Scrollbar.java	3 Feb 2004 17:10:54 -0000	1.16
+++ java/awt/Scrollbar.java	3 Feb 2004 18:47:46 -0000
@@ -120,6 +120,11 @@
 
 private transient boolean valueIsAdjusting = false;
 
+  /*
+   * The number used to generate the name returned by getName.
+   */
+  private static transient long next_scrollbar_number = 0;
+
 /*************************************************************************/
 
 /*
@@ -194,9 +199,8 @@
   // Default is 1 according to online docs.
   lineIncrement = 1;
 
-  pageIncrement = (maximum - minimum) / 5;
-  if (pageIncrement == 0)
-    pageIncrement = 1;
+  // Default is 10 according to javadocs.
+  pageIncrement = 10;
 }
 
 /*************************************************************************/
@@ -394,15 +398,17 @@
   if (visibleAmount > maximum - minimum)
     visibleAmount = maximum - minimum;
 
+  ScrollbarPeer peer = (ScrollbarPeer) getPeer ();
+  if (peer != null
+      && (this.value != value || this.visibleAmount != visibleAmount
+          || this.minimum != minimum || this.maximum != maximum))
+    peer.setValues(value, visibleAmount, minimum, maximum);
+
   this.value = value;
   this.visibleAmount = visibleAmount;
   this.minimum = minimum;
   this.maximum = maximum;
 
-  ScrollbarPeer sp = (ScrollbarPeer)getPeer();
-  if (sp != null)
-    sp.setValues(value, visibleAmount, minimum, maximum);
-
   int range = maximum - minimum;
   if (lineIncrement > range)
     {
@@ -411,8 +417,8 @@
       else
         lineIncrement = range;
 
-      if (sp != null)
-        sp.setLineIncrement(lineIncrement);
+      if (peer != null)
+        peer.setLineIncrement(lineIncrement);
     }
 
   if (pageIncrement > range)
@@ -422,8 +428,8 @@
       else
         pageIncrement = range;
 
-      if (sp != null)
-        sp.setPageIncrement(pageIncrement);
+      if (peer != null)
+        peer.setPageIncrement(pageIncrement);
     }
 }
 
@@ -503,9 +509,9 @@
 
   this.lineIncrement = lineIncrement;
 
-  ScrollbarPeer sp = (ScrollbarPeer) getPeer ();
-  if (sp != null)
-    sp.setLineIncrement (this.lineIncrement);
+  ScrollbarPeer peer = (ScrollbarPeer) getPeer ();
+  if (peer != null)
+    peer.setLineIncrement (this.lineIncrement);
 }
 
 /*************************************************************************/
@@ -584,9 +590,9 @@
 
   this.pageIncrement = pageIncrement;
 
-  ScrollbarPeer sp = (ScrollbarPeer) getPeer ();
-  if (sp != null)
-    sp.setPageIncrement (this.pageIncrement);
+  ScrollbarPeer peer = (ScrollbarPeer) getPeer ();
+  if (peer != null)
+    peer.setPageIncrement (this.pageIncrement);
 }
 
 /*************************************************************************/
@@ -745,6 +751,21 @@
   public void setValueIsAdjusting (boolean valueIsAdjusting)
   {
     this.valueIsAdjusting = valueIsAdjusting;
+  }
+
+  /**
+   * Generate a unique name for this scroll bar.
+   *
+   * @return A unique name for this scroll bar.
+   */
+  String generateName ()
+  {
+    return "scrollbar" + getUniqueLong ();
+  }
+
+  private static synchronized long getUniqueLong ()
+  {
+    return next_scrollbar_number++;
   }
 } // class Scrollbar 
 
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkScrollBarPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c	13 Dec 2003 01:15:47 -0000	1.6
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c	3 Feb 2004 18:47:46 -0000
@@ -40,72 +40,14 @@
 #include "gnu_java_awt_peer_gtk_GtkComponentPeer.h"
 #include "gnu_java_awt_peer_gtk_GtkScrollbarPeer.h"
 
-struct range_scrollbar
-{
-  GtkRange *range;
-  jobject *scrollbar;
-};
-
-static void 
-post_change_event (GtkRange *range,
-		   struct range_scrollbar *rs)
-{
-  GtkAdjustment *adj;
-  adj = gtk_range_get_adjustment (range);
-  (*gdk_env)->CallVoidMethod (gdk_env, *(rs->scrollbar), postAdjustmentEventID,
-			      AWT_ADJUSTMENT_TRACK, (jint) adj->value);
-  
-}
-
-static void 
-post_adjustment_event (GtkRange *range, GtkScrollType scroll, 
-		       struct range_scrollbar *rs)
-{
-  jint type;
-  GtkAdjustment *adj;
-
-  adj = gtk_range_get_adjustment (range);
-
-  switch (scroll)
-    {
-    case GTK_SCROLL_STEP_UP:
-    case GTK_SCROLL_STEP_RIGHT:
-    case GTK_SCROLL_STEP_FORWARD:
-      type = AWT_ADJUSTMENT_UNIT_INCREMENT;
-      break;
-    case GTK_SCROLL_STEP_DOWN:
-    case GTK_SCROLL_STEP_LEFT:
-    case GTK_SCROLL_STEP_BACKWARD:
-      type = AWT_ADJUSTMENT_UNIT_DECREMENT;
-      break;
-    case GTK_SCROLL_PAGE_UP:
-    case GTK_SCROLL_PAGE_RIGHT:
-    case GTK_SCROLL_PAGE_FORWARD:
-      type = AWT_ADJUSTMENT_BLOCK_INCREMENT;
-      break;
-    case GTK_SCROLL_PAGE_DOWN:
-    case GTK_SCROLL_PAGE_LEFT:
-    case GTK_SCROLL_PAGE_BACKWARD:
-      type = AWT_ADJUSTMENT_BLOCK_DECREMENT;
-      break;
-    case GTK_SCROLL_JUMP:
-    case GTK_SCROLL_NONE:  /* Apparently generated when slider is dragged. */
-      type = AWT_ADJUSTMENT_TRACK;
-      break;
-    default: /* Can this happen?  If so, is this right? */
-      return;
-    }
-  
-  (*gdk_env)->CallVoidMethod (gdk_env, *(rs->scrollbar), postAdjustmentEventID,
-			      type, (jint) adj->value);
-}
+static void post_change_event (GtkRange *range, jobject peer);
 
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create
 (JNIEnv *env, jobject obj, jint orientation, jint value, 
  jint min, jint max, jint step_incr, jint page_incr, jint visible_amount)
 {
-  GtkWidget *sb;
+  GtkWidget *scrollbar;
   GtkObject *adj;
 
   /* Create global reference and save it for future use */
@@ -113,16 +55,26 @@
 
   gdk_threads_enter ();
   
-  adj = gtk_adjustment_new (value, min, max, 
-			    step_incr, page_incr, 
-			    visible_amount);
+  adj = gtk_adjustment_new ((gdouble) value,
+                            (gdouble) min,
+                            (gdouble) max,
+			    (gdouble) step_incr,
+                            (gdouble) page_incr,
+			    (gdouble) visible_amount);
 
-  sb = (orientation) ? gtk_vscrollbar_new (GTK_ADJUSTMENT (adj)) :
+  scrollbar = (orientation) ? gtk_vscrollbar_new (GTK_ADJUSTMENT (adj)) :
                        gtk_hscrollbar_new (GTK_ADJUSTMENT (adj));
 
+  GTK_RANGE (scrollbar)->round_digits = 0;
+  /* These calls seem redundant but they are not.  They clamp values
+     so that the slider's entirety is always between the two
+     steppers. */
+  gtk_range_set_range (GTK_RANGE (scrollbar), (gdouble) min, (gdouble) max);
+  gtk_range_set_value (GTK_RANGE (scrollbar), (gdouble) value);
+
   gdk_threads_leave ();
 
-  NSA_SET_PTR (env, obj, sb);
+  NSA_SET_PTR (env, obj, scrollbar);
 }
 
 JNIEXPORT void JNICALL
@@ -137,7 +89,7 @@
 
   gtk_widget_realize (GTK_WIDGET (ptr));
 
-  connect_awt_hook (env, obj, 1, GTK_SCROLLBAR (ptr)->range);
+  connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
 
   gdk_threads_leave ();
 }
@@ -146,27 +98,14 @@
 Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals
   (JNIEnv *env, jobject obj)
 {
-  struct range_scrollbar *rs;
   void *ptr = NSA_GET_PTR (env, obj);
   jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
   g_assert (gref);
 
-  rs = (struct range_scrollbar *) malloc (sizeof (struct range_scrollbar));
-
   gdk_threads_enter ();
 
-  gtk_widget_realize (GTK_WIDGET (ptr));
-
-  rs->range = GTK_RANGE (ptr);
-  rs->scrollbar = gref;
-
-  g_signal_connect (G_OBJECT (GTK_RANGE (ptr)), 
-		      "move-slider", 
-		      GTK_SIGNAL_FUNC (post_adjustment_event), rs);
-
-  g_signal_connect (G_OBJECT (GTK_RANGE (ptr)), 
-		      "value-changed", 
-		      GTK_SIGNAL_FUNC (post_change_event), rs);
+  g_signal_connect (G_OBJECT (ptr), "value-changed",
+                    G_CALLBACK (post_change_event), *gref);
 
   gdk_threads_leave ();
 
@@ -186,8 +125,8 @@
 
   gdk_threads_enter ();
 
-  adj = GTK_RANGE (ptr)->adjustment;
-  adj->step_increment = amount;
+  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
+  adj->step_increment = (gdouble) amount;
   gtk_adjustment_changed (adj);
 
   gdk_threads_leave ();
@@ -204,8 +143,8 @@
 
   gdk_threads_enter ();
 
-  adj = GTK_RANGE (ptr)->adjustment;
-  adj->page_increment = amount;
+  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
+  adj->page_increment = (gdouble) amount;
   gtk_adjustment_changed (adj);
 
   gdk_threads_leave ();
@@ -222,12 +161,22 @@
 
   gdk_threads_enter ();
 
-  adj = GTK_RANGE (ptr)->adjustment;
-  adj->value = value;
-  adj->page_size = visible;
-  adj->lower = min;
-  adj->upper = max;
+  adj = gtk_range_get_adjustment (GTK_RANGE (ptr));
+  adj->page_size = (gdouble) visible;
+
+  gtk_range_set_range (GTK_RANGE (ptr), (gdouble) min, (gdouble) max);
+  gtk_range_set_value (GTK_RANGE (ptr), (gdouble) value);
+
   gtk_adjustment_changed (adj);
 
   gdk_threads_leave ();
+}
+
+static void
+post_change_event (GtkRange *range, jobject peer)
+{
+  GtkAdjustment *adj;
+  adj = gtk_range_get_adjustment (range);
+  (*gdk_env)->CallVoidMethod (gdk_env, peer, postAdjustmentEventID,
+                              AWT_ADJUSTMENT_TRACK, (jint) adj->value);
 }

--=-RBlCjRyDNGX6tniK/3b/--




From MAILER-DAEMON Thu Feb 05 17:10:58 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aori5-00047a-ND
	for mharc-commit-classpath@gnu.org; Thu, 05 Feb 2004 17:10:57 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aori2-00045B-Rg
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 17:10:54 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AorhW-0003ms-Nm
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 17:10:53 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aorg7-0003BZ-29
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 17:08:55 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i15M8ib07851
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 17:08:44 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i15M8ia02738
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 17:08:44 -0500
Received: from toby.toronto.redhat.com (toby.toronto.redhat.com [172.16.14.35])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i15M8hXd009678
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 17:08:43 -0500
From: Olga Rodimina <rodimina@redhat.com>
To: commit-classpath@gnu.org
In-Reply-To: <1075911580.28816.71.camel@toby.toronto.redhat.com>
References: <1075491258.12488.44.camel@toby.toronto.redhat.com>
	<40208431.6030909@redhat.com>
	<1075911580.28816.71.camel@toby.toronto.redhat.com>
Content-Type: multipart/mixed; boundary="=-yYid5KsCDtXaTRV9grqc"
Organization: 
Message-Id: <1076018923.21588.36.camel@toby.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 05 Feb 2004 17:08:43 -0500
Subject: Re: [PATCH] Fixes to AffineTransform
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2004 22:10:55 -0000


--=-yYid5KsCDtXaTRV9grqc
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Wed, 2004-02-04 at 11:19, Olga Rodimina wrote:
> On Wed, 2004-02-04 at 00:33, graydon hoare wrote:
> > Olga Rodimina wrote:
> > 
> > > Here is the patch that fixes few errors in the AffineTransform class. 
> > > It corrects a small error in shear transformation and fixes
> > > createInverse() to return correct inverse matrix.
> > 

Hi, 

I will be committing attached patch.


Olga.

--=-yYid5KsCDtXaTRV9grqc
Content-Disposition: attachment; filename=patch
Content-Type: text/plain; name=patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

? .snprj
? a
? classpath.proj
? libtool.m4
? patch
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1875
diff -c -p -u -r1.1875 ChangeLog
--- ChangeLog	5 Feb 2004 19:54:47 -0000	1.1875
+++ ChangeLog	5 Feb 2004 22:03:45 -0000
@@ -1,3 +1,13 @@
+2004-02-05  Olga Rodimina <rodimina@redhat.com>
+
+	* java/awt/geom/AffineTransform.java:
+	Corrected comments on the field definitions 
+	for m11 and m10
+	(shear): Fixed few errors that caused shear 
+	transformation to be performed incorrectly.
+	(createInverse): Fixed to return correct inverse
+	of the given matrix.
+
 2004-02-05  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* java/awt/Scrollbar.java (next_scrollbar_number): New field.
Index: java/awt/geom/AffineTransform.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/geom/AffineTransform.java,v
retrieving revision 1.5
diff -c -p -u -r1.5 AffineTransform.java
--- java/awt/geom/AffineTransform.java	17 Sep 2003 19:44:26 -0000	1.5
+++ java/awt/geom/AffineTransform.java	5 Feb 2004 22:03:46 -0000
@@ -226,7 +226,7 @@ public class AffineTransform implements 
   private double m00;
 
   /**
-   * The Y coordinate scaling element of the transform matrix.
+   * The Y coordinate shearing element of the transform matrix.
    *
    * @serial matrix[1,0]
    */
@@ -240,7 +240,7 @@ public class AffineTransform implements 
   private double m01;
 
   /**
-   * The Y coordinate shearing element of the transform matrix.
+   * The Y coordinate scaling element of the transform matrix.
    *
    * @serial matrix[1,1]
    */
@@ -738,10 +738,10 @@ public class AffineTransform implements 
    */
   public void shear(double shx, double shy)
   {
-    double n00 = m00 + shx * m01;
-    double n01 = shx * m00 + m01;
-    double n10 = m10 * shy + m11;
-    double n11 = shx * m10 + m11;
+    double n00 = m00 + (shy * m01);
+    double n01 = m01 + (shx * m00);
+    double n10 = m10 + (shy * m11);
+    double n11 = m11 + (shx * m10);
     m00 = n00;
     m01 = n01;
     m10 = n10;
@@ -996,6 +996,38 @@ public class AffineTransform implements 
    * map multiple points to the same line or point). A transform exists only
    * if getDeterminant() has a non-zero value.
    *
+   * The inverse is calculated as:
+   * 
+   * <pre>
+   *
+   * Let A be the matrix for which we want to find the inverse:
+   *
+   * A = [ m00 m01 m02 ]
+   *     [ m10 m11 m12 ]
+   *     [ 0   0   1   ] 
+   *
+   *
+   *                 1    
+   * inverse (A) =  ---   x  adjoint(A) 
+   *                det 
+   *
+   *
+   *
+   *             =   1       [  m11  -m01   m01*m12-m02*m11  ]
+   *                ---   x  [ -m10   m00  -m00*m12+m10*m02  ]
+   *                det      [  0     0     m00*m11-m10*m01  ]
+   *
+   *
+   *
+   *             = [  m11/det  -m01/det   m01*m12-m02*m11/det ]
+   *               [ -m10/det   m00/det  -m00*m12+m10*m02/det ]
+   *               [   0           0          1               ]
+   *
+   *
+   * </pre>
+   *
+   *
+   *
    * @return a new inverse transform
    * @throws NoninvertibleTransformException if inversion is not possible
    * @see #getDeterminant()
@@ -1006,8 +1038,15 @@ public class AffineTransform implements 
     double det = getDeterminant();
     if (det == 0)
       throw new NoninvertibleTransformException("can't invert transform");
-    return new AffineTransform(m11 / det, -m10 / det, m01 / det, -m00 / det,
-                               -m02, -m12);
+    
+    double im00 = m11 / det;
+    double im10 = -m10 / det;
+    double im01 = -m01 / det;
+    double im11 = m00 / det;
+    double im02 = (m01 * m12 - m02 * m11) / det;
+    double im12 = (-m00 * m12 + m10 * m02) / det;
+    
+    return new AffineTransform (im00, im10, im01, im11, im02, im12);
   }
 
   /**

--=-yYid5KsCDtXaTRV9grqc--




From MAILER-DAEMON Thu Feb 05 19:49:32 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AouBX-0001U2-2i
	for mharc-commit-classpath@gnu.org; Thu, 05 Feb 2004 19:49:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AouBM-0001Ot-G6
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 19:49:20 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AouAm-000106-08
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 19:49:15 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AouAl-0000zY-B2
	for commit-classpath@gnu.org; Thu, 05 Feb 2004 19:48:43 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i160mgb18347
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 19:48:42 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i160mfa26014
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 19:48:41 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i160mfXd014554
	for <commit-classpath@gnu.org>; Thu, 5 Feb 2004 19:48:41 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: text/plain
Message-Id: <1076028521.19538.31.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Thu, 05 Feb 2004 19:48:41 -0500
Content-Transfer-Encoding: 7bit
Subject: Patch: FYI: make Component return a default font
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 00:49:23 -0000

Hello,

I committed this patch.

Tom

2004-02-05  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/awt/Component.java (getFont): Return a default font
	instead of null.

Index: java/awt/Component.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Component.java,v
retrieving revision 1.35
diff -u -r1.35 Component.java
--- java/awt/Component.java     3 Feb 2004 17:10:51 -0000       1.35
+++ java/awt/Component.java     5 Feb 2004 23:20:32 -0000
@@ -1001,7 +1001,11 @@
   {
     if (font != null)
       return font;
-    return parent == null ? null : parent.getFont();
+
+    if (parent != null)
+      return parent.getFont ();
+    else
+      return new Font ("Fixed", Font.PLAIN, 12);
   }
 
   /**






From MAILER-DAEMON Fri Feb 06 04:01:33 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ap1rZ-0005sQ-Tl
	for mharc-commit-classpath@gnu.org; Fri, 06 Feb 2004 04:01:25 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ap1rX-0005qO-AY
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:01:23 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ap1r1-0005CL-7Z
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:01:22 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ap1r0-0005AU-0a
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:00:50 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-249.ewetel.net
	[80.228.94.249])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i1690kUa029930
	for <commit-classpath@gnu.org>; Fri, 6 Feb 2004 10:00:47 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ap1qv-0000MM-00
	for <commit-classpath@gnu.org>; Fri, 06 Feb 2004 10:00:45 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 6 Feb 2004 10:04:34 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ii1IASUCjsFvhbz"
Message-Id: <200402061004.35089.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.awt.datatransfer.DataFlavor
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 09:01:24 -0000


--Boundary-00=_ii1IASUCjsFvhbz
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to fix 
java.awt.datatransfer.DataFlavor.


Michael


2004-02-06  Michael Koch  <konqueror@gmx.de>

	* java/awt/datatransfer/DataFlavor.java
	(imageFlavor): Javadoc added.
	(javaJVMLocalObjectType): Fixed.


--Boundary-00=_ii1IASUCjsFvhbz
Content-Type: text/x-diff;
  charset="us-ascii";
  name="datatransfer.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="datatransfer.diff"

Index: java/awt/datatransfer/DataFlavor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/DataFlavor.java,v
retrieving revision 1.18
diff -u -b -B -r1.18 DataFlavor.java
--- java/awt/datatransfer/DataFlavor.java	26 Dec 2003 17:49:37 -0000	1.18
+++ java/awt/datatransfer/DataFlavor.java	6 Feb 2004 08:58:33 -0000
@@ -1,5 +1,5 @@
 /* DataFlavor.java -- A type of data to transfer via the clipboard.
-   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -60,11 +60,7 @@
 {
   static final long serialVersionUID = 8367026044764648243L;
 
-// FIXME: Serialization: Need to write methods for.
-
-/*
- * Static Variables
- */
+  // FIXME: Serialization: Need to write methods for.
 
 /**
  * This is the data flavor used for tranferring plain text.  The MIME
@@ -90,6 +86,10 @@
  */
 public static final DataFlavor javaFileListFlavor;
 
+/**
+ * This is an image flavor used for transferring images.  The
+ * representation type is a <code>java.awt.Image</code>.
+ */
 public static final DataFlavor imageFlavor;
 
 /**
@@ -105,7 +105,7 @@
  * being transferred.
  */
 public static final String javaJVMLocalObjectMimeType =
-  "application/x-java-jvm-local-object";
+  "application/x-java-jvm-local-objectref";
 
 /**
  * This is the MIME type used to transfer a link to a remote object.

--Boundary-00=_ii1IASUCjsFvhbz--




From MAILER-DAEMON Fri Feb 06 04:07:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ap1xh-0000V0-82
	for mharc-commit-classpath@gnu.org; Fri, 06 Feb 2004 04:07:45 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ap1xf-0000TM-G7
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:07:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ap1x8-00005g-80
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:07:42 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ap1x7-00005M-OT
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:07:09 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-249.ewetel.net
	[80.228.94.249])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i16977Ua003676
	for <commit-classpath@gnu.org>; Fri, 6 Feb 2004 10:07:08 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ap1x5-0000SZ-00
	for <commit-classpath@gnu.org>; Fri, 06 Feb 2004 10:07:07 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 6 Feb 2004 10:10:57 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ho1IAmb7QKkH9sT"
Message-Id: <200402061010.57645.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.awt.Scrollbar
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 09:07:44 -0000


--Boundary-00=_ho1IAmb7QKkH9sT
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached obvious fix for java.awt.Scrollbar.


Michael


2004-02-06  Michael Koch  <konqueror@gmx.de>

	* java/awt/Scrollbar.java
	(setBlockIncrement): Fixed.


--Boundary-00=_ho1IAmb7QKkH9sT
Content-Type: text/x-diff;
  charset="us-ascii";
  name="scroll.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="scroll.diff"

Index: java/awt/Scrollbar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Scrollbar.java,v
retrieving revision 1.17
diff -u -b -B -r1.17 Scrollbar.java
--- java/awt/Scrollbar.java	5 Feb 2004 19:54:48 -0000	1.17
+++ java/awt/Scrollbar.java	6 Feb 2004 09:04:20 -0000
@@ -556,7 +556,7 @@
 public synchronized void
 setBlockIncrement(int blockIncrement)
 {
-  setPageIncrement (pageIncrement);
+  setPageIncrement (blockIncrement);
 }
 
 /*************************************************************************/

--Boundary-00=_ho1IAmb7QKkH9sT--




From MAILER-DAEMON Fri Feb 06 04:16:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ap25o-0005LM-CR
	for mharc-commit-classpath@gnu.org; Fri, 06 Feb 2004 04:16:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ap25g-0005DX-Pr
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:16:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ap257-0004wj-5q
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:15:57 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ap256-0004vJ-Bw
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 04:15:24 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-249.ewetel.net
	[80.228.94.249])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i169FLl1009667
	for <commit-classpath@gnu.org>; Fri, 6 Feb 2004 10:15:21 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ap253-0000TE-00
	for <commit-classpath@gnu.org>; Fri, 06 Feb 2004 10:15:21 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 6 Feb 2004 10:19:11 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_Pw1IAKVxlh/ajGU"
Message-Id: <200402061019.11078.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.nio
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 09:16:02 -0000


--Boundary-00=_Pw1IAKVxlh/ajGU
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge the latest NIO and NIO 
related fixes from libgcj.


Michael


2004-02-06  Michael Koch  <konqueror@gmx.de>

	* gnu/java/nio/NIOServerSocket.java
	(impl): Unused, removed.
	* gnu/java/nio/SocketChannelImpl.java
	(finnishConnect): Don't throw NoConnectionPendingException if not
	connected or no connection pending.

2004-02-06  Mohan Embar  <gnustuff@thisiscool.com>

	* gnu/java/nio/DatagramChannelImpl.java
	(inChannelOperation): New field.
	(isInChannelOperation): New accessor.
	(setInChannelOperation): New modifier.
	(receive): Use capacity() - position() of destination
	buffer instead of remaining(). Set and reset our "in
	channel operation indicator" before and after delegating
	the receive to our datagram socket. Removed testing code.
	Update destination buffer's current position if it is
	backed by a byte array (hasArray() is true).
	(send): Set and reset our "in channel operation indicator"
	before and after delegating the send to our datagram socket.
	Removed testing code. Update source buffer's current position
	if it is backed by a byte array (hasArray() is true).
	* gnu/java/nio/SocketChannelImpl.java (read(ByteBuffer)):
	Use capacity() - position() of destination buffer instead
	of remaining().
	* java/net/DatagramSocket.java (receive): Don't throw an
	IllegalBlockingModeException if we have a non-blocking
	channel which initiated this operation.
	(send): Likewise.

2004-02-06  Mohan Embar  <gnustuff@thisiscool.com>

	* gnu/java/net/PlainSocketImpl.java 
	(inChannelOperation): New field.
	(isInChannelOperation): New accessor.
	(setInChannelOperation): New modifier.
	* gnu/java/nio/ServerSocketChannelImpl.java
	(accept): Set and reset our server socket's PlainSocketImpl's
	"in channel operation" indicator before and after delegating
	the accept to our server socket.
	* gnu/java/nio/SocketChannelImpl.java
	(connect): Set and reset our socket's PlainSocketImpl's "in channel
	operation" indicator before and after delegating the operation to
	our socket.
	(read): Likewise.
	(write): Likewise.
	* java/net/ServerSocket.java (implAccept): Don't throw an
	IllegalBlockingModeException if we have a non-blocking
	channel which initiated this accept operation.
	* java/net/Socket.java (connect): Don't throw an
	IllegalBlockingModeException if we have a non-blocking
	channel which initiated this connect operation.
	* java/nio/channels/spi/AbstractSelectableChannel.java
	(configureBlocking): Only call implConfigureBlocking() if
	the desired blocking mode is different from our current one.


--Boundary-00=_Pw1IAKVxlh/ajGU
Content-Type: text/x-diff;
  charset="us-ascii";
  name="nio.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="nio.diff"

Index: gnu/java/net/PlainSocketImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/PlainSocketImpl.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 PlainSocketImpl.java
--- gnu/java/net/PlainSocketImpl.java	20 Oct 2003 14:10:07 -0000	1.5
+++ gnu/java/net/PlainSocketImpl.java	6 Feb 2004 09:11:54 -0000
@@ -1,5 +1,5 @@
 /* PlainSocketImpl.java -- Default socket implementation
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -96,6 +96,33 @@
    */
   private OutputStream out;
 
+  /**
+   * Indicates whether a channel initiated whatever operation
+   * is being invoked on this socket.
+   */
+  private boolean inChannelOperation;
+
+  /**
+   * Indicates whether we should ignore whether any associated
+   * channel is set to non-blocking mode. Certain operations
+   * throw an <code>IllegalBlockingModeException</code> if the
+   * associated channel is in non-blocking mode, <i>except</i>
+   * if the operation is invoked by the channel itself.
+   */
+  public final boolean isInChannelOperation()
+  {
+    return inChannelOperation;
+  }
+  
+  /**
+   * Sets our indicator of whether an I/O operation is being
+   * initiated by a channel.
+   */
+  public final void setInChannelOperation(boolean b)
+  {
+    inChannelOperation = b;
+  }
+ 
   /**
    * Default do nothing constructor
    */
Index: gnu/java/nio/DatagramChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/DatagramChannelImpl.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 DatagramChannelImpl.java
--- gnu/java/nio/DatagramChannelImpl.java	8 Jan 2004 08:40:01 -0000	1.10
+++ gnu/java/nio/DatagramChannelImpl.java	6 Feb 2004 09:11:54 -0000
@@ -57,6 +57,33 @@
 {
   private NIODatagramSocket socket;
   
+  /**
+   * Indicates whether this channel initiated whatever operation
+   * is being invoked on our datagram socket.
+   */
+  private boolean inChannelOperation;
+
+  /**
+   * Indicates whether our datagram socket should ignore whether
+   * we are set to non-blocking mode. Certain operations on our
+   * socket throw an <code>IllegalBlockingModeException</code> if
+   * we are in non-blocking mode, <i>except</i> if the operation
+   * is initiated by us.
+   */
+  public final boolean isInChannelOperation()
+  {
+    return inChannelOperation;
+  }
+  
+  /**
+   * Sets our indicator of whether we are initiating an I/O operation
+   * on our socket.
+   */
+  public final void setInChannelOperation(boolean b)
+  {
+    inChannelOperation = b;
+  }
+ 
   protected DatagramChannelImpl (SelectorProvider provider)
     throws IOException
   {
@@ -178,7 +205,7 @@
     try
       {
         DatagramPacket packet;
-        int len = dst.remaining();
+        int len = dst.capacity() - dst.position();
         
         if (dst.hasArray())
           {
@@ -196,23 +223,23 @@
         try
           {
             begin();
+            setInChannelOperation(true);
             socket.receive (packet);
             completed = true;
           }
         finally
           {
             end (completed);
+            setInChannelOperation(false);
           }
 
         if (!dst.hasArray())
           {
             dst.put (packet.getData(), packet.getOffset(), packet.getLength());
           }
-
-        // FIMXE: remove this testing code.
-        for (int i = 0; i < packet.getLength(); i++)
+        else
           {
-            System.out.println ("Byte " + i + " has value " + packet.getData() [packet.getOffset() + i]);
+            dst.position (dst.position() + packet.getLength());
           }
 
         return packet.getSocketAddress();
@@ -246,13 +273,25 @@
 
     DatagramPacket packet = new DatagramPacket (buffer, offset, len, target);
 
-    // FIMXE: remove this testing code.
-    for (int i = 0; i < packet.getLength(); i++)
+    boolean completed = false;
+    try
+      {
+        begin();
+        setInChannelOperation(true);
+        socket.send(packet);
+        completed = true;
+      }
+    finally
+      {
+        end (completed);
+        setInChannelOperation(false);
+      }
+      
+    if (src.hasArray())
       {
-        System.out.println ("Byte " + i + " has value " + packet.getData() [packet.getOffset() + i]);
+	src.position (src.position() + len);
       }
 
-    socket.send (packet);
     return len;
   }
 }
Index: gnu/java/nio/NIOServerSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/NIOServerSocket.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 NIOServerSocket.java
--- gnu/java/nio/NIOServerSocket.java	15 Oct 2003 12:51:32 -0000	1.1
+++ gnu/java/nio/NIOServerSocket.java	6 Feb 2004 09:11:54 -0000
@@ -1,5 +1,5 @@
 /* NIOServerSocket.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -50,7 +50,6 @@
  */
 public final class NIOServerSocket extends ServerSocket
 {
-  private PlainSocketImpl impl;
   private ServerSocketChannelImpl channel;
     
   protected NIOServerSocket (ServerSocketChannelImpl channel)
Index: gnu/java/nio/ServerSocketChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/ServerSocketChannelImpl.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 ServerSocketChannelImpl.java
--- gnu/java/nio/ServerSocketChannelImpl.java	8 Jan 2004 08:40:01 -0000	1.10
+++ gnu/java/nio/ServerSocketChannelImpl.java	6 Feb 2004 09:11:54 -0000
@@ -1,5 +1,5 @@
 /* ServerSocketChannelImpl.java -- 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -107,6 +107,11 @@
     
     try
       {
+        begin();
+        serverSocket.getPlainSocketImpl().setInChannelOperation(true);
+          // indicate that a channel is initiating the accept operation
+          // so that the socket ignores the fact that we might be in
+          // non-blocking mode.
         NIOSocket socket = (NIOSocket) serverSocket.accept();
         completed = true;
         return socket.getChannel();
@@ -117,6 +122,7 @@
       }
     finally
       {
+        serverSocket.getPlainSocketImpl().setInChannelOperation(false);
         end (completed);
       }
   }
Index: gnu/java/nio/SocketChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/SocketChannelImpl.java,v
retrieving revision 1.21
diff -u -b -B -r1.21 SocketChannelImpl.java
--- gnu/java/nio/SocketChannelImpl.java	8 Jan 2004 08:40:01 -0000	1.21
+++ gnu/java/nio/SocketChannelImpl.java	6 Feb 2004 09:11:54 -0000
@@ -1,5 +1,5 @@
 /* SocketChannelImpl.java -- 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -136,6 +136,13 @@
     if (((InetSocketAddress) remote).isUnresolved())
       throw new UnresolvedAddressException();
     
+    try
+      {
+        socket.getPlainSocketImpl().setInChannelOperation(true);
+          // indicate that a channel is initiating the accept operation
+          // so that the socket ignores the fact that we might be in
+          // non-blocking mode.
+        
     if (isBlocking())
       {
         // Do blocking connect.
@@ -155,6 +162,11 @@
         return false;
       }
   }
+    finally
+      {
+        socket.getPlainSocketImpl().setInChannelOperation(false);
+      }
+  }
     
   public boolean finishConnect ()
     throws IOException
@@ -162,7 +174,7 @@
     if (!isOpen())
       throw new ClosedChannelException();
     
-    if (!connectionPending)
+    if (!isConnected() && !connectionPending)
       throw new NoConnectionPendingException();
     
     if (isConnected())
@@ -214,7 +226,7 @@
     int offset = 0;
     InputStream input = socket.getInputStream();
     int available = input.available();
-    int len = dst.remaining();
+    int len = dst.capacity() - dst.position();
 	
     if (available == 0)
       return 0;
@@ -238,12 +250,14 @@
     try
       {
         begin();
+        socket.getPlainSocketImpl().setInChannelOperation(true);
         readBytes = input.read (data, offset, len);
         completed = true;
       }
     finally
       {
         end (completed);
+        socket.getPlainSocketImpl().setInChannelOperation(false);
       }
 
     if (readBytes > 0)
@@ -301,7 +315,20 @@
       }
 
     OutputStream output = socket.getOutputStream();
+    boolean completed = false;
+
+    try
+      {
+        begin();
+        socket.getPlainSocketImpl().setInChannelOperation(true);
     output.write (data, offset, len);
+        completed = true;
+      }
+    finally
+      {
+        end (completed);
+        socket.getPlainSocketImpl().setInChannelOperation(false);
+      }
 
     if (src.hasArray())
       {
Index: java/net/DatagramSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/DatagramSocket.java,v
retrieving revision 1.37
diff -u -b -B -r1.37 DatagramSocket.java
--- java/net/DatagramSocket.java	26 Dec 2003 22:21:56 -0000	1.37
+++ java/net/DatagramSocket.java	6 Feb 2004 09:11:54 -0000
@@ -39,6 +39,7 @@
 package java.net;
 
 import gnu.java.net.PlainDatagramSocketImpl;
+import gnu.java.nio.DatagramChannelImpl;
 import java.io.IOException;
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.IllegalBlockingModeException;
@@ -565,7 +566,8 @@
         ("Socket connected to a multicast address my not receive");
 
     if (getChannel() != null
-        && !getChannel().isBlocking ())
+        && !getChannel().isBlocking ()
+        && !((DatagramChannelImpl) getChannel()).isInChannelOperation())
       throw new IllegalBlockingModeException ();
 
     getImpl().receive(p);
@@ -618,7 +620,8 @@
     // use getTimeToLive for TTL val.
 
     if (getChannel() != null
-        && !getChannel().isBlocking ())
+        && !getChannel().isBlocking ()
+        && !((DatagramChannelImpl) getChannel()).isInChannelOperation())
       throw new IllegalBlockingModeException ();
 
     getImpl().send(p);
Index: java/net/ServerSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ServerSocket.java,v
retrieving revision 1.32
diff -u -b -B -r1.32 ServerSocket.java
--- java/net/ServerSocket.java	7 Jan 2004 16:38:02 -0000	1.32
+++ java/net/ServerSocket.java	6 Feb 2004 09:11:55 -0000
@@ -1,5 +1,6 @@
 /* ServerSocket.java -- Class for implementing server side sockets
-   Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -345,9 +346,14 @@
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
     
+    // The Sun spec says that if we have an associated channel and
+    // it is in non-blocking mode, we throw an IllegalBlockingModeException.
+    // However, in our implementation if the channel itself initiated this
+    // operation, then we must honor it regardless of its blocking mode.
     if (getChannel() != null
-        && !getChannel().isBlocking())
-      throw new IllegalBlockingModeException();
+        && !getChannel().isBlocking ()
+        && !((PlainSocketImpl) getImpl()).isInChannelOperation())
+      throw new IllegalBlockingModeException ();
 	    
     impl.accept(socket.getImpl());
   }
Index: java/net/Socket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Socket.java,v
retrieving revision 1.40
diff -u -b -B -r1.40 Socket.java
--- java/net/Socket.java	26 Dec 2003 14:23:41 -0000	1.40
+++ java/net/Socket.java	6 Feb 2004 09:11:55 -0000
@@ -1,5 +1,6 @@
 /* Socket.java -- Client socket implementation
-   Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -420,8 +421,13 @@
     if (! (endpoint instanceof InetSocketAddress))
       throw new IllegalArgumentException("unsupported address type");
 
+    // The Sun spec says that if we have an associated channel and
+    // it is in non-blocking mode, we throw an IllegalBlockingModeException.
+    // However, in our implementation if the channel itself initiated this
+    // operation, then we must honor it regardless of its blocking mode.
     if (getChannel() != null
-        && !getChannel().isBlocking ())
+        && !getChannel().isBlocking ()
+        && !((PlainSocketImpl) getImpl()).isInChannelOperation())
       throw new IllegalBlockingModeException ();
   
     if (!isBound ())
Index: java/nio/channels/spi/AbstractSelectableChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractSelectableChannel.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 AbstractSelectableChannel.java
--- java/nio/channels/spi/AbstractSelectableChannel.java	8 Jan 2004 08:40:01 -0000	1.11
+++ java/nio/channels/spi/AbstractSelectableChannel.java	6 Feb 2004 09:11:55 -0000
@@ -1,5 +1,5 @@
 /* AbstractSelectableChannel.java
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -80,8 +80,11 @@
   {
     synchronized (blockingLock())
       {
+        if (this.blocking != blocking)
+          {
         implConfigureBlocking(blocking);
         this.blocking = blocking;
+          }
       }
     
     return this;

--Boundary-00=_Pw1IAKVxlh/ajGU--




From MAILER-DAEMON Fri Feb 06 08:09:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ap5bO-0002AF-Fn
	for mharc-commit-classpath@gnu.org; Fri, 06 Feb 2004 08:00:58 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ap5ap-0001gn-Gq
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 08:00:23 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ap5Xz-0000Il-Mk
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 07:57:58 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ap5Xw-0000Ie-BO
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 07:57:24 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-93-157.ewetel.net
	[80.228.93.157])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i16CvKVM017246
	for <commit-classpath@gnu.org>; Fri, 6 Feb 2004 13:57:20 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ap5Xs-00011V-00
	for <commit-classpath@gnu.org>; Fri, 06 Feb 2004 13:57:20 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 6 Feb 2004 14:01:09 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_VA5IAZMGMJc7jfk"
Message-Id: <200402061401.10885.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: AWT and Swing fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 13:00:46 -0000


--Boundary-00=_VA5IAZMGMJc7jfk
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge fixes done by Graydon Hoare 
in libgcj.


Michael


2004-02-06  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/SwingUtilities.java: Many new functions.
	* java/awt/Container.java (LightweightDispatcher): Reimplement.
	* javax/swing/basic/BasicGraphicsUtils.java 
	(getPreferredButtonSize): Start layout from top-left corner.


--Boundary-00=_VA5IAZMGMJc7jfk
Content-Type: text/x-diff;
  charset="us-ascii";
  name="swing.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="swing.diff"

Index: java/awt/Container.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.30
diff -u -b -B -r1.30 Container.java
--- java/awt/Container.java	3 Feb 2004 17:17:29 -0000	1.30
+++ java/awt/Container.java	6 Feb 2004 12:54:58 -0000
@@ -52,6 +52,7 @@
 import java.util.EventListener;
 import java.util.Set;
 import javax.accessibility.Accessible;
+import javax.swing.SwingUtilities;
 
 /**
  * A generic window toolkit object that acts as a container for other objects.
@@ -1541,20 +1542,12 @@
     nativeContainer = c;
   }
 
-  void dispose()
-  {
-  }
-
   void enableEvents(long l)
   {
     eventMask |= l;
   }
 
-  void mouseExit (MouseEvent me, int x, int y)
-  {
-  }
-
-  void acquireComponentForMouseEvent (MouseEvent me)
+  void acquireComponentForMouseEvent(MouseEvent me)
   {
     int x = me.getX ();
     int y = me.getY ();
@@ -1558,37 +1551,50 @@
   {
     int x = me.getX ();
     int y = me.getY ();
-
     Component candidate = mouseEventTarget;
 
-    boolean candidate_is_container_with_children = 
-      ((candidate != null)
-       && (candidate instanceof Container)
-       && (((Container)candidate).getComponentCount () > 0));
-
-    boolean candidate_does_not_contain_point =
-      ((candidate != null)
-       && (! candidate.contains (x - candidate.getX (),
-                                 y - candidate.getY ())));
-
-    if (candidate == null
-        || candidate_is_container_with_children
-        || candidate_does_not_contain_point)
+    while(candidate != null)
+      {
+        if (candidate.isShowing())
+          {
+            // Convert our point to the candidate's parent's space.
+            Point cp = SwingUtilities.convertPoint(nativeContainer, x, y, candidate);
+            
+            // If the event lands inside candidate, we have a hit.
+            if (candidate.contains(cp.x, cp.y))
       {
-        // Try to reacquire.
-        candidate = nativeContainer.findComponentAt (x, y);
+                // If candidate has children, we refine the hit.
+                if (candidate instanceof Container &&
+                    ((Container)candidate).getComponentCount() > 0)              
+                  candidate = SwingUtilities.getDeepestComponentAt(candidate, cp.x, cp.y);
+                break;
+              }
+          }        
+        // If candidate isn't showing or doesn't contain point, we back out a level.
+        candidate = candidate.getParent();
+      }
+    
+    if (candidate == null)
+      {
+        // We either lost, or never had, a candidate; acquire from our native.
+        candidate = 
+          SwingUtilities.getDeepestComponentAt(nativeContainer, x, y);
       }
 
+
+    // If our candidate is new, inform the old target we're leaving.
     if (mouseEventTarget != null
+        && mouseEventTarget.isShowing()
         && mouseEventTarget != candidate)
       {
-        int nx = x - mouseEventTarget.getX ();
-        int ny = y - mouseEventTarget.getY ();
+        Point tp = 
+          SwingUtilities.convertPoint(nativeContainer, 
+                                      x, y, mouseEventTarget);
         MouseEvent exited = new MouseEvent (mouseEventTarget, 
                                             MouseEvent.MOUSE_EXITED,
                                             me.getWhen (), 
                                             me.getModifiers (), 
-                                            nx, ny,
+                                            tp.x, tp.y,
                                             me.getClickCount (),
                                             me.isPopupTrigger (),
                                             me.getButton ());
@@ -1596,25 +1602,22 @@
         mouseEventTarget = null;
       }
 
+    // If we have a candidate, maybe enter it.
     if (candidate != null)
       {
-        // Possibly set new state.
         if (candidate.isLightweight() 
+            && candidate.isShowing()
             && candidate != nativeContainer
             && candidate != mouseEventTarget)
 	  {
-			
             mouseEventTarget = candidate;
-			
-            int nx = x - mouseEventTarget.getX ();
-            int ny = y - mouseEventTarget.getY ();
-			
-            // If acquired, enter it.
+            Point cp = SwingUtilities.convertPoint(nativeContainer, 
+                                                   x, y, candidate);
             MouseEvent entered = new MouseEvent (mouseEventTarget, 
                                                  MouseEvent.MOUSE_ENTERED,
                                                  me.getWhen (), 
                                                  me.getModifiers (), 
-                                                 nx, ny,
+                                                 cp.x, cp.y,
                                                  me.getClickCount (),
                                                  me.isPopupTrigger (),
                                                  me.getButton ());
@@ -1623,37 +1626,30 @@
       }
   }
 
-  boolean handleEvent (AWTEvent e)
+  boolean handleEvent(AWTEvent e)
   {
-    if ((eventMask & e.getID ()) == 0)
+    if ((eventMask & e.getID()) == 0)
       return false;
 
     if (e instanceof MouseEvent)
       {
         MouseEvent me = (MouseEvent) e;
-        acquireComponentForMouseEvent (me);
+        acquireComponentForMouseEvent(me);
 
-        // Avoid dispatching an ENTERED event twice
+        // Avoid dispatching an ENTERED event twice.
         if (mouseEventTarget != null
+            && mouseEventTarget.isShowing()
             && e.getID() != MouseEvent.MOUSE_ENTERED)
           {
-            // Calculate point translation for the event target.
-            // We use absolute location on screen rather than relative
-            // location because the event target might be a nested child.
-            Point parentLocation = nativeContainer.getLocationOnScreen();
-            Point childLocation = mouseEventTarget.getLocationOnScreen();
-            me.translatePoint(parentLocation.x - childLocation.x,
-                              parentLocation.y - childLocation.y);
-
-            Component oldSource = (Component) me.getSource ();
-            me.setSource (mouseEventTarget);
-            mouseEventTarget.dispatchEvent (me);
-            me.setSource (oldSource);
+            MouseEvent newEvt = 
+              SwingUtilities.convertMouseEvent(nativeContainer, me, 
+                                               mouseEventTarget);
+            mouseEventTarget.dispatchEvent(newEvt);
           }
       }
     else if (e instanceof KeyEvent && focus != null)
       {
-        focus.processKeyEvent ((KeyEvent) e);
+        focus.processKeyEvent((KeyEvent) e);
       }
       
     return e.isConsumed();
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/SwingUtilities.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 SwingUtilities.java
--- javax/swing/SwingUtilities.java	27 Jan 2004 09:46:25 -0000	1.6
+++ javax/swing/SwingUtilities.java	6 Feb 2004 12:54:58 -0000
@@ -35,10 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package javax.swing;
 
+import java.applet.Applet;
 import java.awt.Component;
+import java.awt.ComponentOrientation;
 import java.awt.Container;
 import java.awt.EventQueue;
 import java.awt.Font;
@@ -55,81 +56,623 @@
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleStateSet;
 
+
+/**
+ * This class contains a number of static utility functions which are
+ * useful when drawing swing components, dispatching events, or calculating
+ * regions which need painting.
+ *
+ * @author Graydon Hoare (graydon&064;redhat.com)
+ */
 public class SwingUtilities implements SwingConstants
 {
-  public static FontMetrics getFontMetrics (Font font)
+
+  /**
+   * Calculates the portion of the base rectangle which is inside the
+   * insets.
+   *
+   * @param base The rectangle to apply the insets to
+   * @param insets The insets to apply to the base rectangle
+   * @param ret A rectangle to use for storing the return value, or
+   * <code>null</code>
+   *
+   * @return The calculated area inside the base rectangle and its insets,
+   * either stored in ret or a new Rectangle if ret is <code>null</code>
+   *
+   * @see #calculateInnerArea
+   */
+  public static Rectangle calculateInsetArea(Rectangle base, Insets insets,
+                                             Rectangle ret)
   {
-    return Toolkit.getDefaultToolkit ().getFontMetrics (font);
+    if (ret == null)
+      ret = new Rectangle();
+    ret.setBounds(base.x + insets.left, base.y + insets.top,
+                  base.width - (insets.left + insets.right),
+                  base.height - (insets.top + insets.bottom));
+    return ret;
   }
 
-  public static JRootPane getRootPane (Component a)
+  /**
+   * Calculates the portion of the component's bounds which is inside the
+   * component's border insets. This area is usually the area a component
+   * should confine its painting to.
+   *
+   * @param c The component to measure the bounds of
+   * @param r A Rectangle to store the return value in, or
+   * <code>null</code>
+   *
+   * @return The calculated area inside the component and its border
+   * insets
+   *
+   * @see #calculateInsetArea
+   */
+  public static Rectangle calculateInnerArea(JComponent c, Rectangle r)
   {
-    if (a instanceof JRootPane)
-      return (JRootPane) a;
+    return calculateInsetArea(c.getBounds(), c.getInsets(), r);
+  }
 	
-    a = a.getParent();
+  /**
+   * Calculates the bounds of a component in the component's own coordinate
+   * space. The result has the same height and width as the component's
+   * bounds, but its location is set to (0,0).
+   *
+   * @param aComponent The component to measure
+   *
+   * @return The component's bounds in its local coordinate space
+   */
+  public static Rectangle getLocalBounds(Component aComponent)
+  {
+    Rectangle bounds = aComponent.getBounds();
+    return new Rectangle(0, 0, bounds.x, bounds.y);
+  }
+
+  /**
+   * Returns the font metrics object for a given font. The metrics can be
+   * used to calculate crude bounding boxes and positioning information,
+   * for laying out components with textual elements.
+   *
+   * @param font The font to get metrics for
+   *
+   * @return The font's metrics
+   *
+   * @see java.awt.font.GlyphMetrics
+   */
+  public static FontMetrics getFontMetrics(Font font)
+  {
+    return Toolkit.getDefaultToolkit().getFontMetrics(font);
+  }
+
+  /**
+   * If <code>comp</code> is a RootPaneContainer, return its JRootPane.
+   * Otherwise call <code>getAncestorOfClass(JRootPane.class, a)</code>.
+   *
+   * @param comp The component to get the JRootPane of
+   *
+   * @return a suitable JRootPane for <code>comp</code>, or <code>null</code>
+   * 
+   * @see javax.swing.RootPaneContainer#getRootPane
+   * @see #getAncestorOfClass
+   */
+  public static JRootPane getRootPane(Component comp)
+  {
+    if (comp instanceof RootPaneContainer)
+      return ((RootPaneContainer)comp).getRootPane();
+    else
+      return (JRootPane) getAncestorOfClass(JRootPane.class, comp);
+  }
+
+  /**
+   * Returns the least ancestor of <code>comp</code> which has the
+   * specified name.
+   *
+   * @param name The name to search for
+   * @param comp The component to search the ancestors of
+   *
+   * @return The nearest ancestor of <code>comp</code> with the given
+   * name, or <code>null</code> if no such ancestor exists
+   *
+   * @see java.awt.Component#getName
+   * @see #getAncestorOfClass
+   */
+  public static Container getAncestorNamed(String name, Component comp)
+  {
+    while (comp != null && (comp.getName() != name))
+      comp = comp.getParent();
+    return (Container) comp;
+  }
+
+  /**
+   * Returns the least ancestor of <code>comp</code> which is an instance
+   * of the specified class.
+   *
+   * @param c The class to search for
+   * @param comp The component to search the ancestors of
+   *
+   * @return The nearest ancestor of <code>comp</code> which is an instance
+   * of the given class, or <code>null</code> if no such ancestor exists
+   *
+   * @see #getAncestorOfClass
+   * @see #windowForComponent
+   * @see 
+   * 
+   */
+  public static Container getAncestorOfClass(Class c, Component comp)
+  {
+    while (comp != null && (! c.isInstance(comp)))
+      comp = comp.getParent();
+    return (Container) comp;
+  }
+
+  /**
+   * Equivalent to calling <code>getAncestorOfClass(Window, comp)</code>.
+   *
+   * @param comp The component to search for an ancestor window 
+   *
+   * @return An ancestral window, or <code>null</code> if none exists
+   */
+  public static Window windowForComponent(Component comp)
+  {
+    return (Window) getAncestorOfClass(Window.class, comp);
+  }
 
-    if (a != null)
+  /**
+   * Returns the "root" of the component tree containint <code>comp</code>
+   * The root is defined as either the <em>least</em> ancestor of
+   * <code>comp</code> which is a {@link Window}, or the <em>greatest</em>
+   * ancestor of <code>comp</code> which is a {@link Applet} if no {@link
+   * Window} ancestors are found.
+   *
+   * @param comp The component to search for a root
+   *
+   * @return The root of the component's tree, or <code>null</code>
+   */
+  public static Component getRoot(Component comp)
       {
-        return getRootPane(a);
+    Applet app = null;
+    Window win = null;
+
+    while (comp != null)
+      {
+        if (win == null && comp instanceof Window)
+          win = (Window) comp;
+        else if (comp instanceof Applet)
+          app = (Applet) comp;
+        comp = comp.getParent();
+      }
+
+    if (win != null)
+      return win;
+    else
+      return app;
       }
     
+  /**
+   * Return true if a descends from b, in other words if b is an
+   * ancestor of a.
+   *
+   * @param a The child to search the ancestry of
+   * @param b The potential ancestor to search for
+   *
+   * @return true if a is a descendent of b, false otherwise
+   */
+  public static boolean isDescendingFrom(Component a, Component b)
+  {
+    while (true)
+      {
+        if (a == null || b == null)
+          return false;
+        if (a == b)
+          return true;
+        a = a.getParent();
+      }
+  }
+
+  /**
+   * Returns the deepest descendent of parent which is both visible and
+   * contains the point <code>(x,y)</code>. Returns parent when either
+   * parent is not a container, or has no children which contain
+   * <code>(x,y)</code>. Returns <code>null</code> when either
+   * <code>(x,y)</code> is outside the bounds of parent, or parent is
+   * <code>null</code>.
+   * 
+   * @param parent The component to search the descendents of
+   * @param x Horizontal coordinate to search for
+   * @param y Vertical coordinate to search for
+   *
+   * @return A component containing <code>(x,y)</code>, or
+   * <code>null</code>
+   *
+   * @see java.awt.Container#findComponentAt
+   */
+  public static Component getDeepestComponentAt(Component parent, int x, int y)
+  {
+    if (parent == null || (! parent.contains(x, y)))
     return null;
+
+    if (! (parent instanceof Container))
+      return parent;
+
+    Container c = (Container) parent;
+    return c.findComponentAt(x, y);
   }
 
-  public static void updateComponentTreeUI(JFrame comp)
+  /**
+   * Converts a point from a component's local coordinate space to "screen"
+   * coordinates (such as the coordinate space mouse events are delivered
+   * in). This operation is equivalent to translating the point by the
+   * location of the component (which is the origin of its coordinate
+   * space).
+   *
+   * @param p The point to convert
+   * @param c The component which the point is expressed in terms of
+   *
+   * @see convertPointFromScreen
+   */
+  public static void convertPointToScreen(Point p, Component c)
   {
+    Point c0 = c.getLocationOnScreen();
+    p.translate(c0.x, c0.y);
   }
 
-  public static String layoutCompoundLabel(JComponent c, 
-                                           FontMetrics fm,
-                                           String text,
-                                           Icon i,
-                                           int vert_a, 
-                                           int hor_i, 
-                                           int vert_text_pos,
-                                           int hor_text_pos, 
-                                           Rectangle vr,
-                                           Rectangle ir, 
-                                           Rectangle tr,
-                                           int gap)
+  /**
+   * Converts a point from "screen" coordinates (such as the coordinate
+   * space mouse events are delivered in) to a component's local coordinate
+   * space. This operation is equivalent to translating the point by the
+   * negation of the component's location (which is the origin of its
+   * coordinate space).
+   *
+   * @param p The point to convert
+   * @param c The component which the point should be expressed in terms of
+   */
+  public static void convertPointFromScreen(Point p, Component c)
+  {
+    Point c0 = c.getLocationOnScreen();
+    p.translate(-c0.x, -c0.y);
+  }
+
+  /**
+   * Converts a point <code>(x,y)</code> from the coordinate space of one
+   * component to another. This is equivalent to converting the point from
+   * <code>source</code> space to screen space, then back from screen space
+   * to <code>destination</code> space. If exactly one of the two
+   * Components is <code>null</code>, it is taken to refer to the root
+   * ancestor of the other component. If both are <code>null</code>, no
+   * transformation is done.
+   *
+   * @param source The component which the point is expressed in terms of
+   * @param x Horizontal coordinate of point to transform
+   * @param y Vertical coordinate of point to transform
+   * @param destination The component which the return value will be
+   * expressed in terms of
+   *
+   * @return The point <code>(x,y)</code> converted from the coordinate space of the
+   * source component to the coordinate space of the destination component
+   *
+   * @see #convertPointToScreen
+   * @see #convertPointFromScreen
+   * @see #convertRectangle
+   * @see #getRoot
+   */
+  public static Point convertPoint(Component source, int x, int y,
+                                   Component destination)
+  {
+    Point pt = new Point(x, y);
+
+    if (source == null && destination == null)
+      return pt;
+
+    if (source == null)
+      source = getRoot(destination);
+
+    if (destination == null)
+      destination = getRoot(source);
+
+    convertPointToScreen(pt, source);
+    convertPointFromScreen(pt, destination);
+
+    return pt;
+  }
+
+  
+  /**
+   * Converts a rectangle from the coordinate space of one component to
+   * another. This is equivalent to converting the rectangle from
+   * <code>source</code> space to screen space, then back from screen space
+   * to <code>destination</code> space. If exactly one of the two
+   * Components is <code>null</code>, it is taken to refer to the root
+   * ancestor of the other component. If both are <code>null</code>, no
+   * transformation is done.
+   *
+   * @param source The component which the rectangle is expressed in terms of
+   * @param rect The rectangle to convert
+   * @param destination The component which the return value will be
+   * expressed in terms of
+   *
+   * @return A new rectangle, equal in size to the input rectangle, but
+   * with its position converted from the coordinate space of the source
+   * component to the coordinate space of the destination component
+   *
+   * @see #convertPointToScreen
+   * @see #convertPointFromScreen
+   * @see #convertPoint
+   * @see #getRoot
+   */
+  public static Rectangle convertRectangle(Component source,
+                                           Rectangle rect,
+                                           Component destination)
   {
-    // view rect 'vr' already ok, 
-    // we need to compute ir (icon rect) and tr (text-rect)
+    Point pt = convertPoint(source, rect.x, rect.y, destination);
+    return new Rectangle(pt.x, pt.y, rect.width, rect.height);
+  }
 	
-    int next_x = vr.x;
-    int next_y = vr.y;
+  /**
+   * Convert a mouse event which refrers to one component to another.  This
+   * includes changing the mouse event's coordinate space, as well as the
+   * source property of the event. If <code>source</code> is
+   * <code>null</code>, it is taken to refer to <code>destination</code>'s
+   * root component. If <code>destination</code> is <code>null</code>, the
+   * new event will remain expressed in <code>source</code>'s coordinate
+   * system.
+   *
+   * @param source The component the mouse event currently refers to
+   * @param sourceEvent The mouse event to convert
+   * @param destination The component the new mouse event should refer to
+   *
+   * @return A new mouse event expressed in terms of the destination
+   * component's coordinate space, and with the destination component as
+   * its source
+   *
+   * @see #convertPoint
+   */
+  public static MouseEvent convertMouseEvent(Component source,
+                                             MouseEvent sourceEvent,
+                                             Component destination)
+  {
+    Point newpt = convertPoint(source, sourceEvent.getX(), sourceEvent.getY(),
+                               destination);
 	
-    ir.height = ir.width = ir.y = ir.x = 0;
+    return new MouseEvent(destination, sourceEvent.getID(),
+                          sourceEvent.getWhen(), sourceEvent.getModifiers(),
+                          newpt.x, newpt.y, sourceEvent.getClickCount(),
+                          sourceEvent.isPopupTrigger(), sourceEvent.getButton());
+  }
 
-    if (i != null)
+  /**
+   * Recursively walk the component tree under <code>comp</code> calling
+   * <code>updateUI</code> on each {@link JComponent} found. This causes
+   * the entire tree to re-initialize its UI delegates.
+   *
+   * @param comp The component to walk the children of, calling <code>updateUI</code>
+   */
+  public static void updateComponentTreeUI(Component comp)
       {
-        ir.x = vr.x;
-        ir.y = vr.y;
-        ir.width = i.getIconWidth();
-        ir.height = i.getIconWidth();
+    if (comp == null)
+      return;
 
+    if (comp instanceof Container)
+      {
+        Component[] children = ((Container)comp).getComponents();
+        for (int i = 0; i < children.length; ++i)
+          updateComponentTreeUI(children[i]);
+      }
 
-        next_x += gap + i.getIconWidth();
-        next_y += gap + i.getIconHeight();
+    if (comp instanceof JComponent)
+      ((JComponent)comp).updateUI();
       }
 	
-    tr.x = next_x;
-    tr.y = vr.y; // + (vr.height/2);
+  /**
+   * <p>Layout a "compound label" consisting of a text string and an icon
+   * which is to be placed near the rendered text. Once the text and icon
+   * are laid out, the text rectangle and icon rectangle parameters are
+   * altered to store the calculated positions.</p>
+   *
+   * <p>The size of the text is calculated from the provided font metrics
+   * object.  This object should be the metrics of the font you intend to
+   * paint the label with.</p>
+   *
+   * <p>The position values control where the text is placed relative to
+   * the icon. The horizontal position value should be one of the constants
+   * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>. The
+   * vertical position value should be one fo the constants
+   * <code>TOP</code>, <code>BOTTOM</code>, <code>CENTER</code>.</p>
+   *
+   * <p>The text-icon gap value controls the number of pixels between the
+   * icon and the text.</p>
+   *
+   * <p>The alignment values control where the text and icon are placed, as
+   * a combined unit, within the view rectangle. The horizontal alignment
+   * value should be one of the constants <code>LEADING</code>,
+   * <code>TRAILING</code>, <code>LEFT</code>, <code>RIGHT</code> or
+   * <code>CENTER</code>. The vertical alignment valus should be one of the
+   * constants <code>TOP</code>, <code>BOTTOM</code> or
+   * <code>CENTER</code>.</p>
+   *
+   * <p>If the <code>LEADING</code> or <code>TRAILING</code> constants are
+   * given for horizontal alignment, they are interpreted relative to the
+   * provided component's orientation property, a constant in the {@link
+   * java.awt.ComponentOrientation} class. For example, if the component's
+   * orientation is <code>LEFT_TO_RIGHT</code>, then the
+   * <code>LEADING</code> alignment is a synonym for <code>LEFT</code> and
+   * the <code>TRAILING</code> alignment is a synonym for
+   * <code>RIGHT</code></p>
+   *
+   * <p>If the text and icon are equal to or larger than the view
+   * rectangle, the horizontal and vertical alignment values have no
+   * affect.</p>
+   *
+   * @param c A component used for its orientation value
+   * @param fm The font metrics used to measure the text
+   * @param text The text to place in the compound label
+   * @param icon The icon to place next to the text
+   * @param verticalAlignment The vertical alignment of the label relative
+   * to its component
+   * @param horizontalAlignment The horizontal alignment of the label
+   * relative to its component
+   * @param verticalTextPosition The vertical position of the label's text
+   * relative to its icon
+   * @param horizontalTextPosition The horizontal position of the label's
+   * text relative to its icon
+   * @param viewR The view rectangle, specifying the area which layout is
+   * constrained to
+   * @param iconR A rectangle which is modified to hold the laid-out
+   * position of the icon
+   * @param textR A rectangle which is modified to hold the laid-out
+   * position of the text
+   * @param textIconGap The distance between text and icon
+   *
+   * @return The string of characters, possibly truncated with an elipsis,
+   * which is laid out in this label
+   */
+  public static String layoutCompoundLabel(JComponent c, 
+                                           FontMetrics fm,
+                                           String text, 
+                                           Icon icon, 
+                                           int verticalAlignment,
+                                           int horizontalAlignment, 
+                                           int verticalTextPosition,
+                                           int horizontalTextPosition, 
+                                           Rectangle viewR,
+                                           Rectangle iconR, 
+                                           Rectangle textR, 
+                                           int textIconGap)
+  {
 
-    tr.width  = fm.stringWidth(text);
-    tr.height = fm.getHeight(); // +  fm.getAscent()/2;
+    // Work out basic height and width.
 
-    return text;
+    if (icon == null)
+      {
+        textIconGap = 0;
+        iconR.width = 0;
+        iconR.height = 0;
   }
+      else
+      {
+        iconR.width = icon.getIconWidth();
+        iconR.height = icon.getIconWidth();
+      }
+    textR.width = fm.stringWidth(text);
+    textR.height = fm.getHeight(); 
 
-}
+    // Work out the position of text and icon, assuming the top-left coord
+    // starts at (0,0). We will fix that up momentarily, after these
+    // "position" decisions are made and we look at alignment.
+
+    switch (horizontalTextPosition)
+      {
+      case LEFT:
+        textR.x = 0;
+        iconR.x = textR.width + textIconGap;
+        break;
+      case RIGHT:
+        iconR.x = 0;
+        textR.x = iconR.width + textIconGap;
+        break;
+      case CENTER:
+        int centerLine = Math.max(textR.width, iconR.width) / 2;
+        textR.x = centerLine - textR.width/2;
+        iconR.x = centerLine - iconR.width/2;
+        break;
+      }
+
+    switch (verticalTextPosition)
+      {
+      case TOP:
+        textR.y = 0;
+        iconR.y = textR.height + textIconGap;
+        break;
+      case BOTTOM:
+        iconR.y = 0;
+        textR.y = iconR.height + textIconGap;
+        break;
+      case CENTER:
+        int centerLine = Math.max(textR.height, iconR.height) / 2;
+        textR.y = centerLine - textR.height/2;
+        iconR.y = centerLine - iconR.height/2;
+        break;
+      }
 
+    // Fix up the orientation-based alignments.
 
+    if (horizontalAlignment == LEADING)
+      {
+        if (c.getComponentOrientation() == ComponentOrientation.LEFT_TO_RIGHT)
+          horizontalAlignment = LEFT;
+        else if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
+          horizontalAlignment = RIGHT;
+      }
+    else if (horizontalAlignment == TRAILING)
+      {
+        if (c.getComponentOrientation() == ComponentOrientation.LEFT_TO_RIGHT)
+          horizontalAlignment = RIGHT;
+        else if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
+          horizontalAlignment = LEFT;
+      }
+
+    // The two rectangles are laid out correctly now, but only assuming
+    // that their upper left corner is at (0,0). If we have any alignment other
+    // than TOP and LEFT, we need to adjust them.
+
+    Rectangle u = textR.union(iconR);
+    int horizontalAdjustment = viewR.x;
+    int verticalAdjustment = viewR.y;
+    switch (verticalAlignment)
+      {
+      case TOP:
+        break;
+      case BOTTOM:
+        verticalAdjustment += (viewR.height - u.height);
+        break;
+      case CENTER:
+        verticalAdjustment += ((viewR.height/2) - (u.height/2));
+        break;
+      }
+    switch (horizontalAlignment)
+      {
+      case LEFT:
+        break;
+      case RIGHT:
+        horizontalAdjustment += (viewR.width - u.width);
+        break;
+      case CENTER:
+        horizontalAdjustment += ((viewR.width/2) - (u.width/2));
+        break;
+      }
 
+    iconR.x += horizontalAdjustment;
+    iconR.y += verticalAdjustment;
 
+    textR.x += horizontalAdjustment;
+    textR.y += verticalAdjustment;
 
+    return text;
+  }
 
+  /** 
+   * Calls {@link java.awt.EventQueue.invokeLater} with the
+   * specified {@link Runnable}. 
+   */
+  public static void invokeLater(Runnable doRun)
+  {
+    java.awt.EventQueue.invokeLater(doRun);
+  }
 
+  /** 
+   * Calls {@link java.awt.EventQueue.invokeAndWait} with the
+   * specified {@link Runnable}. 
+   */
+  public static void invokeAndWait(Runnable doRun)
+    throws InterruptedException,
+    InvocationTargetException
+  {
+    java.awt.EventQueue.invokeAndWait(doRun);
+  }
 
+  /** 
+   * Calls {@link java.awt.EventQueue.isEventDispatchThread}.
+   */
+  public static boolean isEventDispatchThread()
+  {
+    return java.awt.EventQueue.isDispatchThread();
+  }
 
+}
Index: javax/swing/plaf/basic/BasicGraphicsUtils.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 BasicGraphicsUtils.java
--- javax/swing/plaf/basic/BasicGraphicsUtils.java	27 Jan 2004 09:46:25 -0000	1.6
+++ javax/swing/plaf/basic/BasicGraphicsUtils.java	6 Feb 2004 12:54:59 -0000
@@ -614,8 +614,8 @@
       b.getToolkit().getFontMetrics(b.getFont()), // see comment above
       b.getText(),
       b.getIcon(),
-      b.getVerticalAlignment(),
-      b.getHorizontalAlignment(),
+      SwingUtilities.TOP,    // important:
+      SwingUtilities.LEFT,   // large vrect, stick to the top left
       b.getVerticalTextPosition(),
       b.getHorizontalTextPosition(),
       viewRect, iconRect, textRect,

--Boundary-00=_VA5IAZMGMJc7jfk--




From MAILER-DAEMON Fri Feb 06 08:12:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ap5mM-0003qs-RC
	for mharc-commit-classpath@gnu.org; Fri, 06 Feb 2004 08:12:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ap5mH-0003og-Ow
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 08:12:13 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ap5lb-0003jA-UQ
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 08:12:03 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ap5in-0003HP-M7
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 08:08:37 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-93-157.ewetel.net
	[80.228.93.157])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i16D8ZVM021471
	for <commit-classpath@gnu.org>; Fri, 6 Feb 2004 14:08:36 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ap5il-000184-00
	for <commit-classpath@gnu.org>; Fri, 06 Feb 2004 14:08:35 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 6 Feb 2004 14:12:25 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_5K5IA3Lt7bXJcZ1"
Message-Id: <200402061412.26221.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.awt.peer.ClasspathFontPeer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 13:12:16 -0000


--Boundary-00=_5K5IA3Lt7bXJcZ1
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to fix 
gnu.java.awt.peer.ClasspathFontPeer.getTransform to never return null.


Michael


2004-02-06  Scott Gilbertson  <scottg@mantatest.com>

	* gnu/java/awt/peer/ClasspathFontPeer.java (getTransform): Never
	return null. 


--Boundary-00=_5K5IA3Lt7bXJcZ1
Content-Type: text/x-diff;
  charset="us-ascii";
  name="fonts.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="fonts.diff"

Index: gnu/java/awt/peer/ClasspathFontPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/ClasspathFontPeer.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ClasspathFontPeer.java
--- gnu/java/awt/peer/ClasspathFontPeer.java	4 Nov 2003 11:24:07 -0000	1.1
+++ gnu/java/awt/peer/ClasspathFontPeer.java	6 Feb 2004 13:05:49 -0000
@@ -501,6 +501,8 @@
 
   public AffineTransform getTransform (Font font)
   {
+    if (transform == null)
+      transform = new AffineTransform ();
     return transform;
   }
 

--Boundary-00=_5K5IA3Lt7bXJcZ1--




From MAILER-DAEMON Fri Feb 06 08:20:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ap5uD-0005PF-Qt
	for mharc-commit-classpath@gnu.org; Fri, 06 Feb 2004 08:20:25 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ap5u9-0005OO-NP
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 08:20:21 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ap5tM-0005HY-FN
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 08:20:03 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ap5tL-0005HN-Gl
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 08:19:31 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-93-157.ewetel.net
	[80.228.93.157])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i16DJSl1021834
	for <commit-classpath@gnu.org>; Fri, 6 Feb 2004 14:19:29 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ap5tI-00018t-00
	for <commit-classpath@gnu.org>; Fri, 06 Feb 2004 14:19:28 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 6 Feb 2004 14:23:19 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_HV5IAw8Tqp251eA"
Message-Id: <200402061423.19376.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.io.BufferedReader
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 13:20:23 -0000


--Boundary-00=_HV5IAw8Tqp251eA
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge in fixes by Mohan Embar in 
libgcj. I ditched the second part of the patch because 
java.io.InputStreamReader is substantially different from libgcj.


Michael


2004-02-06  Mohan Embar  <gnustuff@thisiscool.com>

	* java/io/BufferedReader.java (sbuf): New field.
	(readLine): Use String.valueOf instead of new String() as per
	Per Bothner's suggestion. Use instance sbuf field instead of a
	local StringBuffer instance.


--Boundary-00=_HV5IAw8Tqp251eA
Content-Type: text/x-diff;
  charset="us-ascii";
  name="reader.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="reader.diff"

Index: java/io/BufferedReader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/BufferedReader.java,v
retrieving revision 1.21
diff -u -b -B -r1.21 BufferedReader.java
--- java/io/BufferedReader.java	27 Dec 2003 13:12:34 -0000	1.21
+++ java/io/BufferedReader.java	6 Feb 2004 13:15:54 -0000
@@ -1,5 +1,5 @@
 /* BufferedReader.java
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
      Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -89,6 +89,11 @@
   static final int DEFAULT_BUFFER_SIZE = 8192;
 
   /**
+   * The line buffer for <code>readLine</code>.
+   */
+  private StringBuffer sbuf = null;
+
+  /**
     * Create a new <code>BufferedReader</code> that will read from the 
     * specified subordinate stream with a default buffer size of 8192 chars.
     *
@@ -439,7 +444,7 @@
     int i = lineEnd(limit);
     if (i < limit)
       {
-	String str = new String(buffer, pos, i - pos);
+	String str = String.valueOf(buffer, pos, i - pos);
 	pos = i + 1;
 	// If the last char in the buffer is a '\r', we must remember
 	// to check if the next char to be read after the buffer is refilled
@@ -450,7 +455,10 @@
 	    pos++;
 	return str;
       }
-    StringBuffer sbuf = new StringBuffer(200);
+    if (sbuf == null)
+      sbuf = new StringBuffer(200);
+    else
+      sbuf.setLength(0);
     sbuf.append(buffer, pos, i - pos);
     pos = i;
     // We only want to return null when no characters were read before

--Boundary-00=_HV5IAw8Tqp251eA--




From MAILER-DAEMON Fri Feb 06 18:49:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1ApFif-0002LB-OF
	for mharc-commit-classpath@gnu.org; Fri, 06 Feb 2004 18:49:09 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1ApFib-0002Jr-Lg
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 18:49:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1ApFi0-0002Ap-9L
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 18:48:59 -0500
Received: from [194.109.15.149] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1ApFhy-00029z-VO
	for commit-classpath@gnu.org; Fri, 06 Feb 2004 18:48:27 -0500
Received: from [192.168.1.27] (helo=slauerhoff.wildebeest.org ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1ApFhO-0001c7-00; Sat, 07 Feb 2004 00:47:50 +0100
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200402042218.45165.konqueror@gmx.de>
References: <200402042218.45165.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-GVCSl+APxwZkfQvglEy0"
Message-Id: <1076111304.941.4.camel@localhost>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 07 Feb 2004 00:48:24 +0100
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: pkg.m4
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Feb 2004 23:49:08 -0000


--=-GVCSl+APxwZkfQvglEy0
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Wed, 2004-02-04 at 22:18, Michael Koch wrote:
> I just commited the attached patch to add pkg.m4. This file is needed=20
> when building from CVS and pkg-config is not installed on the build=20
> host.

All files should have a copyright notice and distribution terms. Please
add those to this file and/or note were the file came from.

Cheers,

Mark

P.S. My internet connection is very limited and I am a little sick so I
might be slow with responding to email the next couple of days.

--=-GVCSl+APxwZkfQvglEy0
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBAJCfIxVhZCJWr9QwRAizpAKCFKkC01pjup9jHcafSfwiozShmXACggcaG
MzZ6Wbp8YwQIpp4aF7cl1b4=
=AJzd
-----END PGP SIGNATURE-----

--=-GVCSl+APxwZkfQvglEy0--




From MAILER-DAEMON Sat Feb 07 17:56:41 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1ApbNQ-0001A8-Us
	for mharc-commit-classpath@gnu.org; Sat, 07 Feb 2004 17:56:40 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1ApbNO-0001A3-Uo
	for commit-classpath@gnu.org; Sat, 07 Feb 2004 17:56:38 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1ApbMr-0000jj-NG
	for commit-classpath@gnu.org; Sat, 07 Feb 2004 17:56:38 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1ApbMq-0000iP-Th
	for commit-classpath@gnu.org; Sat, 07 Feb 2004 17:56:05 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-077.ewetel.net
	[80.228.94.77])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i17MtoBS014455;
	Sat, 7 Feb 2004 23:55:51 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1ApbMc-0002ZE-00; Sat, 07 Feb 2004 23:55:50 +0100
Date: Sat, 7 Feb 2004 23:55:50 +0100
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Message-ID: <20040207225550.GB7271@mail.konqueror.de>
References: <200402042218.45165.konqueror@gmx.de>
	<1076111304.941.4.camel@localhost>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="uAKRQypu60I7Lcqm"
Content-Disposition: inline
In-Reply-To: <1076111304.941.4.camel@localhost>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: pkg.m4
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Feb 2004 22:56:39 -0000


--uAKRQypu60I7Lcqm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Sat, Feb 07, 2004 at 12:48:24AM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Wed, 2004-02-04 at 22:18, Michael Koch wrote:
> > I just commited the attached patch to add pkg.m4. This file is needed 
> > when building from CVS and pkg-config is not installed on the build 
> > host.
> 
> All files should have a copyright notice and distribution terms. Please
> add those to this file and/or note were the file came from.

Are you okay with the attached patch ?


Michael

--uAKRQypu60I7Lcqm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="pkg.m4.diff"

Index: pkg.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/pkg.m4,v
retrieving revision 1.1
diff -u -b -B -r1.1 pkg.m4
--- pkg.m4	4 Feb 2004 21:13:14 -0000	1.1
+++ pkg.m4	7 Feb 2004 22:17:42 -0000
@@ -1,3 +1,5 @@
+dnl Copyright (C) 2001, 2002 Red Hat Inc.
+dnl This file is copied from the pkg-config distribution.
 
 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page

--uAKRQypu60I7Lcqm--



From MAILER-DAEMON Sat Feb 07 18:12:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Apbd2-0000k3-5D
	for mharc-commit-classpath@gnu.org; Sat, 07 Feb 2004 18:12:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Apbcz-0000jB-QI
	for commit-classpath@gnu.org; Sat, 07 Feb 2004 18:12:45 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1ApbcS-0000cl-QL
	for commit-classpath@gnu.org; Sat, 07 Feb 2004 18:12:44 -0500
Received: from [194.109.15.149] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1ApbcR-0000cV-SY
	for commit-classpath@gnu.org; Sat, 07 Feb 2004 18:12:12 -0500
Received: from [192.168.1.27] (helo=slauerhoff.wildebeest.org ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1Apbbr-0005SJ-00; Sun, 08 Feb 2004 00:11:35 +0100
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <20040207225550.GB7271@mail.konqueror.de>
References: <200402042218.45165.konqueror@gmx.de>
	<1076111304.941.4.camel@localhost>
	<20040207225550.GB7271@mail.konqueror.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-NdJsY4WZ3ybZhcR5IUOe"
Message-Id: <1076195525.2052.6.camel@localhost>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 08 Feb 2004 00:12:05 +0100
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: pkg.m4
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Feb 2004 23:12:46 -0000


--=-NdJsY4WZ3ybZhcR5IUOe
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Sat, 2004-02-07 at 23:55, Michael Koch wrote:>=20
> > All files should have a copyright notice and distribution terms. Please
> > add those to this file and/or note were the file came from.
>=20
> Are you okay with the attached patch ?

        +dnl Copyright (C) 2001, 2002 Red Hat Inc.
        +dnl This file is copied from the pkg-config distribution.

No, that is not enough. It doesn't state why we may, use, adapt,
distribute, etc it.
Please add the complete distribution terms for the file by adding the
pkg-config license to it.

Thanks,

Mark

--=-NdJsY4WZ3ybZhcR5IUOe
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBAJXDFxVhZCJWr9QwRAvh7AKCGZPsBxr0SbO3NHjGgRjazQsei7wCZARv4
U+LQtxvhhtrlN0J5pfmOREU=
=+e0X
-----END PGP SIGNATURE-----

--=-NdJsY4WZ3ybZhcR5IUOe--




From MAILER-DAEMON Tue Feb 10 02:34:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AqSPd-0003er-7a
	for mharc-commit-classpath@gnu.org; Tue, 10 Feb 2004 02:34:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AqSPa-0003cD-3G
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 02:34:26 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AqSMF-0000oL-Ty
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 02:31:31 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AqSKm-0008OP-Fw
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 02:29:28 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Date: Tue, 10 Feb 2004 08:29:07 +0100
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C8BE@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: java.io.ObjectInputStream
Thread-Index: AcPvp5E+CX0d8xsZR9aJlbZuQ+rGmw==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: <commit-classpath@gnu.org>
Subject: FYI: Patch: java.io.ObjectInputStream
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2004 07:34:27 -0000

Hi,

I applied Ito Kazumitsu's patch below.

Regards,
Jeroen

Index: ChangeLog
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1884
diff -u -r1.1884 ChangeLog
--- ChangeLog	6 Feb 2004 13:17:08 -0000	1.1884
+++ ChangeLog	10 Feb 2004 07:24:09 -0000
@@ -1,3 +1,8 @@
+2004-02-10  Ito Kazumitsu  <kaz@maczuka.gcd.org>
+
+	* java/io/ObjectInputStream.java (readClassDescriptor): Avoid
the
+        overflow of fieldmapping.
+
 2004-02-06  Mohan Embar  <gnustuff@thisiscool.com>
=20
 	* java/io/BufferedReader.java (sbuf): New field.
Index: java/io/ObjectInputStream.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v
retrieving revision 1.37
diff -u -r1.37 ObjectInputStream.java
--- java/io/ObjectInputStream.java	2 Feb 2004 10:26:51 -0000
1.37
+++ java/io/ObjectInputStream.java	10 Feb 2004 07:24:12 -0000
@@ -491,7 +491,6 @@
     ObjectStreamField[] stream_fields =3D osc.fields;
     ObjectStreamField[] real_fields =3D
ObjectStreamClass.lookup(clazz).fields;
     ObjectStreamField[] fieldmapping =3D new ObjectStreamField[2 *
Math.max(stream_fields.length, real_fields.length)];
-    osc.fieldMapping =3D fieldmapping;
=20
     int stream_idx =3D 0;
     int real_idx =3D 0;
@@ -543,9 +542,21 @@
 	  }
 	if (real_field !=3D null && !real_field.isToSet())
 	    real_field =3D null;
+	/* If some of stream_fields does not correspond to any of
real_fields,
+	 * or the opposite, then fieldmapping will go short.
+	 */
+	if (map_idx =3D=3D fieldmapping.length)
+	  {
+	    ObjectStreamField[] newfieldmapping =3D
+	      new ObjectStreamField[fieldmapping.length + 2];
+	    System.arraycopy(fieldmapping, 0,
+	      newfieldmapping, 0, fieldmapping.length);
+	    fieldmapping =3D newfieldmapping;
+	  }
 	fieldmapping[map_idx++] =3D stream_field;
 	fieldmapping[map_idx++] =3D real_field;
       }
+    osc.fieldMapping =3D fieldmapping;
=20
     return osc;
   }



From MAILER-DAEMON Tue Feb 10 13:35:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aqciv-0005U1-07
	for mharc-commit-classpath@gnu.org; Tue, 10 Feb 2004 13:35:05 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aqcin-0005SU-4X
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 13:34:57 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AqciG-0005JB-AV
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 13:34:56 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AqciF-0005Ht-FM
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 13:34:23 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i1AIYHb17726
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 13:34:17 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i1AIYGi15919
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 13:34:16 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i1AIYFXd007410
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 13:34:15 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-MRXHvHsk8gel3T99+A7b"
Organization: 
Message-Id: <1076438055.23292.38.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 10 Feb 2004 13:34:15 -0500
Subject: Patch: FYI: fix setLabel for Button peers
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2004 18:35:02 -0000


--=-MRXHvHsk8gel3T99+A7b
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

I committed the following patch to merge a recent change in libgcj.

-David Jee


2004-02-10  David Jee  <djee@redhat.com>

        * gnu/java/awt/peer/gtk/GtkButtonPeer.java
        (gtkSetLabel): New native method definition.
        (setLabel): Use gtkSetLabel.
        * include/gnu_java_awt_peer_gtk_GtkButtonPeer.h: Regenerated.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
        (Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel): New method.



--=-MRXHvHsk8gel3T99+A7b
Content-Disposition: attachment; filename=ButtonSetLabel.patch
Content-Type: text/x-patch; name=ButtonSetLabel.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: gnu/java/awt/peer/gtk/GtkButtonPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkButtonPeer.java,v
retrieving revision 1.25
diff -u -r1.25 GtkButtonPeer.java
--- gnu/java/awt/peer/gtk/GtkButtonPeer.java	7 Jan 2004 02:23:37 -0000	1.25
+++ gnu/java/awt/peer/gtk/GtkButtonPeer.java	10 Feb 2004 18:23:16 -0000
@@ -54,6 +54,7 @@
   public native void connectSignals ();
 
   native void gtkSetFont(String name, int style, int size);
+  native void gtkSetLabel(String label);
   native void gtkWidgetSetForeground (int red, int green, int blue);
 
   public GtkButtonPeer (Button b)
@@ -63,7 +64,7 @@
 
   public void setLabel (String label) 
   {
-    set ("label", label);
+    gtkSetLabel(label);
   }
 
   public void handleEvent (AWTEvent e)
Index: include/gnu_java_awt_peer_gtk_GtkButtonPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkButtonPeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkButtonPeer.h
--- include/gnu_java_awt_peer_gtk_GtkButtonPeer.h	7 Jan 2004 02:23:37 -0000	1.5
+++ include/gnu_java_awt_peer_gtk_GtkButtonPeer.h	10 Feb 2004 18:23:17 -0000
@@ -14,6 +14,7 @@
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectJObject (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkWidgetSetForeground (JNIEnv *env, jobject, jint, jint, jint);
 
 #ifdef __cplusplus
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,v
retrieving revision 1.10
diff -u -r1.10 gnu_java_awt_peer_gtk_GtkButtonPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c	7 Jan 2004 02:23:37 -0000	1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c	10 Feb 2004 18:23:18 -0000
@@ -88,6 +88,25 @@
 }
 
 JNIEXPORT void JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetLabel
+  (JNIEnv *env, jobject obj, jstring jtext)
+{
+  const char *text;
+  GtkWidget *label;
+  void *ptr;
+
+  ptr = NSA_GET_PTR (env, obj);
+  label = gtk_bin_get_child (GTK_BIN(ptr));
+  text = (*env)->GetStringUTFChars (env, jtext, NULL);
+
+  gdk_threads_enter ();
+  gtk_label_set_text (GTK_LABEL(label), text);
+  gdk_threads_leave ();
+
+  (*env)->ReleaseStringUTFChars (env, jtext, text);
+}
+
+JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkButtonPeer_gtkSetFont
   (JNIEnv *env, jobject obj, jstring name, jint style, jint size)
 {

--=-MRXHvHsk8gel3T99+A7b--




From MAILER-DAEMON Tue Feb 10 14:14:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AqdLK-0008Lg-Lo
	for mharc-commit-classpath@gnu.org; Tue, 10 Feb 2004 14:14:46 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AqdLE-0008FU-OO
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 14:14:40 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AqdKh-0007tQ-G1
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 14:14:38 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AqdKg-0007st-Sw
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 14:14:06 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i1AJE5b09905
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 14:14:05 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i1AJE4i01259
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 14:14:04 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i1AJE4Xd008864
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 14:14:04 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-p/VYMpVwWJT+hoXlGi5/"
Organization: 
Message-Id: <1076440444.23292.42.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 10 Feb 2004 14:14:04 -0500
Subject: Patch: FYI: GetLayoutInfo in java.awt.GridBagLayout
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2004 19:14:41 -0000


--=-p/VYMpVwWJT+hoXlGi5/
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

I committed the following patch to merge recent changes in libgcj.  The
patch fixes some of the most noticeable bugs in GetLayoutInfo() method
in GridBagLayout.

-David Jee

2004-02-10  David Jee  <djee@redhat.com>

        * java/awt/GridBagLayout.java
        (GridBagLayout): New private field, internalcomptable.
        (lookupInternalConstraints): New method.
        (ArrangeGrid): Use components' MINSIZE. Use internalcomptable.
        (GetLayoutInfo): Reimplement.
        (calcCellSizes): Ignore rows/columns with size 0.



--=-p/VYMpVwWJT+hoXlGi5/
Content-Disposition: attachment; filename=GetLayoutInfo.patch
Content-Type: text/x-patch; name=GetLayoutInfo.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: java/awt/GridBagLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/GridBagLayout.java,v
retrieving revision 1.7
diff -u -r1.7 GridBagLayout.java
--- java/awt/GridBagLayout.java	3 Feb 2004 17:10:53 -0000	1.7
+++ java/awt/GridBagLayout.java	6 Feb 2004 16:27:21 -0000
@@ -40,6 +40,7 @@
 
 import java.io.Serializable;
 import java.util.Hashtable;
+import java.util.HashMap;
 
 /**
  * @author Michael Koch <konqueror@gmx.de>
@@ -54,7 +55,14 @@
     protected static final int PREFERREDSIZE = 2;
     protected static final int MAXGRIDSIZE = 512;
 
+    // comptable remembers the original contraints given to us.
+    // internalcomptable is used to keep track of modified constraint values
+    // that we calculate, particularly when we are given RELATIVE and
+    // REMAINDER constraints.
+    // Constraints kept in comptable are never modified, and constraints
+    // kept in internalcomptable can be modified internally only.
     protected Hashtable comptable;
+    private Hashtable internalcomptable;
     protected GridBagLayoutInfo layoutInfo;
     protected GridBagConstraints defaultConstraints;
 
@@ -66,6 +74,7 @@
     public GridBagLayout ()
     {
 	this.comptable = new Hashtable();
+	this.internalcomptable = new Hashtable();
 	this.defaultConstraints= new GridBagConstraints();
     }
 
@@ -213,6 +222,20 @@
 	return result;
     }
 
+    private GridBagConstraints lookupInternalConstraints (Component component)
+    {
+	GridBagConstraints result =
+            (GridBagConstraints) internalcomptable.get (component);
+
+	if (result == null)
+	{
+	    result = (GridBagConstraints) lookupConstraints(component).clone();
+	    internalcomptable.put (component, result);
+	}
+    
+	return result;
+    }
+
     /**
      * @since 1.1
      */
@@ -316,7 +339,7 @@
       if (components.length == 0)
         return;
 
-      GridBagLayoutInfo info = getLayoutInfo (parent, PREFERREDSIZE);
+      GridBagLayoutInfo info = getLayoutInfo (parent, MINSIZE);
       if (info.cols == 0 && info.rows == 0)
         return;
       layoutInfo = info;
@@ -332,7 +355,8 @@
           if (!component.isVisible())
             continue;
 		
-          GridBagConstraints constraints = lookupConstraints (component);
+          GridBagConstraints constraints =
+              lookupInternalConstraints(component);
 
           int cellx = sumIntArray(layoutInfo.colWidths, constraints.gridx);
           int celly = sumIntArray(layoutInfo.rowHeights, constraints.gridy);
@@ -435,12 +459,16 @@
       parentDim.width -= parentInsets.left + parentInsets.right;
       parentDim.height -= parentInsets.top + parentInsets.bottom;
    
-      int x = 0;
-      int y = 0;
+      int current_y = 0;
       int max_x = 0;
       int max_y = 0;
 
-      // first we figure out how many rows/columns
+      // Guaranteed to contain the last component added to the given row
+      // or column, whose gridwidth/height is not REMAINDER.
+      HashMap lastInRow = new HashMap();
+      HashMap lastInCol = new HashMap();
+
+      // STEP 1: first we figure out how many rows/columns
       Component[] components = parent.getComponents();
       for (int i = 0; i < components.length; i++)
 	{
@@ -450,124 +478,338 @@
           if (!component.isVisible())
             continue;
 		
-          GridBagConstraints constraints = lookupConstraints (component);
-		
+          // When looking up the constraint for the first time, check the
+          // original unmodified constraint.  After the first time, always
+          // refer to the internal modified constraint.
+          GridBagConstraints originalConstraints = lookupConstraints (component);
+          GridBagConstraints constraints = (GridBagConstraints) originalConstraints.clone();
+          internalcomptable.put(component, constraints);
+
+          // Cases:
+          //
+          // 1. gridy == RELATIVE, gridx == RELATIVE
+          //
+          //       use y as the row number; check for the next
+          //       available slot at row y
+          //
+          // 2. only gridx == RELATIVE
+          //
+          //       check for the next available slot at row gridy
+          //
+          // 3. only gridy == RELATIVE
+          //
+          //       check for the next available slot at column gridx
+          //
+          // 4. neither gridx or gridy == RELATIVE
+          //
+          //       nothing to check; just add it
+
+
+          // cases 1 and 2
           if(constraints.gridx == GridBagConstraints.RELATIVE)
-            constraints.gridx = x;
+            {
+              if (constraints.gridy == GridBagConstraints.RELATIVE)
+              constraints.gridy = current_y;
+
+              int x;
+
+              // Check the component that occupies the right-most spot in this
+              // row. We want to add this component after it.
+              // If this row is empty, add to the 0 position.
+              if (!lastInRow.containsKey(new Integer(constraints.gridy))) 
+                x = 0;
+              else
+                {
+                  Component lastComponent = (Component) lastInRow.get(new Integer(constraints.gridy));
+                  GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
+                  x = lastConstraints.gridx + Math.max(1, lastConstraints.gridwidth);
+                }
+
+              // Determine if this component will fit in the slot vertically.
+              // If not, bump it over to where it does fit.
+              for (int y = constraints.gridy + 1; y < constraints.gridy + Math.max(1, constraints.gridheight); y++)
+                {
+                  if (lastInRow.containsKey(new Integer(y)))
+                    {
+                      Component lastComponent = (Component) lastInRow.get(new Integer(y));
+                      GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
+                      x = Math.max (x,
+                                    lastConstraints.gridx + Math.max(1, lastConstraints.gridwidth));
+                    }
+                }
+
+              constraints.gridx = x;
+            }
+          // case 3
+          else if(constraints.gridy == GridBagConstraints.RELATIVE)
+            {
+              int y;
+              // Check the component that occupies the bottom-most spot in
+              // this column. We want to add this component below it.
+              // If this column is empty, add to the 0 position.
+              if (!lastInCol.containsKey(new Integer(constraints.gridx))) 
+                y = 0;
+              else
+                {
+                  Component lastComponent = (Component)lastInCol.get(new Integer(constraints.gridx));
+                  GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
+                  y = lastConstraints.gridy + Math.max(1, lastConstraints.gridheight);
+                }
+
+              // Determine if this component will fit in the slot horizontally.
+              // If not, bump it down to where it does fit.
+              for (int x = constraints.gridx + 1; x < constraints.gridx + Math.max(1, constraints.gridwidth); x++)
+                {
+                  if (lastInCol.containsKey(new Integer(x)))
+                    {
+                      Component lastComponent = (Component) lastInCol.get(new Integer(x));
+                      GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
+                      y = Math.max (y,
+                                    lastConstraints.gridy + Math.max(1, lastConstraints.gridheight));
+                    }
+                }
+
+              constraints.gridy = y;
+            }
+          // case 4: do nothing
 
-          if(constraints.gridy == GridBagConstraints.RELATIVE)
-            constraints.gridy = y;
-		
           max_x = Math.max(max_x, 
                            constraints.gridx + Math.max(1, constraints.gridwidth));
           max_y = Math.max(max_y,
                            constraints.gridy + Math.max(1, constraints.gridheight));
 
+          // Update our reference points for RELATIVE gridx and gridy.
           if(constraints.gridwidth == GridBagConstraints.REMAINDER)
 	    {
-              x = 0;
-              y++;
+              current_y = constraints.gridy + Math.max(1, constraints.gridheight);
 	    }
-          else
+          else if (constraints.gridwidth != GridBagConstraints.REMAINDER)
 	    {
-              x = constraints.gridx + Math.max(1, constraints.gridwidth);
-              y = constraints.gridy;
+              for (int y = constraints.gridy; y < constraints.gridy + Math.max(1, constraints.gridheight); y++)
+                {
+                  if(lastInRow.containsKey(new Integer(y)))
+                    {
+                      Component lastComponent = (Component) lastInRow.get(new Integer(y));
+                      GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
+                      if (constraints.gridx > lastConstraints.gridx)
+                        {
+                          lastInRow.put(new Integer(y), component);
+                        }
+                    }
+                  else
+                    {
+                      lastInRow.put(new Integer(y), component);
+                    }
+                }
+
+              for (int x = constraints.gridx; x < constraints.gridx + Math.max(1, constraints.gridwidth); x++)
+                {
+                  if(lastInCol.containsKey(new Integer(x)))
+                    {
+                      Component lastComponent = (Component) lastInCol.get(new Integer(x));
+                      GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
+                      if (constraints.gridy > lastConstraints.gridy)
+                        {
+                          lastInCol.put(new Integer(x), component);
+                        }
+                    }
+                  else
+                    {
+                      lastInCol.put(new Integer(x), component);
+                    }
+                }
 	    }
-	}
+	} // end of STEP 1
 	
-      GridBagLayoutInfo info = new GridBagLayoutInfo(max_x, max_y);
+      boolean[] colIsOccupied = new boolean[max_x];
+      boolean[] rowIsOccupied = new boolean[max_y];
 
-      for (x = 0; x <= max_x; x++)
-	{
-          if(columnWidths != null && columnWidths.length > x)
-	    {
-              info.colWidths[x] = columnWidths[x];
-	    }
-          if(columnWeights != null && columnWeights.length > x)
-	    {
-              info.colWeights[x] = columnWeights[x];
-	    }
-          for (int i = 0; i < components.length; i++)
-	    {
-              Component component = components [i];
+      // STEP 2: Determine which cells the components occupy.
+      for (int i = 0; i < components.length; i++)
+        {
+          Component component = components [i];
 			
-              // If component is not visible we dont have to care about it.
-              if (!component.isVisible())
-                continue;
+          // If component is not visible we dont have to care about it.
+          if (!component.isVisible())
+            continue;
 			
-              GridBagConstraints constraints = lookupConstraints (component);
+          GridBagConstraints constraints = lookupInternalConstraints (component);
 
-              // first we fix up any REMAINDER cells
-              if(constraints.gridwidth == GridBagConstraints.REMAINDER)
-		{
-                  constraints.gridwidth = max_x - constraints.gridx;
-		}
-              if(constraints.gridheight == GridBagConstraints.REMAINDER)
-		{
-                  constraints.gridheight = max_y - constraints.gridy;
-		}
-
-              if(constraints.gridx + constraints.gridwidth - 1 == x)
-		{
-                  int width = (sizeflag == PREFERREDSIZE) ?
-                    component.getPreferredSize().width :
-                    component.getMinimumSize().width;
-                  if(constraints.insets != null)
-		    {
-                      width += constraints.insets.left + constraints.insets.right;
-		    }
-                  width += constraints.ipadx;
-                  for(int w = 1; w < constraints.gridwidth; w++)
-		    {
-                      width -= info.colWidths[x - w];
-		    }
-                  info.colWidths[x] = Math.max(info.colWidths[x], width);
-                  info.colWeights[x] =
-                    Math.max(info.colWeights[x], constraints.weightx);
-		}
-	    }
-	}
+          // Fix up any REMAINDER and RELATIVE cells.
+          if(constraints.gridwidth == GridBagConstraints.REMAINDER)
+            {
+              for (int y = constraints.gridy; y < constraints.gridy + Math.max(1, constraints.gridheight); y++)
+                {
+                  if (lastInRow.containsKey(new Integer(y)))
+                    {
+                      Component lastComponent = (Component) lastInRow.get(new Integer(y));
+                      GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
+
+                      if (lastConstraints.gridwidth == GridBagConstraints.RELATIVE)
+                        {
+                          constraints.gridx = max_x - 1;
+                          break;
+                        }
+                      else
+                        {
+                          constraints.gridx = Math.max (constraints.gridx,
+                                                        lastConstraints.gridx + Math.max (1, lastConstraints.gridwidth));
+                        }
+                    }
+                }
+              constraints.gridwidth = max_x - constraints.gridx;
+            }
+          else if (constraints.gridwidth == GridBagConstraints.RELATIVE)
+            {
+              constraints.gridwidth = max_x - constraints.gridx - 1;
+            }
+
+          if(constraints.gridheight == GridBagConstraints.REMAINDER)
+            {
+              for (int x = constraints.gridx; x < constraints.gridx + Math.max(1, constraints.gridwidth); x++)
+                {
+                  if (lastInCol.containsKey(new Integer(x)))
+                    {
+                      Component lastComponent = (Component) lastInRow.get(new Integer(x));
+                      GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
+
+                      if (lastConstraints.gridheight == GridBagConstraints.RELATIVE)
+                        {
+                          constraints.gridy = max_y - 1;
+                          break;
+                        }
+                      else
+                        {
+                          constraints.gridy = Math.max (constraints.gridy,
+                                                        lastConstraints.gridy + Math.max (1, lastConstraints.gridheight));
+                        }
+                    }
+                }
+              constraints.gridheight = max_y - constraints.gridy;
+            }
+          else if (constraints.gridheight == GridBagConstraints.RELATIVE)
+            {
+              constraints.gridheight = max_y - constraints.gridy - 1;
+            }
+
+          // For now, a row or a column is "occupied" iff a component
+          // both begins and ends in that row or column.
+          if (constraints.gridwidth == 1)
+            colIsOccupied[constraints.gridx] = true;
+          if (constraints.gridheight == 1)
+            rowIsOccupied[constraints.gridy] = true;
+        } // end of STEP 2
 
-      for (y = 0; y <= max_y; y++)
-	{
+      GridBagLayoutInfo info = new GridBagLayoutInfo(max_x, max_y);
+
+      // Check if column widths and row heights are overridden.
+
+      for (int x = 0; x < max_x; x++)
+        {
+          if(columnWidths != null && columnWidths.length > x)
+            info.colWidths[x] = columnWidths[x];
+          if(columnWeights != null && columnWeights.length > x)
+            info.colWeights[x] = columnWeights[x];
+        }
+
+      for (int y = 0; y < max_y; y++)
+        {
           if(rowHeights != null && rowHeights.length > y)
-	    {
-              info.rowHeights[y] = rowHeights[y];
-	    }
+            info.rowHeights[y] = rowHeights[y];
           if(rowWeights != null && rowWeights.length > y)
-	    {
-              info.rowWeights[y] = rowWeights[y];
-	    }
-          for (int i = 0; i < components.length; i++)
-	    {
-              Component component = components [i];
-			
-              // If component is not visible we dont have to care about it.
-              if (!component.isVisible())
-                continue;
+            info.rowWeights[y] = rowWeights[y];
+        }
+
+      // STEP 3: Distribute the weights and min sizes among rows/columns.
+      for (int i = 0; i < components.length; i++)
+        {
+          Component component = components [i];
 			
-              GridBagConstraints constraints = lookupConstraints (component);
+          // If component is not visible we dont have to care about it.
+          if (!component.isVisible())
+            continue;
 
-              if(constraints.gridy + constraints.gridheight - 1 == y)
-		{
-                  int height = (sizeflag == PREFERREDSIZE) ?
-                    component.getPreferredSize().height :
-                    component.getMinimumSize().height;
-                  if(constraints.insets != null)
-		    {
-                      height += constraints.insets.top + constraints.insets.bottom;
-		    } 
-                  height += constraints.ipady;
-                  for(int h = 1; h < constraints.gridheight; h++)
-		    {
-                      height -= info.rowHeights[y - h];
-		    }
-                  info.rowHeights[y] = Math.max(info.rowHeights[y], height);
-                  info.rowWeights[y] =
-                    Math.max(info.rowWeights[y], constraints.weighty);
-		}
-	    }
-	}
+          GridBagConstraints constraints = lookupInternalConstraints (component);
+          GridBagConstraints originalConstraints = lookupConstraints (component);
+
+          // Distribute the width.
+
+          int width = (sizeflag == PREFERREDSIZE) ?
+                      component.getPreferredSize().width :
+                      component.getMinimumSize().width;
+
+          if(constraints.insets != null)
+            width += constraints.insets.left + constraints.insets.right;
+
+          width += constraints.ipadx;
+
+          int occupiedCols = constraints.gridwidth;
+          int lastOccupiedCol = -1;
+
+          for(int w = constraints.gridx; w < constraints.gridx + constraints.gridwidth; w++)
+            {
+              if(colIsOccupied[w])
+                lastOccupiedCol = w;
+              else
+                occupiedCols--;
+            }
+
+          // A component needs to occupy at least one column.
+          if(occupiedCols == 0)
+            {
+              colIsOccupied[constraints.gridx + constraints.gridwidth - 1] = true;
+              lastOccupiedCol = constraints.gridx + constraints.gridwidth - 1;
+            }
+
+          for(int w = constraints.gridx; w < constraints.gridx + constraints.gridwidth - 1; w++)
+            {
+              if(colIsOccupied[w])
+                width -= info.colWidths[w];
+            }
+
+          info.colWidths[lastOccupiedCol] = Math.max(info.colWidths[lastOccupiedCol], width);
+          info.colWeights[lastOccupiedCol] = Math.max(info.colWeights[lastOccupiedCol], constraints.weightx);
+
+
+          // Distribute the height.
+
+          int height = (sizeflag == PREFERREDSIZE) ?
+                       component.getPreferredSize().height :
+                       component.getMinimumSize().height;
+
+          if(constraints.insets != null)
+            height += constraints.insets.top + constraints.insets.bottom;
+
+          height += constraints.ipady;
+
+          int occupiedRows = constraints.gridheight;
+          int lastOccupiedRow = -1;
+
+          for(int h = constraints.gridy; h < constraints.gridy + constraints.gridheight; h++)
+            {
+              if(rowIsOccupied[h])
+                lastOccupiedRow = h;
+              else
+                occupiedRows--;
+            }
+
+          // A component needs to occupy at least one row.
+          if(occupiedRows == 0)
+            {
+              rowIsOccupied[constraints.gridy + constraints.gridheight - 1] = true;
+              lastOccupiedRow = constraints.gridy + constraints.gridheight - 1;
+            }
+
+          for(int h = constraints.gridy; h < constraints.gridy + constraints.gridheight; h++)
+            {
+              if(rowIsOccupied[h])
+                height -= info.rowHeights[h];
+            }
+
+          info.rowHeights[lastOccupiedRow] = Math.max(info.rowHeights[lastOccupiedRow], height);
+          info.rowWeights[lastOccupiedRow] = Math.max(info.rowWeights[lastOccupiedRow], constraints.weighty);
+
+        } // end of STEP 3
 
       calcCellSizes (info.colWidths, info.colWeights, parentDim.width);
       calcCellSizes (info.rowHeights, info.rowWeights, parentDim.height);
@@ -607,20 +849,32 @@
 
     private void calcCellSizes (int[] sizes, double[] weights, int range)
     {
-	int diff = range - sumIntArray (sizes);
+      int totalSize = sumIntArray (sizes);
+      double totalWeight = sumDoubleArray (weights);
 
-	if (diff == 0)
-	    return;
-    
-	double weight = sumDoubleArray (weights);
+      // Rows or columns with size 0 should not be weighted in the calculation.
+      for (int i = 0; i < weights.length; i++)
+        {
+          if (sizes[i] == 0)
+            totalWeight -= weights[i];
+        }
 
-	for (int i = 0; i < sizes.length; i++)
-	{
-	    sizes [i] += (int) (((double) diff) * weights [i] / weight );
+      int diff = range - totalSize;
 
-	    if (sizes [i] < 0)
-		sizes [i] = 0;
-	}
+      if (diff == 0)
+        return;
+
+      for (int i = 0; i < sizes.length; i++)
+        {
+          // A row or column with zero size cannot all of a sudden gain size.
+          if (sizes[i] != 0.0)
+            {
+              int newsize = (int) (sizes[i] + (((double) diff) * weights [i] / totalWeight ));
+
+              if (newsize > 0)
+                sizes[i] = newsize;
+            }
+        }
     }
 
     private void dumpLayoutInfo (GridBagLayoutInfo info)

--=-p/VYMpVwWJT+hoXlGi5/--




From MAILER-DAEMON Tue Feb 10 14:25:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AqdVj-00080Y-T0
	for mharc-commit-classpath@gnu.org; Tue, 10 Feb 2004 14:25:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AqdVg-0007ze-UU
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 14:25:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AqdVA-0007kU-AR
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 14:25:27 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AqdV9-0007jT-Lc
	for commit-classpath@gnu.org; Tue, 10 Feb 2004 14:24:55 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i1AJOsb16168
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 14:24:54 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i1AJOri05619
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 14:24:53 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i1AJOrXd009216
	for <commit-classpath@gnu.org>; Tue, 10 Feb 2004 14:24:53 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-a4FBfjPNDKgWRGax6PB3"
Organization: 
Message-Id: <1076441093.23292.46.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 10 Feb 2004 14:24:53 -0500
Subject: Patch: FYI: Small fixes to AWT
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Feb 2004 19:25:30 -0000


--=-a4FBfjPNDKgWRGax6PB3
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

I committed the following patch which fixes a few things in AWT.  The
patch is a merge from libgcj.

-David Jee

2004-02-10  David Jee  <djee@redhat.com>

        * java/awt/BorderLayout.java
        (calcCompSize): Invisible components get zero dimensions.
        * java/awt/Button.java
        (setLabel): Set actionCommand.
        * java/awt/Component.java
        (show): Invalidate component and parent container.
        (hide): Likewise.



--=-a4FBfjPNDKgWRGax6PB3
Content-Disposition: attachment; filename=Misc20040210.patch
Content-Type: text/x-patch; name=Misc20040210.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: java/awt/BorderLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/BorderLayout.java,v
retrieving revision 1.11
diff -u -r1.11 BorderLayout.java
--- java/awt/BorderLayout.java	3 Feb 2004 17:10:50 -0000	1.11
+++ java/awt/BorderLayout.java	10 Feb 2004 17:17:20 -0000
@@ -637,7 +637,7 @@
 private Dimension
 calcCompSize(Component comp, int what)
 {
-  if (comp == null)
+  if (comp == null || !comp.isVisible())
     return new Dimension(0, 0);
   if (what == MIN)
     return comp.getMinimumSize();
Index: java/awt/Button.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Button.java,v
retrieving revision 1.11
diff -u -r1.11 Button.java
--- java/awt/Button.java	5 Jun 2003 19:58:39 -0000	1.11
+++ java/awt/Button.java	10 Feb 2004 17:17:20 -0000
@@ -148,6 +148,7 @@
 setLabel(String label)
 {
   this.label = label;
+  actionCommand = label;
   if (peer != null)
     {
       ButtonPeer bp = (ButtonPeer) peer;
Index: java/awt/Component.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Component.java,v
retrieving revision 1.36
diff -u -r1.36 Component.java
--- java/awt/Component.java	5 Feb 2004 23:21:40 -0000	1.36
+++ java/awt/Component.java	10 Feb 2004 17:17:20 -0000
@@ -879,6 +879,7 @@
     this.visible = true;
     if (peer != null)
       peer.setVisible(true);
+    invalidate();
   }
 
   /**
@@ -905,6 +906,7 @@
     if (peer != null)
       peer.setVisible(false);
     this.visible = false;
+    invalidate();
   }
 
   /**

--=-a4FBfjPNDKgWRGax6PB3--




From MAILER-DAEMON Wed Feb 11 07:40:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AqtXx-0007FP-VU
	for mharc-commit-classpath@gnu.org; Wed, 11 Feb 2004 07:32:53 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AqtVY-000712-Ey
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 07:30:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AqtB1-00047A-Hm
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 07:09:42 -0500
Received: from [217.8.192.21] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AqtB0-00046m-Gz
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 07:09:10 -0500
Received: from [217.8.199.158] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 680774 for commit-classpath@gnu.org;
	Wed, 11 Feb 2004 13:09:10 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Wed, 11 Feb 2004 13:09:05 +0100
Message-Id: <20040211120905.10516@smtp.mail.ch.easynet.net>
X-Mailer: CTM PowerMail 3.1.1 carbon <http://www.ctmdev.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="==_20040211120905.25537-1_=="
Subject: FYI: Patch: javax.swing.undo.UndoManager
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2004 12:32:48 -0000

--==_20040211120905.25537-1_==
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Hello,

I've committed the attached patch. It is a completely new implementation
for javax.swing.undo.UndoManager (we had only stubs in the past). I'm
also checking in a patch to Mauve, containing tests for every UndoManager
method.

-- Sascha

Sascha Brawer, brawer@dandelis.ch, http://www.dandelis.ch/people/brawer/ 

--==_20040211120905.25537-1_==
Content-Type: application/octet-stream; name="um.diff";
	x-mac-type="00000000"; x-mac-creator="00000000"
Content-Disposition: attachment
Content-Transfer-Encoding: base64

SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFz
c3BhdGgvY2xhc3NwYXRoL0NoYW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4xODg5
CmRpZmYgLXUgLXIxLjE4ODkgQ2hhbmdlTG9nCi0tLSBDaGFuZ2VMb2cJMTAgRmViIDIwMDQg
MTk6MjE6NTIgLTAwMDAJMS4xODg5CisrKyBDaGFuZ2VMb2cJMTEgRmViIDIwMDQgMTI6MDM6
MzggLTAwMDAKQEAgLTEsMyArMSw3IEBACisyMDA0LTAyLTExICBTYXNjaGEgQnJhd2VyICA8
YnJhd2VyQGRhbmRlbGlzLmNoPgorCisJKiBqYXZheC9zd2luZy91bmRvL1VuZG9NYW5hZ2Vy
LmphdmE6IFJlLXdyaXR0ZW4gZnJvbSBzY3JhdGNoLgorCiAyMDA0LTAyLTEwICBEYXZpZCBK
ZWUgIDxkamVlQHJlZGhhdC5jb20+CiAKIAkqIGphdmEvYXd0L0JvcmRlckxheW91dC5qYXZh
CkluZGV4OiBqYXZheC9zd2luZy91bmRvL1VuZG9NYW5hZ2VyLmphdmEKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZheC9zd2luZy91
bmRvL1VuZG9NYW5hZ2VyLmphdmEsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMgpkaWZmIC11
IC1yMS4yIFVuZG9NYW5hZ2VyLmphdmEKLS0tIGphdmF4L3N3aW5nL3VuZG8vVW5kb01hbmFn
ZXIuamF2YQk4IEp1biAyMDAzIDEyOjE0OjU2IC0wMDAwCTEuMgorKysgamF2YXgvc3dpbmcv
dW5kby9VbmRvTWFuYWdlci5qYXZhCTExIEZlYiAyMDA0IDEyOjAzOjM4IC0wMDAwCkBAIC0x
LDUgKzEsNSBAQAogLyogQWJzdHJhY3RUYWJsZU1vZGVsLmphdmEgLS0KLSAgIENvcHlyaWdo
dCAoQykgMjAwMiBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4KKyAgIENvcHlyaWdo
dCAoQykgMjAwMiwgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4KIAogVGhp
cyBmaWxlIGlzIHBhcnQgb2YgR05VIENsYXNzcGF0aC4KIApAQCAtMzgsMjIzICszOCw1ODgg
QEAKIAogcGFja2FnZSBqYXZheC5zd2luZy51bmRvOwogCitpbXBvcnQgamF2YXguc3dpbmcu
VUlNYW5hZ2VyOwogaW1wb3J0IGphdmF4LnN3aW5nLmV2ZW50LlVuZG9hYmxlRWRpdEV2ZW50
OwogaW1wb3J0IGphdmF4LnN3aW5nLmV2ZW50LlVuZG9hYmxlRWRpdExpc3RlbmVyOwogCisK
IC8qKgotICogVW5kb01hbmFnZXIKLSAqIEBhdXRob3IJQW5kcmV3IFNlbGtpcmsKKyAqIEEg
bWFuYWdlciBmb3IgcHJvdmlkaW5nIGFuIGFwcGxpY2F0aW9uJiN4MjAxOTtzIHVuZG8vcmVk
bworICogZnVuY3Rpb25hbGl0eS4KKyAqCisgKiA8cD5UeWlwY2FsbHksIGFuIGFwcGxpY2F0
aW9uIHdpbGwgY3JlYXRlIG9ubHkgb25lIHNpbmdsZSBpbnN0YW5jZQorICogb2YgVW5kb01h
bmFnZXIuIFdoZW4gdGhlIHVzZXIgcGVyZm9ybXMgYW4gdW5kb2FibGUgYWN0aW9uLCBmb3IK
KyAqIGluc3RhbmNlIGNoYW5naW5nIHRoZSBjb2xvciBvZiBhbiBvYmplY3QgZnJvbSBncmVl
biB0byBibHVlLCB0aGUKKyAqIGFwcGxpY2F0aW9uIHJlZ2lzdGVycyBhbiB7QGxpbmsgVW5k
b2FibGVFZGl0fSBvYmplY3Qgd2l0aCB0aGUKKyAqIDxjb2RlPlVuZG9NYW5hZ2VyPC9jb2Rl
Pi4gVG8gaW1wbGVtZW50IHRoZSAmI3gyMDFjO3VuZG8mI3gyMDFkOyBhbmQKKyAqICYjeDIw
MWM7cmVkbyYjeDIwMWQ7IG1lbnUgY29tbWFuZHMsIHRoZSBhcHBsaWNhdGlvbiBpbnZva2Vz
IHRoZQorICogVW5kb01hbmFnZXImI3gyMDE5O3Mge0BsaW5rICN1bmRvfSBhbmQge0BsaW5r
ICNyZWRvfSBtZXRob2RzLiAgVGhlCisgKiBodW1hbi1yZWFkYWJsZSB0ZXh0IG9mIHRoZXNl
IG1lbnUgY29tbWFuZHMgaXMgcHJvdmlkZWQgYnkge0BsaW5rCisgKiAjZ2V0VW5kb1ByZXNl
bnRhdGlvbk5hbWV9IGFuZCB7QGxpbmsgI2dldFJlZG9QcmVzZW50YXRpb25OYW1lfSwKKyAq
IHJlc3BlY3RpdmVseS4gVG8gZGV0ZXJtaW5lIHdoZXRoZXIgdGhlIG1lbnUgaXRlbSBzaG91
bGQgYmUKKyAqIHNlbGVjdGFibGUgb3IgZ3JleWVkIG91dCwgdXNlIHtAbGluayAjY2FuVW5k
b30gYW5kIHtAbGluaworICogI2NhblJlZG99LgorICoKKyAqIDxwPlRoZSBVbmRvTWFuYWdl
ciB3aWxsIG9ubHkga2VlcCBhIHNwZWNpZmllZCBudW1iZXIgb2YgZWRpdGluZworICogYWN0
aW9ucywgdGhlIDxlbT5saW1pdDwvZW0+LiBUaGUgdmFsdWUgb2YgdGhpcyBwYXJhbWV0ZXIg
Y2FuIGJlCisgKiByZXRyaWV2ZWQgYnkgY2FsbGluZyB7QGxpbmsgI2dldExpbWl0fSBhbmQg
c2V0IHdpdGgge0BsaW5rCisgKiAjc2V0TGltaXR9LiAgSWYgbW9yZSBVbmRvYWJsZUVkaXRz
IGFyZSBhZGRlZCB0byB0aGUgVW5kb01hbmFnZXIsCisgKiB0aGUgb2xkZXN0IGFjdGlvbnMg
d2lsbCBiZSBkaXNjYXJkZWQuCisgKgorICogPHA+U29tZSBhcHBsaWNhdGlvbnMgZG8gbm90
IHByb3ZpZGUgc2VwYXJhdGUgbWVudSBjb21tYW5kcyBmb3IKKyAqICYjeDIwMWM7dW5kbyYj
eDIwMWQ7IGFuZCAmI3gyMDFjO3JlZG8uJiN4MjAxZDsgSW5zdGVhZCwgdGhleQorICogaGF2
ZSBqdXN0IGEgc2luZ2xlIGNvbW1hbmQgd2hvc2UgdGV4dCBzd2l0Y2hlcyBiZXR3ZWVuIHRo
ZSB0d28uCisgKiBTdWNoIGFwcGxpY2F0aW9ucyB3b3VsZCB1c2UgYW4gVW5kb01hbmFnZXIg
d2l0aCBhIDxjb2RlPmxpbWl0PC9jb2RlPgorICogb2YgMS4gVGhlIHRleHQgb2YgdGhpcyBj
b21iaW5lZCBtZW51IGl0ZW0gaXMgYXZhaWxhYmxlIHZpYQorICoge0BsaW5rICNnZXRVbmRv
T3JSZWRvUHJlc2VudGF0aW9uTmFtZX0sIGFuZCBpdCBpcyBpbXBsZW1lbnRlZAorICogYnkg
Y2FsbGluZyB7QGxpbmsgI3VuZG9PclJlZG99LgorICoKKyAqIDxwPjxiPlRocmVhZCBTYWZl
dHk6PC9iPiBJbiBjb25zdHJhc3QgdG8gdGhlIG90aGVyIGNsYXNzZXMgb2YgdGhlCisgKiA8
Y29kZT5qYXZheC5zd2luZy51bmRvPC9jb2RlPiBwYWNrYWdlLCB0aGUgcHVibGljIG1ldGhv
ZHMgb2YgYW4KKyAqIDxjb2RlPlVuZG9NYW5hZ2VyPC9jb2RlPiBhcmUgc2FmZSB0byBjYWxs
IGZyb20gY29uY3VycmVudCB0aHJlYWRzLgorICogVGhlIGNhbGxlciBkb2VzIG5vdCBuZWVk
IHRvIHBlcmZvcm0gZXh0ZXJuYWwgc3luY2hyb25pemF0aW9uLCBhbmQKKyAqIHtAbGluayBq
YXZheC5zd2luZy5ldmVudC5VbmRvYWJsZUV2ZW50fSBzb3VyY2VzIGRvIG5vdCBuZWVkIHRv
CisgKiBicm9hZGNhc3QgdGhlaXIgZXZlbnRzIGZyb20gaW5zaWRlIHRoZSBTd2luZyB3b3Jr
ZXIgdGhyZWFkLgorICoKKyAqIEBhdXRob3IgPGEgaHJlZj0ibWFpbHRvOmJyYXdlckBkYW5k
ZWxpcy5jaCI+U2FzY2hhIEJyYXdlcjwvYT4KICAqLwotcHVibGljIGNsYXNzIFVuZG9NYW5h
Z2VyIGV4dGVuZHMgQ29tcG91bmRFZGl0IGltcGxlbWVudHMgVW5kb2FibGVFZGl0TGlzdGVu
ZXIgewotCi0JLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tCi0JLy8gVmFyaWFibGVzIC0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0JLy8tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCi0KLQkvKioKLQkg
KiBpbmRleE9mTmV4dEFkZAotCSAqLwotCWludCBpbmRleE9mTmV4dEFkZDsKLQotCS8qKgot
CSAqIGxpbWl0Ci0JICovCi0JaW50IGxpbWl0OwotCi0KLQkvLy0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KLQkvLyBJbml0
aWFsaXphdGlvbiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0KLQkvLy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0KLQotCS8qKgotCSAqIENvbnN0cnVjdG9yIFVuZG9NYW5hZ2VyCi0J
ICovCi0JcHVibGljIFVuZG9NYW5hZ2VyKCkgewotCQkvLyBUT0RPCi0JfSAvLyBVbmRvTWFu
YWdlcigpCi0KLQotCS8vLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotCS8vIE1ldGhvZHMgLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotCS8vLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQotCi0JLyoq
Ci0JICogdG9TdHJpbmcKLQkgKiBAcmV0dXJucyBTdHJpbmcKLQkgKi8KLQlwdWJsaWMgU3Ry
aW5nIHRvU3RyaW5nKCkgewotCQlyZXR1cm4gbnVsbDsgLy8gVE9ETwotCX0gLy8gdG9TdHJp
bmcoKQotCi0JLyoqCi0JICogZW5kCi0JICovCi0JcHVibGljIHN5bmNocm9uaXplZCB2b2lk
IGVuZCgpIHsKLQkJLy8gVE9ETwotCX0gLy8gZW5kKCkKLQotCS8qKgotCSAqIGdldExpbWl0
Ci0JICogQHJldHVybnMgaW50Ci0JICovCi0JcHVibGljIHN5bmNocm9uaXplZCBpbnQgZ2V0
TGltaXQoKSB7Ci0JCXJldHVybiAwOyAvLyBUT0RPCi0JfSAvLyBnZXRMaW1pdCgpCi0KLQkv
KioKLQkgKiBkaXNjYXJkQWxsRWRpdHMKLQkgKi8KLQlwdWJsaWMgc3luY2hyb25pemVkIHZv
aWQgZGlzY2FyZEFsbEVkaXRzKCkgewotCQkvLyBUT0RPCi0JfSAvLyBkaXNjYXJkQWxsRWRp
dHMoKQotCi0JLyoqCi0JICogdHJpbUZvckxpbWl0Ci0JICovCi0JcHJvdGVjdGVkIHZvaWQg
dHJpbUZvckxpbWl0KCkgewotCQkvLyBUT0RPCi0JfSAvLyB0cmltRm9yTGltaXQoKQotCi0J
LyoqCi0JICogdHJpbUVkaXRzCi0JICogQHBhcmFtIHZhbHVlMCBUT0RPCi0JICogQHBhcmFt
IHZhbHVlMSBUT0RPCi0JICovCi0JcHJvdGVjdGVkIHZvaWQgdHJpbUVkaXRzKGludCB2YWx1
ZTAsIGludCB2YWx1ZTEpIHsKLQkJLy8gVE9ETwotCX0gLy8gdHJpbUVkaXRzKCkKLQotCS8q
KgotCSAqIHNldExpbWl0Ci0JICogQHBhcmFtIHZhbHVlMCBUT0RPCi0JICovCi0JcHVibGlj
IHN5bmNocm9uaXplZCB2b2lkIHNldExpbWl0KGludCB2YWx1ZTApIHsKLQkJLy8gVE9ETwot
CX0gLy8gc2V0TGltaXQoKQotCi0JLyoqCi0JICogZWRpdFRvQmVVbmRvbmUKLQkgKiBAcmV0
dXJucyBVbmRvYWJsZUVkaXQKLQkgKi8KLQlwcm90ZWN0ZWQgVW5kb2FibGVFZGl0IGVkaXRU
b0JlVW5kb25lKCkgewotCQlyZXR1cm4gbnVsbDsgLy8gVE9ETwotCX0gLy8gZWRpdFRvQmVV
bmRvbmUoKQotCi0JLyoqCi0JICogZWRpdFRvQmVSZWRvbmUKLQkgKiBAcmV0dXJucyBVbmRv
YWJsZUVkaXQKLQkgKi8KLQlwcm90ZWN0ZWQgVW5kb2FibGVFZGl0IGVkaXRUb0JlUmVkb25l
KCkgewotCQlyZXR1cm4gbnVsbDsgLy8gVE9ETwotCX0gLy8gZWRpdFRvQmVSZWRvbmUoKQot
Ci0JLyoqCi0JICogdW5kb1RvCi0JICogQHBhcmFtIHZhbHVlMCBUT0RPCi0JICogQGV4Y2Vw
dGlvbiBDYW5ub3RVbmRvRXhjZXB0aW9uIFRPRE8KLQkgKi8KLQlwcm90ZWN0ZWQgdm9pZCB1
bmRvVG8oVW5kb2FibGVFZGl0IHZhbHVlMCkgdGhyb3dzIENhbm5vdFVuZG9FeGNlcHRpb24g
ewotCQkvLyBUT0RPCi0JfSAvLyB1bmRvVG8oKQotCi0JLyoqCi0JICogcmVkb1RvCi0JICog
QHBhcmFtIHZhbHVlMCBUT0RPCi0JICogQGV4Y2VwdGlvbiBDYW5ub3RSZWRvRXhjZXB0aW9u
IFRPRE8KLQkgKi8KLQlwcm90ZWN0ZWQgdm9pZCByZWRvVG8oVW5kb2FibGVFZGl0IHZhbHVl
MCkgdGhyb3dzIENhbm5vdFJlZG9FeGNlcHRpb24gewotCQkvLyBUT0RPCi0JfSAvLyByZWRv
VG8oKQotCi0JLyoqCi0JICogdW5kb09yUmVkbwotCSAqIEBleGNlcHRpb24gQ2Fubm90UmVk
b0V4Y2VwdGlvbiBUT0RPCi0JICogQGV4Y2VwdGlvbiBDYW5ub3RVbmRvRXhjZXB0aW9uIFRP
RE8KLQkgKi8KLQlwdWJsaWMgc3luY2hyb25pemVkIHZvaWQgdW5kb09yUmVkbygpIHRocm93
cyBDYW5ub3RSZWRvRXhjZXB0aW9uLCBDYW5ub3RVbmRvRXhjZXB0aW9uIHsKLQkJLy8gVE9E
TwotCX0gLy8gdW5kb09yUmVkbygpCi0KLQkvKioKLQkgKiBjYW5VbmRvT3JSZWRvCi0JICog
QHJldHVybnMgYm9vbGVhbgotCSAqLwotCXB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiBj
YW5VbmRvT3JSZWRvKCkgewotCQlyZXR1cm4gZmFsc2U7IC8vIFRPRE8KLQl9IC8vIGNhblVu
ZG9PclJlZG8oKQotCi0JLyoqCi0JICogdW5kbwotCSAqIEBleGNlcHRpb24gQ2Fubm90VW5k
b0V4Y2VwdGlvbiBUT0RPCi0JICovCi0JcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHVuZG8o
KSB0aHJvd3MgQ2Fubm90VW5kb0V4Y2VwdGlvbiB7Ci0JCS8vIFRPRE8KLQl9IC8vIHVuZG8o
KQotCi0JLyoqCi0JICogY2FuVW5kbwotCSAqIEByZXR1cm5zIGJvb2xlYW4KLQkgKi8KLQlw
dWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gY2FuVW5kbygpIHsKLQkJcmV0dXJuIGZhbHNl
OyAvLyBUT0RPCi0JfSAvLyBjYW5VbmRvKCkKLQotCS8qKgotCSAqIHJlZG8KLQkgKiBAZXhj
ZXB0aW9uIENhbm5vdFJlZG9FeGNlcHRpb24gVE9ETwotCSAqLwotCXB1YmxpYyBzeW5jaHJv
bml6ZWQgdm9pZCByZWRvKCkgdGhyb3dzIENhbm5vdFJlZG9FeGNlcHRpb24gewotCQkvLyBU
T0RPCi0JfSAvLyByZWRvKCkKLQotCS8qKgotCSAqIGNhblJlZG8KLQkgKiBAcmV0dXJucyBi
b29sZWFuCi0JICovCi0JcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIGNhblJlZG8oKSB7
Ci0JCXJldHVybiBmYWxzZTsgLy8gVE9ETwotCX0gLy8gY2FuUmVkbygpCi0KLQkvKioKLQkg
KiBhZGRFZGl0Ci0JICogQHBhcmFtIHZhbHVlMCBUT0RPCi0JICogQHJldHVybnMgYm9vbGVh
bgotCSAqLwotCXB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiBhZGRFZGl0KFVuZG9hYmxl
RWRpdCB2YWx1ZTApIHsKLQkJcmV0dXJuIGZhbHNlOyAvLyBUT0RPCi0JfSAvLyBhZGRFZGl0
KCkKLQotCS8qKgotCSAqIGdldFVuZG9PclJlZG9QcmVzZW50YXRpb25OYW1lCi0JICogQHJl
dHVybnMgU3RyaW5nCi0JICovCi0JcHVibGljIHN5bmNocm9uaXplZCBTdHJpbmcgZ2V0VW5k
b09yUmVkb1ByZXNlbnRhdGlvbk5hbWUoKSB7Ci0JCXJldHVybiBudWxsOyAvLyBUT0RPCi0J
fSAvLyBnZXRVbmRvT3JSZWRvUHJlc2VudGF0aW9uTmFtZSgpCi0KLQkvKioKLQkgKiBnZXRV
bmRvUHJlc2VudGF0aW9uTmFtZQotCSAqIEByZXR1cm5zIFN0cmluZwotCSAqLwotCXB1Ymxp
YyBzeW5jaHJvbml6ZWQgU3RyaW5nIGdldFVuZG9QcmVzZW50YXRpb25OYW1lKCkgewotCQly
ZXR1cm4gbnVsbDsgLy8gVE9ETwotCX0gLy8gZ2V0VW5kb1ByZXNlbnRhdGlvbk5hbWUoKQot
Ci0JLyoqCi0JICogZ2V0UmVkb1ByZXNlbnRhdGlvbk5hbWUKLQkgKiBAcmV0dXJucyBTdHJp
bmcKLQkgKi8KLQlwdWJsaWMgc3luY2hyb25pemVkIFN0cmluZyBnZXRSZWRvUHJlc2VudGF0
aW9uTmFtZSgpIHsKLQkJcmV0dXJuIG51bGw7IC8vIFRPRE8KLQl9IC8vIGdldFJlZG9QcmVz
ZW50YXRpb25OYW1lKCkKLQotCS8qKgotCSAqIHVuZG9hYmxlRWRpdEhhcHBlbmVkCi0JICog
QHBhcmFtIHZhbHVlMCBUT0RPCi0JICovCi0JcHVibGljIHZvaWQgdW5kb2FibGVFZGl0SGFw
cGVuZWQoVW5kb2FibGVFZGl0RXZlbnQgdmFsdWUwKSB7Ci0JCS8vIFRPRE8KLQl9IC8vIHVu
ZG9hYmxlRWRpdEhhcHBlbmVkKCkKLQotCi19IC8vIFVuZG9NYW5hZ2VyCitwdWJsaWMgY2xh
c3MgVW5kb01hbmFnZXIKKyAgZXh0ZW5kcyBDb21wb3VuZEVkaXQKKyAgaW1wbGVtZW50cyBV
bmRvYWJsZUVkaXRMaXN0ZW5lcgoreworICAvKioKKyAgICogVGhlIHVuaXF1ZSBJRCBmb3Ig
c2VyaWFsaXppbmcgaW5zdGFuY2VzIG9mIHRoaXMgY2xhc3MuIERldGVybWluZWQKKyAgICog
dXNpbmcgdGhlIDxjb2RlPnNlcmlhbHZlcjwvY29kZT4gdG9vbCBvZiBTdW4gSkRLIDEuNC4x
XzAxIG9uCisgICAqIEdOVS9MaW51eC4KKyAgICovCisgIHN0YXRpYyBmaW5hbCBsb25nIHNl
cmlhbFZlcnNpb25VSUQgPSAtMjA3NzUyOTk5ODI0NDA2Njc1MEw7CisKKworICAvKioKKyAg
ICogQW4gaW5kZXggaW50byB0aGUgaW5oZXJpdGVkIHtAbGluayAjZWRpdHN9IFZlY3RvciB0
aGF0IGluZGljYXRlcworICAgKiBhdCB3aGljaCBwb3NpdGlvbiBuZXdseSBhZGRlZCBlZGl0
aW5nIGFjdGlvbnMgd291bGQgZ2V0IGluc2VydGVkLgorICAgKgorICAgKiA8cD5Ob3JtYWxs
eSwgdGhlIHZhbHVlIG9mIDxjb2RlPmluZGV4T2ZOZXh0QWRkPC9jb2RlPiBlcXVhbHMKKyAg
ICogdGhlIG51bWJlciBvZiBVbmRvYWJsZUVkaXRzIHN0b3JlZCBieSB0aGlzIFVuZG9NYW5h
Z2VyLCBpLmUuCisgICAqIDxjb2RlPmVkaXRzLnNpemUoKTwvY29kZT4uIEZvciBlYWNoIGNh
bGwgdG8ge0BsaW5rICN1bmRvfSwKKyAgICogPGNvZGU+aW5kZXhPZk5leHRBZGQ8L2NvZGU+
IGlzIGRlY3JlbWVudGVkIGJ5IG9uZS4gRm9yIGVhY2gKKyAgICogY2FsbCB0byB7QGxpbmsg
I3JlZG99LCBpdCBpcyBpbmNyZW1lbnRlZCBhZ2Fpbi4KKyAgICovCisgIGludCBpbmRleE9m
TmV4dEFkZDsKKworCisgIC8qKgorICAgKiBUaGUgbWF4aW11bSBudW1iZXIgb2YgVW5kb2Fi
bGVFZGl0cyBzdG9yZWQgYnkgdGhpcyBVbmRvTWFuYWdlci4KKyAgICovCisgIGludCBsaW1p
dDsKKworCisgIC8qKgorICAgKiBDb25zdHJ1Y3RzIGFuIFVuZG9NYW5hZ2VyLgorICAgKgor
ICAgKiA8cD5UaGUgPGNvZGU+bGltaXQ8L2NvZGU+IG9mIHRoZSBmcmVzaGx5IGNvbnN0cnVj
dGVkIFVuZG9NYW5hZ2VyCisgICAqIGlzIDEwMC4KKyAgICovCisgIHB1YmxpYyBVbmRvTWFu
YWdlcigpCisgIHsKKyAgICBsaW1pdCA9IDEwMDsKKyAgfQorCisKKyAgLyoqCisgICAqIFJl
dHVybnMgYSBzdHJpbmcgcmVwcmVzZW50YXRpb24gZm9yIHRoaXMgVW5kb01hbmFnZXIuIFRo
aXMgbWF5IGJlCisgICAqIHVzZWZ1bCBmb3IgZGVidWdnaW5nIHB1cnBvc2VzLiBGb3IgdGhl
IHRleHQgb2YgbWVudSBpdGVtcywgcGxlYXNlCisgICAqIHJlZmVyIHRvIHtAbGluayAjZ2V0
VW5kb1ByZXNlbnRhdGlvbk5hbWV9LCB7QGxpbmsKKyAgICogI2dldFJlZG9QcmVzZW50YXRp
b25OYW1lfSwgYW5kIHtAbGluaworICAgKiAjZ2V0VW5kb09yUmVkb1ByZXNlbnRhdGlvbk5h
bWV9LgorICAgKi8KKyAgcHVibGljIFN0cmluZyB0b1N0cmluZygpCisgIHsKKyAgICByZXR1
cm4gc3VwZXIudG9TdHJpbmcoKQorICAgICAgKyAiIGxpbWl0OiAiICsgbGltaXQKKyAgICAg
ICsgIiBpbmRleE9mTmV4dEFkZDogIiArIGluZGV4T2ZOZXh0QWRkOworICB9CisKKworICAv
KioKKyAgICogUHV0cyB0aGlzIFVuZG9NYW5hZ2VyIGludG8gYSBzdGF0ZSB3aGVyZSBpdCBh
Y3RzIGFzIGEgbm9ybWFsCisgICAqIHtAbGluayBDb21wb3VuZEVkaXR9LiBJdCBpcyB1bmxp
a2VseSB0aGF0IGFuIGFwcGxpY2F0aW9uIHdvdWxkCisgICAqIHdhbnQgdG8gZG8gdGhpcy4K
KyAgICovCisgIHB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBlbmQoKQorICB7CisgICAgc3Vw
ZXIuZW5kKCk7CisgICAgdHJpbUVkaXRzKGluZGV4T2ZOZXh0QWRkLCBlZGl0cy5zaXplKCkg
LSAxKTsKKyAgfQorCisKKyAgLyoqCisgICAqIFJldHVybnMgaG93IG1hbnkgZWRpdHMgdGhp
cyBVbmRvTWFuYWdlciBjYW4gbWF4aW1hbGx5IGhvbGQuCisgICAqCisgICAqIEBzZWUgI3Nl
dExpbWl0CisgICAqLworICBwdWJsaWMgc3luY2hyb25pemVkIGludCBnZXRMaW1pdCgpCisg
IHsKKyAgICByZXR1cm4gbGltaXQ7CisgIH0KKworCisgIC8qKgorICAgKiBDaGFuZ2VzIHRo
ZSBtYXhpbWFsIG51bWJlciBvZiBlZGl0cyB0aGF0IHRoaXMgVW5kb01hbmFnZXIgY2FuCisg
ICAqIHByb2Nlc3MuIElmIHRoZXJlIGFyZSBjdXJyZW50bHkgbW9yZSBlZGl0cyB0aGFuIHRo
ZSBuZXcgbGltaXQKKyAgICogYWxsb3dzLCB0aGV5IHdpbGwgcmVjZWl2ZSBhIHtAbGluayBV
bmRvYWJsZUVkaXQjZGllKCkgZGllfQorICAgKiBtZXNzYWdlIGluIHJldmVyc2Ugb3JkZXIg
b2YgYWRkaXRpb24uCisgICAqCisgICAqIEBwYXJhbSBsaW1pdCB0aGUgbmV3IGxpbWl0Lgor
ICAgKgorICAgKiBAdGhyb3dzIElsbGVnYWxTdGF0ZUV4Y2VwdGlvbiBpZiB7QGxpbmsgI2Vu
ZCgpfSBoYXMgYWxyZWFkeSBiZWVuCisgICAqIGNhbGxlZCBvbiB0aGlzIFVuZG9NYW5hZ2Vy
LgorICAgKi8KKyAgcHVibGljIHN5bmNocm9uaXplZCB2b2lkIHNldExpbWl0KGludCBsaW1p
dCkKKyAgeworICAgIGlmICghaXNJblByb2dyZXNzKCkpCisgICAgICB0aHJvdyBuZXcgSWxs
ZWdhbFN0YXRlRXhjZXB0aW9uKCk7CisKKyAgICB0aGlzLmxpbWl0ID0gbGltaXQ7CisgICAg
dHJpbUZvckxpbWl0KCk7CisgIH0KKworCisgIC8qKgorICAgKiBEaXNjYXJkcyBhbGwgZWRp
dGluZyBhY3Rpb25zIHRoYXQgYXJlIGN1cnJlbnRseSByZWdpc3RlcmVkIHdpdGgKKyAgICog
dGhpcyBVbmRvTWFuYWdlci4gRWFjaCB7QGxpbmsgVW5kb2FibGVFZGl0fSB3aWxsIHJlY2Vp
dmUgYSB7QGxpbmsKKyAgICogVW5kb2FibGVFZGl0I2RpZSgpIGRpZSBtZXNzYWdlfS4KKyAg
ICovCisgIHB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCBkaXNjYXJkQWxsRWRpdHMoKQorICB7
CisgICAgaW50IHNpemU7CisKKyAgICBzaXplID0gZWRpdHMuc2l6ZSgpOworICAgIGZvciAo
aW50IGkgPSBzaXplIC0gMTsgaSA+PSAwOyBpLS0pCisgICAgICAoKFVuZG9hYmxlRWRpdCkg
ZWRpdHMuZ2V0KGkpKS5kaWUoKTsKKyAgICBpbmRleE9mTmV4dEFkZCA9IDA7CisgICAgZWRp
dHMuY2xlYXIoKTsKKyAgfQorCisKKyAgLyoqCisgICAqIENhbGxlZCBieSB2YXJpb3VzIGlu
dGVybmFsIG1ldGhvZHMgaW4gb3JkZXIgdG8gZW5mb3JjZQorICAgKiB0aGUgPGNvZGU+bGlt
aXQ8L2NvZGU+IHZhbHVlLgorICAgKi8KKyAgcHJvdGVjdGVkIHZvaWQgdHJpbUZvckxpbWl0
KCkKKyAgeworICAgIGludCBoaWdoLCBzOworCisgICAgcyA9IGVkaXRzLnNpemUoKTsKKwor
ICAgIC8qIFRoZSBTdW4gSjJTRTEuNC4xXzAxIGltcGxlbWVudGF0aW9uIGNhbiBiZSBvYnNl
cnZlZCB0byBkbworICAgICAqIG5vdGhpbmcgKGluc3RlYWQgb2YgdGhyb3dpbmcgYW4gZXhj
ZXB0aW9uKSB3aXRoIGEgbmVnYXRpdmUgb3IKKyAgICAgKiB6ZXJvIGxpbWl0LiBJdCBtYXkg
YmUgZGViYXRhYmxlIHdoZXRoZXIgdGhpcyBpcyB0aGUgYmVzdAorICAgICAqIGJlaGF2aW9y
LCBidXQgd2UgcmVwbGljYXRlIGl0IGZvciBzYWtlIG9mIGNvbXBhdGliaWxpdHkuCisgICAg
ICovCisgICAgaWYgKGxpbWl0IDw9IDAgfHwgcyA8PSBsaW1pdCkKKyAgICAgIHJldHVybjsK
KworICAgIGhpZ2ggPSBNYXRoLm1pbihpbmRleE9mTmV4dEFkZCArIGxpbWl0LzIgLSAxLCBz
IC0gMSk7CisgICAgdHJpbUVkaXRzKGhpZ2ggKyAxLCBzIC0gMSk7CisgICAgdHJpbUVkaXRz
KDAsIGhpZ2ggLSBsaW1pdCk7CisgIH0KKworCisgIC8qKgorICAgKiBEaXNjYXJkcyBhIHJh
bmdlIG9mIGVkaXRzLiBBbGwgZWRpdHMgaW4gdGhlIHJhbmdlIDxjb2RlPltmcm9tCisgICAq
IC4uIHRvXTwvY29kZT4gd2lsbCByZWNlaXZlIGEge0BsaW5rcGxhaW4gVW5kb2FibGVFZGl0
I2RpZSgpIGRpZQorICAgKiBtZXNzYWdlfSBiZWZvcmUgYmVpbmcgcmVtb3ZlZCBmcm9tIHRo
ZSBlZGl0cyBhcnJheS4gIElmCisgICAqIDxjb2RlPmZyb208L2NvZGU+IGlzIGdyZWF0ZXIg
dGhhbiA8Y29kZT50bzwvY29kZT4sIG5vdGhpbmcKKyAgICogaGFwcGVucy4KKyAgICoKKyAg
ICogQHBhcmFtIGZyb20gdGhlIGxvd2VyIGJvdW5kIG9mIHRoZSByYW5nZSBvZiBlZGl0cyB0
byBiZQorICAgKiBkaXNjYXJkZWQuCisgICAqCisgICAqIEBwYXJhbSB0byB0aGUgdXBwZXIg
Ym91bmQgb2YgdGhlIHJhbmdlIG9mIGVkaXRzIHRvIGJlIGRpc2NhcmRlZC4KKyAgICovCisg
IHByb3RlY3RlZCB2b2lkIHRyaW1FZGl0cyhpbnQgZnJvbSwgaW50IHRvKQorICB7CisgICAg
aWYgKGZyb20gPiB0bykKKyAgICAgIHJldHVybjsKKworICAgIGZvciAoaW50IGkgPSB0bzsg
aSA+PSBmcm9tOyBpLS0pCisgICAgICAgICgoVW5kb2FibGVFZGl0KSBlZGl0cy5nZXQoaSkp
LmRpZSgpOworCisgICAgLy8gUmVtb3ZlIHRoZSByYW5nZSBbZnJvbSAuLiB0b10gZnJvbSBl
ZGl0cy4gSWYgZnJvbSA9PSB0bywgd2hpY2gKKyAgICAvLyBpcyBsaWtlbHkgdG8gYmUgYSB2
ZXJ5IGNvbW1vbiBjYXNlLCB3ZSBjYW4gZG8gYmV0dGVyIHRoYW4KKyAgICAvLyBjcmVhdGlu
ZyBhIHN1Yi1saXN0IGFuZCBjbGVhcmluZyBpdC4KKyAgICBpZiAodG8gPT0gZnJvbSkKKyAg
ICAgIGVkaXRzLnJlbW92ZShmcm9tKTsKKyAgICBlbHNlCisgICAgICBlZGl0cy5zdWJMaXN0
KGZyb20sIHRvICsgMSkuY2xlYXIoKTsKKworICAgIGlmIChpbmRleE9mTmV4dEFkZCA+IHRv
KQorICAgICAgaW5kZXhPZk5leHRBZGQgPSBpbmRleE9mTmV4dEFkZCAtIHRvICsgZnJvbSAt
IDE7CisgICAgZWxzZSBpZiAoaW5kZXhPZk5leHRBZGQgPj0gZnJvbSkKKyAgICAgIGluZGV4
T2ZOZXh0QWRkID0gZnJvbTsKKyAgfQorCisKKyAgLyoqCisgICAqIERldGVybWluZXMgd2hp
Y2ggc2lnbmlmaWNhbnQgZWRpdCB3b3VsZCBiZSB1bmRvbmUgaWYge0BsaW5rCisgICAqICN1
bmRvKCl9IHdhcyBjYWxsZWQuCisgICAqCisgICAqIEByZXR1cm5zIHRoZSBzaWduaWZpY2Fu
dCBlZGl0IHRoYXQgd291bGQgYmUgdW5kb25lLCBvcgorICAgKiA8Y29kZT5udWxsPC9jb2Rl
PiBpZiBubyBzaWduaWZpY2FudCBlZGl0IHdvdWxkIGJlIGFmZmVjdGVkIGJ5CisgICAqIGNh
bGxpbmcge0BsaW5rICN1bmRvKCl9LgorICAgKi8KKyAgcHJvdGVjdGVkIFVuZG9hYmxlRWRp
dCBlZGl0VG9CZVVuZG9uZSgpCisgIHsKKyAgICBVbmRvYWJsZUVkaXQgcmVzdWx0OworCisg
ICAgZm9yIChpbnQgaSA9IGluZGV4T2ZOZXh0QWRkIC0gMTsgaSA+PSAwOyBpLS0pCisgICAg
ICB7CisgICAgICAgIHJlc3VsdCA9IChVbmRvYWJsZUVkaXQpIGVkaXRzLmdldChpKTsKKyAg
ICAgICAgaWYgKHJlc3VsdC5pc1NpZ25pZmljYW50KCkpCisgICAgICAgICAgcmV0dXJuIHJl
c3VsdDsKKyAgICAgIH0KKworICAgIHJldHVybiBudWxsOworICB9CisKKworICAvKioKKyAg
ICogRGV0ZXJtaW5lcyB3aGljaCBzaWduaWZpY2FudCBlZGl0IHdvdWxkIGJlIHJlZG9uZSBp
ZiB7QGxpbmsKKyAgICogI3JlZG8oKX0gd2FzIGNhbGxlZC4KKyAgICoKKyAgICogQHJldHVy
bnMgdGhlIHNpZ25pZmljYW50IGVkaXQgdGhhdCB3b3VsZCBiZSByZWRvbmUsIG9yCisgICAq
IDxjb2RlPm51bGw8L2NvZGU+IGlmIG5vIHNpZ25pZmljYW50IGVkaXQgd291bGQgYmUgYWZm
ZWN0ZWQgYnkKKyAgICogY2FsbGluZyB7QGxpbmsgI3JlZG8oKX0uCisgICAqLworICBwcm90
ZWN0ZWQgVW5kb2FibGVFZGl0IGVkaXRUb0JlUmVkb25lKCkKKyAgeworICAgIFVuZG9hYmxl
RWRpdCByZXN1bHQ7CisKKyAgICBmb3IgKGludCBpID0gaW5kZXhPZk5leHRBZGQ7IGkgPCBl
ZGl0cy5zaXplKCk7IGkrKykKKyAgICAgIHsKKyAgICAgICAgcmVzdWx0ID0gKFVuZG9hYmxl
RWRpdCkgZWRpdHMuZ2V0KGkpOworICAgICAgICBpZiAocmVzdWx0LmlzU2lnbmlmaWNhbnQo
KSkKKyAgICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgfQorCisgICAgcmV0dXJuIG51
bGw7CisgIH0KKworCisgIC8qKgorICAgKiBVbmRvZXMgYWxsIGVkaXRpbmcgYWN0aW9ucyBp
biByZXZlcnNlIG9yZGVyIG9mIGFkZGl0aW9uLAorICAgKiB1cCB0byB0aGUgc3BlY2lmaWVk
IGFjdGlvbiwKKyAgICoKKyAgICogQHBhcmFtIGVkaXQgdGhlIGxhc3QgZWRpdGluZyBhY3Rp
b24gdG8gYmUgdW5kb25lLgorICAgKi8KKyAgcHJvdGVjdGVkIHZvaWQgdW5kb1RvKFVuZG9h
YmxlRWRpdCBlZGl0KQorICAgIHRocm93cyBDYW5ub3RVbmRvRXhjZXB0aW9uCisgIHsKKyAg
ICBVbmRvYWJsZUVkaXQgY3VyOworCisgICAgaWYgKCFlZGl0cy5jb250YWlucyhlZGl0KSkK
KyAgICAgIHRocm93IG5ldyBDYW5ub3RVbmRvRXhjZXB0aW9uKCk7CisKKyAgICB3aGlsZSAo
dHJ1ZSkKKyAgICAgIHsKKyAgICAgICAgaW5kZXhPZk5leHRBZGQgLT0gMTsKKyAgICAgICAg
Y3VyID0gKFVuZG9hYmxlRWRpdCkgZWRpdHMuZ2V0KGluZGV4T2ZOZXh0QWRkKTsKKyAgICAg
ICAgY3VyLnVuZG8oKTsKKyAgICAgICAgaWYgKGN1ciA9PSBlZGl0KQorICAgICAgICAgIHJl
dHVybjsKKyAgICAgIH0KKyAgfQorCisKKyAgLyoqCisgICAqIFJlZG9lcyBhbGwgZWRpdGlu
ZyBhY3Rpb25zIGluIHRoZSBzYW1lIG9yZGVyIGFzIHRoZXkgd2VyZQorICAgKiBhZGRlZCB0
byB0aGlzIFVuZG9NYW5hZ2VyLCB1cCB0byB0aGUgc3BlY2lmaWVkIGFjdGlvbi4KKyAgICoK
KyAgICogQHBhcmFtIGVkaXQgdGhlIGxhc3QgZWRpdGluZyBhY3Rpb24gdG8gYmUgcmVkb25l
LgorICAgKi8KKyAgcHJvdGVjdGVkIHZvaWQgcmVkb1RvKFVuZG9hYmxlRWRpdCBlZGl0KQor
ICAgIHRocm93cyBDYW5ub3RSZWRvRXhjZXB0aW9uCisgIHsKKyAgICBVbmRvYWJsZUVkaXQg
Y3VyOworCisgICAgaWYgKCFlZGl0cy5jb250YWlucyhlZGl0KSkKKyAgICAgIHRocm93IG5l
dyBDYW5ub3RSZWRvRXhjZXB0aW9uKCk7CisKKyAgICB3aGlsZSAodHJ1ZSkKKyAgICAgIHsK
KyAgICAgICAgY3VyID0gKFVuZG9hYmxlRWRpdCkgZWRpdHMuZ2V0KGluZGV4T2ZOZXh0QWRk
KTsKKyAgICAgICAgaW5kZXhPZk5leHRBZGQgKz0gMTsKKyAgICAgICAgY3VyLnJlZG8oKTsK
KyAgICAgICAgaWYgKGN1ciA9PSBlZGl0KQorICAgICAgICAgIHJldHVybjsKKyAgICAgIH0K
KyAgfQorCisgIAorICAvKioKKyAgICogVW5kb2VzIG9yIHJlZG9lcyB0aGUgbGFzdCBhY3Rp
b24uIElmIHRoZSBsYXN0IGFjdGlvbiBoYXMgYWxyZWFkeQorICAgKiBiZWVuIHVuZG9uZSwg
aXQgd2lsbCBiZSByZS1kb25lLCBhbmQgdmljZSB2ZXJzYS4KKyAgICoKKyAgICogPHA+VGhp
cyBpcyB1c2VmdWwgZm9yIGFwcGxpY2F0aW9ucyB0aGF0IGRvIG5vdCBwcmVzZW50IGEgc2Vw
YXJhdGUKKyAgICogdW5kbyBhbmQgcmVkbyBmYWNpbGl0eSwgYnV0IGp1c3QgaGF2ZSBhIHNp
bmdsZSBtZW51IGl0ZW0gZm9yCisgICAqIHVuZG9pbmcgYW5kIHJlZG9pbmcgdGhlIHZlcnkg
bGFzdCBhY3Rpb24uIFN1Y2ggYXBwbGljYXRpb25zIHdpbGwKKyAgICogdXNlIGFuIDxjb2Rl
PlVuZG9NYW5hZ2VyPC9jb2RlPiB3aG9zZSA8Y29kZT5saW1pdDwvY29kZT4gaXMgMS4KKyAg
ICovCisgIHB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCB1bmRvT3JSZWRvKCkKKyAgICB0aHJv
d3MgQ2Fubm90UmVkb0V4Y2VwdGlvbiwgQ2Fubm90VW5kb0V4Y2VwdGlvbgorICB7CisgICAg
aWYgKGluZGV4T2ZOZXh0QWRkID09IGVkaXRzLnNpemUoKSkKKyAgICAgIHVuZG8oKTsKKyAg
ICBlbHNlCisgICAgICByZWRvKCk7CisgIH0KKworCisgIC8qKgorICAgKiBEZXRlcm1pbmVz
IHdoZXRoZXIgaXQgd291bGQgYmUgcG9zc2libGUgdG8gZWl0aGVyIHVuZG8gb3IgcmVkbwor
ICAgKiB0aGlzIGVkaXRpbmcgYWN0aW9uLgorICAgKgorICAgKiA8cD5UaGlzIGlzIHVzZWZ1
bCBmb3IgYXBwbGljYXRpb25zIHRoYXQgZG8gbm90IHByZXNlbnQgYSBzZXBhcmF0ZQorICAg
KiB1bmRvIGFuZCByZWRvIGZhY2lsaXR5LCBidXQganVzdCBoYXZlIGEgc2luZ2xlIG1lbnUg
aXRlbSBmb3IKKyAgICogdW5kb2luZyBhbmQgcmVkb2luZyB0aGUgdmVyeSBsYXN0IGFjdGlv
bi4gU3VjaCBhcHBsaWNhdGlvbnMgd2lsbAorICAgKiB1c2UgYW4gPGNvZGU+VW5kb01hbmFn
ZXI8L2NvZGU+IHdob3NlIDxjb2RlPmxpbWl0PC9jb2RlPiBpcyAxLgorICAgKgorICAgKiBA
cmV0dXJuIDxjb2RlPnRydWU8L2NvZGU+IHRvIGluZGljYXRlIHRoYXQgdGhpcyBhY3Rpb24g
Y2FuIGJlCisgICAqIHVuZG9uZSBvciByZWRvbmU7IDxjb2RlPmZhbHNlPC9jb2RlPiBpZiBu
ZWl0aGVyIGlzIHBvc3NpYmxlIGF0CisgICAqIHRoZSBjdXJyZW50IHRpbWUuCisgICAqLwor
ICBwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4gY2FuVW5kb09yUmVkbygpCisgIHsKKyAg
ICByZXR1cm4gaW5kZXhPZk5leHRBZGQgPT0gZWRpdHMuc2l6ZSgpID8gY2FuVW5kbygpIDog
Y2FuUmVkbygpOworICB9CisKKworICAvKioKKyAgICogVW5kb2VzIG9uZSBzaWduaWZpY2Fu
dCBlZGl0IGFjdGlvbi4gSWYgaW5zaWduaWZpY2FudCBhY3Rpb25zIGhhdmUKKyAgICogYmVl
biBwb3N0ZWQgYWZ0ZXIgdGhlIGxhc3Qgc2lnbmZpY2FudCBhY3Rpb24sIHRoZSBpbnNpZ25p
ZmljYW50CisgICAqIG9uZXMgd2lsbCBiZSB1bmRvbmUgZmlyc3QuCisgICAqCisgICAqIDxw
Pkhvd2V2ZXIsIGlmIHtAbGluayAjZW5kKCl9IGhhcyBiZWVuIGNhbGxlZCBvbiB0aGlzCisg
ICAqIFVuZG9NYW5hZ2VyLCBpdCB3aWxsIGJlaGF2ZSBsaWtlIGEgbm9ybWFsIHtAbGluawor
ICAgKiBDb21wb3VuZEVkaXR9LiBJbiB0aGlzIGNhc2UsIGFsbCBhY3Rpb25zIHdpbGwgYmUg
dW5kb25lIGluCisgICAqIHJldmVyc2Ugb3JkZXIgb2YgYWRkaXRpb24uIFR5cGljYWwgYXBw
bGljYXRpb25zIHdpbGwgbmV2ZXIgY2FsbAorICAgKiB7QGxpbmsgI2VuZCgpfSBvbiB0aGVp
ciA8Y29kZT5VbmRvTWFuYWdlcjwvY29kZT4uCisgICAqCisgICAqIEB0aHJvd3MgQ2Fubm90
VW5kb0V4Y2VwdGlvbiBpZiBubyBhY3Rpb24gY2FuIGJlIHVuZG9uZS4KKyAgICoKKyAgICog
QHNlZSAjY2FuVW5kbygpCisgICAqIEBzZWUgI3JlZG8oKQorICAgKiBAc2VlICN1bmRvT3JS
ZWRvKCkKKyAgICovCisgIHB1YmxpYyBzeW5jaHJvbml6ZWQgdm9pZCB1bmRvKCkKKyAgICB0
aHJvd3MgQ2Fubm90VW5kb0V4Y2VwdGlvbgorICB7CisgICAgaWYgKCFpc0luUHJvZ3Jlc3Mo
KSkKKyAgICAgIHsKKyAgICAgICAgc3VwZXIudW5kbygpOworICAgICAgICByZXR1cm47Cisg
ICAgICB9CisKKyAgICBVbmRvYWJsZUVkaXQgZWRpdCA9IGVkaXRUb0JlVW5kb25lKCk7Cisg
ICAgaWYgKGVkaXQgPT0gbnVsbCkKKyAgICAgIHRocm93IG5ldyBDYW5ub3RVbmRvRXhjZXB0
aW9uKCk7CisKKyAgICB1bmRvVG8oZWRpdCk7CisgIH0KKworCisgIC8qKgorICAgKiBEZXRl
cm1pbmVzIHdoZXRoZXIgaXQgd291bGQgYmUgcG9zc2libGUgdG8gdW5kbyB0aGlzIGVkaXRp
bmcKKyAgICogYWN0aW9uLgorICAgKgorICAgKiBAcmV0dXJuIDxjb2RlPnRydWU8L2NvZGU+
IHRvIGluZGljYXRlIHRoYXQgdGhpcyBhY3Rpb24gY2FuIGJlCisgICAqIHVuZG9uZTsgPGNv
ZGU+ZmFsc2U8L2NvZGU+IG90aGVyd2lzZS4KKyAgICoKKyAgICogQHNlZSAjdW5kbygpCisg
ICAqIEBzZWUgI2NhblJlZG8oKQorICAgKiBAc2VlICNjYW5VbmRvT3JSZWRvKCkKKyAgICov
CisgIHB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiBjYW5VbmRvKCkKKyAgeworICAgIFVu
ZG9hYmxlRWRpdCBlZGl0OworCisgICAgaWYgKCFpc0luUHJvZ3Jlc3MoKSkKKyAgICAgIHJl
dHVybiBzdXBlci5jYW5VbmRvKCk7CisKKyAgICBlZGl0ID0gZWRpdFRvQmVVbmRvbmUoKTsK
KyAgICByZXR1cm4gZWRpdCAhPSBudWxsICYmIGVkaXQuY2FuVW5kbygpOworICB9CisKKwor
CisgIC8qKgorICAgKiBSZWRvZXMgb25lIHNpZ25pZmljYW50IGVkaXQgYWN0aW9uLiBJZiBp
bnNpZ25pZmljYW50IGFjdGlvbnMgaGF2ZQorICAgKiBiZWVuIHBvc3RlZCBpbiBiZXR3ZWVu
LCB0aGUgaW5zaWduaWZpY2FudCBvbmVzIHdpbGwgYmUgcmVkb25lCisgICAqIGZpcnN0Lgor
ICAgKgorICAgKiA8cD5Ib3dldmVyLCBpZiB7QGxpbmsgI2VuZCgpfSBoYXMgYmVlbiBjYWxs
ZWQgb24gdGhpcworICAgKiBVbmRvTWFuYWdlciwgaXQgd2lsbCBiZWhhdmUgbGlrZSBhIG5v
cm1hbCB7QGxpbmsKKyAgICogQ29tcG91bmRFZGl0fS4gSW4gdGhpcyBjYXNlLCA8ZW0+YWxs
PC9lbT4gYWN0aW9ucyB3aWxsIGJlIHJlZG9uZQorICAgKiBpbiBvcmRlciBvZiBhZGRpdGlv
bi4gVHlwaWNhbCBhcHBsaWNhdGlvbnMgd2lsbCBuZXZlciBjYWxsIHtAbGluaworICAgKiAj
ZW5kKCl9IG9uIHRoZWlyIDxjb2RlPlVuZG9NYW5hZ2VyPC9jb2RlPi4KKyAgICoKKyAgICog
QHRocm93cyBDYW5ub3RSZWRvRXhjZXB0aW9uIGlmIG5vIGFjdGlvbiBjYW4gYmUgcmVkb25l
LgorICAgKgorICAgKiBAc2VlICNjYW5SZWRvKCkKKyAgICogQHNlZSAjcmVkbygpCisgICAq
IEBzZWUgI3VuZG9PclJlZG8oKQorICAgKi8KKyAgcHVibGljIHN5bmNocm9uaXplZCB2b2lk
IHJlZG8oKQorICAgIHRocm93cyBDYW5ub3RSZWRvRXhjZXB0aW9uCisgIHsKKyAgICBpZiAo
IWlzSW5Qcm9ncmVzcygpKQorICAgICAgeworICAgICAgICBzdXBlci5yZWRvKCk7CisgICAg
ICAgIHJldHVybjsKKyAgICAgIH0KKworICAgIFVuZG9hYmxlRWRpdCBlZGl0ID0gZWRpdFRv
QmVSZWRvbmUoKTsKKyAgICBpZiAoZWRpdCA9PSBudWxsKQorICAgICAgdGhyb3cgbmV3IENh
bm5vdFJlZG9FeGNlcHRpb24oKTsKKworICAgIHJlZG9UbyhlZGl0KTsKKyAgfQorCisKKyAg
LyoqCisgICAqIERldGVybWluZXMgd2hldGhlciBpdCB3b3VsZCBiZSBwb3NzaWJsZSB0byBy
ZWRvIHRoaXMgZWRpdGluZworICAgKiBhY3Rpb24uCisgICAqCisgICAqIEByZXR1cm4gPGNv
ZGU+dHJ1ZTwvY29kZT4gdG8gaW5kaWNhdGUgdGhhdCB0aGlzIGFjdGlvbiBjYW4gYmUKKyAg
ICogcmVkb25lOyA8Y29kZT5mYWxzZTwvY29kZT4gb3RoZXJ3aXNlLgorICAgKgorICAgKiBA
c2VlICNyZWRvKCkKKyAgICogQHNlZSAjY2FuVW5kbygpCisgICAqIEBzZWUgI2NhblVuZG9P
clJlZG8oKQorICAgKi8KKyAgcHVibGljIHN5bmNocm9uaXplZCBib29sZWFuIGNhblJlZG8o
KQorICB7CisgICAgVW5kb2FibGVFZGl0IGVkaXQ7CisKKyAgICBpZiAoIWlzSW5Qcm9ncmVz
cygpKQorICAgICAgcmV0dXJuIHN1cGVyLmNhblJlZG8oKTsKKworICAgIGVkaXQgPSBlZGl0
VG9CZVJlZG9uZSgpOworICAgIHJldHVybiBlZGl0ICE9IG51bGwgJiYgZWRpdC5jYW5SZWRv
KCk7CisgIH0KKworCisgIC8qKgorICAgKiBSZWdpc3RlcnMgYW4gdW5kb2FibGUgZWRpdGlu
ZyBhY3Rpb24gd2l0aCB0aGlzIFVuZG9NYW5hZ2VyLiAgSWYKKyAgICogdGhlIGNhcGFjaXR5
IDxjb2RlPmxpbWl0PC9jb2RlPiBpcyByZWFjaGVkLCB0aGUgb2xkZXN0IGFjdGlvbgorICAg
KiB3aWxsIGJlIGRpc2NhcmRlZCAoYW5kIHJlY2VpdmVzIGEge0BsaW5rcGxhaW4gVW5kb2Fi
bGVFZGl0I2RpZSgpCisgICAqIGRpZSBtZXNzYWdlfS4gRXF1YWxseSwgYW55IGFjdGlvbnMg
dGhhdCB3ZXJlIHVuZG9uZSAoYnV0IG5vdCByZS1kb25lKQorICAgKiB3aWxsIGJlIGRpc2Nh
cmRlZCwgdG9vLgorICAgKgorICAgKiBAcGFyYW0gZWRpdCB0aGUgZWRpdGluZyBhY3Rpb24g
dGhhdCBpcyBhZGRlZCB0byB0aGlzIFVuZG9NYW5hZ2VyLgorICAgKgorICAgKiBAcmV0dXJu
IDxjb2RlPnRydWU8L2NvZGU+IGlmIDxjb2RlPmVkaXQ8L2NvZGU+IGNvdWxkIGJlCisgICAq
IGluY29ycG9yYXRlZDsgPGNvZGU+ZmFsc2U8L2NvZGU+IGlmIDxjb2RlPmVkaXQ8L2NvZGU+
IGhhcyBub3QKKyAgICogYmVlbiBpbmNvcnBvcmF0ZWQgYmVjYXVzZSB7QGxpbmsgI2VuZCgp
fSBoYXMgYWxyZWFkeSBiZWVuIGNhbGxlZAorICAgKiBvbiB0aGlzIDxjb2RlPlVuZG9NYW5h
Z2VyPC9jb2RlPi4KKyAgICovCisgIHB1YmxpYyBzeW5jaHJvbml6ZWQgYm9vbGVhbiBhZGRF
ZGl0KFVuZG9hYmxlRWRpdCBlZGl0KQorICB7CisgICAgYm9vbGVhbiByZXN1bHQ7CisKKyAg
ICAvLyBEaXNjYXJkIGFueSBlZGl0cyBzdGFydGluZyBhdCBpbmRleE9mTmV4dEFkZC4KKyAg
ICB0cmltRWRpdHMoaW5kZXhPZk5leHRBZGQsIGVkaXRzLnNpemUoKSAtIDEpOworCisgICAg
cmVzdWx0ID0gc3VwZXIuYWRkRWRpdChlZGl0KTsKKyAgICBpbmRleE9mTmV4dEFkZCA9IGVk
aXRzLnNpemUoKTsKKyAgICB0cmltRm9yTGltaXQoKTsKKyAgICByZXR1cm4gcmVzdWx0Owor
ICB9CisKKworICAvKioKKyAgICogQ2FsY3VsYXRlcyBhIGxvY2FsaXplZCB0ZXh0IGZvciBw
cmVzZW50aW5nIHRoZSB1bmRvIG9yIHJlZG8KKyAgICogYWN0aW9uIHRvIHRoZSB1c2VyLCBm
b3IgZXhhbXBsZSBpbiB0aGUgZm9ybSBvZiBhIG1lbnUgY29tbWFuZC4KKyAgICoKKyAgICog
PHA+VGhpcyBpcyB1c2VmdWwgZm9yIGFwcGxpY2F0aW9ucyB0aGF0IGRvIG5vdCBwcmVzZW50
IGEgc2VwYXJhdGUKKyAgICogdW5kbyBhbmQgcmVkbyBmYWNpbGl0eSwgYnV0IGp1c3QgaGF2
ZSBhIHNpbmdsZSBtZW51IGl0ZW0gZm9yCisgICAqIHVuZG9pbmcgYW5kIHJlZG9pbmcgdGhl
IHZlcnkgbGFzdCBhY3Rpb24uIFN1Y2ggYXBwbGljYXRpb25zIHdpbGwKKyAgICogdXNlIGFu
IDxjb2RlPlVuZG9NYW5hZ2VyPC9jb2RlPiB3aG9zZSA8Y29kZT5saW1pdDwvY29kZT4gaXMg
MS4KKyAgICoKKyAgICogQHJldHVybiB0aGUgcmVkbyBwcmVzZW50YXRpb24gbmFtZSBpZiB0
aGUgbGFzdCBhY3Rpb24gaGFzIGFscmVhZHkKKyAgICogYmVlbiB1bmRvbmUsIG9yIHRoZSB1
bmRvIHByZXNlbnRhdGlvbiBuYW1lIG90aGVyd2lzZS4KKyAgICoKKyAgICogQHNlZSAjZ2V0
VW5kb1ByZXNlbnRhdGlvbk5hbWUoKQorICAgKiBAc2VlICNnZXRSZWRvUHJlc2VudGF0aW9u
TmFtZSgpCisgICAqLworICBwdWJsaWMgc3luY2hyb25pemVkIFN0cmluZyBnZXRVbmRvT3JS
ZWRvUHJlc2VudGF0aW9uTmFtZSgpCisgIHsKKyAgICBpZiAoaW5kZXhPZk5leHRBZGQgPT0g
ZWRpdHMuc2l6ZSgpKQorICAgICAgcmV0dXJuIGdldFVuZG9QcmVzZW50YXRpb25OYW1lKCk7
CisgICAgZWxzZQorICAgICAgcmV0dXJuIGdldFJlZG9QcmVzZW50YXRpb25OYW1lKCk7Cisg
IH0KKworCisgIC8qKgorICAgKiBDYWxjdWxhdGVzIGEgbG9jYWxpemVkIHRleHQgZm9yIHBy
ZXNlbnRpbmcgdGhlIHVuZG8gYWN0aW9uCisgICAqIHRvIHRoZSB1c2VyLCBmb3IgZXhhbXBs
ZSBpbiB0aGUgZm9ybSBvZiBhIG1lbnUgY29tbWFuZC4KKyAgICovCisgIHB1YmxpYyBzeW5j
aHJvbml6ZWQgU3RyaW5nIGdldFVuZG9QcmVzZW50YXRpb25OYW1lKCkKKyAgeworICAgIFVu
ZG9hYmxlRWRpdCBlZGl0OworCisgICAgaWYgKCFpc0luUHJvZ3Jlc3MoKSkKKyAgICAgIHJl
dHVybiBzdXBlci5nZXRVbmRvUHJlc2VudGF0aW9uTmFtZSgpOworCisgICAgZWRpdCA9IGVk
aXRUb0JlVW5kb25lKCk7CisgICAgaWYgKGVkaXQgPT0gbnVsbCkKKyAgICAgIHJldHVybiBV
SU1hbmFnZXIuZ2V0U3RyaW5nKCJBYnN0cmFjdFVuZG9hYmxlRWRpdC51bmRvVGV4dCIpOwor
ICAgIGVsc2UKKyAgICAgIHJldHVybiBlZGl0LmdldFVuZG9QcmVzZW50YXRpb25OYW1lKCk7
CisgIH0KKworCisgIC8qKgorICAgKiBDYWxjdWxhdGVzIGEgbG9jYWxpemVkIHRleHQgZm9y
IHByZXNlbnRpbmcgdGhlIHJlZG8gYWN0aW9uCisgICAqIHRvIHRoZSB1c2VyLCBmb3IgZXhh
bXBsZSBpbiB0aGUgZm9ybSBvZiBhIG1lbnUgY29tbWFuZC4KKyAgICovCisgIHB1YmxpYyBz
eW5jaHJvbml6ZWQgU3RyaW5nIGdldFJlZG9QcmVzZW50YXRpb25OYW1lKCkKKyAgeworICAg
IFVuZG9hYmxlRWRpdCBlZGl0OworCisgICAgaWYgKCFpc0luUHJvZ3Jlc3MoKSkKKyAgICAg
IHJldHVybiBzdXBlci5nZXRSZWRvUHJlc2VudGF0aW9uTmFtZSgpOworCisgICAgZWRpdCA9
IGVkaXRUb0JlUmVkb25lKCk7CisgICAgaWYgKGVkaXQgPT0gbnVsbCkKKyAgICAgIHJldHVy
biBVSU1hbmFnZXIuZ2V0U3RyaW5nKCJBYnN0cmFjdFVuZG9hYmxlRWRpdC5yZWRvVGV4dCIp
OworICAgIGVsc2UKKyAgICAgIHJldHVybiBlZGl0LmdldFJlZG9QcmVzZW50YXRpb25OYW1l
KCk7CisgIH0KKyAgCisgIAorICAvKioKKyAgICogUmVnaXN0ZXJzIHRoZSBlZGl0IGFjdGlv
biBvZiBhbiB7QGxpbmsgVW5kb2FibGVFZGl0RXZlbnR9CisgICAqIHdpdGggdGhpcyBVbmRv
TWFuYWdlci4KKyAgICoKKyAgICogPHA+PGI+VGhyZWFkIFNhZmV0eTo8L2I+IFRoaXMgbWV0
aG9kIG1heSBzYWZlbHkgYmUgaW52b2tlZCBmcm9tCisgICAqIGNvbmN1cnJlbnQgdGhyZWFk
cy4gIFRoZSBjYWxsZXIgZG9lcyBub3QgbmVlZCB0byBwZXJmb3JtIGV4dGVybmFsCisgICAq
IHN5bmNocm9uaXphdGlvbi4gVGhpcyBtZWFucyB0aGF0IHtAbGluaworICAgKiBqYXZheC5z
d2luZy5ldmVudC5VbmRvYWJsZUV2ZW50fSBzb3VyY2VzIGRvIG5vdCBuZWVkIHRvIGJyb2Fk
Y2FzdAorICAgKiB0aGVpciBldmVudHMgZnJvbSBpbnNpZGUgdGhlIFN3aW5nIHdvcmtlciB0
aHJlYWQuCisgICAqCisgICAqIEBwYXJhbSBldmVudCB0aGUgZXZlbnQgd2hvc2UgPGNvZGU+
ZWRpdDwvY29kZT4gd2lsbCBiZQorICAgKiBwYXNzZWQgdG8ge0BsaW5rICNhZGRFZGl0fS4K
KyAgICoKKyAgICogQHNlZSBVbmRvYWJsZUVkaXRFdmVudCNnZXRFZGl0KCkKKyAgICogQHNl
ZSAjYWRkRWRpdAorICAgKi8KKyAgcHVibGljIHZvaWQgdW5kb2FibGVFZGl0SGFwcGVuZWQo
VW5kb2FibGVFZGl0RXZlbnQgZXZlbnQpCisgIHsKKyAgICAvLyBOb3RlIHRoYXQgdGhpcyBt
ZXRob2QgZG9lcyBub3QgbmVlZCB0byBiZSBzeW5jaHJvbml6ZWQsCisgICAgLy8gYmVjYXVz
ZSBhZGRFZGl0IHdpbGwgb2J0YWluIGFuZCByZWxlYXNlIHRoZSBtdXRleC4KKyAgICBhZGRF
ZGl0KGV2ZW50LmdldEVkaXQoKSk7CisgIH0KK30K
--==_20040211120905.25537-1_==--




From MAILER-DAEMON Wed Feb 11 13:51:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AqzSV-0008Rc-7i
	for mharc-commit-classpath@gnu.org; Wed, 11 Feb 2004 13:51:39 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AqzSP-0008M0-RA
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 13:51:33 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AqzRl-0007ze-Dd
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 13:51:24 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AqzRk-0007yr-Sm
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 13:50:53 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-249.ewetel.net
	[80.228.94.249])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i1BIolBS022010
	for <commit-classpath@gnu.org>; Wed, 11 Feb 2004 19:50:48 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AqzRf-0006uU-00
	for <commit-classpath@gnu.org>; Wed, 11 Feb 2004 19:50:47 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 11 Feb 2004 19:54:43 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_zpnKAL6UH38md5c"
Message-Id: <200402111954.44182.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.ref.Reference
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2004 18:51:37 -0000


--Boundary-00=_zpnKAL6UH38md5c
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited a little change to fix a typo.


Michael


2004-02-11  Michael Koch  <konqueror@gmx.de>

	* java/lang/ref/Reference.java
	(Reference): Fixed typo.


--Boundary-00=_zpnKAL6UH38md5c
Content-Type: text/x-diff;
  charset="us-ascii";
  name="reference.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="reference.diff"

Index: java/lang/ref/Reference.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/ref/Reference.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 Reference.java
--- java/lang/ref/Reference.java	20 Aug 2003 14:18:45 -0000	1.5
+++ java/lang/ref/Reference.java	10 Feb 2004 21:37:35 -0000
@@ -40,7 +40,7 @@
 
 /**
  * This is the base class of all references.  A reference allows
- * refering to an object without preventing the garbage collector from
+ * refering to an object without preventing the garbage collector to
  * collect it.  The only way to get the referred object is via the
  * <code>get()</code>-method.  This method will return
  * <code>null</code> if the object was collected. <br>

--Boundary-00=_zpnKAL6UH38md5c--




From MAILER-DAEMON Wed Feb 11 14:07:14 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aqzha-0006Sc-DH
	for mharc-commit-classpath@gnu.org; Wed, 11 Feb 2004 14:07:14 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AqzhX-0006SB-E4
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 14:07:11 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aqzh1-0006K8-2X
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 14:07:10 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aqzh0-0006Jy-6Q
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 14:06:38 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-249.ewetel.net
	[80.228.94.249])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i1BJ6VPt005527
	for <commit-classpath@gnu.org>; Wed, 11 Feb 2004 20:06:32 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Aqzgt-00071q-00
	for <commit-classpath@gnu.org>; Wed, 11 Feb 2004 20:06:31 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 11 Feb 2004 20:10:27 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_j4nKAEGZJf9z7ak"
Message-Id: <200402112010.28109.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.nio buffer fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2004 19:07:12 -0000


--Boundary-00=_j4nKAEGZJf9z7ak
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I commited the attached patch to merge the latest NIO fixes to 
classpath.


Michael


2004-02-11  Per Bothner  <per@bothner.com>

	* java/nio/ByteBuffer.java (shiftDown):  New helper method.
	* java/nio/ByteBufferImpl.java (compact):  Use new shiftDown method.
	* sava/nio/ByteBufferHelper.java:  Remove redundant 'final' specifiers.
	Pass ByteOrder parameter to most methods, since the underlying
	ByteBuffer's order isn't always what we should use.
	* java/nio/ByteBufferImpl.java:  Pass byte-order various places.
	* java/nio/DirectByteBufferImpl.java:  Likewise.
	Use ByteBufferHelper methods.
	* java/nio/MappedByteBufferImpl.java:  Likewise.
	(compact):  Use shiftDown.
	* java/nio/CharViewBufferImpl.java (<init>):  Pass byte-order.
	(get, put):  Use ByteBufferHelper.
	(compact):  Use new shiftDown method.
	(duplicate(boolean)):  New helper method.
	(duplicate, asReadOnlyBuffer):  Use it.
	(order):  Return endian field.
	* java/nio/DoubleViewBufferImpl.java:  Likewise.
	* java/nio/FloatViewBufferImpl.java:  Likewise.
	* java/nio/IntViewBufferImpl.java:  Likewise.
	* java/nio/LongViewBufferImpl.java:  Likewise.
	* java/nio/ShortViewBufferImpl.java:  Likewise.
	* java/nio/CharViewBufferImpl.java (subsequence):  Redundant test.
	* java/nio/DirectByteBufferImpl.java (shiftDown):  New native method.
	(compact):  Re-implement using shiftDown.

2004-02-11  Michael Koch  <konqueror@gmx.de>

	* include/java_nio_DirectByteBufferImpl.h: Regenerated.
	* native/jni/java-nio/java_nio_DirectByteBufferImpl.c
	(shiftDown): New method.


--Boundary-00=_j4nKAEGZJf9z7ak
Content-Type: text/x-diff;
  charset="us-ascii";
  name="nio.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="nio.diff"

Index: java/nio/ByteBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ByteBuffer.java,v
retrieving revision 1.17
diff -u -b -B -r1.17 ByteBuffer.java
--- java/nio/ByteBuffer.java	4 Nov 2003 10:00:28 -0000	1.17
+++ java/nio/ByteBuffer.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* ByteBuffer.java -- 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -382,8 +382,14 @@
    */
   public abstract ByteBuffer compact ();
 
+  void shiftDown (int dst_offset, int src_offset, int count)
+  {
+    for (int i = 0; i < count; i++)
+      put(dst_offset + i, get(src_offset + i));
+  }
+
   /**
-   * Tells wether or not this buffer is direct.
+   * Tells whether or not this buffer is direct.
    */
   public abstract boolean isDirect ();
 
Index: java/nio/ByteBufferHelper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ByteBufferHelper.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 ByteBufferHelper.java
--- java/nio/ByteBufferHelper.java	6 Oct 2003 13:54:30 -0000	1.3
+++ java/nio/ByteBufferHelper.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* ByteBufferImpl.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,58 +42,58 @@
  */
 final class ByteBufferHelper
 {
-  private static final void checkRemainingForRead (ByteBuffer buffer, int bytes)
+  private static void checkRemainingForRead (ByteBuffer buffer, int bytes)
   {
     if (buffer.remaining() < bytes)
       throw new BufferUnderflowException();
   }
   
-  private static final void checkRemainingForWrite (ByteBuffer buffer, int bytes)
+  private static void checkRemainingForWrite (ByteBuffer buffer, int bytes)
   {
     if (buffer.remaining() < bytes)
       throw new BufferOverflowException();
   }
 
-  private static final void checkAvailableForRead (ByteBuffer buffer,
+  private static void checkAvailableForRead (ByteBuffer buffer,
                                                    int index, int bytes)
   {
     if (buffer.limit() < (index + bytes))
       throw new BufferUnderflowException();
   }
   
-  private static final void checkAvailableForWrite (ByteBuffer buffer,
+  private static void checkAvailableForWrite (ByteBuffer buffer,
                                                     int index, int bytes)
   {
     if (buffer.limit() < (index + bytes))
       throw new BufferOverflowException();
   }
   
-  public static final char getChar (ByteBuffer buffer)
+  public static char getChar (ByteBuffer buffer, ByteOrder order)
   {
-    return (char) getShort (buffer);
+    return (char) getShort (buffer, order);
   }
   
-  public static final ByteBuffer putChar (ByteBuffer buffer, char value)
+  public static void putChar (ByteBuffer buffer, char value, ByteOrder order)
   {
-    return putShort (buffer, (short) value);
+    putShort (buffer, (short) value, order);
   }
   
-  public static final char getChar (ByteBuffer buffer, int index)
+  public static char getChar (ByteBuffer buffer, int index, ByteOrder order)
   {
-    return (char) getShort (buffer, index);
+    return (char) getShort (buffer, index, order);
   }
   
-  public static final ByteBuffer putChar (ByteBuffer buffer, int index,
-                                          char value)
+  public static void putChar (ByteBuffer buffer, int index,
+			      char value, ByteOrder order)
   {
-    return putShort (buffer, index, (short) value);
+    putShort (buffer, index, (short) value, order);
   }
 
-  public static final short getShort (ByteBuffer buffer)
+  public static short getShort (ByteBuffer buffer, ByteOrder order)
   {
     checkRemainingForRead (buffer, 2);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         return (short) ((buffer.get() & 0xff)
                         + (buffer.get() << 8));
@@ -103,11 +103,11 @@
                     + (buffer.get() & 0xff));
   }
   
-  public static final ByteBuffer putShort (ByteBuffer buffer, short value)
+  public static void putShort (ByteBuffer buffer, short value, ByteOrder order)
   {
     checkRemainingForWrite (buffer, 2);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         buffer.put ((byte) value);
         buffer.put ((byte) (value >> 8));
@@ -117,15 +117,14 @@
         buffer.put ((byte) (value >> 8));
         buffer.put ((byte) value);
       }
-
-    return buffer;
   }
   
-  public static final short getShort (ByteBuffer buffer, int index)
+  public static short getShort (ByteBuffer buffer,
+				      int index, ByteOrder order)
   {
     checkAvailableForRead (buffer, index, 2);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         return (short) ((buffer.get (index) & 0xff)
                         + (buffer.get (++index) << 8));
@@ -135,12 +134,12 @@
                     + (buffer.get (++index) & 0xff));
   }
   
-  public static final ByteBuffer putShort (ByteBuffer buffer, int index,
-                                           short value)
+  public static void putShort (ByteBuffer buffer, int index,
+			       short value, ByteOrder order)
   {
     checkAvailableForWrite (buffer, index, 2);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         buffer.put (index, (byte) value);
         buffer.put (++index, (byte) (value >> 8));
@@ -150,15 +149,13 @@
         buffer.put (index, (byte) (value >> 8));
         buffer.put (++index, (byte) value);
       }
-    
-    return buffer;
   }
 
-  public static final int getInt (ByteBuffer buffer)
+  public static int getInt (ByteBuffer buffer, ByteOrder order)
   {
     checkRemainingForRead (buffer, 4);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         return ((buffer.get() & 0xff)
                 + ((buffer.get() & 0xff) << 8)
@@ -172,11 +169,11 @@
                   + (buffer.get() & 0xff));
   }
   
-  public static final ByteBuffer putInt (ByteBuffer buffer, int value)
+  public static void putInt (ByteBuffer buffer, int value, ByteOrder order)
   {
     checkRemainingForWrite (buffer, 4);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         buffer.put ((byte) value);
         buffer.put ((byte) (value >> 8));
@@ -190,15 +187,13 @@
         buffer.put ((byte) (value >> 8));
         buffer.put ((byte) value);
       }
-    
-    return buffer;
   }
   
-  public static final int getInt (ByteBuffer buffer, int index)
+  public static int getInt (ByteBuffer buffer, int index, ByteOrder order)
   {
     checkAvailableForRead (buffer, index, 4);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         return ((buffer.get (index) & 0xff)
                 + ((buffer.get (++index) & 0xff) << 8)
@@ -212,12 +207,12 @@
             + (buffer.get (++index) & 0xff));
   }
   
-  public static final ByteBuffer putInt (ByteBuffer buffer, int index,
-                                         int value)
+  public static void putInt (ByteBuffer buffer, int index,
+				   int value, ByteOrder order)
   {
     checkAvailableForWrite (buffer, index, 4);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         buffer.put (index, (byte) value);
         buffer.put (++index, (byte) (value >> 8));
@@ -231,15 +226,13 @@
         buffer.put (++index, (byte) (value >> 8));
         buffer.put (++index, (byte) value);
       }
-  
-    return buffer;
   }
 
-  public static final long getLong (ByteBuffer buffer)
+  public static long getLong (ByteBuffer buffer, ByteOrder order)
   {
     checkRemainingForRead (buffer, 8);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         return ((buffer.get() & 0xff)
                 + (((buffer.get() & 0xff)) << 8)
@@ -261,11 +254,11 @@
             + (buffer.get() & 0xff));
   }
   
-  public static final ByteBuffer putLong (ByteBuffer buffer, long value)
+  public static void putLong (ByteBuffer buffer, long value, ByteOrder order)
   {
     checkRemainingForWrite (buffer, 8);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         buffer.put ((byte) value);
         buffer.put ((byte) (value >> 8));
@@ -287,15 +280,13 @@
         buffer.put ((byte) (value >> 8));
         buffer.put ((byte) value);
       }
-    
-    return buffer;
   }
   
-  public static final long getLong (ByteBuffer buffer, int index)
+  public static long getLong (ByteBuffer buffer, int index, ByteOrder order)
   {
     checkAvailableForRead (buffer, index, 8);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         return ((buffer.get (index) & 0xff)
                 + ((buffer.get (++index) & 0xff) << 8)
@@ -317,12 +308,12 @@
             + (buffer.get (++index) & 0xff));
   }
   
-  public static final ByteBuffer putLong (ByteBuffer buffer, int index,
-                                          long value)
+  public static void putLong (ByteBuffer buffer, int index,
+				    long value, ByteOrder order)
   {
     checkAvailableForWrite (buffer, index, 8);
 
-    if (buffer.order() == ByteOrder.LITTLE_ENDIAN)
+    if (order == ByteOrder.LITTLE_ENDIAN)
       {
         buffer.put (index, (byte) value);
         buffer.put (++index, (byte) (value >> 8));
@@ -344,50 +335,47 @@
         buffer.put (++index, (byte) (value >> 8));
         buffer.put (++index, (byte) value);
       }
-    
-    return buffer;
   }
 
-  public static final float getFloat (ByteBuffer buffer)
+  public static float getFloat (ByteBuffer buffer, ByteOrder order)
   {
-    return Float.intBitsToFloat (getInt (buffer));
+    return Float.intBitsToFloat (getInt (buffer, order));
   }
   
-  public static final ByteBuffer putFloat (ByteBuffer buffer, float value)
+  public static void putFloat (ByteBuffer buffer, float value, ByteOrder order)
   {
-    return putInt (buffer, Float.floatToRawIntBits (value));
+    putInt (buffer, Float.floatToRawIntBits (value), order);
   }
   
-  public static final float getFloat (ByteBuffer buffer, int index)
+  public static float getFloat (ByteBuffer buffer, int index, ByteOrder order)
   {
-    return Float.intBitsToFloat (getInt (buffer, index));
+    return Float.intBitsToFloat (getInt (buffer, index, order));
   }
 
-  public static final ByteBuffer putFloat (ByteBuffer buffer, int index,
-                                           float value)
+  public static void putFloat (ByteBuffer buffer, int index,
+				     float value, ByteOrder order)
   {
-    return putInt (buffer, index, Float.floatToRawIntBits (value));
+    putInt (buffer, index, Float.floatToRawIntBits (value), order);
   }
 
-  public static final double getDouble (ByteBuffer buffer)
+  public static double getDouble (ByteBuffer buffer, ByteOrder order)
   {
-    return Double.longBitsToDouble (getLong (buffer));
+    return Double.longBitsToDouble (getLong (buffer, order));
   }
 
-  public static final ByteBuffer putDouble (ByteBuffer buffer, double value)
+  public static void putDouble (ByteBuffer buffer, double value, ByteOrder order)
   {
-    return putLong (buffer, Double.doubleToLongBits (value));
+    putLong (buffer, Double.doubleToLongBits (value), order);
   }
   
-  public static final double getDouble (ByteBuffer buffer, int index)
+  public static double getDouble (ByteBuffer buffer, int index, ByteOrder order)
   {
-    return Double.longBitsToDouble (getLong (buffer, index));
+    return Double.longBitsToDouble (getLong (buffer, index, order));
   }
   
-  public static final ByteBuffer putDouble (ByteBuffer buffer, int index,
-                                            double value)
+  public static void putDouble (ByteBuffer buffer, int index,
+				double value, ByteOrder order)
   {
-    return putLong (buffer, index, Double.doubleToLongBits (value));
+    putLong (buffer, index, Double.doubleToLongBits (value), order);
   }
-
 } // ByteBufferHelper
Index: java/nio/ByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ByteBufferImpl.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 ByteBufferImpl.java
--- java/nio/ByteBufferImpl.java	25 Sep 2003 14:01:18 -0000	1.3
+++ java/nio/ByteBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* ByteBufferImpl.java -- 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -58,32 +58,32 @@
   
   public CharBuffer asCharBuffer ()
   {
-    return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public ShortBuffer asShortBuffer ()
   {
-    return new ShortViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new ShortViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public IntBuffer asIntBuffer ()
   {
-    return new IntViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new IntViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public LongBuffer asLongBuffer ()
   {
-    return new LongViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new LongViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public FloatBuffer asFloatBuffer ()
   {
-    return new FloatViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new FloatViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public DoubleBuffer asDoubleBuffer ()
   {
-    return new DoubleViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new DoubleViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public boolean isReadOnly ()
@@ -108,15 +108,14 @@
   
   public ByteBuffer compact ()
   {
-    int copied = 0;
-    
-    while (remaining () > 0)
+    int pos = position();
+    if (pos > 0)
       {
-	put (copied, get ());
-	copied++;
+	int count = remaining();
+	shiftDown(0, pos, count);
+	position(count);
+	limit(capacity());
       }
-
-    position (copied);
     return this;
   }
   
@@ -182,121 +181,133 @@
   
   final public char getChar ()
   {
-    return ByteBufferHelper.getChar (this);
+    return ByteBufferHelper.getChar(this, order());
   }
   
   final public ByteBuffer putChar (char value)
   {
-    return ByteBufferHelper.putChar (this, value);
+    ByteBufferHelper.putChar(this, value, order());
+    return this;
   }
   
   final public char getChar (int index)
   {
-    return ByteBufferHelper.getChar (this, index);
+    return ByteBufferHelper.getChar(this, index, order());
   }
   
   final public ByteBuffer putChar (int index, char value)
   {
-    return ByteBufferHelper.putChar (this, index, value);
+    ByteBufferHelper.putChar(this, index, value, order());
+    return this;
   }
 
   final public short getShort ()
   {
-    return ByteBufferHelper.getShort (this);
+    return ByteBufferHelper.getShort(this, order());
   }
   
   final public ByteBuffer putShort (short value)
   {
-    return ByteBufferHelper.putShort (this, value);
+    ByteBufferHelper.putShort(this, value, order());
+    return this;
   }
   
   final public short getShort (int index)
   {
-    return ByteBufferHelper.getShort (this, index);
+    return ByteBufferHelper.getShort(this, index, order());
   }
   
   final public ByteBuffer putShort (int index, short value)
   {
-    return ByteBufferHelper.putShort (this, index, value);
+    ByteBufferHelper.putShort(this, index, value, order());
+    return this;
   }
 
   final public int getInt ()
   {
-    return ByteBufferHelper.getInt (this);
+    return ByteBufferHelper.getInt(this, order());
   }
   
   final public ByteBuffer putInt (int value)
   {
-    return ByteBufferHelper.putInt (this, value);
+    ByteBufferHelper.putInt(this, value, order());
+    return this;
   }
   
   final public int getInt (int index)
   {
-    return ByteBufferHelper.getInt (this, index);
+    return ByteBufferHelper.getInt(this, index, order());
   }
   
   final public ByteBuffer putInt (int index, int value)
   {
-    return ByteBufferHelper.putInt (this, index, value);
+    ByteBufferHelper.putInt(this, index, value, order());
+    return this;
   }
 
   final public long getLong ()
   {
-    return ByteBufferHelper.getLong (this);
+    return ByteBufferHelper.getLong(this, order());
   }
   
   final public ByteBuffer putLong (long value)
   {
-    return ByteBufferHelper.putLong (this, value);
+    ByteBufferHelper.putLong (this, value, order());
+    return this;
   }
   
   final public long getLong (int index)
   {
-    return ByteBufferHelper.getLong (this, index);
+    return ByteBufferHelper.getLong (this, index, order());
   }
   
   final public ByteBuffer putLong (int index, long value)
   {
-    return ByteBufferHelper.putLong (this, index, value);
+    ByteBufferHelper.putLong (this, index, value, order());
+    return this;
   }
 
   final public float getFloat ()
   {
-    return ByteBufferHelper.getFloat (this);
+    return ByteBufferHelper.getFloat (this, order());
   }
   
   final public ByteBuffer putFloat (float value)
   {
-    return ByteBufferHelper.putFloat (this, value);
+    ByteBufferHelper.putFloat (this, value, order());
+    return this;
   }
   
-  final public float getFloat (int index)
+  public final float getFloat (int index)
   {
-    return ByteBufferHelper.getFloat (this, index);
+    return ByteBufferHelper.getFloat (this, index, order());
   }
 
-  public final ByteBuffer putFloat (int index, float value)
+  final public ByteBuffer putFloat (int index, float value)
   {
-    return ByteBufferHelper.putFloat (this, index, value);
+    ByteBufferHelper.putFloat (this, index, value, order());
+    return this;
   }
 
   final public double getDouble ()
   {
-    return ByteBufferHelper.getDouble (this);
+    return ByteBufferHelper.getDouble (this, order());
   }
 
   final public ByteBuffer putDouble (double value)
   {
-    return ByteBufferHelper.putDouble (this, value);
+    ByteBufferHelper.putDouble (this, value, order());
+    return this;
   }
   
   final public double getDouble (int index)
   {
-    return ByteBufferHelper.getDouble (this, index);
+    return ByteBufferHelper.getDouble (this, index, order());
   }
   
   final public ByteBuffer putDouble (int index, double value)
   {
-    return ByteBufferHelper.putDouble (this, index, value);
+    ByteBufferHelper.putDouble (this, index, value, order());
+    return this;
   }
 }
Index: java/nio/ByteOrder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ByteOrder.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 ByteOrder.java
--- java/nio/ByteOrder.java	20 Oct 2003 15:32:56 -0000	1.6
+++ java/nio/ByteOrder.java	11 Feb 2004 19:04:06 -0000
@@ -63,7 +63,7 @@
    */
   public static ByteOrder nativeOrder ()
   {
-    return (System.getProperty ("gnu.cpu.endian") == "big"
+    return (System.getProperty ("gnu.cpu.endian").equals("big")
             ? BIG_ENDIAN : LITTLE_ENDIAN);
   }
 
Index: java/nio/CharViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/CharViewBufferImpl.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 CharViewBufferImpl.java
--- java/nio/CharViewBufferImpl.java	19 May 2003 09:05:13 -0000	1.1
+++ java/nio/CharViewBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* CharViewBufferImpl.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,54 +40,47 @@
 
 class CharViewBufferImpl extends CharBuffer
 {
-  private boolean readOnly;
+  /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
   private ByteBuffer bb;
+  private boolean readOnly;
   private ByteOrder endian;
   
-  public CharViewBufferImpl (ByteBuffer bb, boolean readOnly)
-  {
-    super (bb.remaining () >> 1, bb.remaining () >> 1, bb.position (), 0);
-    this.bb = bb;
-    this.readOnly = readOnly;
-    // FIXME: What if this is called from CharByteBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
-  }
-
   public CharViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                                int limit, int position, int mark,
-                               boolean readOnly)
+			     boolean readOnly, ByteOrder endian)
   {
     super (limit >> 1, limit >> 1, position >> 1, mark >> 1);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
-    // FIXME: What if this is called from CharViewBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
+    this.endian = endian;
   }
 
   public char get ()
   {
-    char result = bb.getChar ((position () << 1) + offset);
-    position (position () + 1);
+    int p = position();
+    char result = ByteBufferHelper.getChar(bb, (p << 1) + offset, endian);
+    position(p + 1);
     return result;
   }
 
   public char get (int index)
   {
-    return bb.getChar ((index << 1) + offset);
+    return ByteBufferHelper.getChar(bb, (index << 1) + offset, endian);
   }
 
   public CharBuffer put (char value)
   {
-    bb.putChar ((position () << 1) + offset, value);
-    position (position () + 1);
+    int p = position();
+    ByteBufferHelper.putChar(bb, (p << 1) + offset, value, endian);
+    position(p + 1);
     return this;
   }
   
   public CharBuffer put (int index, char value)
   {
-    bb.putChar ((index << 1) + offset, value);
+    ByteBufferHelper.putChar(bb, (index << 1) + offset, value, endian);
     return this;
   }
 
@@ -95,18 +88,8 @@
   {
     if (position () > 0)
       {
-        // Copy all data from position() to limit() to the beginning of the
-        // buffer, set position to end of data and limit to capacity
-        // XXX: This can surely be optimized, for direct and non-direct buffers
-        
         int count = limit () - position ();
-              
-        for (int i = 0; i < count; i++)
-          {
-            bb.putChar ((i >> 1) + offset,
-                          bb.getChar (((i + position ()) >> 1) + offset));
-          }
-
+	bb.shiftDown(offset, offset + 2 * position(), 2 * count);
         position (count);
         limit (capacity ());
       }
@@ -114,38 +96,44 @@
     return this;
   }
   
-  public CharBuffer duplicate ()
-  {
-    // Create a copy of this object that shares its content
-    // FIXME: mark is not correct
-    return new CharViewBufferImpl (bb, offset, capacity (), limit (),
-                                     position (), -1, isReadOnly ());
-  }
-  
   public CharBuffer slice ()
   {
     // Create a sliced copy of this object that shares its content.
     return new CharViewBufferImpl (bb, (position () >> 1) + offset,
                                       remaining (), remaining (), 0, -1,
-                                     isReadOnly ());
+				   isReadOnly (), endian);
+  }
+  
+  CharBuffer duplicate (boolean readOnly)
+  {
+    int pos = position();
+    reset();
+    int mark = position();
+    position(pos);
+    return new CharViewBufferImpl (bb, offset, capacity(), limit(),
+                                     pos, mark, readOnly, endian);
+  }
+  
+  public CharBuffer duplicate ()
+  {
+    return duplicate(readOnly);
+  }
+
+  public CharBuffer asReadOnlyBuffer ()
+  {
+    return duplicate(true);
   }
   
   public CharSequence subSequence (int start, int end)
   {
     if (start < 0
-        || start > length ()
         || end < start
         || end > length ())
       throw new IndexOutOfBoundsException ();
 
-    return new CharViewBufferImpl (bb, array_offset, capacity (), position () + end, position () + start, -1, isReadOnly ());
-  }
-
-  public CharBuffer asReadOnlyBuffer ()
-  {
-    // Create a copy of this object that shares its content and is read-only
-    return new CharViewBufferImpl (bb, (position () >> 1) + offset,
-                                     remaining (), remaining (), 0, -1, true);
+    return new CharViewBufferImpl (bb, array_offset, capacity (),
+				   position () + end, position () + start,
+				   -1, isReadOnly (), endian);
   }
   
   public boolean isReadOnly ()
@@ -160,6 +148,6 @@
   
   public ByteOrder order ()
   {
-    return ByteOrder.LITTLE_ENDIAN;
+    return endian;
   }
 }
Index: java/nio/DirectByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DirectByteBufferImpl.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 DirectByteBufferImpl.java
--- java/nio/DirectByteBufferImpl.java	20 Oct 2003 15:32:56 -0000	1.6
+++ java/nio/DirectByteBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* DirectByteBufferImpl.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -117,18 +117,18 @@
     return this;
   }
   
+  native void shiftDown (int dst_offset, int src_offset, int count);
+
   public ByteBuffer compact ()
   {
-    // FIXME this can sure be optimized using memcpy()  
-    int copied = 0;
-    
-    while (remaining () > 0)
+    int pos = position();
+    if (pos > 0)
       {
-	put (copied, get ());
-	copied++;
+	int count = remaining();
+	shiftDown(0, pos, count);
+	position(count);
+	limit(capacity());
       }
-
-    position (copied);
     return this;
   }
 
@@ -161,197 +161,163 @@
 
   public CharBuffer asCharBuffer ()
   {
-    return new CharViewBufferImpl (this, position () + offset, remaining (), remaining (), 0, -1, isReadOnly ());
+    return new CharViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
   }
   
   public DoubleBuffer asDoubleBuffer ()
   {
-    return new DoubleViewBufferImpl (this, position () + offset, remaining (), remaining (), 0, -1, isReadOnly ());
+    return new DoubleViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
   }
   
   public FloatBuffer asFloatBuffer ()
   {
-    return new FloatViewBufferImpl (this, position () + offset, remaining (), remaining (), 0, -1, isReadOnly ());
+    return new FloatViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
   }
   
   public IntBuffer asIntBuffer ()
   {
-    return new IntViewBufferImpl (this, position () + offset, remaining (), remaining (), 0, -1, isReadOnly ());
+    return new IntViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
   }
   
   public LongBuffer asLongBuffer ()
   {
-    return new LongViewBufferImpl (this, position () + offset, remaining (), remaining (), 0, -1, isReadOnly ());
+    return new LongViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
   }
   
   public ShortBuffer asShortBuffer ()
   {
-    return new ShortViewBufferImpl (this, position () + offset, remaining (), remaining (), 0, -1, isReadOnly ());
+    return new ShortViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
   }
   
   final public char getChar ()
   {
-    // FIXME: this handles little endian only
-    return (char) (((get () & 0xff) << 8)
-                   + (get () & 0xff));
+    return ByteBufferHelper.getChar(this, order());
   }
   
   final public ByteBuffer putChar (char value)
   {
-    // FIXME: this handles little endian only
-    put ((byte) ((((int) value) & 0xff00) >> 8));
-    put ((byte) (((int) value) & 0x00ff));
+    ByteBufferHelper.putChar(this, value, order());
     return this;
   }
   
   final public char getChar (int index)
   {
-    // FIXME: this handles little endian only
-    return (char) (((get (index) & 0xff) << 8)
-                   + (get (index + 1) & 0xff));
+    return ByteBufferHelper.getChar(this, index, order());
   }
   
   final public ByteBuffer putChar (int index, char value)
   {
-    // FIXME: this handles little endian only
-    put (index, (byte) ((((int) value) & 0xff00) >> 8));
-    put (index + 1, (byte) (((int) value) & 0x00ff));
+    ByteBufferHelper.putChar(this, index, value, order());
     return this;
   }
 
   final public short getShort ()
   {
-    // FIXME: this handles little endian only
-    return (short) (((get () & 0xff) << 8)
-                    + (get () & 0xff));
+    return ByteBufferHelper.getShort(this, order());
   }
   
   final public ByteBuffer putShort (short value)
   {
-    // FIXME: this handles little endian only
-    put ((byte) ((((int) value) & 0xff00) >> 8));
-    put ((byte) (((int) value) & 0x00ff));
+    ByteBufferHelper.putShort(this, value, order());
     return this;
   }
   
   final public short getShort (int index)
   {
-    // FIXME: this handles little endian only
-    return (short) (((get (index) & 0xff) << 8)
-                    + (get (index + 1) & 0xff));
+    return ByteBufferHelper.getShort(this, index, order());
   }
   
   final public ByteBuffer putShort (int index, short value)
   {
-    // FIXME: this handles little endian only
-    put (index, (byte) ((((int) value) & 0xff00) >> 8));
-    put (index + 1, (byte) (((int) value) & 0x00ff));
+    ByteBufferHelper.putShort(this, index, value, order());
     return this;
   }
 
   final public int getInt ()
   {
-    // FIXME: this handles little endian only
-    return (int) (((get () & 0xff) << 24)
-                  + ((get () & 0xff) << 16)
-                  + ((get () & 0xff) << 8)
-                  + (get () & 0xff));
+    return ByteBufferHelper.getInt(this, order());
   }
   
   final public ByteBuffer putInt (int value)
   {
-    // FIXME: this handles little endian only
-    put ((byte) ((((int) value) & 0xff000000) >> 24));
-    put ((byte) ((((int) value) & 0x00ff0000) >> 16));
-    put ((byte) ((((int) value) & 0x0000ff00) >> 8));
-    put ((byte) (((int) value) & 0x000000ff));
+    ByteBufferHelper.putInt(this, value, order());
     return this;
   }
   
   final public int getInt (int index)
   {
-    // FIXME: this handles little endian only
-    return (int) (((get (index) & 0xff) << 24)
-                  + ((get (index + 1) & 0xff) << 16)
-                  + ((get (index + 2) & 0xff) << 8)
-                  + (get (index + 3) & 0xff));
+    return ByteBufferHelper.getInt(this, index, order());
   }
   
   final public ByteBuffer putInt (int index, int value)
   {
-    // FIXME: this handles little endian only
-    put (index, (byte) ((((int) value) & 0xff000000) >> 24));
-    put (index + 1, (byte) ((((int) value) & 0x00ff0000) >> 16));
-    put (index + 2, (byte) ((((int) value) & 0x0000ff00) >> 8));
-    put (index + 3, (byte) (((int) value) & 0x000000ff));
+    ByteBufferHelper.putInt(this, index, value, order());
     return this;
   }
 
   final public long getLong ()
   {
-    // FIXME: this handles little endian only
-    return (long) (((get () & 0xff) << 56)
-                   + ((get () & 0xff) << 48)
-                   + ((get () & 0xff) << 40)
-                   + ((get () & 0xff) << 32)
-                   + ((get () & 0xff) << 24)
-                   + ((get () & 0xff) << 16)
-                   + ((get () & 0xff) << 8)
-                   + (get () & 0xff));
+    return ByteBufferHelper.getLong(this, order());
   }
   
   final public ByteBuffer putLong (long value)
   {
-    return ByteBufferHelper.putLong (this, value);
+    ByteBufferHelper.putLong (this, value, order());
+    return this;
   }
   
   final public long getLong (int index)
   {
-    return ByteBufferHelper.getLong (this, index);
+    return ByteBufferHelper.getLong (this, index, order());
   }
   
   final public ByteBuffer putLong (int index, long value)
   {
-    return ByteBufferHelper.putLong (this, index, value);
+    ByteBufferHelper.putLong (this, index, value, order());
+    return this;
   }
 
   final public float getFloat ()
   {
-    return ByteBufferHelper.getFloat (this);
+    return ByteBufferHelper.getFloat (this, order());
   }
   
   final public ByteBuffer putFloat (float value)
   {
-    return ByteBufferHelper.putFloat (this, value);
+    ByteBufferHelper.putFloat (this, value, order());
+    return this;
   }
   
   public final float getFloat (int index)
   {
-    return ByteBufferHelper.getFloat (this, index);
+    return ByteBufferHelper.getFloat (this, index, order());
   }
 
   final public ByteBuffer putFloat (int index, float value)
   {
-    return ByteBufferHelper.putFloat (this, index, value);
+    ByteBufferHelper.putFloat (this, index, value, order());
+    return this;
   }
 
   final public double getDouble ()
   {
-    return ByteBufferHelper.getDouble (this);
+    return ByteBufferHelper.getDouble (this, order());
   }
 
   final public ByteBuffer putDouble (double value)
   {
-    return ByteBufferHelper.putDouble (this, value);
+    ByteBufferHelper.putDouble (this, value, order());
+    return this;
   }
   
   final public double getDouble (int index)
   {
-    return ByteBufferHelper.getDouble (this, index);
+    return ByteBufferHelper.getDouble (this, index, order());
   }
   
   final public ByteBuffer putDouble (int index, double value)
   {
-    return ByteBufferHelper.putDouble (this, index, value);
+    ByteBufferHelper.putDouble (this, index, value, order());
+    return this;
   }
 }
Index: java/nio/DoubleViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleViewBufferImpl.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DoubleViewBufferImpl.java
--- java/nio/DoubleViewBufferImpl.java	19 May 2003 09:05:13 -0000	1.1
+++ java/nio/DoubleViewBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* DoubleViewBufferImpl.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,54 +40,47 @@
 
 class DoubleViewBufferImpl extends DoubleBuffer
 {
-  private boolean readOnly;
+  /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
   private ByteBuffer bb;
+  private boolean readOnly;
   private ByteOrder endian;
   
-  public DoubleViewBufferImpl (ByteBuffer bb, boolean readOnly)
-  {
-    super (bb.remaining () >> 3, bb.remaining () >> 3, bb.position (), 0);
-    this.bb = bb;
-    this.readOnly = readOnly;
-    // FIXME: What if this is called from DoubleByteBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
-  }
-
   public DoubleViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                                int limit, int position, int mark,
-                               boolean readOnly)
+                               boolean readOnly, ByteOrder endian)
   {
     super (limit >> 3, limit >> 3, position >> 3, mark >> 3);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
-    // FIXME: What if this is called from DoubleViewBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
+    this.endian = endian;
   }
 
   public double get ()
   {
-    double result = bb.getDouble ((position () << 3) + offset);
-    position (position () + 1);
+    int p = position();
+    double result = ByteBufferHelper.getDouble(bb, (p << 3) + offset, endian);
+    position(p + 1);
     return result;
   }
 
   public double get (int index)
   {
-    return bb.getDouble ((index << 3) + offset);
+    return ByteBufferHelper.getDouble(bb, (index << 3) + offset, endian);
   }
 
   public DoubleBuffer put (double value)
   {
-    bb.putDouble ((position () << 3) + offset, value);
-    position (position () + 1);
+    int p = position();
+    ByteBufferHelper.putDouble(bb, (p << 3) + offset, value, endian);
+    position(p + 1);
     return this;
   }
   
   public DoubleBuffer put (int index, double value)
   {
-    bb.putDouble ((index << 3) + offset, value);
+    ByteBufferHelper.putDouble(bb, (index << 3) + offset, value, endian);
     return this;
   }
 
@@ -95,18 +88,8 @@
   {
     if (position () > 0)
       {
-        // Copy all data from position() to limit() to the beginning of the
-        // buffer, set position to end of data and limit to capacity
-        // XXX: This can surely be optimized, for direct and non-direct buffers
-        
         int count = limit () - position ();
-              
-        for (int i = 0; i < count; i++)
-          {
-            bb.putDouble ((i >> 3) + offset,
-                          bb.getDouble (((i + position ()) >> 3) + offset));
-          }
-
+	bb.shiftDown(offset, offset + 8 * position(), 8 * count);
         position (count);
         limit (capacity ());
       }
@@ -114,27 +96,31 @@
     return this;
   }
   
-  public DoubleBuffer duplicate ()
+  public DoubleBuffer slice ()
   {
-    // Create a copy of this object that shares its content
-    // FIXME: mark is not correct
-    return new DoubleViewBufferImpl (bb, offset, capacity (), limit (),
-                                     position (), -1, isReadOnly ());
+    return new DoubleViewBufferImpl (bb, (position () >> 3) + offset,
+				     remaining(), remaining(), 0, -1,
+                                     readOnly, endian);
   }
   
-  public DoubleBuffer slice ()
+  DoubleBuffer duplicate (boolean readOnly)
   {
-    // Create a sliced copy of this object that shares its content.
-    return new DoubleViewBufferImpl (bb, (position () >> 3) + offset,
-                                      remaining (), remaining (), 0, -1,
-                                     isReadOnly ());
+    int pos = position();
+    reset();
+    int mark = position();
+    position(pos);
+    return new DoubleViewBufferImpl (bb, offset, capacity(), limit(),
+                                     pos, mark, readOnly, endian);
+  }
+  
+  public DoubleBuffer duplicate ()
+  {
+    return duplicate(readOnly);
   }
   
   public DoubleBuffer asReadOnlyBuffer ()
   {
-    // Create a copy of this object that shares its content and is read-only
-    return new DoubleViewBufferImpl (bb, (position () >> 3) + offset,
-                                     remaining (), remaining (), 0, -1, true);
+    return duplicate(true);
   }
   
   public boolean isReadOnly ()
@@ -149,6 +135,6 @@
   
   public ByteOrder order ()
   {
-    return ByteOrder.LITTLE_ENDIAN;
+    return endian;
   }
 }
Index: java/nio/FloatViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatViewBufferImpl.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 FloatViewBufferImpl.java
--- java/nio/FloatViewBufferImpl.java	19 May 2003 09:05:13 -0000	1.1
+++ java/nio/FloatViewBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* FloatViewBufferImpl.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,54 +40,47 @@
 
 class FloatViewBufferImpl extends FloatBuffer
 {
-  private boolean readOnly;
+  /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
   private ByteBuffer bb;
+  private boolean readOnly;
   private ByteOrder endian;
   
-  public FloatViewBufferImpl (ByteBuffer bb, boolean readOnly)
-  {
-    super (bb.remaining () >> 2, bb.remaining () >> 2, bb.position (), 0);
-    this.bb = bb;
-    this.readOnly = readOnly;
-    // FIXME: What if this is called from FloatByteBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
-  }
-
   public FloatViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                                int limit, int position, int mark,
-                               boolean readOnly)
+			      boolean readOnly, ByteOrder endian)
   {
     super (limit >> 2, limit >> 2, position >> 2, mark >> 2);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
-    // FIXME: What if this is called from FloatViewBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
+    this.endian = endian;
   }
 
   public float get ()
   {
-    float result = bb.getFloat ((position () << 2) + offset);
-    position (position () + 1);
+    int p = position();
+    float result = ByteBufferHelper.getFloat(bb, (p << 2) + offset, endian);
+    position(p + 1);
     return result;
   }
 
   public float get (int index)
   {
-    return bb.getFloat ((index << 2) + offset);
+    return ByteBufferHelper.getFloat(bb, (index << 2) + offset, endian);
   }
 
   public FloatBuffer put (float value)
   {
-    bb.putFloat ((position () << 2) + offset, value);
-    position (position () + 1);
+    int p = position();
+    ByteBufferHelper.putFloat(bb, (p << 2) + offset, value, endian);
+    position(p + 1);
     return this;
   }
   
   public FloatBuffer put (int index, float value)
   {
-    bb.putFloat ((index << 2) + offset, value);
+    ByteBufferHelper.putFloat(bb, (index << 2) + offset, value, endian);
     return this;
   }
 
@@ -95,18 +88,8 @@
   {
     if (position () > 0)
       {
-        // Copy all data from position() to limit() to the beginning of the
-        // buffer, set position to end of data and limit to capacity
-        // XXX: This can surely be optimized, for direct and non-direct buffers
-        
         int count = limit () - position ();
-              
-        for (int i = 0; i < count; i++)
-          {
-            bb.putFloat ((i >> 2) + offset,
-                          bb.getFloat (((i + position ()) >> 2) + offset));
-          }
-
+	bb.shiftDown(offset, offset + 4 * position(), 4 * count);
         position (count);
         limit (capacity ());
       }
@@ -114,27 +96,32 @@
     return this;
   }
   
-  public FloatBuffer duplicate ()
-  {
-    // Create a copy of this object that shares its content
-    // FIXME: mark is not correct
-    return new FloatViewBufferImpl (bb, offset, capacity (), limit (),
-                                     position (), -1, isReadOnly ());
-  }
-  
   public FloatBuffer slice ()
   {
     // Create a sliced copy of this object that shares its content.
     return new FloatViewBufferImpl (bb, (position () >> 2) + offset,
-                                      remaining (), remaining (), 0, -1,
-                                     isReadOnly ());
+				    remaining(), remaining(), 0, -1,
+				    readOnly, endian);
+  }
+  
+  FloatBuffer duplicate (boolean readOnly)
+  {
+    int pos = position();
+    reset();
+    int mark = position();
+    position(pos);
+    return new FloatViewBufferImpl (bb, offset, capacity(), limit(),
+				    pos, mark, readOnly, endian);
+  }
+  
+  public FloatBuffer duplicate ()
+  {
+    return duplicate(readOnly);
   }
   
   public FloatBuffer asReadOnlyBuffer ()
   {
-    // Create a copy of this object that shares its content and is read-only
-    return new FloatViewBufferImpl (bb, (position () >> 2) + offset,
-                                     remaining (), remaining (), 0, -1, true);
+    return duplicate(true);
   }
   
   public boolean isReadOnly ()
@@ -149,6 +136,6 @@
   
   public ByteOrder order ()
   {
-    return ByteOrder.LITTLE_ENDIAN;
+    return endian;
   }
 }
Index: java/nio/IntViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntViewBufferImpl.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 IntViewBufferImpl.java
--- java/nio/IntViewBufferImpl.java	19 May 2003 09:05:13 -0000	1.1
+++ java/nio/IntViewBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* IntViewBufferImpl.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,54 +40,47 @@
 
 class IntViewBufferImpl extends IntBuffer
 {
-  private boolean readOnly;
+  /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
   private ByteBuffer bb;
+  private boolean readOnly;
   private ByteOrder endian;
   
-  public IntViewBufferImpl (ByteBuffer bb, boolean readOnly)
-  {
-    super (bb.remaining () >> 2, bb.remaining () >> 2, bb.position (), 0);
-    this.bb = bb;
-    this.readOnly = readOnly;
-    // FIXME: What if this is called from IntByteBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
-  }
-
   public IntViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                                int limit, int position, int mark,
-                               boolean readOnly)
+			    boolean readOnly, ByteOrder endian)
   {
     super (limit >> 2, limit >> 2, position >> 2, mark >> 2);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
-    // FIXME: What if this is called from IntViewBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
+    this.endian = endian;
   }
 
   public int get ()
   {
-    int result = bb.getInt ((position () << 2) + offset);
-    position (position () + 1);
+    int p = position();
+    int result = ByteBufferHelper.getInt(bb, (p << 2) + offset, endian);
+    position(p + 1);
     return result;
   }
 
   public int get (int index)
   {
-    return bb.getInt ((index << 2) + offset);
+    return ByteBufferHelper.getInt(bb, (index << 2) + offset, endian);
   }
 
   public IntBuffer put (int value)
   {
-    bb.putInt ((position () << 2) + offset, value);
-    position (position () + 1);
+    int p = position();
+    ByteBufferHelper.putInt(bb, (p << 2) + offset, value, endian);
+    position(p + 1);
     return this;
   }
   
   public IntBuffer put (int index, int value)
   {
-    bb.putInt ((index << 2) + offset, value);
+    ByteBufferHelper.putInt(bb, (index << 2) + offset, value, endian);
     return this;
   }
 
@@ -95,18 +88,8 @@
   {
     if (position () > 0)
       {
-        // Copy all data from position() to limit() to the beginning of the
-        // buffer, set position to end of data and limit to capacity
-        // XXX: This can surely be optimized, for direct and non-direct buffers
-        
         int count = limit () - position ();
-              
-        for (int i = 0; i < count; i++)
-          {
-            bb.putInt ((i >> 2) + offset,
-                          bb.getInt (((i + position ()) >> 2) + offset));
-          }
-
+	bb.shiftDown(offset, offset + 4 * position(), 4 * count);
         position (count);
         limit (capacity ());
       }
@@ -114,27 +96,32 @@
     return this;
   }
   
-  public IntBuffer duplicate ()
-  {
-    // Create a copy of this object that shares its content
-    // FIXME: mark is not correct
-    return new IntViewBufferImpl (bb, offset, capacity (), limit (),
-                                     position (), -1, isReadOnly ());
-  }
-  
   public IntBuffer slice ()
   {
     // Create a sliced copy of this object that shares its content.
     return new IntViewBufferImpl (bb, (position () >> 2) + offset,
-                                      remaining (), remaining (), 0, -1,
-                                     isReadOnly ());
+				  remaining(), remaining(), 0, -1,
+				  readOnly, endian);
+  }
+  
+  IntBuffer duplicate (boolean readOnly)
+  {
+    int pos = position();
+    reset();
+    int mark = position();
+    position(pos);
+    return new IntViewBufferImpl (bb, offset, capacity(), limit(),
+				  pos, mark, readOnly, endian);
+  }
+  
+  public IntBuffer duplicate ()
+  {
+    return duplicate(readOnly);
   }
   
   public IntBuffer asReadOnlyBuffer ()
   {
-    // Create a copy of this object that shares its content and is read-only
-    return new IntViewBufferImpl (bb, (position () >> 2) + offset,
-                                     remaining (), remaining (), 0, -1, true);
+    return duplicate(true);
   }
   
   public boolean isReadOnly ()
@@ -149,6 +136,6 @@
   
   public ByteOrder order ()
   {
-    return ByteOrder.LITTLE_ENDIAN;
+    return endian;
   }
 }
Index: java/nio/LongViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongViewBufferImpl.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 LongViewBufferImpl.java
--- java/nio/LongViewBufferImpl.java	19 May 2003 09:05:13 -0000	1.1
+++ java/nio/LongViewBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* LongViewBufferImpl.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,54 +40,47 @@
 
 class LongViewBufferImpl extends LongBuffer
 {
-  private boolean readOnly;
+  /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
   private ByteBuffer bb;
+  private boolean readOnly;
   private ByteOrder endian;
   
-  public LongViewBufferImpl (ByteBuffer bb, boolean readOnly)
-  {
-    super (bb.remaining () >> 3, bb.remaining () >> 3, bb.position (), 0);
-    this.bb = bb;
-    this.readOnly = readOnly;
-    // FIXME: What if this is called from LongByteBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
-  }
-
   public LongViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                                int limit, int position, int mark,
-                               boolean readOnly)
+			     boolean readOnly, ByteOrder endian)
   {
     super (limit >> 3, limit >> 3, position >> 3, mark >> 3);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
-    // FIXME: What if this is called from LongViewBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
+    this.endian = endian;
   }
 
   public long get ()
   {
-    long result = bb.getLong ((position () << 3) + offset);
-    position (position () + 1);
+    int p = position();
+    long result = ByteBufferHelper.getLong(bb, (p << 3) + offset, endian);
+    position(p + 1);
     return result;
   }
 
   public long get (int index)
   {
-    return bb.getLong ((index << 3) + offset);
+    return ByteBufferHelper.getLong(bb, (index << 3) + offset, endian);
   }
 
   public LongBuffer put (long value)
   {
-    bb.putLong ((position () << 3) + offset, value);
-    position (position () + 1);
+    int p = position();
+    ByteBufferHelper.putLong(bb, (p << 3) + offset, value, endian);
+    position(p + 1);
     return this;
   }
   
   public LongBuffer put (int index, long value)
   {
-    bb.putLong ((index << 3) + offset, value);
+    ByteBufferHelper.putLong(bb, (index << 3) + offset, value, endian);
     return this;
   }
 
@@ -95,18 +88,8 @@
   {
     if (position () > 0)
       {
-        // Copy all data from position() to limit() to the beginning of the
-        // buffer, set position to end of data and limit to capacity
-        // XXX: This can surely be optimized, for direct and non-direct buffers
-        
         int count = limit () - position ();
-              
-        for (int i = 0; i < count; i++)
-          {
-            bb.putLong ((i >> 3) + offset,
-                          bb.getLong (((i + position ()) >> 3) + offset));
-          }
-
+	bb.shiftDown(offset, offset + 8 * position(), 8 * count);
         position (count);
         limit (capacity ());
       }
@@ -114,27 +96,32 @@
     return this;
   }
   
-  public LongBuffer duplicate ()
-  {
-    // Create a copy of this object that shares its content
-    // FIXME: mark is not correct
-    return new LongViewBufferImpl (bb, offset, capacity (), limit (),
-                                     position (), -1, isReadOnly ());
-  }
-  
   public LongBuffer slice ()
   {
     // Create a sliced copy of this object that shares its content.
     return new LongViewBufferImpl (bb, (position () >> 3) + offset,
-                                      remaining (), remaining (), 0, -1,
-                                     isReadOnly ());
+				   remaining(), remaining(), 0, -1,
+				   readOnly, endian);
+  }
+  
+  LongBuffer duplicate (boolean readOnly)
+  {
+    int pos = position();
+    reset();
+    int mark = position();
+    position(pos);
+    return new LongViewBufferImpl (bb, offset, capacity(), limit(),
+				   pos, mark, readOnly, endian);
+  }
+  
+  public LongBuffer duplicate ()
+  {
+    return duplicate(readOnly);
   }
   
   public LongBuffer asReadOnlyBuffer ()
   {
-    // Create a copy of this object that shares its content and is read-only
-    return new LongViewBufferImpl (bb, (position () >> 3) + offset,
-                                     remaining (), remaining (), 0, -1, true);
+    return duplicate(true);
   }
   
   public boolean isReadOnly ()
@@ -149,6 +136,6 @@
   
   public ByteOrder order ()
   {
-    return ByteOrder.LITTLE_ENDIAN;
+    return endian;
   }
 }
Index: java/nio/MappedByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/MappedByteBufferImpl.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 MappedByteBufferImpl.java
--- java/nio/MappedByteBufferImpl.java	25 Sep 2003 14:01:18 -0000	1.5
+++ java/nio/MappedByteBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* MappedByteBufferImpl.java -- 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -111,15 +111,14 @@
 
   public ByteBuffer compact ()
   {
-    int copied = 0;
-    
-    while (remaining () > 0)
+    int pos = position();
+    if (pos > 0)
       {
-	put (copied, get ());
-	copied++;
+	int count = remaining();
+	shiftDown(0, pos, count);
+	position(count);
+	limit(capacity());
       }
-
-    position (copied);
     return this;
   }
 
@@ -145,151 +144,163 @@
 
   public CharBuffer asCharBuffer ()
   {
-    return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public ShortBuffer asShortBuffer ()
   {
-    return new ShortViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new ShortViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public IntBuffer asIntBuffer ()
   {
-    return new IntViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new IntViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
   
   public LongBuffer asLongBuffer ()
   {
-    return new LongViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new LongViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public FloatBuffer asFloatBuffer ()
   {
-    return new FloatViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new FloatViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
   public DoubleBuffer asDoubleBuffer ()
   {
-    return new DoubleViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly ());
+    return new DoubleViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
   }
 
-  public final char getChar()
+  final public char getChar ()
   {
-    return ByteBufferHelper.getChar (this);
+    return ByteBufferHelper.getChar(this, order());
   }
   
-  public final ByteBuffer putChar (char value)
+  final public ByteBuffer putChar (char value)
   {
-    return ByteBufferHelper.putChar (this, value);
+    ByteBufferHelper.putChar(this, value, order());
+    return this;
   }
   
-  public final char getChar (int index)
+  final public char getChar (int index)
   {
-    return ByteBufferHelper.getChar (this, index);
+    return ByteBufferHelper.getChar(this, index, order());
   }
   
-  public final ByteBuffer putChar (int index, char value)
+  final public ByteBuffer putChar (int index, char value)
   {
-    return ByteBufferHelper.putChar (this, index, value);
+    ByteBufferHelper.putChar(this, index, value, order());
+    return this;
   }
 
-  public final short getShort()
+  final public short getShort ()
   {
-    return ByteBufferHelper.getShort (this);
+    return ByteBufferHelper.getShort(this, order());
   }
   
-  public final ByteBuffer putShort (short value)
+  final public ByteBuffer putShort (short value)
   {
-    return ByteBufferHelper.putShort (this, value);
+    ByteBufferHelper.putShort(this, value, order());
+    return this;
   }
   
-  public final short getShort (int index)
+  final public short getShort (int index)
   {
-    return ByteBufferHelper.getShort (this, index);
+    return ByteBufferHelper.getShort(this, index, order());
   }
   
-  public final ByteBuffer putShort (int index, short value)
+  final public ByteBuffer putShort (int index, short value)
   {
-    return ByteBufferHelper.putShort (this, index, value);
+    ByteBufferHelper.putShort(this, index, value, order());
+    return this;
   }
 
-  public final int getInt()
+  final public int getInt ()
   {
-    return ByteBufferHelper.getInt (this);
+    return ByteBufferHelper.getInt(this, order());
   }
   
-  public final ByteBuffer putInt (int value)
+  final public ByteBuffer putInt (int value)
   {
-    return ByteBufferHelper.putInt (this, value);
+    ByteBufferHelper.putInt(this, value, order());
+    return this;
   }
   
-  public final int getInt (int index)
+  final public int getInt (int index)
   {
-    return ByteBufferHelper.getInt (this, index);
+    return ByteBufferHelper.getInt(this, index, order());
   }
   
-  public final ByteBuffer putInt (int index, int value)
+  final public ByteBuffer putInt (int index, int value)
   {
-    return ByteBufferHelper.putInt (this, index, value);
+    ByteBufferHelper.putInt(this, index, value, order());
+    return this;
   }
 
-  public final long getLong()
+  final public long getLong ()
   {
-    return ByteBufferHelper.getLong (this);
+    return ByteBufferHelper.getLong(this, order());
   }
   
-  public final ByteBuffer putLong (long value)
+  final public ByteBuffer putLong (long value)
   {
-    return ByteBufferHelper.putLong (this, value);
+    ByteBufferHelper.putLong (this, value, order());
+    return this;
   }
   
-  public final long getLong (int index)
+  final public long getLong (int index)
   {
-    return ByteBufferHelper.getLong (this, index);
+    return ByteBufferHelper.getLong (this, index, order());
   }
   
-  public final ByteBuffer putLong (int index, long value)
+  final public ByteBuffer putLong (int index, long value)
   {
-    return ByteBufferHelper.putLong (this, index, value);
+    ByteBufferHelper.putLong (this, index, value, order());
+    return this;
   }
 
-  public final float getFloat()
+  final public float getFloat ()
   {
-    return ByteBufferHelper.getFloat (this);
+    return ByteBufferHelper.getFloat (this, order());
   }
   
-  public final ByteBuffer putFloat (float value)
+  final public ByteBuffer putFloat (float value)
   {
-    return ByteBufferHelper.putFloat (this, value);
+    ByteBufferHelper.putFloat (this, value, order());
+    return this;
   }
   
   public final float getFloat (int index)
   {
-    return ByteBufferHelper.getFloat (this, index);
+    return ByteBufferHelper.getFloat (this, index, order());
   }
 
-  public final ByteBuffer putFloat (int index, float value)
+  final public ByteBuffer putFloat (int index, float value)
   {
-    return ByteBufferHelper.putFloat (this, index, value);
+    ByteBufferHelper.putFloat (this, index, value, order());
+    return this;
   }
 
-  public final double getDouble()
+  final public double getDouble ()
   {
-    return ByteBufferHelper.getDouble (this);
+    return ByteBufferHelper.getDouble (this, order());
   }
 
-  public final ByteBuffer putDouble (double value)
+  final public ByteBuffer putDouble (double value)
   {
-    return ByteBufferHelper.putDouble (this, value);
+    ByteBufferHelper.putDouble (this, value, order());
+    return this;
   }
   
-  public final double getDouble (int index)
+  final public double getDouble (int index)
   {
-    return ByteBufferHelper.getDouble (this, index);
+    return ByteBufferHelper.getDouble (this, index, order());
   }
   
-  public final ByteBuffer putDouble (int index, double value)
+  final public ByteBuffer putDouble (int index, double value)
   {
-    return ByteBufferHelper.putDouble (this, index, value);
+    ByteBufferHelper.putDouble (this, index, value, order());
+    return this;
   }
 }
Index: java/nio/ShortViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortViewBufferImpl.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ShortViewBufferImpl.java
--- java/nio/ShortViewBufferImpl.java	19 May 2003 09:05:13 -0000	1.1
+++ java/nio/ShortViewBufferImpl.java	11 Feb 2004 19:04:06 -0000
@@ -1,5 +1,5 @@
 /* ShortViewBufferImpl.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,54 +40,47 @@
 
 class ShortViewBufferImpl extends ShortBuffer
 {
-  private boolean readOnly;
+  /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
   private ByteBuffer bb;
+  private boolean readOnly;
   private ByteOrder endian;
   
-  public ShortViewBufferImpl (ByteBuffer bb, boolean readOnly)
-  {
-    super (bb.remaining () >> 1, bb.remaining () >> 1, bb.position (), 0);
-    this.bb = bb;
-    this.readOnly = readOnly;
-    // FIXME: What if this is called from ShortByteBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
-  }
-
   public ShortViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                                int limit, int position, int mark,
-                               boolean readOnly)
+			      boolean readOnly, ByteOrder endian)
   {
     super (limit >> 1, limit >> 1, position >> 1, mark >> 1);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
-    // FIXME: What if this is called from ShortViewBufferImpl and ByteBuffer has changed its endianess ?
-    this.endian = bb.order ();
+    this.endian = endian;
   }
 
   public short get ()
   {
-    short result = bb.getShort ((position () << 1) + offset);
-    position (position () + 1);
+    int p = position();
+    short result = ByteBufferHelper.getShort(bb, (p << 1) + offset, endian);
+    position(p + 1);
     return result;
   }
 
   public short get (int index)
   {
-    return bb.getShort ((index << 1) + offset);
+    return ByteBufferHelper.getShort(bb, (index << 1) + offset, endian);
   }
 
   public ShortBuffer put (short value)
   {
-    bb.putShort ((position () << 1) + offset, value);
-    position (position () + 1);
+    int p = position();
+    ByteBufferHelper.putShort(bb, (p << 1) + offset, value, endian);
+    position(p + 1);
     return this;
   }
   
   public ShortBuffer put (int index, short value)
   {
-    bb.putShort ((index << 1) + offset, value);
+    ByteBufferHelper.putShort(bb, (index << 1) + offset, value, endian);
     return this;
   }
 
@@ -95,18 +88,8 @@
   {
     if (position () > 0)
       {
-        // Copy all data from position() to limit() to the beginning of the
-        // buffer, set position to end of data and limit to capacity
-        // XXX: This can surely be optimized, for direct and non-direct buffers
-        
         int count = limit () - position ();
-              
-        for (int i = 0; i < count; i++)
-          {
-            bb.putShort ((i >> 1) + offset,
-                          bb.getShort (((i + position ()) >> 1) + offset));
-          }
-
+	bb.shiftDown(offset, offset + 2 * position(), 2 * count);
         position (count);
         limit (capacity ());
       }
@@ -114,27 +96,32 @@
     return this;
   }
   
-  public ShortBuffer duplicate ()
-  {
-    // Create a copy of this object that shares its content
-    // FIXME: mark is not correct
-    return new ShortViewBufferImpl (bb, offset, capacity (), limit (),
-                                     position (), -1, isReadOnly ());
-  }
-  
   public ShortBuffer slice ()
   {
     // Create a sliced copy of this object that shares its content.
     return new ShortViewBufferImpl (bb, (position () >> 1) + offset,
-                                      remaining (), remaining (), 0, -1,
-                                     isReadOnly ());
+				    remaining(), remaining(), 0, -1,
+				    readOnly, endian);
+  }
+  
+  ShortBuffer duplicate (boolean readOnly)
+  {
+    int pos = position();
+    reset();
+    int mark = position();
+    position(pos);
+    return new ShortViewBufferImpl (bb, offset, capacity(), limit(),
+				    pos, mark, readOnly, endian);
+  }
+  
+  public ShortBuffer duplicate ()
+  {
+    return duplicate(readOnly);
   }
   
   public ShortBuffer asReadOnlyBuffer ()
   {
-    // Create a copy of this object that shares its content and is read-only
-    return new ShortViewBufferImpl (bb, (position () >> 1) + offset,
-                                     remaining (), remaining (), 0, -1, true);
+    return duplicate(true);
   }
   
   public boolean isReadOnly ()
@@ -149,6 +136,6 @@
   
   public ByteOrder order ()
   {
-    return ByteOrder.LITTLE_ENDIAN;
+    return endian;
   }
 }
Index: include/java_nio_DirectByteBufferImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_nio_DirectByteBufferImpl.h,v
retrieving revision 1.1
diff -u -b -B -r1.1 java_nio_DirectByteBufferImpl.h
--- include/java_nio_DirectByteBufferImpl.h	2 Jul 2003 09:16:52 -0000	1.1
+++ include/java_nio_DirectByteBufferImpl.h	11 Feb 2004 19:04:06 -0000
@@ -14,6 +14,7 @@
 extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_freeImpl (JNIEnv *env, jclass, jobject);
 extern JNIEXPORT jbyte JNICALL Java_java_nio_DirectByteBufferImpl_getImpl (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_putImpl (JNIEnv *env, jobject, jint, jbyte);
+extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jobject, jint, jint, jint);
 
 #ifdef __cplusplus
 }
Index: native/jni/java-nio/java_nio_DirectByteBufferImpl.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/java_nio_DirectByteBufferImpl.c,v
retrieving revision 1.1
diff -u -b -B -r1.1 java_nio_DirectByteBufferImpl.c
--- native/jni/java-nio/java_nio_DirectByteBufferImpl.c	2 Jul 2003 09:16:52 -0000	1.1
+++ native/jni/java-nio/java_nio_DirectByteBufferImpl.c	11 Feb 2004 19:04:06 -0000
@@ -71,3 +71,8 @@
   JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.putImpl(): not implemented");
 }
 
+JNIEXPORT void JNICALL
+Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jobject obj, jint src_offset, jint dst_offset, jint count);
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.shiftDown(): not implemented");
+}

--Boundary-00=_j4nKAEGZJf9z7ak--




From MAILER-DAEMON Wed Feb 11 14:16:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aqzqg-0001EQ-Vn
	for mharc-commit-classpath@gnu.org; Wed, 11 Feb 2004 14:16:38 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aqzqc-0001DT-N0
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 14:16:34 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aqzq6-00013O-7d
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 14:16:33 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aqzpy-000123-BW
	for commit-classpath@gnu.org; Wed, 11 Feb 2004 14:15:54 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-249.ewetel.net
	[80.228.94.249])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i1BJFokY015650
	for <commit-classpath@gnu.org>; Wed, 11 Feb 2004 20:15:51 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Aqzpu-00072f-00
	for <commit-classpath@gnu.org>; Wed, 11 Feb 2004 20:15:50 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 11 Feb 2004 20:19:46 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_SBoKAZuwpyLdGiu"
Message-Id: <200402112019.47013.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.net.protocol.file.Conenction
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Feb 2004 19:16:36 -0000


--Boundary-00=_SBoKAZuwpyLdGiu
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge the copyright boilerplate 
with libgcj again.


Michael


2004-02-11  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/protocol/file/Connection.java:
	Reformated copyright boilerplate.


--Boundary-00=_SBoKAZuwpyLdGiu
Content-Type: text/x-diff;
  charset="us-ascii";
  name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="file.diff"

Index: gnu/java/net/protocol/file/Connection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/file/Connection.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 Connection.java
--- gnu/java/net/protocol/file/Connection.java	6 Jan 2004 10:07:59 -0000	1.7
+++ gnu/java/net/protocol/file/Connection.java	11 Feb 2004 19:12:57 -0000
@@ -1,41 +1,40 @@
-/*
-  FileURLConnection.java -- URLConnection class for "file" protocol
+/* FileURLConnection.java -- URLConnection class for "file" protocol
   Copyright (C) 1998, 1999, 2003 Free Software Foundation, Inc.
 
-  This file is part of GNU Classpath.
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.  */
 
-  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
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with GNU Classpath; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-  02111-1307 USA.
-
-  Linking this library statically or dynamically with other modules is
-  making a combined work based on this library.  Thus, the terms and
-  conditions of the GNU General Public License cover the whole
-  combination.
-
-  As a special exception, the copyright holders of this library give you
-  permission to link this library with independent modules to produce an
-  executable, regardless of the license terms of these independent
-  modules, and to copy and distribute the resulting executable under
-  terms of your choice, provided that you also meet, for each linked
-  independent module, the terms and conditions of the license of that
-  module.  An independent module is a module which is not derived from
-  or based on this library.  If you modify this library, you may extend
-  this exception to your version of the library, but you are not
-  obligated to do so.  If you do not wish to do so, delete this
-  exception statement from your version.
-*/
 package gnu.java.net.protocol.file;
 
 import java.io.BufferedInputStream;

--Boundary-00=_SBoKAZuwpyLdGiu--




From MAILER-DAEMON Thu Feb 12 11:41:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1ArJtm-0007Na-6Z
	for mharc-commit-classpath@gnu.org; Thu, 12 Feb 2004 11:41:10 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1ArJth-0007Lr-OA
	for commit-classpath@gnu.org; Thu, 12 Feb 2004 11:41:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1ArJt9-0007Bm-Hw
	for commit-classpath@gnu.org; Thu, 12 Feb 2004 11:41:03 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1ArJt8-0007B1-La
	for commit-classpath@gnu.org; Thu, 12 Feb 2004 11:40:30 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-93-086.ewetel.net
	[80.228.93.86])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i1CGeRq7021095
	for <commit-classpath@gnu.org>; Thu, 12 Feb 2004 17:40:28 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1ArJt5-0004Zt-00
	for <commit-classpath@gnu.org>; Thu, 12 Feb 2004 17:40:27 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 12 Feb 2004 17:44:25 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_p16KAGpu2pDEpWZ"
Message-Id: <200402121744.25414.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.net fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2004 16:41:07 -0000


--Boundary-00=_p16KAGpu2pDEpWZ
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge some java.net fixes from 
libgcj.


Michael


2004-02-12  Michael Koch  <konqueror@gmx.de>

	* java/net/DatagramSocket.java
	(setReuseAddress): Use Boolean.valueOf() instead of creating a new
	Boolean object.
	(setBroadcast): Likewise.
	* java/net/MulticastSocket.java
	(setLoopbackMode): Likewise.
	* java/net/ServerSocket.java
	(setReuseAddress): Likewise.
	* java/net/Socket.java
	(setTcpNoDelay): Likewise.
	(setSoLinger): Likewise.
	(setOOBInline): Likewise.
	(setKeepAlive): Likewise.
	(setReuseAddress): Likewise.
	* java/net/URLStreamHandler.java
	(hostSEquals): Fix checking host addresses.
	(toExternalForm): Dont check protocol for null. We know already its
	not null.


--Boundary-00=_p16KAGpu2pDEpWZ
Content-Type: text/x-diff;
  charset="us-ascii";
  name="net.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="net.diff"

Index: java/net/DatagramSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/DatagramSocket.java,v
retrieving revision 1.38
diff -u -b -B -r1.38 DatagramSocket.java
--- java/net/DatagramSocket.java	6 Feb 2004 09:13:24 -0000	1.38
+++ java/net/DatagramSocket.java	12 Feb 2004 16:36:54 -0000
@@ -798,7 +798,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+    getImpl().setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
@@ -837,7 +837,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption(SocketOptions.SO_BROADCAST, new Boolean(enable));
+    getImpl().setOption(SocketOptions.SO_BROADCAST, Boolean.valueOf(enable));
   }
 
   /**
Index: java/net/MulticastSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/MulticastSocket.java,v
retrieving revision 1.22
diff -u -b -B -r1.22 MulticastSocket.java
--- java/net/MulticastSocket.java	2 Dec 2003 10:50:56 -0000	1.22
+++ java/net/MulticastSocket.java	12 Feb 2004 16:36:54 -0000
@@ -255,7 +255,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption (SocketOptions.IP_MULTICAST_LOOP, new Boolean (disable));
+    getImpl().setOption (SocketOptions.IP_MULTICAST_LOOP, Boolean.valueOf(disable));
   }
 
   /**
Index: java/net/ServerSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ServerSocket.java,v
retrieving revision 1.33
diff -u -b -B -r1.33 ServerSocket.java
--- java/net/ServerSocket.java	6 Feb 2004 09:13:24 -0000	1.33
+++ java/net/ServerSocket.java	12 Feb 2004 16:36:54 -0000
@@ -471,7 +471,7 @@
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
     
-    impl.setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+    impl.setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
Index: java/net/Socket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Socket.java,v
retrieving revision 1.41
diff -u -b -B -r1.41 Socket.java
--- java/net/Socket.java	6 Feb 2004 09:13:24 -0000	1.41
+++ java/net/Socket.java	12 Feb 2004 16:36:54 -0000
@@ -657,7 +657,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
     
-    getImpl().setOption(SocketOptions.TCP_NODELAY, new Boolean(on));
+    getImpl().setOption(SocketOptions.TCP_NODELAY, Boolean.valueOf(on));
   }
 
   /**
@@ -719,7 +719,7 @@
       }
     else
       {
-        getImpl().setOption(SocketOptions.SO_LINGER, new Boolean(false));
+        getImpl().setOption(SocketOptions.SO_LINGER, Boolean.valueOf(false));
       }
   }
 
@@ -784,7 +784,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
     
-    getImpl().setOption(SocketOptions.SO_OOBINLINE, new Boolean(on));
+    getImpl().setOption(SocketOptions.SO_OOBINLINE, Boolean.valueOf(on));
   }
 
   /**
@@ -975,7 +975,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
     
-    getImpl().setOption(SocketOptions.SO_KEEPALIVE, new Boolean(on));
+    getImpl().setOption(SocketOptions.SO_KEEPALIVE, Boolean.valueOf(on));
   }
 
   /**
@@ -1150,7 +1150,7 @@
    */
   public void setReuseAddress (boolean on) throws SocketException
   {
-    getImpl().setOption (SocketOptions.SO_REUSEADDR, new Boolean (on));
+    getImpl().setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
Index: java/net/URLStreamHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLStreamHandler.java,v
retrieving revision 1.24
diff -u -b -B -r1.24 URLStreamHandler.java
--- java/net/URLStreamHandler.java	31 Dec 2003 08:44:39 -0000	1.24
+++ java/net/URLStreamHandler.java	12 Feb 2004 16:36:54 -0000
@@ -415,7 +415,7 @@
     InetAddress addr1 = getHostAddress (url1);
     InetAddress addr2 = getHostAddress (url2);
 
-    if (addr1 != null || addr2 != null)
+    if (addr1 != null && addr2 != null)
       return addr1.equals (addr2);
 
     String host1 = url1.getHost();
@@ -511,7 +511,7 @@
     int size = protocol.length() + host.length() + file.length() + 24;
     StringBuffer sb = new StringBuffer(size);
 
-    if (protocol != null && protocol.length() > 0)
+    if (protocol.length() != 0)
       {
 	sb.append(protocol);
 	sb.append(":");

--Boundary-00=_p16KAGpu2pDEpWZ--




From MAILER-DAEMON Thu Feb 12 11:57:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1ArK9p-0002Aa-9x
	for mharc-commit-classpath@gnu.org; Thu, 12 Feb 2004 11:57:45 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1ArK9l-0002AH-GM
	for commit-classpath@gnu.org; Thu, 12 Feb 2004 11:57:41 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1ArK9C-00022L-Th
	for commit-classpath@gnu.org; Thu, 12 Feb 2004 11:57:39 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1ArK9C-00021t-0Q
	for commit-classpath@gnu.org; Thu, 12 Feb 2004 11:57:06 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-93-086.ewetel.net
	[80.228.93.86])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i1CGv1kS010959
	for <commit-classpath@gnu.org>; Thu, 12 Feb 2004 17:57:02 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1ArK97-0004cZ-00
	for <commit-classpath@gnu.org>; Thu, 12 Feb 2004 17:57:01 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 12 Feb 2004 18:00:59 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_LF7KA5SxFCLf6ws"
Message-Id: <200402121800.59685.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: embedded window support 
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Feb 2004 16:57:42 -0000


--Boundary-00=_LF7KA5SxFCLf6ws
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the first part of the embedded window support. This 
allows embedded windows of a Java application into another non-Java 
application. This is e.g. useful to write java applet plugins ;-).


Michael


2004-02-12  Michael Koch  <konqueror@gmx.de>

	* gnu/java/awt/EmbeddedWindow.java,
	gnu/java/awt/EmbeddedWindowSupport.java,
	gnu/java/awt/peer/EmbeddedWindowPeer.java,
	gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java,
	include/gnu_java_awt_EmbeddedWindow.h,
	include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h,
	native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c,
	native/jni/java-awt/Makefile.am,
	native/jni/java-awt/.cvsignore: New files.
	* gnu/java/awt/peer/gtk/GtkToolkit.java
	* configure.ac (AC_OUTPUT_FILES): Added native/jni/java-awt/Makefile
	* gnu/java/awt/Makefile.am
	(EXTRA_DIST): Added EmbeddedWindow.java and
	EmbeddedWindowSupport.java.
	* gnu/java/awt/peer/Makefile.am
	(EXTRA_DIST): Added EmbeddedWindowPeer.java.
	* gnu/java/awt/peer/gtk/Makefile.am
	(EXTRA_DIST): Added GtkEmbeddedWindowPeer.java.
	* include/Makefile.am: Generate gnu_java_awt_EmbeddedWindow.h and
	gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h.
	* native/jni/Makefile.am: Added subdir java-awt.
	* native/jni/gtk-peer/Makefile.am: Added
	gnu_java_awt_EmbeddedWindow.c.


--Boundary-00=_LF7KA5SxFCLf6ws
Content-Type: text/x-diff;
  charset="us-ascii";
  name="embedded.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="embedded.diff"

Index: gnu/java/awt/EmbeddedWindow.java
===================================================================
RCS file: gnu/java/awt/EmbeddedWindow.java
diff -N gnu/java/awt/EmbeddedWindow.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/awt/EmbeddedWindow.java	12 Feb 2004 16:52:15 -0000
@@ -0,0 +1,125 @@
+/* EmbeddedWindow.java --
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.awt;
+
+import gnu.java.awt.peer.EmbeddedWindowPeer;
+import java.awt.Frame;
+import java.awt.Toolkit;
+
+/**
+ * Represents an AWT window that can be embedded into another
+ * application.
+ * 
+ * @author Michael Koch <konqueror@gmx.de>
+ */
+public class EmbeddedWindow extends Frame
+{
+  private long handle;
+  
+  /**
+   * Creates a window to be embedded into another application.  The
+   * window will only be embedded after its setHandle method has been
+   * called.
+   */
+  public EmbeddedWindow ()
+  {
+    super();
+    this.handle = 0;
+  }
+  
+  /**
+   * Creates a window to be embedded into another application.
+   *
+   * @param handle the native handle to the screen area where the AWT
+   * window should be embedded
+   */
+  public EmbeddedWindow (long handle)
+  {
+    super();
+    this.handle = handle;
+  }
+  
+  /**
+   * Creates the native peer for this embedded window.
+   */
+  public void addNotify()
+  {
+    Toolkit tk = getToolkit();
+
+    if (! (tk instanceof EmbeddedWindowSupport))
+      throw new UnsupportedOperationException
+        ("Embedded windows are not supported by the current peers: " + tk.getClass());
+
+    setWindowPeer (((EmbeddedWindowSupport) tk).createEmbeddedWindow (this));
+    super.addNotify();
+  }
+
+  // This method is only made native to circumvent the package-privateness of
+  // an AWT internal java.awt.Component.peer member variable.
+  native void setWindowPeer (EmbeddedWindowPeer peer);
+
+  /**
+   * If the native peer for this embedded window has been created,
+   * then setHandle will embed the window.  If not, setHandle tells
+   * us where to embed ourselves when our peer is created.
+   *
+   * @param handle the native handle to the screen area where the AWT
+   * window should be embedded
+   */
+  public void setHandle(long handle)
+  {
+    if (this.handle != 0)
+      throw new RuntimeException ("EmbeddedWindow is already embedded");
+
+    this.handle = handle;
+    if (getPeer() != null)
+      ((EmbeddedWindowPeer) getPeer()).embed (this.handle);
+  }
+
+  /**
+   * Gets the native handle of the screen area where the window will
+   * be embedded.
+   *
+   * @return The native handle that was passed to the constructor.
+   */
+  public long getHandle()
+  {
+    return handle;
+  }
+}
Index: gnu/java/awt/EmbeddedWindowSupport.java
===================================================================
RCS file: gnu/java/awt/EmbeddedWindowSupport.java
diff -N gnu/java/awt/EmbeddedWindowSupport.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/awt/EmbeddedWindowSupport.java	12 Feb 2004 16:52:15 -0000
@@ -0,0 +1,65 @@
+/* EmbeddedWindowSupport.java --
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.awt;
+
+import gnu.java.awt.peer.EmbeddedWindowPeer;
+
+/**
+ * Declares a method for creating native embedded window peers.
+ *
+ * All classes inherited from java.awt.Toolkit that implement this
+ * interface are assumed to support the creation of embedded window
+ * peers. To create an embedded window, use
+ * gnu.java.awt.EmbeddedWindow.
+ *
+ * @see gnu.java.awt.EmbeddedWindow
+ * @see java.awt.Toolkit
+ *
+ * @author Michael Koch <konqueror@gmx.de>
+ */
+public interface EmbeddedWindowSupport
+{
+  /**
+   * Creates an embedded window peer, and associates it with an
+   * EmbeddedWindow object.
+   *
+   * @param w The embedded window with which to associate a peer.
+   */
+  EmbeddedWindowPeer createEmbeddedWindow (EmbeddedWindow w);
+}
Index: gnu/java/awt/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/Makefile.am,v
retrieving revision 1.7
diff -u -b -B -r1.7 Makefile.am
--- gnu/java/awt/Makefile.am	6 Nov 2003 17:09:35 -0000	1.7
+++ gnu/java/awt/Makefile.am	12 Feb 2004 16:52:15 -0000
@@ -8,4 +8,6 @@
 Buffers.java \
 ComponentDataBlitOp.java \
 ClasspathToolkit.java \
+EmbeddedWindow.java \
+EmbeddedWindowSupport.java \
 EventModifier.java
Index: gnu/java/awt/peer/EmbeddedWindowPeer.java
===================================================================
RCS file: gnu/java/awt/peer/EmbeddedWindowPeer.java
diff -N gnu/java/awt/peer/EmbeddedWindowPeer.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/awt/peer/EmbeddedWindowPeer.java	12 Feb 2004 16:52:15 -0000
@@ -0,0 +1,47 @@
+/* EmbeddedWindowPeer.java -- Interface for window peers that may be
+   embedded into other applications
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.awt.peer;
+
+import java.awt.peer.FramePeer;
+
+public interface EmbeddedWindowPeer extends FramePeer
+{
+  void embed (long handle);
+}
Index: gnu/java/awt/peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/Makefile.am,v
retrieving revision 1.5
diff -u -b -B -r1.5 Makefile.am
--- gnu/java/awt/peer/Makefile.am	4 Nov 2003 11:24:08 -0000	1.5
+++ gnu/java/awt/peer/Makefile.am	12 Feb 2004 16:52:15 -0000
@@ -4,4 +4,5 @@
 
 EXTRA_DIST = \
 ClasspathFontPeer.java \
+EmbeddedWindowPeer.java \
 GLightweightPeer.java
Index: gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java
===================================================================
RCS file: gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java
diff -N gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java	12 Feb 2004 16:52:15 -0000
@@ -0,0 +1,73 @@
+/* GtkEmbeddedWindowPeer.java -- Implements EmbeddedWindowPeer using a
+   GtkPlug
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.java.awt.peer.gtk;
+
+import gnu.java.awt.EmbeddedWindow;
+import gnu.java.awt.peer.EmbeddedWindowPeer;
+
+public class GtkEmbeddedWindowPeer extends GtkFramePeer
+  implements EmbeddedWindowPeer
+{
+  native void create (long socket_id);
+
+  void create ()
+  {
+    create (((EmbeddedWindow) awtComponent).getHandle ());
+  }
+
+  native void construct (long socket_id);
+
+  // FIXME: embed doesn't work right now, though I believe it should.
+  // This means that you can't call setVisible (true) on an
+  // EmbeddedWindow before calling setHandle with a valid handle.  The
+  // problem is that somewhere after the call to
+  // GtkEmbeddedWindow.create and before the call to
+  // GtkEmbeddedWindow.construct, the GtkPlug peer is being realized.
+  // GtkSocket silently fails to embed an already-realized GtkPlug.
+  public void embed (long handle)
+  {
+    construct (handle);
+  }
+
+  public GtkEmbeddedWindowPeer (EmbeddedWindow w)
+  {
+    super (w);
+  }
+}
Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.47
diff -u -b -B -r1.47 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java	25 Jan 2004 18:45:26 -0000	1.47
+++ gnu/java/awt/peer/gtk/GtkToolkit.java	12 Feb 2004 16:52:15 -0000
@@ -53,6 +53,9 @@
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.Properties;
+import gnu.java.awt.EmbeddedWindow;
+import gnu.java.awt.EmbeddedWindowSupport;
+import gnu.java.awt.peer.EmbeddedWindowPeer;
 import gnu.java.awt.peer.ClasspathFontPeer;
 import gnu.classpath.Configuration;
 import gnu.java.awt.peer.gtk.GdkPixbufDecoder;
@@ -73,6 +76,7 @@
  */
 
 public class GtkToolkit extends gnu.java.awt.ClasspathToolkit
+  implements EmbeddedWindowSupport
 {
   GtkMainThread main;
   Hashtable containers = new Hashtable();
@@ -351,6 +355,11 @@
   protected WindowPeer createWindow (Window w)
   {
     return new GtkWindowPeer (w);
+  }
+
+  public EmbeddedWindowPeer createEmbeddedWindow (EmbeddedWindow w)
+  {
+    return new GtkEmbeddedWindowPeer (w);
   }
 
   /** 
Index: gnu/java/awt/peer/gtk/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/Makefile.am,v
retrieving revision 1.11
diff -u -b -B -r1.11 Makefile.am
--- gnu/java/awt/peer/gtk/Makefile.am	21 Nov 2003 12:54:26 -0000	1.11
+++ gnu/java/awt/peer/gtk/Makefile.am	12 Feb 2004 16:52:15 -0000
@@ -20,6 +20,7 @@
 	GtkComponentPeer.java \
 	GtkContainerPeer.java \
 	GtkDialogPeer.java \
+	GtkEmbeddedWindowPeer.java \
 	GtkFileDialogPeer.java \
 	GtkFontPeer.java \
 	GtkFramePeer.java \
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.6
diff -u -b -B -r1.6 configure.ac
--- configure.ac	4 Feb 2004 09:01:52 -0000	1.6
+++ configure.ac	12 Feb 2004 16:52:16 -0000
@@ -412,6 +412,7 @@
 native/cni/Makefile
 native/jni/Makefile
 native/jni/classpath/Makefile
+native/jni/java-awt/Makefile
 native/jni/java-io/Makefile
 native/jni/java-lang/Makefile
 native/jni/java-net/Makefile
Index: include/gnu_java_awt_EmbeddedWindow.h
===================================================================
RCS file: include/gnu_java_awt_EmbeddedWindow.h
diff -N include/gnu_java_awt_EmbeddedWindow.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_awt_EmbeddedWindow.h	12 Feb 2004 16:52:16 -0000
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_EmbeddedWindow__
+#define __gnu_java_awt_EmbeddedWindow__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_EmbeddedWindow_setWindowPeer (JNIEnv *env, jobject, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_awt_EmbeddedWindow__ */
Index: include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
===================================================================
RCS file: include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
diff -N include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h	12 Feb 2004 16:52:16 -0000
@@ -0,0 +1,20 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__
+#define __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create__J (JNIEnv *env, jobject, jlong);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer__ */
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.9
diff -u -b -B -r1.9 Makefile.am
--- include/Makefile.am	28 Jan 2004 14:22:31 -0000	1.9
+++ include/Makefile.am	12 Feb 2004 16:52:16 -0000
@@ -3,6 +3,7 @@
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) ../lib:$(USER_CLASSLIB)
 
 H_FILES = \
+$(top_srcdir)/include/gnu_java_awt_EmbeddedWindow.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphics.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkPixbufDecoder.h \
@@ -14,6 +15,7 @@
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkChoicePeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkClipboard.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h \
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFramePeer.h \
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkGenericPeer.h \
@@ -58,6 +60,8 @@
 
 all-local: $(H_FILES)
 
+$(top_srcdir)/include/gnu_java_awt_EmbeddedWindow.h: $(top_srcdir)/gnu/java/awt/EmbeddedWindow.java
+	$(JAVAH) -o $@ gnu.java.awt.EmbeddedWindow
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkFontMetrics.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GdkFontMetrics
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GdkGraphics.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GdkGraphics.java
@@ -80,6 +84,8 @@
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkClipboard
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkComponentPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkComponentPeer
+$(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java
+	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkEmbeddedWindowPeer
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
 	$(JAVAH) -o $@ gnu.java.awt.peer.gtk.GtkFileDialogPeer
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkFramePeer.h: $(top_srcdir)/gnu/java/awt/peer/gtk/GtkFramePeer.java
Index: native/jni/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/Makefile.am,v
retrieving revision 1.8
diff -u -b -B -r1.8 Makefile.am
--- native/jni/Makefile.am	30 Jan 2004 22:16:15 -0000	1.8
+++ native/jni/Makefile.am	12 Feb 2004 16:52:16 -0000
@@ -4,6 +4,6 @@
   GTKDIR = gtk-peer
 endif
 
-SUBDIRS = classpath java-io java-lang java-net java-nio java-util $(GTKDIR)
-DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util gtk-peer
+SUBDIRS = classpath java-awt java-io java-lang java-net java-nio java-util $(GTKDIR)
+DIST_SUBDIRS = classpath java-awt java-io java-lang java-net java-nio java-util gtk-peer
 
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.6
diff -u -b -B -r1.6 Makefile.am
--- native/jni/gtk-peer/Makefile.am	4 Feb 2004 08:21:59 -0000	1.6
+++ native/jni/gtk-peer/Makefile.am	12 Feb 2004 16:52:16 -0000
@@ -2,35 +2,36 @@
 
 libgtkpeer_la_SOURCES = \
 			gnu_java_awt_peer_gtk_GdkFontMetrics.c \
+			gnu_java_awt_peer_gtk_GdkGraphics.c \
 			gnu_java_awt_peer_gtk_GdkPixbufDecoder.c \
 			gnu_java_awt_peer_gtk_GtkFileDialogPeer.c \
-			gnu_java_awt_peer_gtk_GtkScrollPanePeer.c \
-			gnu_java_awt_peer_gtk_GdkGraphics.c \
+			gnu_java_awt_peer_gtk_GtkButtonPeer.c \
+			gnu_java_awt_peer_gtk_GtkCanvasPeer.c \
+			gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c \
+			gnu_java_awt_peer_gtk_GtkCheckboxPeer.c \
+			gnu_java_awt_peer_gtk_GtkChoicePeer.c \
+			gnu_java_awt_peer_gtk_GtkClipboard.c \
+			gnu_java_awt_peer_gtk_GtkComponentPeer.c \
+			gnu_java_awt_peer_gtk_GtkEvents.c \
+			gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c \
 			gnu_java_awt_peer_gtk_GtkImagePainter.c \
-			gnu_java_awt_peer_gtk_GtkTextAreaPeer.c \
-			gthread-jni.c \
 			gnu_java_awt_peer_gtk_GtkLabelPeer.c \
-			gnu_java_awt_peer_gtk_GtkTextComponentPeer.c \
-			gnu_java_awt_peer_gtk_GtkButtonPeer.c \
 			gnu_java_awt_peer_gtk_GtkListPeer.c	\
-			gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \
-			gnu_java_awt_peer_gtk_GtkCanvasPeer.c \
 			gnu_java_awt_peer_gtk_GtkMainThread.c \
-			gnu_java_awt_peer_gtk_GtkToolkit.c \
-			gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c \
 			gnu_java_awt_peer_gtk_GtkMenuBarPeer.c \
                         gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c \
-			gnu_java_awt_peer_gtk_GtkWindowPeer.c \
-			gnu_java_awt_peer_gtk_GtkCheckboxPeer.c \
 			gnu_java_awt_peer_gtk_GtkMenuItemPeer.c \
-			gnu_java_awt_peer_gtk_GtkChoicePeer.c \
 			gnu_java_awt_peer_gtk_GtkMenuPeer.c \
-			gnu_java_awt_peer_gtk_GtkClipboard.c \
 			gnu_java_awt_peer_gtk_GtkPanelPeer.c \
-			gnu_java_awt_peer_gtk_GtkComponentPeer.c \
 			gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c \
-			gnu_java_awt_peer_gtk_GtkEvents.c \
 			gnu_java_awt_peer_gtk_GtkScrollBarPeer.c \
+			gnu_java_awt_peer_gtk_GtkScrollPanePeer.c \
+			gnu_java_awt_peer_gtk_GtkTextAreaPeer.c \
+			gnu_java_awt_peer_gtk_GtkTextComponentPeer.c \
+			gnu_java_awt_peer_gtk_GtkTextFieldPeer.c \
+			gnu_java_awt_peer_gtk_GtkToolkit.c \
+			gnu_java_awt_peer_gtk_GtkWindowPeer.c \
+			gthread-jni.c \
 			gthread-jni.h \
 			gtkpeer.h 
 
Index: native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c
===================================================================
RCS file: native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c
diff -N native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c	12 Feb 2004 16:52:16 -0000
@@ -0,0 +1,67 @@
+/* EmbeddedWindow.c -
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#include <config.h>
+#include <errno.h>
+
+#include <jni.h>
+#include <jcl.h>
+
+#include "gnu_java_awt_EmbeddedWindow.h"
+
+#define AWT_EXCEPTION "java/awt/AWTException"
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_EmbeddedWindow_setWindowPeer (JNIEnv *env, jobject obj, jobject peer)
+{
+  jclass clazz;
+  jfieldID fid;
+  
+  if (!peer) {
+    clazz = (*env)->FindClass (env, "java.awt.Component");
+    if (clazz == NULL) {
+      JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.EmbbeddedWindow.setWindowPeer(): Error");
+    }
+
+    fid = (*env)->GetFieldID (env, clazz, "peer", "[java.awt.peer.ComponentPeer");
+    if (fid == NULL) {
+      JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.EmbbeddedWindow.setWindowPeer(): Error");
+    }
+
+    (*env)->SetObjectField (env, obj, fid, peer);
+  }
+}
Index: native/jni/java-awt/Makefile.am
===================================================================
RCS file: native/jni/java-awt/Makefile.am
diff -N native/jni/java-awt/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-awt/Makefile.am	12 Feb 2004 16:52:16 -0000
@@ -0,0 +1,12 @@
+pkglib_LTLIBRARIES = libjavaawt.la
+
+libjavaawt_la_SOURCES = gnu_java_awt_EmbeddedWindow.c
+			
+
+libjavaawt_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavaawt_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
+
+INCLUDES = -I. @EXTRA_INCLUDES@ \
+	   -I$(top_srcdir)/native/jni/classpath \
+           -I$(top_srcdir)/include \
+	   -I$(top_builddir)/include 
Index: native/jni/java-awt/.cvsignore
===================================================================
RCS file: native/jni/java-awt/.cvsignore
diff -N native/jni/java-awt/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-awt/.cvsignore	12 Feb 2004 16:52:16 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

--Boundary-00=_LF7KA5SxFCLf6ws--




From MAILER-DAEMON Sat Feb 14 05:26:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Arx0E-0002KZ-TO
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 05:26:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Arx0C-0002HT-5a
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 05:26:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Arx0A-0002F7-MG
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 05:26:23 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Arx0A-0002EV-1c
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 05:26:22 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1Arx00-00034P-00; Sat, 14 Feb 2004 11:26:12 +0100
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200402121800.59685.konqueror@gmx.de>
References: <200402121800.59685.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-/RpDOx1jafKSTP8Cd+dm"
Message-Id: <1076754373.11504.245.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 14 Feb 2004 11:26:13 +0100
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: embedded window support
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 10:26:24 -0000


--=-/RpDOx1jafKSTP8Cd+dm
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Thu, 2004-02-12 at 18:00, Michael Koch wrote:
> I just commited the first part of the embedded window support. This=20
> allows embedded windows of a Java application into another non-Java=20
> application. This is e.g. useful to write java applet plugins ;-).

Very cool!

> 	* native/jni/gtk-peer/Makefile.am: Added
> 	gnu_java_awt_EmbeddedWindow.c.

But you forgot to commit/add
native/jni/gtk-peer/gnu_java_awt_EmbeddedWindow.c.

Cheers,

Mark

--=-/RpDOx1jafKSTP8Cd+dm
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBALffExVhZCJWr9QwRAm6nAJ9H5Moe4cMpvrOxCC8fbmaqRaVOcgCaAgQF
kSSw9d0/Fj1AjAmN5vIZEgA=
=b0//
-----END PGP SIGNATURE-----

--=-/RpDOx1jafKSTP8Cd+dm--




From MAILER-DAEMON Sat Feb 14 06:17:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Arxnr-0005bo-Jk
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 06:17:43 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Arxno-0005Zt-KK
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 06:17:40 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1ArxnI-0005ME-9W
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 06:17:39 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1ArxnF-0005L2-TR
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 06:17:07 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-139.ewetel.net
	[80.228.95.139])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i1EBGuPt022813;
	Sat, 14 Feb 2004 12:16:57 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1Arxn6-00059y-00; Sat, 14 Feb 2004 12:16:56 +0100
Date: Sat, 14 Feb 2004 12:16:56 +0100
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Message-ID: <20040214111656.GA18654@mail.konqueror.de>
References: <200402121800.59685.konqueror@gmx.de>
	<1076754373.11504.245.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1076754373.11504.245.camel@elsschot.wildebeest.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: embedded window support
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 11:17:41 -0000

On Sat, Feb 14, 2004 at 11:26:13AM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Thu, 2004-02-12 at 18:00, Michael Koch wrote:
> > I just commited the first part of the embedded window support. This 
> > allows embedded windows of a Java application into another non-Java 
> > application. This is e.g. useful to write java applet plugins ;-).
> 
> Very cool!
> 
> > 	* native/jni/gtk-peer/Makefile.am: Added
> > 	gnu_java_awt_EmbeddedWindow.c.
> 
> But you forgot to commit/add
> native/jni/gtk-peer/gnu_java_awt_EmbeddedWindow.c.

Strange. I goet this with "cvs log":


ch@obelix ~/src/classpath> cvs log
native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c

RCS file:
/cvsroot/classpath/classpath/native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c,v
Working file: native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2004/02/12 16:53:09;  author: mkoch;  state: Exp;
2004-02-12  Michael Koch  <konqueror@gmx.de>

        * gnu/java/awt/EmbeddedWindow.java,
        gnu/java/awt/EmbeddedWindowSupport.java,
        gnu/java/awt/peer/EmbeddedWindowPeer.java,
        gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java,
        include/gnu_java_awt_EmbeddedWindow.h,
        include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h,
        native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c,
        native/jni/java-awt/Makefile.am,
        native/jni/java-awt/.cvsignore: New files.
        * gnu/java/awt/peer/gtk/GtkToolkit.java
        * configure.ac (AC_OUTPUT_FILES): Added
        * native/jni/java-awt/Makefile
        * gnu/java/awt/Makefile.am
        (EXTRA_DIST): Added EmbeddedWindow.java and
        EmbeddedWindowSupport.java.
        * gnu/java/awt/peer/Makefile.am
        (EXTRA_DIST): Added EmbeddedWindowPeer.java.
        * gnu/java/awt/peer/gtk/Makefile.am
        (EXTRA_DIST): Added GtkEmbeddedWindowPeer.java.
        * include/Makefile.am: Generate gnu_java_awt_EmbeddedWindow.h
        * and
        gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h.
        * native/jni/Makefile.am: Added subdir java-awt.
        * native/jni/gtk-peer/Makefile.am: Added
        gnu_java_awt_EmbeddedWindow.c.
=============================================================================


Looks like its commited. Lines may be broken by may mail client ....


Michael



From MAILER-DAEMON Sat Feb 14 06:27:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Arxxd-0000pw-AE
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 06:27:49 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Arxxa-0000oJ-EY
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 06:27:46 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1ArxxY-0000ns-GI
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 06:27:44 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1ArxxY-0000np-2f
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 06:27:44 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1ArxxT-0003Bm-00; Sat, 14 Feb 2004 12:27:39 +0100
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <20040214111656.GA18654@mail.konqueror.de>
References: <200402121800.59685.konqueror@gmx.de>
	<1076754373.11504.245.camel@elsschot.wildebeest.org>
	<20040214111656.GA18654@mail.konqueror.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-uZZqHFJ5r0k0k7LtV2V0"
Message-Id: <1076758061.11504.273.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 14 Feb 2004 12:27:41 +0100
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: embedded window support
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 11:27:47 -0000


--=-uZZqHFJ5r0k0k7LtV2V0
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Sat, 2004-02-14 at 12:16, Michael Koch wrote:
> > > 	* native/jni/gtk-peer/Makefile.am: Added
> > > 	gnu_java_awt_EmbeddedWindow.c.
> >=20
> > But you forgot to commit/add
> > native/jni/gtk-peer/gnu_java_awt_EmbeddedWindow.c.
>=20
> Strange. I goet this with "cvs log":

Sorry I was confused. I am missing
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c which
was added to native/jni/gtk-peer/Makefile.am, but which is not in CVS.

Cheers,

Mark

--=-uZZqHFJ5r0k0k7LtV2V0
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD4DBQBALgYsxVhZCJWr9QwRAjCBAKCqCAsLPt4FBPnUrOVhSs132AxESQCYk6gM
TtS2jgXSWljzoDPoOL7XHw==
=eYNz
-----END PGP SIGNATURE-----

--=-uZZqHFJ5r0k0k7LtV2V0--




From MAILER-DAEMON Sat Feb 14 07:27:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1ArytC-0000Du-VE
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 07:27:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1ArytA-0000Co-6d
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 07:27:16 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aryst-0008WR-8D
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 07:27:14 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Arysj-0008W0-IN
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 07:26:49 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-139.ewetel.net
	[80.228.95.139])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i1ECQjq7011497;
	Sat, 14 Feb 2004 13:26:46 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1Arysf-0005Lx-00; Sat, 14 Feb 2004 13:26:45 +0100
Date: Sat, 14 Feb 2004 13:26:45 +0100
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Message-ID: <20040214122645.GB18654@mail.konqueror.de>
References: <200402121800.59685.konqueror@gmx.de>
	<1076754373.11504.245.camel@elsschot.wildebeest.org>
	<20040214111656.GA18654@mail.konqueror.de>
	<1076758061.11504.273.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1076758061.11504.273.camel@elsschot.wildebeest.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: embedded window support
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 12:27:17 -0000

On Sat, Feb 14, 2004 at 12:27:41PM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Sat, 2004-02-14 at 12:16, Michael Koch wrote:
> > > > 	* native/jni/gtk-peer/Makefile.am: Added
> > > > 	gnu_java_awt_EmbeddedWindow.c.
> > > 
> > > But you forgot to commit/add
> > > native/jni/gtk-peer/gnu_java_awt_EmbeddedWindow.c.
> > 
> > Strange. I goet this with "cvs log":
> 
> Sorry I was confused. I am missing
> native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c which
> was added to native/jni/gtk-peer/Makefile.am, but which is not in CVS.

Thx for the report. I fixed it now. I accidently put this file into my
build tree instead of my source tree and make just worked ...


Michael



From MAILER-DAEMON Sat Feb 14 07:28:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1ArysQ-0008Pn-Aa
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 07:26:30 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1ArysC-0008O2-NT
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 07:26:16 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aryrg-0008BA-2V
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 07:26:15 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AryrS-0007zB-3o
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 07:25:30 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-139.ewetel.net
	[80.228.95.139])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i1ECPDq7010871
	for <commit-classpath@gnu.org>; Sat, 14 Feb 2004 13:25:13 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AryrB-0005Lo-00
	for <commit-classpath@gnu.org>; Sat, 14 Feb 2004 13:25:13 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 14 Feb 2004 13:29:11 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_XShLAEVutJ18at/"
Message-Id: <200402141329.11730.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: added missing file for embedded window support
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 12:26:18 -0000


--Boundary-00=_XShLAEVutJ18at/
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to add a missing file.


Michael


2004-02-14  Michael Koch  <konqueror@gmx.de>

	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c:
	New file. Forgot this to add in a previous commit.


--Boundary-00=_XShLAEVutJ18at/
Content-Type: text/x-diff;
  charset="us-ascii";
  name="embed.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="embed.diff"

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
===================================================================
RCS file: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
diff -N native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c	14 Feb 2004 12:21:50 -0000
@@ -0,0 +1,58 @@
+/* GtkEmbeddedWindowPeer.c -
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#include <config.h>
+#include <errno.h>
+
+#include <jni.h>
+#include <jcl.h>
+
+#include "gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h"
+
+#define AWT_EXCEPTION "java/awt/AWTException"
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create__J (JNIEnv *env, jobject obj, jlong socket_id)
+{
+  JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.peer.gtk.GtkEmbbeddedWindowPeer.create(): not implemented");
+}
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject obj, jlong socket_id)
+{
+  JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.peer.gtk.GtkEmbbeddedWindowPeer.construct(): not implemented");
+}

--Boundary-00=_XShLAEVutJ18at/--




From MAILER-DAEMON Sat Feb 14 16:45:06 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1As7b0-0002US-4F
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 16:45:06 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As7av-0002Pb-Mp
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 16:45:01 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As7aP-00028c-46
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 16:45:00 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1As7aN-00027k-VR
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 16:44:28 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-042.ewetel.net
	[80.228.94.42])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i1ELiKx9006862
	for <commit-classpath@gnu.org>; Sat, 14 Feb 2004 22:44:20 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1As7aF-0001R3-00
	for <commit-classpath@gnu.org>; Sat, 14 Feb 2004 22:44:19 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 14 Feb 2004 22:48:17 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_hepLAexBN0Fo2kO"
Message-Id: <200402142248.17570.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: Swing fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 21:45:02 -0000


--Boundary-00=_hepLAexBN0Fo2kO
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just merged a BIG commit from Graydon Hoare in libgcj.


Michael


2004-02-14  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/ToggleButtonModel.java: Remove dead class.
	* javax/swing/plaf/basic/BasicDefaults.java: Remove dead class.
	* javax/swing/plaf/basic/BasicButtonListener.java: New class.
	* javax/swing/plaf/basic/BasicRootPaneUI.java: New class.
	* Makefile.am: Update for new and removed files.
	* Makefile.in: Regenerate.

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Initialize default hints.
	* javax/swing/AbstractButton.java 
	(AbstractButton): Initialize fields correctly in ctor.
	* javax/swing/JCheckbox.java 
	(JCheckBox): Override painting flags.
	* javax/swing/DefaultButtonModel.java: Conform to sun.
	* javax/swing/JComponent.java (paint): Fill with background color
	if available.
	(processComponentKeyEvent)
	(processFocusEvent)
	(processKeyEvent)
	(processMouseMotionEvent): Remove event-consuming empty methods.
	(getUIClassID): Return "ComponentUI" not "JComponent"
	* javax/swing/JFrame.java: Remove some debugging chatter.
	(JFrame): Subscribe to window events.
	* javax/swing/JRadioButton.java 
	(JRadioButton): Override painting flags.
	* javax/swing/JRootPane.java 
	(JRootPane): Set background from UIDefaults.
	* javax/swing/JToggleButton.java 
	(ToggleButtonModel): New inner class.
	(JToggleButton): Override layout alighment.
	* javax/swing/SwingUtilities.java:
	(getLocalBounds): Return width and height, not x and y.
	(calculateInnerArea): Use local bounds, not bounds.
	(layoutCompoundLabel): Provide overridden form.
	(layoutCompoundLabel): Correct bugs.
	* javax/swing/UIDefaults.java: Correct comment.
	* javax/swing/plaf/basic/BasicButtonUI.java: 
	Move most logic into defaults, external listener.
	(paintIcon): Implement icon painting.
	(paint): Fix state painting to conform to changes in model.
	* javax/swing/plaf/basic/BasicCheckBoxUI.java:
	Remove most dead/wrong methods.
	(getDefaultIcon): Return defaults.getIcon("CheckBox.icon").
	* javax/swing/plaf/basic/BasicIconFactory.java:
	(DummyIcon): New class.
	(getMenuItemCheckIcon)
	(getMenuItemArrowIcon) 
	(getMenuArrowIcon)
	(getCheckBoxMenuItemIcon)
	(getRadioButtonMenuItemIcon)
	(createEmptyFrameIcon): Return DummyIcons, not null.
	(getCheckBoxIcon): Implement an icon that looks like sun's.
	(getRadioButtonIcon): Implement an icon that looks like sun's.
	* javax/swing/plaf/basic/BasicLookAndFeel.java 
	(initComponentDefaults): Fix impossible values, add some missing.
	* javax/swing/plaf/basic/BasicPanelUI.java (gap): Remove field.
	* javax/swing/plaf/basic/BasicRadioButtonUI.java:
	Remove most dead/wrong methods.
	(icon): New field.
	(getDefaultIcon): New method.
	* javax/swing/plaf/basic/BasicToggleButtonUI.java:
	Remove most dead/wrong methods.
	* javax/swing/plaf/metal/MetalLookAndFeel.java
	(getDefaults): Return super.getDefaults(), not BasicDefaults.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
	(Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect):
	Implement "clearing" as drawing, when on pixmap drawables.

	* javax/swing/JButton.java (getUIClassID): 
	* javax/swing/JCheckBox.java (getUIClassID):
	* javax/swing/JEditorPane.java (getUIClassID):
	* javax/swing/JLabel.java (getUIClassID): 
	* javax/swing/JList.java (getUIClassID): 
	* javax/swing/JOptionPane.java (getUIClassID): 
	* javax/swing/JPanel.java (getUIClassID): 
	* javax/swing/JPasswordField.java (uiClassID): 
	* javax/swing/JRadioButton.java (getUIClassID): 
	* javax/swing/JRootPane.java (getUIClassID): 
	* javax/swing/JScrollPane.java (getUIClassID): 
	* javax/swing/JTabbedPane.java (getUIClassID): 
	* javax/swing/JToggleButton.java (getUIClassID): 
	* javax/swing/JTree.java (getUIClassID): 
	* javax/swing/JViewport.java (getUIClassID): 
	* javax/swing/text/JTextComponent.java (getUIClassID):
	Return "fooUI" not "Jfoo"


--Boundary-00=_hepLAexBN0Fo2kO
Content-Type: text/x-diff;
  charset="us-ascii";
  name="swing.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="swing.diff"

Index: gnu/java/awt/peer/gtk/GdkGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 GdkGraphics2D.java
--- gnu/java/awt/peer/gtk/GdkGraphics2D.java	27 Jan 2004 09:46:25 -0000	1.7
+++ gnu/java/awt/peer/gtk/GdkGraphics2D.java	14 Feb 2004 21:41:58 -0000
@@ -158,7 +158,7 @@
     setFont (new Font("SansSerif", Font.PLAIN, 12));
     setTransform (new AffineTransform ());
     setStroke (new BasicStroke ());
-    setRenderingHints (new HashMap ());
+    setRenderingHints (getDefaultHints());
 
     stateStack = new Stack();
   }
@@ -174,7 +174,7 @@
     setFont (new Font("SansSerif", Font.PLAIN, 12));
     setTransform (new AffineTransform ());
     setStroke (new BasicStroke ());
-    setRenderingHints (new HashMap ());
+    setRenderingHints (getDefaultHints());
 
     stateStack = new Stack ();
   }
Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractButton.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 AbstractButton.java
--- javax/swing/AbstractButton.java	27 Jan 2004 09:46:25 -0000	1.9
+++ javax/swing/AbstractButton.java	14 Feb 2004 21:41:59 -0000
@@ -186,19 +186,19 @@
   String text;
 
   /** The vertical alignment of the button's text and icon. */
-  int vert_align = CENTER;
+  int vert_align;
 
   /** The horizontal alignment of the button's text and icon. */
-  int hori_align = CENTER;
+  int hori_align;
 
   /** The horizontal position of the button's text relative to its icon. */
-  int hori_text_pos = CENTER;
+  int hori_text_pos;
 
   /** The vertical position of the button's text relative to its icon. */
-  int vert_text_pos = CENTER;
+  int vert_text_pos;
 
   /** Whether or not the button paints its border. */
-  boolean paint_border = true;
+  boolean paint_border;
 
   /** Whether or not the button paints its focus state. */
   boolean paint_focus;
@@ -487,8 +487,16 @@
     model.addChangeListener(changeListener);
     model.addItemListener(itemListener);
 
+    hori_align = CENTER;
+    hori_text_pos = TRAILING;
+    vert_align = CENTER;
+    vert_text_pos = CENTER;
+    paint_border = true;
+    content_area_filled = true;
+
     setAlignmentX(LEFT_ALIGNMENT);
     setAlignmentY(CENTER_ALIGNMENT);
+
     addFocusListener(new ButtonFocusListener());
     updateUI();
   }
Index: javax/swing/DefaultButtonModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/DefaultButtonModel.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 DefaultButtonModel.java
--- javax/swing/DefaultButtonModel.java	27 Jan 2004 09:46:25 -0000	1.6
+++ javax/swing/DefaultButtonModel.java	14 Feb 2004 21:41:59 -0000
@@ -55,15 +55,23 @@
  * button. The concrete button type holding this state may be a a "toggle"
  * button (checkbox, radio button) or a "push" button (menu button, button).
  * 
- * Any change to the model's properties will trigger the firing of a
- * ChangeEvent.
+ * If the model is disabled, only the "selected" property can be changed.
+ * An attempt to change the "armed", "rollover" or "pressed" properties 
+ * while the model is disabled will be blocked.
+ *
+ * Any successful (non-blocked) change to the model's properties will
+ * trigger the firing of a ChangeEvent.
+ *
+ * Any change to the "selected" property will trigger the firing of an
+ * ItemEvent in addition to ChangeEvent. This is true whether the model is
+ * enabled or not.
+ *
+ * One other state change is special: the transition from "enabled, armed
+ * and pressd" to "enabled, armed and not-pressed". This is considered the
+ * "trailing edge" of a successful mouse click, and therefore fires an 
+ * ActionEvent in addition to a ChangeEvent.
  *
- * Any change to the "pressed" property will trigger the firing of an
- * ItemEvent in addition to ChangeEvent.
- *
- * Any change which causes the enabled, armed and pressed properties to
- * simultaneously become <code>true</code> will trigger the firing of an
- * ActionEvent in addition to the ChangeEvent.
+ * In all other respects this class is just a container of boolean flags.
  *
  * @author Graydon Hoare (graydon&064;redhat.com)
  */
@@ -80,9 +88,9 @@
    be pressed or selected unless they are enabled. */
   static int ENABLED = 2;
 
-  /** State constant indicating that the button has been fully
-   pressed. This usually happens when a user has released the mouse over a
-   previously "armed" button. */
+  /** State constant indicating that the user is holding down the button.
+   When this transitions from true to false, an ActionEvent may be fired,
+   depending on the value of the "armed" property.*/
   static int PRESSED = 4;
 
   /** State constant indicating that the mouse is currently positioned over
@@ -120,7 +128,8 @@
 
   public DefaultButtonModel()
   {
-    stateMask = 0;
+    stateMask = ENABLED;
+    mnemonic = java.awt.event.KeyEvent.VK_UNDEFINED;
     listenerList = new EventListenerList();    
     changeEvent = new ChangeEvent(this);
   }
@@ -262,13 +271,15 @@
     if (oldstate == newstate)
       return;
 
+    if ((stateflag != SELECTED) 
+        && (stateflag != ENABLED)
+        && (stateMask & ENABLED) == 0)
+      return;
+
     stateMask = newstate;
 
     fireStateChanged(changeEvent);
 
-    if ((newstate & ENABLED) == 0)
-      return;
-
     if ((oldstate & SELECTED) == 0
         && (newstate & SELECTED) == SELECTED)
       fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED, 
@@ -279,14 +290,13 @@
       fireItemStateChanged(new ItemEvent(this, ItemEvent.ITEM_STATE_CHANGED, 
                                          null, ItemEvent.DESELECTED));
 
-    else if ((newstate & ARMED) == ARMED
-             && (newstate & PRESSED) == PRESSED)
+    else if (((oldstate & ARMED) == ARMED && (oldstate & PRESSED) == PRESSED)
+             &&
+             ((newstate & ARMED) == ARMED && (newstate & PRESSED) == 0))
 	    {
         fireActionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED,
                                             actionCommand));
-        stateMask = stateMask & ~(PRESSED | ARMED);
 	    }
-    
     }
 
   /**
Index: javax/swing/JButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JButton.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 JButton.java
--- javax/swing/JButton.java	9 Jan 2004 10:19:16 -0000	1.6
+++ javax/swing/JButton.java	14 Feb 2004 21:41:59 -0000
@@ -98,7 +98,7 @@
     public String getUIClassID()
     {
 	//Returns a string that specifies the name of the L&F class that renders this component.  
-	return "JButton";
+	return "ButtonUI";
     }
   
     public boolean isDefaultButton()
Index: javax/swing/JCheckBox.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JCheckBox.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JCheckBox.java
--- javax/swing/JCheckBox.java	8 Jun 2003 11:20:06 -0000	1.5
+++ javax/swing/JCheckBox.java	14 Feb 2004 21:41:59 -0000
@@ -70,6 +70,8 @@
     public JCheckBox(String text, Icon icon)
     {
 	super(text, icon);
+        paint_border = false;
+        content_area_filled = false;
     }
 
     
@@ -82,7 +84,7 @@
     public String getUIClassID()
     {
 	//Returns a string that specifies the name of the L&F class that renders this component.  
-	return "JCheckBox";
+	return "CheckBoxUI";
     }
   
     protected  String paramString()
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 JComponent.java
--- javax/swing/JComponent.java	28 Jan 2004 19:10:07 -0000	1.11
+++ javax/swing/JComponent.java	14 Feb 2004 21:42:00 -0000
@@ -765,7 +765,15 @@
 		{
 			im = createImage (r.width, r.height);
 			g2 = im.getGraphics ();
-			g2.clearRect (0, 0, r.width, r.height);
+                  if (this.getBackground() != null)
+                    {
+                      Color save = g2.getColor();
+                      g2.setColor(this.getBackground());
+                      g2.fillRect (0, 0, r.width, r.height);
+                      g2.setColor(save);
+                    }
+                  else
+                    g2.clearRect(0, 0, r.width, r.height);
 		}
 		
 		paintBorder(g2);
@@ -837,28 +845,6 @@
 		//      Returns a string representation of this JComponent.
 		return "JComponent";
 	}
-	protected  void processComponentKeyEvent(KeyEvent e)
-	{
-		//     Process any key events that the component itself recognizes.
-	    //System.out.println("COMP_KEY-EVENT: " + e);
-	}
-	protected  void processFocusEvent(FocusEvent e)
-	{
-		//      Processes focus events occurring on this component by dispatching them to any registered FocusListener objects.
-	    //System.out.println("FOCUS_EVENT: " + e);
-	}
-
-	protected  void processKeyEvent(KeyEvent e)
-	{
-		//      Override processKeyEvent to process events protected
-	    //System.out.println("KEY-EVENT: " + e);
-	}
-
-        public void processMouseMotionEvent(MouseEvent e)
-	{
-	    //      Processes mouse motion events occurring on this component by dispatching them to any registered MouseMotionListener objects.
-	    //System.out.println("COMP_MOUSE-EVENT: " + e + ", MEMORY = " + Runtime.getRuntime().freeMemory());
-	}
 
 	public void registerKeyboardAction(ActionListener anAction,
 	                            KeyStroke aKeyStroke,
@@ -1044,7 +1030,7 @@
         public String getUIClassID()
 	{
 		///          Return the UIDefaults key used to look up the name of the swing.
-		return "JComponent";
+		return "ComponentUI";
 	}
 
 	protected void setUI(ComponentUI newUI)
Index: javax/swing/JEditorPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JEditorPane.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 JEditorPane.java
--- javax/swing/JEditorPane.java	5 Feb 2004 18:50:30 -0000	1.8
+++ javax/swing/JEditorPane.java	14 Feb 2004 21:42:00 -0000
@@ -137,7 +137,7 @@
     { return super.getText();    }
     
     public String getUIClassID()
-    {    return "JEditorPane";  }
+    {    return "EditorPaneUI";  }
 
     public boolean isFocusCycleRoot()
     { return focus_root;    }
Index: javax/swing/JFrame.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JFrame.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 JFrame.java
--- javax/swing/JFrame.java	21 Nov 2003 22:38:40 -0000	1.7
+++ javax/swing/JFrame.java	14 Feb 2004 21:42:00 -0000
@@ -38,6 +38,7 @@
 
 package javax.swing;
 
+import java.awt.AWTEvent;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.Container;
@@ -105,6 +106,7 @@
     protected  void frameInit()
     {
       super.setLayout(new BorderLayout(1, 1));
+      enableEvents(AWTEvent.WINDOW_EVENT_MASK);
       getRootPane(); // will do set/create
     }
   
@@ -201,9 +203,7 @@
 
     protected  void processWindowEvent(WindowEvent e)
     {
-	//	System.out.println("PROCESS_WIN_EV-1: " + e);
 	super.processWindowEvent(e); 
-	//	System.out.println("PROCESS_WIN_EV-2: " + e);
 	switch (e.getID())
 	    {
 	    case WindowEvent.WINDOW_CLOSING:
@@ -212,13 +212,11 @@
 			{
 			case EXIT_ON_CLOSE:
 			    {
-				System.out.println("user requested exit on close");
 				System.exit(1);
 				break;
 			    }
 			case DISPOSE_ON_CLOSE:
 			    {
-				System.out.println("user requested dispose on close");
 				dispose();
 				break;
 			    }
Index: javax/swing/JLabel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JLabel.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 JLabel.java
--- javax/swing/JLabel.java	5 Feb 2004 18:50:30 -0000	1.8
+++ javax/swing/JLabel.java	14 Feb 2004 21:42:00 -0000
@@ -148,7 +148,7 @@
     {	return text;    }
 
     public String getUIClassID()
-    {	return "JLabel";    }
+    {	return "LabelUI";    }
 
     public int getVerticalAlignment()
     {
Index: javax/swing/JList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JList.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 JList.java
--- javax/swing/JList.java	5 Feb 2004 18:50:30 -0000	1.10
+++ javax/swing/JList.java	14 Feb 2004 21:42:00 -0000
@@ -212,7 +212,7 @@
 
     public String getUIClassID()
     {
-	return "JList";
+	return "ListUI";
     }
 
 
Index: javax/swing/JOptionPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JOptionPane.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JOptionPane.java
--- javax/swing/JOptionPane.java	8 Jun 2003 11:20:07 -0000	1.5
+++ javax/swing/JOptionPane.java	14 Feb 2004 21:42:00 -0000
@@ -161,7 +161,7 @@
     {	return val;    }
 
     public String getUIClassID()
-    {	return "JOptionPane";    }
+    {	return "OptionPaneUI";    }
 
 
     public void setUI(OptionPaneUI ui) {
Index: javax/swing/JPanel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JPanel.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 JPanel.java
--- javax/swing/JPanel.java	9 Jan 2004 10:19:16 -0000	1.7
+++ javax/swing/JPanel.java	14 Feb 2004 21:42:00 -0000
@@ -85,7 +85,7 @@
     } 
 
     public String getUIClassID()
-    {	return "JPanel";    }
+    {	return "PanelUI";    }
 
 
     public void setUI(PanelUI ui) {
Index: javax/swing/JPasswordField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JPasswordField.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JPasswordField.java
--- javax/swing/JPasswordField.java	9 Jan 2004 10:19:16 -0000	1.3
+++ javax/swing/JPasswordField.java	14 Feb 2004 21:42:00 -0000
@@ -102,7 +102,7 @@
 	/**
 	 * uiClassID
 	 */
-	private static final String uiClassID = "PasswordFIeldUI";
+	private static final String uiClassID = "PasswordFieldUI";
 
 	/**
 	 * echoChar.  Default is 0
Index: javax/swing/JRadioButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRadioButton.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JRadioButton.java
--- javax/swing/JRadioButton.java	8 Jun 2003 11:20:07 -0000	1.5
+++ javax/swing/JRadioButton.java	14 Feb 2004 21:42:00 -0000
@@ -65,6 +65,8 @@
     public JRadioButton(String text, Icon icon)
     {
 	super(text, icon);
+        paint_border = false;
+        content_area_filled = false;
     }
 
     
@@ -77,7 +79,7 @@
     public String getUIClassID()
     {
 	//Returns a string that specifies the name of the L&F class that renders this component.  
-	return "JRadioButton";
+	return "RadioButtonUI";
     }
   
     protected  String paramString()
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRootPane.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 JRootPane.java
--- javax/swing/JRootPane.java	21 Nov 2003 22:38:41 -0000	1.6
+++ javax/swing/JRootPane.java	14 Feb 2004 21:42:00 -0000
@@ -75,7 +75,6 @@
       public Dimension preferredLayoutSize ( Container c )
 	{	    
 	  Dimension p = super.preferredLayoutSize(c);
-	  System.out.println("              PREF-SIZE from RootLayout = " + p);
 	  return p;
 	}        
     }
@@ -97,7 +96,7 @@
     /********************************************************/
 
     public String getUIClassID()
-    {	return "JPanel";    }
+    {	return "RootPaneUI";    }
 
     
     void setJMenuBar(JMenuBar m)
@@ -169,7 +168,7 @@
     JRootPane()
     {
 	setLayout(createRootLayout());
-	
+	setBackground(UIManager.getColor("control"));
 	getGlassPane();
 	getLayeredPane();
 	getContentPane();
Index: javax/swing/JScrollPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JScrollPane.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JScrollPane.java
--- javax/swing/JScrollPane.java	8 Jun 2003 14:14:50 -0000	1.4
+++ javax/swing/JScrollPane.java	14 Feb 2004 21:42:00 -0000
@@ -86,7 +86,7 @@
     public String getUIClassID()
     {
 	//Returns a string that specifies the name of the L&F class that renders this component.  
-	return "JScrollPane";
+	return "ScrollPaneUI";
     }
 
     public JViewport getViewport()
Index: javax/swing/JTabbedPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTabbedPane.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 JTabbedPane.java
--- javax/swing/JTabbedPane.java	8 Jun 2003 11:43:14 -0000	1.6
+++ javax/swing/JTabbedPane.java	14 Feb 2004 21:42:00 -0000
@@ -66,6 +66,8 @@
 	}
     }
     
+  private static final long serialVersionUID = 1614381073220130939L;
+    
     private Vector tabs = new Vector();
 
     public JTabbedPane()
@@ -102,7 +104,7 @@
     }
     
     public String getUIClassID()
-    {	return "JTabbedPane";    }
+    {	return "TabbedPaneUI";    }
 
 
     public void setUI(TabbedPaneUI ui) {
Index: javax/swing/JToggleButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JToggleButton.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 JToggleButton.java
--- javax/swing/JToggleButton.java	27 Jan 2004 09:46:25 -0000	1.7
+++ javax/swing/JToggleButton.java	14 Feb 2004 21:42:00 -0000
@@ -44,6 +44,24 @@
 
 public class JToggleButton extends AbstractButton implements Accessible
 {
+
+  public class ToggleButtonModel extends DefaultButtonModel
+  {
+    public void setPressed(boolean b)  
+    {
+      if (! isEnabled())
+        return;
+      
+      super.setPressed(b);
+      
+      // setPressed(false) == mouse release on us,
+      // if we were armed, we flip the selected state.
+      if (!b && isArmed())
+        setSelected(! isSelected());
+    }
+  }
+
+
     public JToggleButton()
     {
 	this(null, null);
@@ -73,9 +91,8 @@
     {
 	super(text, icon);
 
-        // Create the model
+    hori_align = LEADING;
         setModel(new ToggleButtonModel());
-	
         model.setSelected(selected);
     }
 
@@ -90,7 +107,7 @@
     public String getUIClassID()
     {
 	//Returns a string that specifies the name of the L&F class that renders this component.  
-	return "JToggleButton";
+    return "ToggleButtonUI";
     }
   
     protected  String paramString()
Index: javax/swing/JTree.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTree.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 JTree.java
--- javax/swing/JTree.java	8 Jun 2003 11:20:07 -0000	1.4
+++ javax/swing/JTree.java	14 Feb 2004 21:42:00 -0000
@@ -83,7 +83,7 @@
     
     public String getUIClassID()
     {
-	return "JTree";
+	return "TreeUI";
     }
 
 
Index: javax/swing/JViewport.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JViewport.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 JViewport.java
--- javax/swing/JViewport.java	8 Jun 2003 14:14:50 -0000	1.3
+++ javax/swing/JViewport.java	14 Feb 2004 21:42:00 -0000
@@ -69,7 +69,7 @@
 
     public String getUIClassID()
     {
-	return "JViewport";
+	return "ViewportUI";
     }
 
     public void updateUI()
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/SwingUtilities.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 SwingUtilities.java
--- javax/swing/SwingUtilities.java	6 Feb 2004 12:55:51 -0000	1.7
+++ javax/swing/SwingUtilities.java	14 Feb 2004 21:42:01 -0000
@@ -95,7 +95,9 @@
   /**
    * Calculates the portion of the component's bounds which is inside the
    * component's border insets. This area is usually the area a component
-   * should confine its painting to.
+   * should confine its painting to. The coordinates are returned in terms
+   * of the <em>component's</em> coordinate system, where (0,0) is the
+   * upper left corner of the component's bounds.
    *
    * @param c The component to measure the bounds of
    * @param r A Rectangle to store the return value in, or
@@ -108,7 +110,8 @@
    */
   public static Rectangle calculateInnerArea(JComponent c, Rectangle r)
   {
-    return calculateInsetArea(c.getBounds(), c.getInsets(), r);
+    Rectangle b = getLocalBounds(c);
+    return calculateInsetArea(b, c.getInsets(), r);
   }
 
   /**
@@ -123,7 +126,7 @@
   public static Rectangle getLocalBounds(Component aComponent)
   {
     Rectangle bounds = aComponent.getBounds();
-    return new Rectangle(0, 0, bounds.x, bounds.y);
+    return new Rectangle(0, 0, bounds.width, bounds.height);
   }
 
   /**
@@ -472,9 +476,10 @@
    *
    * <p>The position values control where the text is placed relative to
    * the icon. The horizontal position value should be one of the constants
-   * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>. The
-   * vertical position value should be one fo the constants
-   * <code>TOP</code>, <code>BOTTOM</code>, <code>CENTER</code>.</p>
+   * <code>LEADING</code>, <code>TRAILING</code>, <code>LEFT</code>,
+   * <code>RIGHT</code> or <code>CENTER</code>. The vertical position value
+   * should be one fo the constants <code>TOP</code>, <code>BOTTOM</code>
+   * or <code>CENTER</code>.</p>
    *
    * <p>The text-icon gap value controls the number of pixels between the
    * icon and the text.</p>
@@ -488,12 +493,12 @@
    * <code>CENTER</code>.</p>
    *
    * <p>If the <code>LEADING</code> or <code>TRAILING</code> constants are
-   * given for horizontal alignment, they are interpreted relative to the
-   * provided component's orientation property, a constant in the {@link
-   * java.awt.ComponentOrientation} class. For example, if the component's
-   * orientation is <code>LEFT_TO_RIGHT</code>, then the
-   * <code>LEADING</code> alignment is a synonym for <code>LEFT</code> and
-   * the <code>TRAILING</code> alignment is a synonym for
+   * given for horizontal alignment or horizontal text position, they are
+   * interpreted relative to the provided component's orientation property,
+   * a constant in the {@link java.awt.ComponentOrientation} class. For
+   * example, if the component's orientation is <code>LEFT_TO_RIGHT</code>,
+   * then the <code>LEADING</code> value is a synonym for <code>LEFT</code>
+   * and the <code>TRAILING</code> value is a synonym for
    * <code>RIGHT</code></p>
    *
    * <p>If the text and icon are equal to or larger than the view
@@ -537,6 +543,119 @@
                                            int textIconGap)
   {
 
+    // Fix up the orientation-based horizontal positions.
+
+    if (horizontalTextPosition == LEADING)
+      {
+        if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
+          horizontalTextPosition = RIGHT;
+        else
+          horizontalTextPosition = LEFT;
+      }
+    else if (horizontalTextPosition == TRAILING)
+      {
+        if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
+          horizontalTextPosition = LEFT;
+        else
+          horizontalTextPosition = RIGHT;
+      }
+
+    // Fix up the orientation-based alignments.
+
+    if (horizontalAlignment == LEADING)
+      {
+        if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
+          horizontalAlignment = RIGHT;
+        else
+          horizontalAlignment = LEFT;
+      }
+    else if (horizontalAlignment == TRAILING)
+      {
+        if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
+          horizontalAlignment = LEFT;
+        else
+          horizontalAlignment = RIGHT;
+      }
+    
+    return layoutCompoundLabel(fm, text, icon,
+                               verticalAlignment,
+                               horizontalAlignment,
+                               verticalTextPosition,
+                               horizontalTextPosition,
+                               viewR, iconR, textR, textIconGap);
+  }
+
+  /**
+   * <p>Layout a "compound label" consisting of a text string and an icon
+   * which is to be placed near the rendered text. Once the text and icon
+   * are laid out, the text rectangle and icon rectangle parameters are
+   * altered to store the calculated positions.</p>
+   *
+   * <p>The size of the text is calculated from the provided font metrics
+   * object.  This object should be the metrics of the font you intend to
+   * paint the label with.</p>
+   *
+   * <p>The position values control where the text is placed relative to
+   * the icon. The horizontal position value should be one of the constants
+   * <code>LEFT</code>, <code>RIGHT</code> or <code>CENTER</code>. The
+   * vertical position value should be one fo the constants
+   * <code>TOP</code>, <code>BOTTOM</code> or <code>CENTER</code>.</p>
+   *
+   * <p>The text-icon gap value controls the number of pixels between the
+   * icon and the text.</p>
+   *
+   * <p>The alignment values control where the text and icon are placed, as
+   * a combined unit, within the view rectangle. The horizontal alignment
+   * value should be one of the constants <code>LEFT</code>, <code>RIGHT</code> or
+   * <code>CENTER</code>. The vertical alignment valus should be one of the
+   * constants <code>TOP</code>, <code>BOTTOM</code> or
+   * <code>CENTER</code>.</p>
+   *
+   * <p>If the text and icon are equal to or larger than the view
+   * rectangle, the horizontal and vertical alignment values have no
+   * affect.</p>
+   *
+   * <p>Note that this method does <em>not</em> know how to deal with
+   * horizontal alignments or positions given as <code>LEADING</code> or
+   * <code>TRAILING</code> values. Use the other overloaded variant of this
+   * method if you wish to use such values.
+   *
+   * @param fm The font metrics used to measure the text
+   * @param text The text to place in the compound label
+   * @param icon The icon to place next to the text
+   * @param verticalAlignment The vertical alignment of the label relative
+   * to its component
+   * @param horizontalAlignment The horizontal alignment of the label
+   * relative to its component
+   * @param verticalTextPosition The vertical position of the label's text
+   * relative to its icon
+   * @param horizontalTextPosition The horizontal position of the label's
+   * text relative to its icon
+   * @param viewR The view rectangle, specifying the area which layout is
+   * constrained to
+   * @param iconR A rectangle which is modified to hold the laid-out
+   * position of the icon
+   * @param textR A rectangle which is modified to hold the laid-out
+   * position of the text
+   * @param textIconGap The distance between text and icon
+   *
+   * @return The string of characters, possibly truncated with an elipsis,
+   * which is laid out in this label
+   */
+
+  public static String layoutCompoundLabel(FontMetrics fm,
+                                           String text,
+                                           Icon icon,
+                                           int verticalAlignment,
+                                           int horizontalAlignment,
+                                           int verticalTextPosition,
+                                           int horizontalTextPosition,
+                                           Rectangle viewR,
+                                           Rectangle iconR,
+                                           Rectangle textR,
+                                           int textIconGap)
+  {
+
     // Work out basic height and width.
 
     if (icon == null)
@@ -589,23 +708,6 @@
         textR.y = centerLine - textR.height/2;
         iconR.y = centerLine - iconR.height/2;
         break;
-      }
-
-    // Fix up the orientation-based alignments.
-
-    if (horizontalAlignment == LEADING)
-      {
-        if (c.getComponentOrientation() == ComponentOrientation.LEFT_TO_RIGHT)
-          horizontalAlignment = LEFT;
-        else if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
-          horizontalAlignment = RIGHT;
-      }
-    else if (horizontalAlignment == TRAILING)
-      {
-        if (c.getComponentOrientation() == ComponentOrientation.LEFT_TO_RIGHT)
-          horizontalAlignment = RIGHT;
-        else if (c.getComponentOrientation() == ComponentOrientation.RIGHT_TO_LEFT)
-          horizontalAlignment = LEFT;
       }
 
     // The two rectangles are laid out correctly now, but only assuming
Index: javax/swing/ToggleButtonModel.java
===================================================================
RCS file: javax/swing/ToggleButtonModel.java
diff -N javax/swing/ToggleButtonModel.java
--- javax/swing/ToggleButtonModel.java	27 Jan 2004 09:46:25 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,55 +0,0 @@
-/* ToggleButtonModel.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-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
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package javax.swing;
-
-public class ToggleButtonModel extends DefaultButtonModel
-{
-    public void setPressed(boolean b)  
-    {
-	if (! isEnabled())
-	    return;
-	
-	if (! b)
-	    {
-		return;
-	    }
-	
-	setSelected(b);
-    }
-}
Index: javax/swing/UIDefaults.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/UIDefaults.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 UIDefaults.java
--- javax/swing/UIDefaults.java	17 Nov 2003 23:20:11 -0000	1.7
+++ javax/swing/UIDefaults.java	14 Feb 2004 21:42:01 -0000
@@ -61,7 +61,7 @@
 /**
  * UIDefaults is a database where all settings and interface bindings are
  * stored into. An PLAF implementation fills one of these (see for example
- * plaf/basic/BasicDefaults.java) with "JButton" -> new BasicButtonUI().
+ * plaf/basic/BasicLookAndFeel.java) with "ButtonUI" -> new BasicButtonUI().
  *
  * @author Ronald Veldema (rveldema@cs.vu.nl)
  */
Index: javax/swing/plaf/basic/BasicButtonListener.java
===================================================================
RCS file: javax/swing/plaf/basic/BasicButtonListener.java
diff -N javax/swing/plaf/basic/BasicButtonListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/swing/plaf/basic/BasicButtonListener.java	14 Feb 2004 21:42:01 -0000
@@ -0,0 +1,188 @@
+/* BasicButtonListener.java
+   Copyright (C) 2004 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.swing.plaf.basic;
+
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.InputEvent;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.JComponent;
+
+public class BasicButtonListener
+  implements MouseListener, MouseMotionListener, FocusListener, 
+             ChangeListener, PropertyChangeListener
+{
+  public void propertyChange(PropertyChangeEvent e)
+  {
+  }
+  protected void checkOpacity(AbstractButton b) 
+  {    
+  }
+  public void focusGained(FocusEvent e) 
+  {    
+  }
+
+  public void focusLost(FocusEvent e)
+  {
+    if (e.getSource() instanceof AbstractButton)
+      {
+        AbstractButton button = (AbstractButton) e.getSource();
+        ButtonModel model = button.getModel();
+        model.setArmed(false);
+      }
+  }
+  public void installKeyboardActions(JComponent c)
+  {
+  }
+  public void uninstallKeyboardActions(JComponent c)
+  {
+  }
+  public void stateChanged(ChangeEvent e)
+  {
+  }
+  public void mouseMoved(MouseEvent e)
+  {
+    System.err.println("button got mouse move");
+  }
+  public void mouseDragged(MouseEvent e)
+  {
+    System.err.println("button got mouse drag");
+  }
+  public void mouseClicked(MouseEvent e)
+  {
+    System.err.println("button got mouse click");
+  }
+
+  /**
+   * Accept a mouse press event and arm the button.
+   *
+   * @param e The mouse press event to accept
+   */
+  public void mousePressed(MouseEvent e)
+  {
+    if (e.getSource() instanceof AbstractButton)
+      {
+        AbstractButton button = (AbstractButton) e.getSource();
+        ButtonModel model = button.getModel();
+        if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+          {
+            // It is important that these transitions happen in this order.
+            model.setArmed(true);
+            model.setPressed(true);
+          }
+      }
+  }
+
+
+  /**
+   * Accept a mouse release event and set the button's 
+   * "pressed" property to <code>true</code>, if the model
+   * is armed. If the model is not armed, ignore the event.
+   *
+   * @param e The mouse release event to accept
+   */
+  public void mouseReleased(MouseEvent e)
+  {
+    if (e.getSource() instanceof AbstractButton)
+      {
+        AbstractButton button = (AbstractButton) e.getSource();
+        ButtonModel model = button.getModel();
+        if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+          {
+            // It is important that these transitions happen in this order.
+            model.setPressed(false);
+            model.setArmed(false);
+          }
+      }
+  }
+
+
+  /**
+   * Accept a mouse enter event and set the button's "rollover" property to
+   * <code>true</code>, if the button's "rolloverEnabled" property is
+   * <code>true</code>. If the button is currently armed and the mouse
+   * button is not held down, this enter event will also disarm the model.
+   *
+   * @param e The mouse enter event to accept
+   */
+  public void mouseEntered(MouseEvent e)
+  {
+    if (e.getSource() instanceof AbstractButton)
+      {
+        AbstractButton button = (AbstractButton) e.getSource();
+        ButtonModel model = button.getModel();
+        if (button.isRolloverEnabled())
+          model.setRollover(true);
+        
+        if (model.isPressed() 
+            && (e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+          model.setArmed(true);
+        else
+          model.setArmed(false);
+      }
+  }
+
+  /**
+   * Accept a mouse exit event and set the button's model's "rollover"
+   * property to <code>false</code>, if it's "rolloverEnabled" property is
+   * <code>true</code>. Also disarm the button.
+   *
+   * @param e The mouse exit event to accept
+   */
+  public void mouseExited(MouseEvent e)
+  {
+    if (e.getSource() instanceof AbstractButton)
+      {
+        AbstractButton button = (AbstractButton) e.getSource();
+        ButtonModel model = button.getModel();
+        if (button.isRolloverEnabled())
+          model.setRollover(false);
+        model.setArmed(false);
+      }
+  }
+}
Index: javax/swing/plaf/basic/BasicButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicButtonUI.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 BasicButtonUI.java
--- javax/swing/plaf/basic/BasicButtonUI.java	27 Jan 2004 09:46:25 -0000	1.6
+++ javax/swing/plaf/basic/BasicButtonUI.java	14 Feb 2004 21:42:01 -0000
@@ -47,14 +47,20 @@
 import java.awt.Stroke;
 import java.awt.Insets;
 import java.awt.Rectangle;
+import java.awt.event.FocusListener;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import javax.swing.AbstractButton;
+import javax.swing.ButtonModel;
+import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.SwingUtilities;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
+import javax.swing.event.MouseInputListener;
 import javax.swing.plaf.ButtonUI;
 import javax.swing.plaf.ComponentUI;
 
@@ -62,21 +68,11 @@
 {
   /** A constant used to pad out elements in the button's layout and
       preferred size calculations. */
-    int gap = 3;
+  int defaultTextIconGap = 3;
 
-  /** The color that text will be painted when the button is enabled */
-  Color textColor;
-
-  /** The color that text will be painted when the button is disabled */
-  Color disabledTextColor;
-
-  /** The color that the button's background will be painted when the
-      button is pressed. */
-    Color pressedBackgroundColor;
-
-  /** The color that the button's background will be painted when the
-      button is not pressed. */
-  Color normalBackgroundColor;
+  /** A constant added to the defaultTextIconGap to adjust the text
+      within this particular button. */
+  int defaultTextShiftOffset = 0;
 
   /**
    * Factory method to create an instance of BasicButtonUI for a given
@@ -91,120 +87,60 @@
 	return new BasicButtonUI();
     }
 
-  /**
-   * Helper class which listens to a button's focus events and disarms the
-   * button's model when focus is lost.
-   */
-  private static class FocusUIListener extends FocusAdapter
+  public int getDefaultTextIconGap(AbstractButton b)
   {
-    /** Button to listen to focus events from */
-    AbstractButton button;
+    return defaultTextIconGap;
+  }
 
-    /**
-     * Creates a new FocusUIListener object.
-     *
-     * @param b The button to listen to
-     */
-    FocusUIListener(AbstractButton b)
+  protected void installDefaults(AbstractButton b)
     {
-      button = b;
+    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+    b.setForeground(defaults.getColor("Button.foreground"));
+    b.setBackground(defaults.getColor("Button.background"));
+    b.setMargin(defaults.getInsets("Button.margin"));
+    b.setBorder(defaults.getBorder("Button.border"));
     }
     
-    /**
-     * Called when the button loses focus.
-     *
-     * @param event The loss of focus event.
-     */
-    public void focusLost(FocusEvent event)
+  protected void uninstallDefaults(AbstractButton b)
     {
-      // System.err.println("ButtonUI :: lost focus -- disarming");
-      button.getModel().setArmed(false);
-    }
+    b.setForeground(null);
+    b.setBackground(null);
+    b.setBorder(null);
+    b.setMargin(null);
   }
 
-  /**
-   * A helper class which interprets mouse events as 
-   * state changes to the button's underlying model.
-   */
-  private static class ButtonUIListener extends MouseAdapter
-  {
-    /** The button to change the model of */
-    AbstractButton button;
+  protected BasicButtonListener listener;
 
-    /**
-     * Creates a new ButtonUIListener object.
-     *
-     * @param b The button to change the model of
-     */
-    public ButtonUIListener(AbstractButton b)
+  protected BasicButtonListener createButtonListener(AbstractButton b)
     {
-      button = b;
+    return new BasicButtonListener();
     }
 
-    /**
-     * Accept a mouse press event and arm the button's model.
-     *
-     * @param e The mouse press event to accept
-     */
-    public void mousePressed(MouseEvent e)
-    {
-      // System.err.println("ButtonUI :: mouse pressed");
-      if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
+  public void installListeners(AbstractButton b)
         {
-          // System.err.println("ButtonUI :: arming");
-          button.getModel().setArmed(true);
-        }
+    listener = createButtonListener(b);
+    b.addChangeListener(listener);
+    b.addPropertyChangeListener(listener);
+    b.addFocusListener(listener);    
+    b.addMouseListener(listener);
+    b.addMouseMotionListener(listener);
     }
 
-    /**
-     * Accept a mouse enter event and set the button's model's
-     * "rollover" property to <code>true</code>. If the button's
-     * model is currently armed and the mouse button is not held
-     * down, this enter event will also disarm the model.
-     *
-     * @param e The mouse enter event to accept
-     */
-    public void mouseEntered(MouseEvent e)
+  public void uninstallListeners(AbstractButton b)
     {
-      // System.err.println("ButtonUI :: mouse entered");
-      // System.err.println("ButtonUI :: rolling over");
-      button.getModel().setRollover(true);
-      if (button.getModel().isArmed() 
-          && (e.getModifiers() & InputEvent.BUTTON1_MASK) == 0)
-        {
-          // System.err.println("ButtonUI :: no button pressed -- disarming");
-          button.getModel().setArmed(false);
-        }
+    b.removeChangeListener(listener);
+    b.removePropertyChangeListener(listener);
+    b.removeFocusListener(listener);    
+    b.removeMouseListener(listener);
+    b.removeMouseMotionListener(listener);
     }
 
-    /**
-     * Accept a mouse exit event and set the button's model's
-     * "rollover" property to <code>false</code>.
-     *
-     * @param e The mouse exit event to accept
-     */
-    public void mouseExited(MouseEvent e)
+  protected void installKeyboardActions(AbstractButton b)
     {
-      // System.err.println("ButtonUI :: mouse exited");
-      button.getModel().setRollover(false);
     }
 
-    /**
-     * Accept a mouse release event and set the button's model's
-     * "pressed" property to <code>true</code>, if the model
-     * is armed. If the model is not armed, ignore the event.
-     *
-     * @param e The mouse release event to accept
-     */
-    public void mouseReleased(MouseEvent e)
+  protected void uninstallKeyboardActions(AbstractButton b)
     {
-      // System.err.println("ButtonUI :: mouse released");
-      if (button.getModel().isArmed()
-          && (e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
-        {
-          button.getModel().setPressed(true);
-        }
-    }
   }
 
   /**
@@ -218,19 +154,13 @@
     public void installUI(final JComponent c) 
     {
 	super.installUI(c);
-
-	textColor                = new Color(0,0,0);
-	disabledTextColor        = new Color(130, 130, 130);
-	pressedBackgroundColor   = new Color(150,150,150);
-	pressedBackgroundColor   = new Color(150,150,150);
-	normalBackgroundColor    = new Color(192,192,192);
-
-    // this tells the border (if we have one) how to paint.
-    c.setBackground(normalBackgroundColor);
-    ((AbstractButton)c).setMargin (new Insets(10,10,10,10));
-
-    c.addMouseListener(new ButtonUIListener((AbstractButton) c));
-    c.addFocusListener(new FocusUIListener((AbstractButton) c));
+    if (c instanceof AbstractButton)
+      {
+        AbstractButton b = (AbstractButton) c;
+        installDefaults(b);
+        installListeners(b);
+        installKeyboardActions(b);
+      }
   }
 
   /**
@@ -244,10 +174,42 @@
     public Dimension getPreferredSize(JComponent c) 
     {
 	AbstractButton b = (AbstractButton)c;
-	Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b, gap);
+    Dimension d = 
+      BasicGraphicsUtils.getPreferredButtonSize
+      (b, defaultTextIconGap + defaultTextShiftOffset);
 	return d;
     }
     
+  static private Icon currentIcon(AbstractButton b)
+  {
+    Icon i = b.getIcon();
+    ButtonModel model = b.getModel();
+
+    if (model.isPressed() && b.getPressedIcon() != null)
+      i = b.getPressedIcon();
+
+    else if (model.isRollover())
+      {
+        if (b.isSelected() && b.getRolloverSelectedIcon() != null)
+          i = b.getRolloverSelectedIcon();
+        else if (b.getRolloverIcon() != null)
+          i = b.getRolloverIcon();
+      }    
+
+    else if (b.isSelected())
+      {
+        if (b.isEnabled() && b.getSelectedIcon() != null)
+          i = b.getSelectedIcon();
+        else if (b.getDisabledSelectedIcon() != null)
+          i = b.getDisabledSelectedIcon();
+      }
+
+    else if (! b.isEnabled() && b.getDisabledIcon() != null)
+      i = b.getDisabledIcon();
+
+    return i;
+  }
+
   /**
    * Paint the component, which is an {@link AbstractButton}, according to 
    * its current state.
@@ -268,31 +230,21 @@
 
         g.setFont(f);
 
-        FontMetrics fm = g.getFontMetrics(f);
-
-    Insets border = b.getInsets();
-    Insets margin = b.getMargin();
-
-    br.x = border.left;
-    br.y = border.top;
-    br.width = b.getWidth() - (border.right + border.left);
-    br.height = b.getHeight() - (border.top + border.bottom);
-
-    vr.x = br.x + margin.left;
-    vr.y = br.y + margin.top;
-    vr.width = br.width - (margin.right + margin.left);
-    vr.height = br.height - (margin.top + margin.bottom);
-
-    String text = SwingUtilities.layoutCompoundLabel(c, fm, b.getText(),
-							 b.getIcon(),
+    SwingUtilities.calculateInnerArea(b, br);
+    SwingUtilities.calculateInsetArea(br, b.getMargin(), vr);    
+    String text = SwingUtilities.layoutCompoundLabel(c, g.getFontMetrics(f), 
+                                                     b.getText(),
+                                                     currentIcon(b),
 							 b.getVerticalAlignment(), 
 							 b.getHorizontalAlignment(),
 							 b.getVerticalTextPosition(), 
 							 b.getHorizontalTextPosition(),
-                                                     vr, ir, tr, gap);
+                                                     vr, ir, tr, 
+                                                     defaultTextIconGap 
+                                                     + defaultTextShiftOffset);
 
-    if ((b.getModel().isRollover() && b.getModel().isArmed()) 
-        || b.getModel().isSelected())
+    if ((b.getModel().isArmed() && b.getModel().isPressed()) 
+        || b.isSelected())
       paintButtonPressed(g, br, c);
 	else
       paintButtonNormal(g, br, c);
@@ -354,11 +306,13 @@
   protected void paintIcon(Graphics g, JComponent c, Rectangle iconRect)
     {
 	AbstractButton b = (AbstractButton) c;
-	if (b.getIcon() != null)
+    Icon i = currentIcon(b);
+
+    if (i != null)
 	    {
 		int x = iconRect.x;
 		int y = iconRect.y;
-		b.getIcon().paintIcon(c, g, x, y);
+        i.paintIcon(c, g, x, y);
 	    }
     }
 
@@ -373,11 +327,12 @@
    */
   protected void paintButtonPressed(Graphics g, Rectangle area, JComponent b)
     {
-	Dimension size = b.getSize();
-	
-	g.setColor(pressedBackgroundColor);
+    if (((AbstractButton)b).isContentAreaFilled())
+      {
+        g.setColor(b.getBackground().darker());
     g.fillRect(area.x, area.y, area.width, area.height);
     }
+  }
     
   /**
    * Paints the background area of an {@link AbstractButton} in the normal,
@@ -390,10 +345,12 @@
    */
   protected void paintButtonNormal(Graphics g, Rectangle area, JComponent b)
     {
-	Dimension size = b.getSize();
-	g.setColor(normalBackgroundColor);
+    if (((AbstractButton)b).isContentAreaFilled())
+      {
+        g.setColor(b.getBackground());
     g.fillRect(area.x, area.y, area.width, area.height);
     }
+  }
     
   /**
    * Paints the "text" property of an {@link AbstractButton}, using the
@@ -410,9 +367,8 @@
 	Font f = c.getFont();
         g.setFont(f);
         FontMetrics fm = g.getFontMetrics(f);
-	g.setColor(c.isEnabled() ? textColor : disabledTextColor);
-    BasicGraphicsUtils.drawString(g, text, 
-				      0,
+    g.setColor(c.getForeground());
+    BasicGraphicsUtils.drawString(g, text, 0,
 				      textRect.x, 
                                   textRect.y + fm.getAscent());
     } 
Index: javax/swing/plaf/basic/BasicCheckBoxUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicCheckBoxUI.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicCheckBoxUI.java
--- javax/swing/plaf/basic/BasicCheckBoxUI.java	10 Jan 2004 21:59:46 -0000	1.5
+++ javax/swing/plaf/basic/BasicCheckBoxUI.java	14 Feb 2004 21:42:01 -0000
@@ -38,81 +38,27 @@
 
 package javax.swing.plaf.basic;
 
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-import javax.swing.AbstractButton;
+import javax.swing.Icon;
 import javax.swing.JComponent;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
 public class BasicCheckBoxUI extends BasicRadioButtonUI
 {  
+  
     public static ComponentUI createUI(final JComponent c)  {
 	return new BasicCheckBoxUI();
     }
 
-    
-    public void installUI(final JComponent c)  {
-	super.installUI(c);
-    }
-    
-    public Dimension getPreferredSize(JComponent c) 
-    {
-	AbstractButton b = (AbstractButton)c;
-	Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b, gap);
-	//System.out.println("^^^^^^^^^^^^^^^^^^^^^^   BASIC-PREF="+d + ",T="+b.text);
-	return d;
-    }
-    
-    protected void paintFocus(Graphics g, 
-			      JComponent c,
-			      Rectangle vr,
-			      Rectangle tr,
-			      Rectangle ir)
-    {
-    }
-
-    protected void paintIcon(Graphics g, 
-			     JComponent c, 
-			     Rectangle iconRect)
-    {
-    }
-
-    protected void paintButtonPressed(Graphics g,
-				      JComponent b)
+  public Icon getDefaultIcon()
     {
-	Dimension size = b.getSize();
-	
-	g.setColor(pressedBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);                
-
+    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+    return defaults.getIcon("CheckBox.icon");
     }
     
-    protected void paintButtonNormal(Graphics g,
-				     JComponent b)
-    {
-	Dimension size = b.getSize();
-	
-	g.setColor(normalBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);                
-
-    }
-    protected void paintText(Graphics g,
-			     JComponent c,
-			     Rectangle textRect,
-			     String text) 
-    {
-	//        AbstractButton b = (AbstractButton) c;
-	
-	//	System.out.println("drawing string: " + text + ", at:" + textRect);
-	
-	g.setColor(textColor);
-	BasicGraphicsUtils.drawString(g,
-				      text, 
-				      0,
-				      textRect.x, 
-				      textRect.y);
+  public void installUI(final JComponent c)  {
+    super.installUI(c);
     } 
 }
 
Index: javax/swing/plaf/basic/BasicDefaults.java
===================================================================
RCS file: javax/swing/plaf/basic/BasicDefaults.java
diff -N javax/swing/plaf/basic/BasicDefaults.java
--- javax/swing/plaf/basic/BasicDefaults.java	21 Nov 2003 01:53:18 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,126 +0,0 @@
-/* BasicDefaults.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
-
-This file is part of GNU Classpath.
-
-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
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
-
-
-package javax.swing.plaf.basic;
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Graphics;
-import java.awt.Insets;
-import javax.swing.UIDefaults;
-import javax.swing.border.MatteBorder;
-
-class BasicBorder extends MatteBorder
-{
-    static Color BtnPointClr = new Color( 180, 180, 180);
-
-	BasicBorder()
-	{
-		super(5,5,5,5, Color.black);
-	}
-	
-	public void paintBorder(Component  c,
-				Graphics  g, 
-				int  x, 
-				int  y, 
-				int  width, 
-				int  height)
-	{
-	    //    System.out.println("PAINT-------------------------------------------BORDER");
-
-	    if (g != null)
-		{
-		    g.setColor( BtnPointClr);
-		    g.draw3DRect( 0, 0, width-1, height-1, true);
-		}
-	}
- }
-
-class PanelBorder extends MatteBorder
-{
-    PanelBorder()
-    {
-	super(5,5,5,5, Color.black);
-	}
-	
-	public void paintBorder(Component  c,
-				Graphics  g, 
-				int  x, 
-				int  y, 
-				int  width, 
-				int  height)
-	{
-	    //    System.out.println("PAINT-------------------------------------------BORDER");
-	    super.paintBorder(c, g, x, y, width, height);
-	}
- }
-
-public class BasicDefaults extends UIDefaults
-{
-    public BasicDefaults()
-    {
-	//	System.out.println("BasicDefaults !!!!!!!!!!!!!!!!!!!!!!!!!");
-	put("JButton", "javax.swing.plaf.basic.BasicButtonUI");
-	put("JLabel",  "javax.swing.plaf.basic.BasicLabelUI");
-	
-	put("JPanel",  "javax.swing.plaf.basic.BasicPanelUI");
-	put("JCheckBox",  "javax.swing.plaf.basic.BasicCheckBoxUI");
-	put("JRadioButton",  "javax.swing.plaf.basic.BasicRadioButtonUI");
-	put("JToggleButton",  "javax.swing.plaf.basic.BasicToggleButtonUI");
-	put("JOptionPane",  "javax.swing.plaf.basic.BasicOptionPaneUI");
-	put("JList",  "javax.swing.plaf.basic.BasicListUI");
-	put("JTree",  "javax.swing.plaf.basic.BasicTreeUI");
-	put("JTextComponent",  "javax.swing.plaf.basic.BasicTextUI");
-	put("JTabbedPane",  "javax.swing.plaf.basic.BasicTabbedPaneUI");
-	put("JScrollPane", "javax.swing.plaf.basic.BasicScrollPaneUI");
-	put("JViewport",   "javax.swing.plaf.basic.BasicViewportUI");
-
-	put("JButton.border",      "javax.swing.plaf.basic.BasicBorder");
-	put("JPanel.border",       "javax.swing.plaf.basic.PanelBorder");
-
-	put("JToggleButton.border", "javax.swing.plaf.basic.PanelBorder");
-	put("JCheckBox.border", "javax.swing.plaf.basic.PanelBorder");
-	put("JRadioButton.border", "javax.swing.plaf.basic.PanelBorder");
-
-	put("AbstractUndoableEdit.undoText", "Undo");
-	put("AbstractUndoableEdit.redoText", "Redo");
-    }
-    
-}
-
-
Index: javax/swing/plaf/basic/BasicIconFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicIconFactory.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicIconFactory.java
--- javax/swing/plaf/basic/BasicIconFactory.java	2 Oct 2002 12:58:40 -0000	1.3
+++ javax/swing/plaf/basic/BasicIconFactory.java	14 Feb 2004 21:42:01 -0000
@@ -39,7 +39,14 @@
 package javax.swing.plaf.basic;
 
 import java.io.Serializable;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Polygon;
+import javax.swing.AbstractButton;
 import javax.swing.Icon;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
 /**
  * STUBBED
  */
@@ -47,39 +54,156 @@
 {
   static final long serialVersionUID = 5605588811185324383L;
 
+  static private class DummyIcon 
+    implements Icon
+  {    
+    public int getIconHeight() { return 10; }
+    public int getIconWidth() { return 10; }
+    public void paintIcon(Component c, Graphics g, int x, int y)
+    {
+      Color save = g.getColor();
+      g.setColor(c.getForeground());
+      g.drawRect(x, y, 10, 10);
+      g.setColor(save);
+    }
+  }
+
+
   public BasicIconFactory()
   {
   }
   public static Icon getMenuItemCheckIcon()
   {
-    return null;
+    return new DummyIcon();
   }
   public static Icon getMenuItemArrowIcon()
   {
-    return null;
+    return new DummyIcon();
   }
   public static Icon getMenuArrowIcon()
   {
-    return null;
+    return new DummyIcon();
   }
+
   public static Icon getCheckBoxIcon()
   {
-    return null;
+    return new Icon()
+      {        
+        public int getIconHeight() 
+        { 
+          return 10; 
+        }
+        public int getIconWidth() 
+        { 
+          return 10; 
+        }
+        public void paintIcon(Component c, Graphics g, int x, int y)
+        {
+          if (c instanceof AbstractButton)
+            {
+              UIDefaults defaults;
+              defaults = UIManager.getLookAndFeelDefaults();
+              Color hi = defaults.getColor("CheckBox.highlight");
+              Color low = defaults.getColor("CheckBox.darkShadow");
+              Color sel = defaults.getColor("CheckBox.foreground");
+              Color dim = defaults.getColor("CheckBox.shadow");
+              Polygon check = new Polygon(new int[] {x+3, x+3, x+8},
+                                          new int[] {y+5, y+9, y+3}, 3);
+              AbstractButton b = (AbstractButton) c;
+              Color saved = g.getColor();
+              if (b.isEnabled())
+                {
+                  g.setColor(low);
+                  g.drawRect(x, y, 10, 10);
+                  g.setColor(hi);
+                  g.drawRect(x+1, y+1, 10, 10);
+                  if (b.isSelected())
+                    {
+                      g.setColor(sel);
+                      if (b.isSelected())
+                        {
+                          g.drawLine(x+3, y+5, x+3, y+8);
+                          g.drawLine(x+4, y+5, x+4, y+8);
+                          g.drawLine(x+3, y+8, x+8, y+3);
+                          g.drawLine(x+4, y+8, x+8, y+3);
+                        }
+                    }
+                }
+              else
+                {                  
+                  g.setColor(hi);
+                  g.drawRect(x, y, 10, 10);
+                  if (b.isSelected())
+                    {
+                      g.drawLine(x+3, y+5, x+3, y+9);
+                      g.drawLine(x+3, y+9, x+8, y+3);
   }
+                }
+              g.setColor(saved);
+            }
+        }
+      };
+  }
+
   public static Icon getRadioButtonIcon()
   {
-    return null;
+    return new Icon()
+      {        
+        public int getIconHeight() 
+        { 
+          return 12; 
+        }
+        public int getIconWidth() 
+        { 
+          return 12; 
+        }
+        public void paintIcon(Component c, Graphics g, int x, int y)
+        {
+          UIDefaults defaults;      
+          defaults = UIManager.getLookAndFeelDefaults();
+          Color hi = defaults.getColor("RadioButton.highlight");
+          Color low = defaults.getColor("RadioButton.darkShadow");
+          Color sel = defaults.getColor("RadioButton.foreground");
+          Color dim = defaults.getColor("RadioButton.shadow");
+
+          if (c instanceof AbstractButton)
+            {
+              AbstractButton b = (AbstractButton) c;
+              Color saved = g.getColor();
+              if (b.isEnabled())
+                {
+                  g.setColor(low);
+                  g.drawOval(x, y, 12, 12);
+                  g.setColor(hi);
+                  g.drawOval(x+1, y+1, 12, 12);
+                  if (b.isSelected())
+                    {
+                      g.setColor(sel);
+                      g.fillOval(x+4, y+4, 6, 6);
+                    }
+                }
+              else
+                {                  
+                  g.setColor(hi);
+                  g.drawOval(x, y, 12, 12);
+                  if (b.isSelected())
+                    g.fillOval(x+4, y+4, 6, 6);
+                }
+              g.setColor(saved);
+            }
+        }
+      };
   }
   public static Icon getCheckBoxMenuItemIcon()
   {
-    return null;
+    return new DummyIcon();
   }
   public static Icon getRadioButtonMenuItemIcon()
   {
-    return null;
+    return new DummyIcon();
   }
   public static Icon createEmptyFrameIcon()
   {
-    return null;
+    return new DummyIcon();
   }
 } // class BasicIconFactory
Index: javax/swing/plaf/basic/BasicLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLookAndFeel.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 BasicLookAndFeel.java
--- javax/swing/plaf/basic/BasicLookAndFeel.java	2 Jul 2003 05:21:52 -0000	1.4
+++ javax/swing/plaf/basic/BasicLookAndFeel.java	14 Feb 2004 21:42:01 -0000
@@ -227,29 +227,40 @@
   {
     Object[] uiDefaults;
     uiDefaults = new Object[] {
+
+      "AbstractUndoableEdit.undoText", "Undo",
+      "AbstractUndoableEdit.redoText", "Redo",
+
       "Button.background", new ColorUIResource(Color.lightGray),
-      "Button.border", new BorderUIResource.CompoundBorderUIResource(null,
-                                                                     null),
+      "Button.border", BorderUIResource.getEtchedBorderUIResource(),
+      "Button.darkShadow", new ColorUIResource(Color.darkGray),
       "Button.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
         "SPACE",  "pressed",
         "released SPACE", "released"
       }),
       "Button.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "Button.foreground", new ColorUIResource(Color.black),
+      "Button.highlight", new ColorUIResource(Color.white),
+      "Button.light", new ColorUIResource(Color.lightGray.brighter()),
       "Button.margin", new InsetsUIResource(2, 14, 2, 14),
+      "Button.shadow", new ColorUIResource(Color.gray),
       "Button.textIconGap", new Integer(4),
       "Button.textShiftOffset", new Integer(0),
       "CheckBox.background", new ColorUIResource(Color.lightGray),
       "CheckBox.border", new BorderUIResource.CompoundBorderUIResource(null,
                                                                        null),
+      "CheckBox.darkShadow", new ColorUIResource(Color.darkGray),
       "CheckBox.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
         "SPACE",  "pressed",
         "released SPACE", "released"
       }),
       "CheckBox.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "CheckBox.foreground", new ColorUIResource(Color.black),
+      "CheckBox.highlight", new ColorUIResource(Color.white),
       "CheckBox.icon", BasicIconFactory.getCheckBoxIcon(),
+      "CheckBox.light", new ColorUIResource(Color.lightGray.brighter()),
       "CheckBox.margin",new InsetsUIResource(2, 2, 2, 2),
+      "CheckBox.shadow", new ColorUIResource(Color.gray),
       "CheckBox.textIconGap", new Integer(4),
       "CheckBox.textShiftOffset", new Integer(0),
       "CheckBoxMenuItem.acceleratorFont", new FontUIResource("Dialog",
@@ -540,7 +551,7 @@
       "PopupMenu.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "PopupMenu.foreground", new ColorUIResource(Color.black),
       "ProgressBar.background", new ColorUIResource(Color.lightGray),
-      "ProgressBar.border", new BorderUIResource.LineBorderUIResource(null),
+      "ProgressBar.border", new BorderUIResource.LineBorderUIResource(Color.darkGray),
       "ProgressBar.cellLength", new Integer(1),
       "ProgressBar.cellSpacing", new Integer(0),
       "ProgressBar.font", new FontUIResource("Dialog", Font.PLAIN, 12),
@@ -550,14 +561,18 @@
       "RadioButton.background", new ColorUIResource(Color.lightGray),
       "RadioButton.border", new BorderUIResource.CompoundBorderUIResource(null,
                                                                           null),
+      "RadioButton.darkShadow", new ColorUIResource(Color.darkGray),
       "RadioButton.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
         "SPACE",  "pressed",
         "released SPACE", "released"
       }),
       "RadioButton.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "RadioButton.foreground", new ColorUIResource(Color.black),
+      "RadioButton.highlight", new ColorUIResource(Color.white),
       "RadioButton.icon", BasicIconFactory.getRadioButtonIcon(),
+      "RadioButton.light", new ColorUIResource(Color.lightGray.brighter()),
       "RadioButton.margin", new InsetsUIResource(2, 2, 2, 2),
+      "RadioButton.shadow", new ColorUIResource(Color.gray),
       "RadioButton.textIconGap", new Integer(4),
       "RadioButton.textShiftOffset", new Integer(0),
       "RadioButtonMenuItem.acceleratorFont", new FontUIResource("Dialog",
@@ -742,7 +757,7 @@
       "Table.background", new ColorUIResource(Color.white),
       "Table.focusCellBackground", new ColorUIResource(Color.white),
       "Table.focusCellForeground", new ColorUIResource(Color.black),
-      "Table.focusCellHighlightBorder", new BorderUIResource.LineBorderUIResource(null),
+      "Table.focusCellHighlightBorder", new BorderUIResource.LineBorderUIResource(Color.white),
       "Table.font", new FontUIResource("Dialog", Font.PLAIN, 12),
       "Table.foreground", new ColorUIResource(Color.black),
       "Table.gridColor", new ColorUIResource(Color.gray),
@@ -849,7 +864,7 @@
       "ToolBar.foreground", new ColorUIResource(Color.black),
       "ToolBar.separatorSize", new DimensionUIResource(10, 10),
       "ToolTip.background", new ColorUIResource(Color.white),
-      "ToolTip.border", new BorderUIResource.LineBorderUIResource(null),
+      "ToolTip.border", new BorderUIResource.LineBorderUIResource(Color.lightGray),
       "ToolTip.font", new FontUIResource("SansSerif", Font.PLAIN, 12),
       "ToolTip.foreground", new ColorUIResource(Color.black),
       "Tree.ancestorInputMap", new UIDefaults.LazyInputMap(new Object[] {
@@ -860,7 +875,7 @@
       // XXX Don't use gif
       "Tree.closedIcon", new IconUIResource(new ImageIcon("icons/TreeClosed.gif")),
       "Tree.drawsFocusBorderAroundIcon", Boolean.FALSE,
-      "Tree.editorBorder", new BorderUIResource.LineBorderUIResource(null),
+      "Tree.editorBorder", new BorderUIResource.LineBorderUIResource(Color.lightGray),
       "Tree.focusInputMap", new UIDefaults.LazyInputMap(new Object[] {
         "shift PAGE_DOWN", "scrollDownExtendSelection",
         "PAGE_DOWN", "scrollDownChangeSelection",
Index: javax/swing/plaf/basic/BasicPanelUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicPanelUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicPanelUI.java
--- javax/swing/plaf/basic/BasicPanelUI.java	10 Jan 2004 21:59:46 -0000	1.3
+++ javax/swing/plaf/basic/BasicPanelUI.java	14 Feb 2004 21:42:01 -0000
@@ -44,8 +44,6 @@
 
 public class BasicPanelUI extends PanelUI
 {
-    int gap = 3;
-
     public static ComponentUI createUI(JComponent x) 
     {
         return new BasicPanelUI();
Index: javax/swing/plaf/basic/BasicRadioButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicRadioButtonUI.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicRadioButtonUI.java
--- javax/swing/plaf/basic/BasicRadioButtonUI.java	10 Jan 2004 21:59:46 -0000	1.5
+++ javax/swing/plaf/basic/BasicRadioButtonUI.java	14 Feb 2004 21:42:01 -0000
@@ -38,116 +38,42 @@
 
 package javax.swing.plaf.basic;
 
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Rectangle;
 import javax.swing.AbstractButton;
+import javax.swing.Icon;
 import javax.swing.JComponent;
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
 public class BasicRadioButtonUI extends BasicToggleButtonUI
 {
-  int large_circle_width = 20;
-  int circle_width = large_circle_width - 8; // FIXME: sun == ?
+
+  protected Icon icon;
   
     public static ComponentUI createUI(final JComponent c)  {
 	return new BasicRadioButtonUI();
     }
 
+  public BasicRadioButtonUI()
+  {
+    icon = getDefaultIcon();
+  }
     
     public void installUI(final JComponent c)  {
 	super.installUI(c);
-    }
-    
-    public Dimension getPreferredSize(JComponent c) 
+    if (c instanceof AbstractButton)
     {
-	AbstractButton b = (AbstractButton)c;
-	Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b, gap);
-	
-	// and add a little something for the circles:
-
-	d.width += large_circle_width;
-	d.height = Math.max(large_circle_width, d.height);
-	
-	//System.out.println("^^^^^^^^^^^^^^^^^^^^^^   BASIC-PREF="+d + ",T="+b.text);
-	return d;
+        AbstractButton b = (AbstractButton) c;        
+        b.setIcon(icon);
     }
-    
-    protected void paintFocus(Graphics g, 
-			      JComponent c,
-			      Rectangle vr,
-			      Rectangle tr,
-			      Rectangle ir)
-    {
     }
 
-    protected void paintIcon(Graphics g, 
-			     JComponent c, 
-			     Rectangle iconRect)
+  public Icon getDefaultIcon()
     {
+    UIDefaults defaults = UIManager.getLookAndFeelDefaults();
+    return defaults.getIcon("RadioButton.icon");
     }
 
-    protected void paintButtonPressed(Graphics g,
-				      JComponent b)
-    {
-	Dimension size = b.getSize();
-	
-	paintButtonNormal(g, b);
-
-	int x = gap;
-	int y = gap;
-
-	int diffp = 2;
-	int diff = 3;
-	
-	g.setColor(textColor);
-	g.fillArc(x+diffp, y+diffp, 
-		  circle_width-diff, circle_width-diff,
-		  0, 360);
-    }
-    
-    protected void paintButtonNormal(Graphics g,
-				     JComponent c)
-    {
-	AbstractButton b = (AbstractButton) c;
-	
-	Dimension size = b.getSize();
-	
-	g.setColor(normalBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);  
-	
-	int x = gap;
-	int y = gap;
-	
-	g.setColor(pressedBackgroundColor);
-	g.drawArc(x, y,
-		  circle_width, circle_width,
-		  0, 360);
-
-	g.setColor(new Color(255,255,255));
-	g.drawArc(x, y,
-		  circle_width+1, circle_width+1,
-		  145, 160);
-    }
-    
-    protected void paintText(Graphics g,
-			     JComponent c,
-			     Rectangle textRect,
-			     String text) 
-    {
-	//        AbstractButton b = (AbstractButton) c;
-	
-	//System.out.println("drawing string: " + text + ", " + c.isEnabled());
-	
-	g.setColor(c.isEnabled() ? textColor : disabledTextColor);
-	
-	BasicGraphicsUtils.drawString(g,
-				      text, 
-				      0,
-				      textRect.x + circle_width + gap, 
-				      textRect.y);
-    } 
 }
 
 
Index: javax/swing/plaf/basic/BasicRootPaneUI.java
===================================================================
RCS file: javax/swing/plaf/basic/BasicRootPaneUI.java
diff -N javax/swing/plaf/basic/BasicRootPaneUI.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/swing/plaf/basic/BasicRootPaneUI.java	14 Feb 2004 21:42:01 -0000
@@ -0,0 +1,57 @@
+/* BasicPanelUI.java
+   Copyright (C) 2002 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package javax.swing.plaf.basic;
+
+import javax.swing.*;
+import javax.swing.plaf.*;
+import java.awt.*;
+
+
+public class BasicRootPaneUI extends RootPaneUI
+{
+    public static ComponentUI createUI(JComponent x) 
+    {
+        return new BasicRootPaneUI();
+    }
+
+    public void installUI(JComponent c)
+    {
+      super.installUI(c);
+    }
+}
Index: javax/swing/plaf/basic/BasicToggleButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicToggleButtonUI.java
--- javax/swing/plaf/basic/BasicToggleButtonUI.java	10 Jan 2004 21:59:46 -0000	1.5
+++ javax/swing/plaf/basic/BasicToggleButtonUI.java	14 Feb 2004 21:42:01 -0000
@@ -51,71 +51,6 @@
     public static ComponentUI createUI(final JComponent c)  {
 	return new BasicToggleButtonUI();
     }
-
-    
-    public void installUI(final JComponent c)  {
-	super.installUI(c);
-    }
-    
-    public Dimension getPreferredSize(JComponent c) 
-    {
-	AbstractButton b = (AbstractButton)c;
-	Dimension d = BasicGraphicsUtils.getPreferredButtonSize(b, gap);
-							  
-	//System.out.println("^^^^^^^^^^^^^^^^^^^^^^   BASIC-PREF="+d + ",T="+b.text);
-	return d;
-    }
-    
-    protected void paintFocus(Graphics g, 
-			      JComponent c,
-			      Rectangle vr,
-			      Rectangle tr,
-			      Rectangle ir)
-    {
-    }
-
-    protected void paintIcon(Graphics g, 
-			     JComponent c, 
-			     Rectangle iconRect)
-    {
-    }
-
-    protected void paintButtonPressed(Graphics g,
-				      JComponent b)
-    {
-	Dimension size = b.getSize();
-	
-	g.setColor(pressedBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);                
-
-    }
-    
-    protected void paintButtonNormal(Graphics g,
-				     JComponent b)
-    {
-	Dimension size = b.getSize();
-	
-	g.setColor(normalBackgroundColor);
-	g.fillRect(1,1,size.width-2, size.height-2);                
-
-    }
-    protected void paintText(Graphics g,
-			     JComponent c,
-			     Rectangle textRect,
-			     String text) 
-    {
-	//        AbstractButton b = (AbstractButton) c;
-	
-	//	System.out.println("drawing string: " + text + ", at:" + textRect);
-	
-	g.setColor(textColor);
-
-	BasicGraphicsUtils.drawString(g,
-				      text, 
-				      0,	
-				      textRect.x, 
-				      textRect.y);
-    } 
 }
 
 
Index: javax/swing/plaf/metal/MetalLookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/metal/MetalLookAndFeel.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 MetalLookAndFeel.java
--- javax/swing/plaf/metal/MetalLookAndFeel.java	12 Oct 2003 16:44:40 -0000	1.5
+++ javax/swing/plaf/metal/MetalLookAndFeel.java	14 Feb 2004 21:42:01 -0000
@@ -40,7 +40,6 @@
 package javax.swing.plaf.metal;
 
 import javax.swing.UIDefaults;
-import javax.swing.plaf.basic.BasicDefaults;
 import javax.swing.plaf.basic.BasicLookAndFeel;
 
 public class MetalLookAndFeel extends BasicLookAndFeel
@@ -61,7 +60,7 @@
      public UIDefaults getDefaults()
 	 {
 	   if (LAF_defaults == null)
-	     LAF_defaults = new BasicDefaults();
+	     LAF_defaults = super.getDefaults();
 	     
 	     //      Returns the default values for this look and feel. 
 	     return LAF_defaults;
Index: javax/swing/text/JTextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/JTextComponent.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 JTextComponent.java
--- javax/swing/text/JTextComponent.java	23 Jun 2003 06:42:10 -0000	1.8
+++ javax/swing/text/JTextComponent.java	14 Feb 2004 21:42:01 -0000
@@ -406,7 +406,7 @@
     public String getUIClassID()
     {
 	//          Returns a string that specifies the name of the l&f class that renders this component.  
-	return "JTextComponent";
+	return "TextComponentUI";
     }
     public int getVerticalAlignment()
     {

--Boundary-00=_hepLAexBN0Fo2kO--




From MAILER-DAEMON Sat Feb 14 17:05:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1As7v7-00049F-M0
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 17:05:53 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As7v5-000497-IO
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:05:51 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As7v4-00048s-8e
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:05:50 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1As7v3-00048i-Sa
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:05:50 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1As7uy-0004OU-00; Sat, 14 Feb 2004 23:05:44 +0100
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200402142248.17570.konqueror@gmx.de>
References: <200402142248.17570.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-MFwLpj7zkfqE+cpP+kYb"
Message-Id: <1076796346.11504.310.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 14 Feb 2004 23:05:46 +0100
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: Swing fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 22:05:52 -0000


--=-MFwLpj7zkfqE+cpP+kYb
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Sat, 2004-02-14 at 22:48, Michael Koch wrote:
> I just merged a BIG commit from Graydon Hoare in libgcj.

Nice so classpath 0.08 will enable programmers that really need those
JButtons working! :)

But this change breaks the build with jikes:

Found 4 semantic errors compiling
"../../classpath/javax/swing/plaf/basic/BasicButtonUI.java":
=20
   193.         if (b.isSelected() && b.getRolloverSelectedIcon() !=3D
null)
                                      ^-------------------------^
*** Semantic Error: The method "javax.swing.Icon
getRolloverSelectedIcon();" in type "javax.swing.AbstractButton" has
default access and is not accessible here.=20
=20
   194.           i =3D b.getRolloverSelectedIcon();
                      ^-------------------------^
*** Semantic Error: The method "javax.swing.Icon
getRolloverSelectedIcon();" in type "javax.swing.AbstractButton" has
default access and is not accessible here.=20
=20
   201.         if (b.isEnabled() && b.getSelectedIcon() !=3D null)
                                     ^-----------------^
*** Semantic Error: The method "javax.swing.Icon getSelectedIcon();" in
type "javax.swing.AbstractButton" has default access and is not
accessible here.
=20
=20
   202.           i =3D b.getSelectedIcon();
                      ^-----------------^
*** Semantic Error: The method "javax.swing.Icon getSelectedIcon();" in
type "javax.swing.AbstractButton" has default access and is not
accessible here.

Cheers,

Mark

--=-MFwLpj7zkfqE+cpP+kYb
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBALpu5xVhZCJWr9QwRAuLTAJ9OxaWoXcyCMAC5OVr9UtwVV8ZIlQCfRfEZ
IMe+A5RZ20kA/R76mVH4uG8=
=Jode
-----END PGP SIGNATURE-----

--=-MFwLpj7zkfqE+cpP+kYb--




From MAILER-DAEMON Sat Feb 14 17:18:28 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1As87D-00028p-0F
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 17:18:23 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As877-0001yy-LC
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:18:17 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As86w-0001aZ-E2
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:18:09 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1As86u-0001Xy-Uu
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:18:05 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1As86q-0004P9-00; Sat, 14 Feb 2004 23:18:00 +0100
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <1076796346.11504.310.camel@elsschot.wildebeest.org>
References: <200402142248.17570.konqueror@gmx.de>
	<1076796346.11504.310.camel@elsschot.wildebeest.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-qBXYAOpGBMAKE5+0Rfnf"
Message-Id: <1076797081.11504.317.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 14 Feb 2004 23:18:02 +0100
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: Swing fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 22:18:20 -0000


--=-qBXYAOpGBMAKE5+0Rfnf
Content-Type: multipart/mixed; boundary="=-+NZ9kUzi7cHdnBQF3Pfr"


--=-+NZ9kUzi7cHdnBQF3Pfr
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Sat, 2004-02-14 at 23:05, Mark Wielaard wrote:
> But this change breaks the build with jikes:

A quick look at the API confirms that jikes is right.
The following fixes it:

2004-02-14  Mark Wielaard  <mark@klomp.org>

	* javax/swing/AbstractButton.java (getSelectedIcon): Make public
        (getRolloverSelectedIcon): Likewise.

Committed.

Cheers,

Mark

--=-+NZ9kUzi7cHdnBQF3Pfr
Content-Disposition: inline; filename=AbstractButton.patch
Content-Type: text/x-patch; name=AbstractButton.patch; charset=iso-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IGphdmF4L3N3aW5nL0Fic3RyYWN0QnV0dG9uLmphdmENCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBm
aWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmF4L3N3aW5nL0Fic3RyYWN0QnV0
dG9uLmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjEwDQpkaWZmIC11IC1yMS4xMCBBYnN0
cmFjdEJ1dHRvbi5qYXZhDQotLS0gamF2YXgvc3dpbmcvQWJzdHJhY3RCdXR0b24uamF2YQkxNCBG
ZWIgMjAwNCAyMTo0Mjo1NiAtMDAwMAkxLjEwDQorKysgamF2YXgvc3dpbmcvQWJzdHJhY3RCdXR0
b24uamF2YQkxNCBGZWIgMjAwNCAyMjoxNjowNSAtMDAwMA0KQEAgLTE2MTIsNyArMTYxMiw3IEBA
DQogICAgKg0KICAgICogQHJldHVybiBUaGUgY3VycmVudCByb2xsb3ZlciBzZWxlY3RlZCBpY29u
DQogICAgKi8NCi0gIEljb24gZ2V0Um9sbG92ZXJTZWxlY3RlZEljb24oKQ0KKyAgcHVibGljIElj
b24gZ2V0Um9sbG92ZXJTZWxlY3RlZEljb24oKQ0KICAgew0KICAgICByZXR1cm4gcm9sbG92ZXJf
c2VsZWN0ZWRfaWNvbjsNCiAgIH0NCkBAIC0xNjQ4LDcgKzE2NDgsNyBAQA0KICAgICoNCiAgICAq
IEByZXR1cm4gVGhlIGN1cnJlbnQgc2VsZWN0ZWQgaWNvbg0KICAgICovDQotICBJY29uIGdldFNl
bGVjdGVkSWNvbigpDQorICBwdWJsaWMgSWNvbiBnZXRTZWxlY3RlZEljb24oKQ0KICAgew0KICAg
ICByZXR1cm4gc2VsZWN0ZWRfaWNvbjsNCiAgIH0NCg==

--=-+NZ9kUzi7cHdnBQF3Pfr--

--=-qBXYAOpGBMAKE5+0Rfnf
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBALp6YxVhZCJWr9QwRAuqRAJ9sP6mkUaFh1olk+JHLBNiNRRygjwCglUvl
y8Xhlo0uqsT5c7ySz2xVcXk=
=apmO
-----END PGP SIGNATURE-----

--=-qBXYAOpGBMAKE5+0Rfnf--




From MAILER-DAEMON Sat Feb 14 17:26:06 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1As8Ef-0005LB-Td
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 17:26:05 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As8Ee-0005L2-3f
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:26:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As8E8-0005HO-FJ
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:26:03 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1As8E7-0005Gi-VZ
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:25:32 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-042.ewetel.net
	[80.228.94.42])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i1EMPRx9018146;
	Sat, 14 Feb 2004 23:25:28 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1As8E3-0001Zb-00; Sat, 14 Feb 2004 23:25:27 +0100
Date: Sat, 14 Feb 2004 23:25:27 +0100
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Message-ID: <20040214222527.GB3860@mail.konqueror.de>
References: <200402142248.17570.konqueror@gmx.de>
	<1076796346.11504.310.camel@elsschot.wildebeest.org>
	<1076797081.11504.317.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1076797081.11504.317.camel@elsschot.wildebeest.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: Swing fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 22:26:04 -0000

On Sat, Feb 14, 2004 at 11:18:02PM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Sat, 2004-02-14 at 23:05, Mark Wielaard wrote:
> > But this change breaks the build with jikes:
> 
> A quick look at the API confirms that jikes is right.
> The following fixes it:
> 
> 2004-02-14  Mark Wielaard  <mark@klomp.org>
> 
> 	* javax/swing/AbstractButton.java (getSelectedIcon): Make public
>         (getRolloverSelectedIcon): Likewise.
> 
> Committed.

Thx for fixing this. I just found out the same. I think thats one of the
cases where gcj is buggy, still :-/

I will merge your fixes back to libgcj.



Michael



From MAILER-DAEMON Sat Feb 14 17:48:42 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1As8aY-000859-Fn
	for mharc-commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:42 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As8aV-00083n-Vr
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:39 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As8aT-000837-Te
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:38 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1As8aT-000831-3d
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:37 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1As8aP-0004QO-00
	for <commit-classpath@gnu.org>; Sat, 14 Feb 2004 23:48:33 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-f7fffkumgzOR4Mu2Jq6q"
Message-Id: <1076798914.11504.335.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 14 Feb 2004 23:48:34 +0100
Subject: FYI: Fixup Makefile.am EXTRA_DIST for added/removed files
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Feb 2004 22:48:41 -0000


--=-f7fffkumgzOR4Mu2Jq6q
Content-Type: multipart/mixed; boundary="=-pSPiIhEyfeO6It+UgUCQ"


--=-pSPiIhEyfeO6It+UgUCQ
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

After the last patch I needed the following to make distcheck work
again.

2004-02-14  Mark Wielaard  <mark@klomp.org>
 =20
       * javax/swing/Makefile.am (EXTRA_DIST): Remove ToggleButtonModel.jav=
a.
       * javax/swing/plaf/basic/Makefile.am (EXTRA_DIST): Remove
       BasicDefaults.java. Add BasicButtonListener.java and
       BasicRootPaneUI.java.

Committed.

Cheers,

Mark

--=-pSPiIhEyfeO6It+UgUCQ
Content-Disposition: inline; filename=Makefile.diff
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=Makefile.diff; charset=ISO-8859-1

SW5kZXg6IGphdmF4L3N3aW5nL01ha2VmaWxlLmFtDQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2
c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZheC9zd2luZy9NYWtlZmlsZS5hbSx2DQpyZXRy
aWV2aW5nIHJldmlzaW9uIDEuMTENCmRpZmYgLXUgLXIxLjExIE1ha2VmaWxlLmFtDQotLS0gamF2
YXgvc3dpbmcvTWFrZWZpbGUuYW0gICAgIDEwIEF1ZyAyMDAzIDE0OjExOjQ1IC0wMDAwICAgICAg
MS4xMQ0KKysrIGphdmF4L3N3aW5nL01ha2VmaWxlLmFtICAgICAxNCBGZWIgMjAwNCAyMjozNzo1
MyAtMDAwMA0KQEAgLTEwOSw3ICsxMDksNiBAQA0KIFN3aW5nQ29uc3RhbnRzLmphdmEgXA0KIFN3
aW5nVXRpbGl0aWVzLmphdmEgXA0KIFRpbWVyLmphdmEgXA0KLVRvZ2dsZUJ1dHRvbk1vZGVsLmph
dmEgXA0KIFRvb2xUaXBNYW5hZ2VyLmphdmEgXA0KIFVJRGVmYXVsdHMuamF2YSBcDQogVUlNYW5h
Z2VyLmphdmEgXA0KSW5kZXg6IGphdmF4L3N3aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0NCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmF4L3N3
aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0sdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMNCmRp
ZmYgLXUgLXIxLjMgTWFrZWZpbGUuYW0NCi0tLSBqYXZheC9zd2luZy9wbGFmL2Jhc2ljL01ha2Vm
aWxlLmFtICAyMiBKdW4gMjAwMyAxNDo0MToyNiAtMDAwMCAgICAgIDEuMw0KKysrIGphdmF4L3N3
aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0gIDE0IEZlYiAyMDA0IDIyOjM3OjUzIC0wMDAwDQpA
QCAtMSw4ICsxLDggQEANCiBFWFRSQV9ESVNUID0gXA0KIEJhc2ljQm9yZGVycy5qYXZhIFwNCitC
YXNpY0J1dHRvbkxpc3RlbmVyLmphdmEgXA0KIEJhc2ljQnV0dG9uVUkuamF2YSBcDQogQmFzaWND
aGVja0JveFVJLmphdmEgXA0KLUJhc2ljRGVmYXVsdHMuamF2YSBcDQogQmFzaWNHcmFwaGljc1V0
aWxzLmphdmEgXA0KIEJhc2ljSWNvbkZhY3RvcnkuamF2YSBcDQogQmFzaWNMYWJlbFVJLmphdmEg
XA0KQEAgLTExLDYgKzExLDcgQEANCiBCYXNpY09wdGlvblBhbmVVSS5qYXZhIFwNCiBCYXNpY1Bh
bmVsVUkuamF2YSBcDQogQmFzaWNSYWRpb0J1dHRvblVJLmphdmEgXA0KK0Jhc2ljUm9vdFBhbmVV
SS5qYXZhIFwNCiBCYXNpY1Njcm9sbFBhbmVVSS5qYXZhIFwNCiBCYXNpY1NwbGl0UGFuZURpdmlk
ZXIuamF2YSBcDQogQmFzaWNTcGxpdFBhbmVVSS5qYXZhIFwNCg==

--=-pSPiIhEyfeO6It+UgUCQ--

--=-f7fffkumgzOR4Mu2Jq6q
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBALqXBxVhZCJWr9QwRAio6AJ4nz/bCPG2F9vJWN7Iua1fo39IQowCfb68V
PzIkySWImAIAqsELC1wAzQE=
=EfPy
-----END PGP SIGNATURE-----

--=-f7fffkumgzOR4Mu2Jq6q--




From MAILER-DAEMON Mon Feb 16 09:13:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AsjTI-0006pN-NZ
	for mharc-commit-classpath@gnu.org; Mon, 16 Feb 2004 09:11:40 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AsjSt-0006dj-75
	for commit-classpath@gnu.org; Mon, 16 Feb 2004 09:11:15 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AsjSD-0006SI-Uf
	for commit-classpath@gnu.org; Mon, 16 Feb 2004 09:11:05 -0500
Received: from [24.25.9.100] (helo=ms-smtp-01-eri0.southeast.rr.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AsjOH-0004pa-3q
	for commit-classpath@gnu.org; Mon, 16 Feb 2004 09:06:29 -0500
Received: from [10.0.0.2] (rdu57-9-048.nc.rr.com [66.57.9.48])
	by ms-smtp-01-eri0.southeast.rr.com (8.12.10/8.12.7) with ESMTP id
	i1GE6MaL018042; Mon, 16 Feb 2004 09:06:23 -0500 (EST)
From: "C. Brian Jones" <cbj@gnu.org>
To: commit-classpath@gnu.org, brawer@dandelis.ch, reali@acm.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-AxTlaJrWPQ8eOWES9Nxk"
Message-Id: <1076940382.4096.39.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Mon, 16 Feb 2004 09:06:22 -0500
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Cc: 
Subject: [Fwd: Bounce action notification]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: cbj@gnu.org
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2004 14:11:20 -0000


--=-AxTlaJrWPQ8eOWES9Nxk
Content-Type: multipart/mixed; boundary="=-n1c3AkAWfSuPhwiv0Sby"


--=-n1c3AkAWfSuPhwiv0Sby
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hey guys (Sasha, Patrick), your email is bouncing from commit-classpath
and it automatically disabled you.

Brian

--=-n1c3AkAWfSuPhwiv0Sby
Content-Type: multipart/digest; boundary="=-2n1gKUqrfvfYGFLVZvl+"
Content-Description: Forwarded messages


--=-2n1gKUqrfvfYGFLVZvl+
Content-Disposition: inline
Content-Description: Forwarded message - Bounce action notification
Content-Type: message/rfc822

Return-Path: <mailman-bounces@gnu.org>
Received: from localhost (localhost.localdomain [127.0.0.1]) by
	lyta.haphazard.org (8.12.10/8.12.10) with ESMTP id i1EMt4bw027421 for
	<cbj@localhost>; Sat, 14 Feb 2004 17:55:04 -0500
Received: from pop-server.nc.rr.com [24.25.4.167] by localhost with POP3
	(fetchmail-6.2.0) for cbj@localhost (single-drop); Sat, 14 Feb 2004
	17:55:04 -0500 (EST)
Received: from ms-mta-01-eri0 (ms-mta-01-qfe1 [10.10.5.70]) by
	ms-mss-01.southeast.rr.com (iPlanet Messaging Server 5.2 HotFix 1.21
	(built
	Sep 8 2003)) with ESMTP id <0HT3000JUJGNA5@ms-mss-01.southeast.rr.com>
	for cbj@nc.rr.com; Sat, 14 Feb 2004 17:50:47 -0500 (EST)
Received: from ncmx02.mgw.rr.com (ncmx02.mgw.rr.com [24.25.4.96]) by
	ms-mta-01.southeast.rr.com (iPlanet Messaging Server 5.2 HotFix 1.21
	(built
	Sep 8 2003)) with ESMTP id <0HT3007IAJGMIS@ms-mta-01.southeast.rr.com>
	for cbj@nc.rr.com (ORCPT cbj@nc.rr.com);
	Sat, 14 Feb 2004 17:50:47 -0500 (EST)
Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164]) by
	ncmx02.mgw.rr.com (8.12.10/8.12.8) with ESMTP id i1EMp9RW011934	for
	<cbj@nc.rr.com>; Sat, 14 Feb 2004 17:51:09 -0500 (EST)
Received: from monty-python.gnu.org ([199.232.76.173]) by fencepost.gnu.org
	with esmtp (Exim 4.24) id 1As8Ze-0003I4-OE	for cbj@gnu.org; Sat, 14 Feb
	2004 17:47:46 -0500
Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by
	monty-python.gnu.org with esmtp (Exim 4.24)	id 1As8cP-0000Z2-KC; Sat, 14
	Feb 2004 17:50:37 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As8cN-0000Vt-Fe	for commit-classpath-owner@gnu.org; Sat, 14 Feb 2004
	17:50:35 -0500
Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by
	monty-python.gnu.org with esmtp (Exim 4.24) id 1As8cL-0000U2-RZ	for
	commit-classpath-owner@gnu.org; Sat, 14 Feb 2004 17:50:33 -0500
Date: Sat, 14 Feb 2004 17:50:31 -0500
From: mailman@gnu.org
Subject: Bounce action notification
Sender: mailman-bounces@gnu.org
To: commit-classpath-owner@gnu.org
Errors-to: mailman-bounces@gnu.org
Message-id: <mailman.2123.1076799031.924.commit-classpath@gnu.org>
MIME-version: 1.0
Content-type: multipart/mixed; boundary="===============1251409112=="
Precedence: bulk
X-BeenThere: commit-classpath@gnu.org
X-List-Administrivia: yes
X-Virus-Scanned: Symantec AntiVirus Scan Engine
X-Mailman-Version: 2.1.2
List-Id: Automatic administrative message (CVS, bugs, regressions)
	.	<commit-classpath.gnu.org>
Original-recipient: rfc822;cbj@nc.rr.com


--===============1251409112==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

This is a Mailman mailing list bounce action notice:

    List:       Commit-classpath
    Member:     reali@acm.org
    Action:     Subscription disabled.
    Reason:     Excessive or fatal bounces.
   =20


The triggering bounce notice is attached below.

Questions? Contact the Mailman site administrator at mailman@gnu.org.

--===============1251409112==
Content-Type: message/rfc822
MIME-Version: 1.0

Envelope-to: commit-classpath-bounces+reali=acm.org@gnu.org
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As8bm-0008Pp-Ff for commit-classpath-bounces+reali=acm.org@gnu.org; 
	Sat, 14 Feb 2004 17:49:59 -0500
Received: from mail by monty-python.gnu.org with local (Exim 4.24) id
	1As8bm-0008Pj-1u for commit-classpath-bounces+reali=acm.org@gnu.org;
	Sat, 14 Feb 2004 17:49:58 -0500
X-Failed-Recipients: reali@acm.org
Auto-Submitted: auto-generated
From: Mail Delivery System <Mailer-Daemon@gnu.org>
To: commit-classpath-bounces+reali=acm.org@gnu.org
Subject: Mail delivery failed: returning message to sender
Message-Id: <E1As8bm-0008Pj-1u@monty-python.gnu.org>
Date: Sat, 14 Feb 2004 17:49:58 -0500
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable

This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  reali@acm.org
    SMTP error from remote mailer after end of data:
    host alias.acm.org [199.222.69.90]: 554 5.7.1 Message cannot be accepte=
d, content filter rejection reject mydoom attachment name

------ This is a copy of the message, including all the headers. ------

Return-path: <commit-classpath-bounces+reali=3Dacm.org@gnu.org>
Received: from localhost ([127.0.0.1] helo=3Dmonty-python.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.24)
	id 1As8at-00085F-Ms
	for reali@acm.org; Sat, 14 Feb 2004 17:49:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As8aV-00083n-Vr
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:39 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As8aT-000837-Te
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:38 -0500
Received: from [82.161.94.186] (helo=3Dnescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1As8aT-000831-3d
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:37 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=3Dmark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1As8aP-0004QO-00
	for <commit-classpath@gnu.org>; Sat, 14 Feb 2004 23:48:33 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Message-Id: <1076798914.11504.335.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5=20
Date: Sat, 14 Feb 2004 23:48:34 +0100
Subject: FYI: Fixup Makefile.am EXTRA_DIST for added/removed files
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=3Dunsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=3Dhelp>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=3Dsubscribe>
Content-Type: multipart/mixed; boundary=3D"=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D1029085924=3D=3D"
Sender: commit-classpath-bounces+reali=3Dacm.org@gnu.org
Errors-To: commit-classpath-bounces+reali=3Dacm.org@gnu.org


--=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D1029085924=3D=3D
Content-Type: multipart/signed; micalg=3Dpgp-sha1;
	protocol=3D"application/pgp-signature";
	boundary=3D"=3D-f7fffkumgzOR4Mu2Jq6q"


--=3D-f7fffkumgzOR4Mu2Jq6q
Content-Type: multipart/mixed; boundary=3D"=3D-pSPiIhEyfeO6It+UgUCQ"


--=3D-pSPiIhEyfeO6It+UgUCQ
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

After the last patch I needed the following to make distcheck work
again.

2004-02-14  Mark Wielaard  <mark@klomp.org>
 =3D20
       * javax/swing/Makefile.am (EXTRA_DIST): Remove ToggleButtonModel.jav=
=3D
a.
       * javax/swing/plaf/basic/Makefile.am (EXTRA_DIST): Remove
       BasicDefaults.java. Add BasicButtonListener.java and
       BasicRootPaneUI.java.

Committed.

Cheers,

Mark

--=3D-pSPiIhEyfeO6It+UgUCQ
Content-Disposition: inline; filename=3DMakefile.diff
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=3DMakefile.diff; charset=3DISO-8859-1

SW5kZXg6IGphdmF4L3N3aW5nL01ha2VmaWxlLmFtDQo9PT09PT09PT09PT09PT09PT09PT09PT0=
9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N=
2
c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZheC9zd2luZy9NYWtlZmlsZS5hbSx2DQpyZXR=
y
aWV2aW5nIHJldmlzaW9uIDEuMTENCmRpZmYgLXUgLXIxLjExIE1ha2VmaWxlLmFtDQotLS0gamF=
2
YXgvc3dpbmcvTWFrZWZpbGUuYW0gICAgIDEwIEF1ZyAyMDAzIDE0OjExOjQ1IC0wMDAwICAgICA=
g
MS4xMQ0KKysrIGphdmF4L3N3aW5nL01ha2VmaWxlLmFtICAgICAxNCBGZWIgMjAwNCAyMjozNzo=
1
MyAtMDAwMA0KQEAgLTEwOSw3ICsxMDksNiBAQA0KIFN3aW5nQ29uc3RhbnRzLmphdmEgXA0KIFN=
3
aW5nVXRpbGl0aWVzLmphdmEgXA0KIFRpbWVyLmphdmEgXA0KLVRvZ2dsZUJ1dHRvbk1vZGVsLmp=
h
dmEgXA0KIFRvb2xUaXBNYW5hZ2VyLmphdmEgXA0KIFVJRGVmYXVsdHMuamF2YSBcDQogVUlNYW5=
h
Z2VyLmphdmEgXA0KSW5kZXg6IGphdmF4L3N3aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0NCj0=
9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0=
9
PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmF4L3N=
3
aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0sdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMNCmR=
p
ZmYgLXUgLXIxLjMgTWFrZWZpbGUuYW0NCi0tLSBqYXZheC9zd2luZy9wbGFmL2Jhc2ljL01ha2V=
m
aWxlLmFtICAyMiBKdW4gMjAwMyAxNDo0MToyNiAtMDAwMCAgICAgIDEuMw0KKysrIGphdmF4L3N=
3
aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0gIDE0IEZlYiAyMDA0IDIyOjM3OjUzIC0wMDAwDQp=
A
QCAtMSw4ICsxLDggQEANCiBFWFRSQV9ESVNUID0gXA0KIEJhc2ljQm9yZGVycy5qYXZhIFwNCit=
C
YXNpY0J1dHRvbkxpc3RlbmVyLmphdmEgXA0KIEJhc2ljQnV0dG9uVUkuamF2YSBcDQogQmFzaWN=
D
aGVja0JveFVJLmphdmEgXA0KLUJhc2ljRGVmYXVsdHMuamF2YSBcDQogQmFzaWNHcmFwaGljc1V=
0
aWxzLmphdmEgXA0KIEJhc2ljSWNvbkZhY3RvcnkuamF2YSBcDQogQmFzaWNMYWJlbFVJLmphdmE=
g
XA0KQEAgLTExLDYgKzExLDcgQEANCiBCYXNpY09wdGlvblBhbmVVSS5qYXZhIFwNCiBCYXNpY1B=
h
bmVsVUkuamF2YSBcDQogQmFzaWNSYWRpb0J1dHRvblVJLmphdmEgXA0KK0Jhc2ljUm9vdFBhbmV=
V
SS5qYXZhIFwNCiBCYXNpY1Njcm9sbFBhbmVVSS5qYXZhIFwNCiBCYXNpY1NwbGl0UGFuZURpdml=
k
ZXIuamF2YSBcDQogQmFzaWNTcGxpdFBhbmVVSS5qYXZhIFwNCg=3D=3D

--=3D-pSPiIhEyfeO6It+UgUCQ--

--=3D-f7fffkumgzOR4Mu2Jq6q
Content-Type: application/pgp-signature; name=3Dsignature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBALqXBxVhZCJWr9QwRAio6AJ4nz/bCPG2F9vJWN7Iua1fo39IQowCfb68V
PzIkySWImAIAqsELC1wAzQE=3D
=3DEfPy
-----END PGP SIGNATURE-----

--=3D-f7fffkumgzOR4Mu2Jq6q--




--=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D1029085924=3D=3D
Content-Type: text/plain; charset=3D"us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Commit-classpath mailing list
Commit-classpath@gnu.org
http://mail.gnu.org/mailman/listinfo/commit-classpath

--=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D1029085924=3D=3D--





--===============1251409112==--


--=-2n1gKUqrfvfYGFLVZvl+
Content-Disposition: inline
Content-Description: Forwarded message - Bounce action notification
Content-Type: message/rfc822

Return-Path: <mailman-bounces@gnu.org>
Received: from localhost (localhost.localdomain [127.0.0.1]) by
	lyta.haphazard.org (8.12.10/8.12.10) with ESMTP id i1EMt4bv027421 for
	<cbj@localhost>; Sat, 14 Feb 2004 17:55:04 -0500
Received: from pop-server.nc.rr.com [24.25.4.167] by localhost with POP3
	(fetchmail-6.2.0) for cbj@localhost (single-drop); Sat, 14 Feb 2004
	17:55:04 -0500 (EST)
Received: from ms-mta-01-eri0 (ms-mta-01-qfe1 [10.10.5.70]) by
	ms-mss-01.southeast.rr.com (iPlanet Messaging Server 5.2 HotFix 1.21
	(built
	Sep 8 2003)) with ESMTP id <0HT3000JAJGMA5@ms-mss-01.southeast.rr.com>
	for cbj@nc.rr.com; Sat, 14 Feb 2004 17:50:46 -0500 (EST)
Received: from ncmx01.mgw.rr.com (ncmx01.mgw.rr.com [24.25.4.95]) by
	ms-mta-01.southeast.rr.com (iPlanet Messaging Server 5.2 HotFix 1.21
	(built
	Sep 8 2003)) with ESMTP id <0HT300B5BJGLJ0@ms-mta-01.southeast.rr.com>
	for cbj@nc.rr.com (ORCPT cbj@nc.rr.com);
	Sat, 14 Feb 2004 17:50:45 -0500 (EST)
Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164]) by
	ncmx01.mgw.rr.com (8.12.10/8.12.8) with ESMTP id i1EMq8q0021883	for
	<cbj@nc.rr.com>; Sat, 14 Feb 2004 17:52:09 -0500 (EST)
Received: from monty-python.gnu.org ([199.232.76.173]) by fencepost.gnu.org
	with esmtp (Exim 4.24) id 1As8Zd-0003I4-Oc	for cbj@gnu.org; Sat, 14 Feb
	2004 17:47:45 -0500
Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by
	monty-python.gnu.org with esmtp (Exim 4.24)	id 1As8cP-0000YU-6M; Sat, 14
	Feb 2004 17:50:37 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As8cM-0000Uy-RN	for commit-classpath-owner@gnu.org; Sat, 14 Feb 2004
	17:50:34 -0500
Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by
	monty-python.gnu.org with esmtp (Exim 4.24) id 1As8cL-0000TW-7I	for
	commit-classpath-owner@gnu.org; Sat, 14 Feb 2004 17:50:33 -0500
Date: Sat, 14 Feb 2004 17:50:30 -0500
From: mailman@gnu.org
Subject: Bounce action notification
Sender: mailman-bounces@gnu.org
To: commit-classpath-owner@gnu.org
Errors-to: mailman-bounces@gnu.org
Message-id: <mailman.2121.1076799030.924.commit-classpath@gnu.org>
MIME-version: 1.0
Content-type: multipart/mixed; boundary="===============0523804905=="
Precedence: bulk
X-BeenThere: commit-classpath@gnu.org
X-List-Administrivia: yes
X-Virus-Scanned: Symantec AntiVirus Scan Engine
X-Mailman-Version: 2.1.2
List-Id: Automatic administrative message (CVS, bugs, regressions)
	.	<commit-classpath.gnu.org>
Original-recipient: rfc822;cbj@nc.rr.com


--===============0523804905==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

This is a Mailman mailing list bounce action notice:

    List:       Commit-classpath
    Member:     brawer@dandelis.ch
    Action:     Subscription disabled.
    Reason:     Excessive or fatal bounces.
   =20


The triggering bounce notice is attached below.

Questions? Contact the Mailman site administrator at mailman@gnu.org.

--===============0523804905==
Content-Type: message/rfc822
MIME-Version: 1.0

Envelope-to: commit-classpath-bounces+brawer=dandelis.ch@gnu.org
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As8b7-0008EH-Cb for
	commit-classpath-bounces+brawer=dandelis.ch@gnu.org; Sat, 14 Feb 2004
	17:49:48 -0500
Received: from [212.162.56.50] (helo=d59.x-mailer.de) by
	monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168) (Exim 4.24) id
	1As8b6-0008Dd-Lt for
	commit-classpath-bounces+brawer=dandelis.ch@gnu.org; 
	Sat, 14 Feb 2004 17:49:17 -0500
Received: from mail by d59.x-mailer.de with local (Exim 4.24) id
	1As8b4-0008Gj-Dz for
	commit-classpath-bounces+brawer=dandelis.ch@gnu.org; 
	Sat, 14 Feb 2004 23:49:14 +0100
X-Failed-Recipients: brawer@acm.org
Auto-Submitted: auto-generated
From: Mail Delivery System <Mailer-Daemon@d59.x-mailer.de>
To: commit-classpath-bounces+brawer=dandelis.ch@gnu.org
Subject: Mail delivery failed: returning message to sender
Message-Id: <E1As8b4-0008Gj-Dz@d59.x-mailer.de>
Date: Sat, 14 Feb 2004 23:49:14 +0100
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable

This message was created automatically by mail delivery software.

A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  brawer@acm.org
    (generated from brawer@dandelis.ch)
    SMTP error from remote mailer after end of data:
    host alias2.acm.org [199.222.69.92]: 554 5.7.1 Message cannot be accept=
ed, content filter rejection reject mydoom attachment name

------ This is a copy of the message, including all the headers. ------

Return-path: <commit-classpath-bounces+brawer=3Ddandelis.ch@gnu.org>
Received: from [199.232.76.173] (helo=3Dmonty-python.gnu.org)
	by d59.x-mailer.de with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24)
	id 1As8b3-0008Gf-0b
	for brawer@dandelis.ch; Sat, 14 Feb 2004 23:49:13 +0100
Received: from localhost ([127.0.0.1] helo=3Dmonty-python.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.24)
	id 1As8au-00085F-FY
	for brawer@dandelis.ch; Sat, 14 Feb 2004 17:49:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1As8aV-00083n-Vr
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:39 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1As8aT-000837-Te
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:38 -0500
Received: from [82.161.94.186] (helo=3Dnescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1As8aT-000831-3d
	for commit-classpath@gnu.org; Sat, 14 Feb 2004 17:48:37 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=3Dmark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1As8aP-0004QO-00
	for <commit-classpath@gnu.org>; Sat, 14 Feb 2004 23:48:33 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Message-Id: <1076798914.11504.335.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5=20
Date: Sat, 14 Feb 2004 23:48:34 +0100
Subject: FYI: Fixup Makefile.am EXTRA_DIST for added/removed files
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=3Dunsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=3Dhelp>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=3Dsubscribe>
Content-Type: multipart/mixed; boundary=3D"=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D0161324798=3D=3D"
Sender: commit-classpath-bounces+brawer=3Ddandelis.ch@gnu.org
Errors-To: commit-classpath-bounces+brawer=3Ddandelis.ch@gnu.org


--=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0161324798=3D=3D
Content-Type: multipart/signed; micalg=3Dpgp-sha1;
	protocol=3D"application/pgp-signature";
	boundary=3D"=3D-f7fffkumgzOR4Mu2Jq6q"


--=3D-f7fffkumgzOR4Mu2Jq6q
Content-Type: multipart/mixed; boundary=3D"=3D-pSPiIhEyfeO6It+UgUCQ"


--=3D-pSPiIhEyfeO6It+UgUCQ
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

After the last patch I needed the following to make distcheck work
again.

2004-02-14  Mark Wielaard  <mark@klomp.org>
 =3D20
       * javax/swing/Makefile.am (EXTRA_DIST): Remove ToggleButtonModel.jav=
=3D
a.
       * javax/swing/plaf/basic/Makefile.am (EXTRA_DIST): Remove
       BasicDefaults.java. Add BasicButtonListener.java and
       BasicRootPaneUI.java.

Committed.

Cheers,

Mark

--=3D-pSPiIhEyfeO6It+UgUCQ
Content-Disposition: inline; filename=3DMakefile.diff
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=3DMakefile.diff; charset=3DISO-8859-1

SW5kZXg6IGphdmF4L3N3aW5nL01ha2VmaWxlLmFtDQo9PT09PT09PT09PT09PT09PT09PT09PT0=
9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N=
2
c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZheC9zd2luZy9NYWtlZmlsZS5hbSx2DQpyZXR=
y
aWV2aW5nIHJldmlzaW9uIDEuMTENCmRpZmYgLXUgLXIxLjExIE1ha2VmaWxlLmFtDQotLS0gamF=
2
YXgvc3dpbmcvTWFrZWZpbGUuYW0gICAgIDEwIEF1ZyAyMDAzIDE0OjExOjQ1IC0wMDAwICAgICA=
g
MS4xMQ0KKysrIGphdmF4L3N3aW5nL01ha2VmaWxlLmFtICAgICAxNCBGZWIgMjAwNCAyMjozNzo=
1
MyAtMDAwMA0KQEAgLTEwOSw3ICsxMDksNiBAQA0KIFN3aW5nQ29uc3RhbnRzLmphdmEgXA0KIFN=
3
aW5nVXRpbGl0aWVzLmphdmEgXA0KIFRpbWVyLmphdmEgXA0KLVRvZ2dsZUJ1dHRvbk1vZGVsLmp=
h
dmEgXA0KIFRvb2xUaXBNYW5hZ2VyLmphdmEgXA0KIFVJRGVmYXVsdHMuamF2YSBcDQogVUlNYW5=
h
Z2VyLmphdmEgXA0KSW5kZXg6IGphdmF4L3N3aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0NCj0=
9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0=
9
PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmF4L3N=
3
aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0sdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMNCmR=
p
ZmYgLXUgLXIxLjMgTWFrZWZpbGUuYW0NCi0tLSBqYXZheC9zd2luZy9wbGFmL2Jhc2ljL01ha2V=
m
aWxlLmFtICAyMiBKdW4gMjAwMyAxNDo0MToyNiAtMDAwMCAgICAgIDEuMw0KKysrIGphdmF4L3N=
3
aW5nL3BsYWYvYmFzaWMvTWFrZWZpbGUuYW0gIDE0IEZlYiAyMDA0IDIyOjM3OjUzIC0wMDAwDQp=
A
QCAtMSw4ICsxLDggQEANCiBFWFRSQV9ESVNUID0gXA0KIEJhc2ljQm9yZGVycy5qYXZhIFwNCit=
C
YXNpY0J1dHRvbkxpc3RlbmVyLmphdmEgXA0KIEJhc2ljQnV0dG9uVUkuamF2YSBcDQogQmFzaWN=
D
aGVja0JveFVJLmphdmEgXA0KLUJhc2ljRGVmYXVsdHMuamF2YSBcDQogQmFzaWNHcmFwaGljc1V=
0
aWxzLmphdmEgXA0KIEJhc2ljSWNvbkZhY3RvcnkuamF2YSBcDQogQmFzaWNMYWJlbFVJLmphdmE=
g
XA0KQEAgLTExLDYgKzExLDcgQEANCiBCYXNpY09wdGlvblBhbmVVSS5qYXZhIFwNCiBCYXNpY1B=
h
bmVsVUkuamF2YSBcDQogQmFzaWNSYWRpb0J1dHRvblVJLmphdmEgXA0KK0Jhc2ljUm9vdFBhbmV=
V
SS5qYXZhIFwNCiBCYXNpY1Njcm9sbFBhbmVVSS5qYXZhIFwNCiBCYXNpY1NwbGl0UGFuZURpdml=
k
ZXIuamF2YSBcDQogQmFzaWNTcGxpdFBhbmVVSS5qYXZhIFwNCg=3D=3D

--=3D-pSPiIhEyfeO6It+UgUCQ--

--=3D-f7fffkumgzOR4Mu2Jq6q
Content-Type: application/pgp-signature; name=3Dsignature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBALqXBxVhZCJWr9QwRAio6AJ4nz/bCPG2F9vJWN7Iua1fo39IQowCfb68V
PzIkySWImAIAqsELC1wAzQE=3D
=3DEfPy
-----END PGP SIGNATURE-----

--=3D-f7fffkumgzOR4Mu2Jq6q--




--=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0161324798=3D=3D
Content-Type: text/plain; charset=3D"us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Commit-classpath mailing list
Commit-classpath@gnu.org
http://mail.gnu.org/mailman/listinfo/commit-classpath

--=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D0161324798=3D=3D--





--===============0523804905==--


--=-2n1gKUqrfvfYGFLVZvl+--

--=-2n1gKUqrfvfYGFLVZvl+--

--=-n1c3AkAWfSuPhwiv0Sby--

--=-AxTlaJrWPQ8eOWES9Nxk
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQBAMM5dcEcmdY33uzYRAoNTAKCBMM7rUIoaBX55xxcAa7/DP7BpmwCgoDUN
q3c5fytzn65lDjsoiYgaKdI=
=RRVZ
-----END PGP SIGNATURE-----

--=-AxTlaJrWPQ8eOWES9Nxk--




From MAILER-DAEMON Mon Feb 16 16:12:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Asq2E-0004F7-5W
	for mharc-commit-classpath@gnu.org; Mon, 16 Feb 2004 16:12:10 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Asq2B-0004Co-5X
	for commit-classpath@gnu.org; Mon, 16 Feb 2004 16:12:07 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Asq1d-0003T4-3O
	for commit-classpath@gnu.org; Mon, 16 Feb 2004 16:12:05 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Asq1b-0003GS-PS
	for commit-classpath@gnu.org; Mon, 16 Feb 2004 16:11:32 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 308956231E
	for <commit-classpath@gnu.org>; Mon, 16 Feb 2004 21:11:15 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 96630-09 for <commit-classpath@gnu.org>;
	Mon, 16 Feb 2004 21:11:14 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-176.adsl.solnet.ch
	[212.41.94.176])
	by mail01.solnet.ch (Postfix) with ESMTP id AF7176225F
	for <commit-classpath@gnu.org>; Mon, 16 Feb 2004 21:11:13 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id 3362C665FA; Mon, 16 Feb 2004 22:10:31 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040216211031.3362C665FA@reali.dnsalias.net>
Date: Mon, 16 Feb 2004 22:10:31 +0100 (CET)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet
Subject: doc/www.gnu.org/faq/faq.wml
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2004 21:12:08 -0000

Some more legal FAQ entries, checked by the FSF legal people.

-Patrik



Index: doc/www.gnu.org/faq/faq.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/faq/faq.wml,v
retrieving revision 1.2
diff -u -r1.2 faq.wml
--- doc/www.gnu.org/faq/faq.wml	2 Feb 2004 22:14:28 -0000	1.2
+++ doc/www.gnu.org/faq/faq.wml	16 Feb 2004 21:06:25 -0000
@@ -96,6 +96,26 @@
 Please check the FSF FAQ on the GNU GPL: <createlink name="http://www.fsf.org/licenses/gpl-faq.html" url="http://www.fsf.org/licenses/gpl-faq.html">.
 </faq>
 
+<faq question="What does the exception allow me to do?">
+<p>If you combine GNU Classpath <em>with independent modules to produce an
+executable</em> you can <em>copy and distribute the resulting executable under
+terms of your choice</em>.</p>
+
+<p>So you can use and distribute GNU Classpath as is in your program without changing the license of your software.</p>
+</faq>
+
+<faq question="I have a question about licensing GNU Classpath. Who can I ask?">
+Direct such questions to <a href="mailto:licensing@gnu.org">licensing@gnu.org</a>. The FSF is the
+official copyright holder of Classpath and sets the distribution terms
+</faq>
+
+<faq question="How can I be sure that my application does not break the license?">
+The FSF has a GPL-compliance lab which offers consulting services for
+companies who are working to develop products that incorporate Free
+Software so that they can do so in ways that comply with the terms of
+the GPL and other Free Software licenses. If you are interested in this
+service, please write to <a href="mailto:compliance-lab@fsf.org">compliance-lab@fsf.org</a>.
+</faq>
 </faq-section>
 
 <faq-section name="Classpath Development">
@@ -108,6 +128,8 @@
 intellectual property system of the United States, GNU projects tend to
 be a bit picky about getting signatures from all contributors. Please do
 not see this as a personal offence.
+
+<p>Giving the copyright to the FSF also gives us a clear paper trail where changes come from, which confirms our clean-room status.
 
 <p>See also <a href="http://www.gnu.org/licenses/why-assign.html">http://www.gnu.org/licenses/why-assign.html</a>.
 </p>



From MAILER-DAEMON Tue Feb 17 00:00:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AsxLq-0000nJ-Uu
	for mharc-commit-classpath@gnu.org; Tue, 17 Feb 2004 00:00:54 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AsxLo-0000md-8m
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 00:00:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AsxLI-0000fW-GY
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 00:00:51 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AsxLI-0000d0-0Q
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 00:00:20 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 49CC4622C5; Tue, 17 Feb 2004 05:00:17 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 11916-05; Tue, 17 Feb 2004 05:00:16 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-176.adsl.solnet.ch
	[212.41.94.176]) by mail01.solnet.ch (Postfix) with ESMTP
	id 8CF11622BF; Tue, 17 Feb 2004 05:00:14 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 766DB7D33E; Tue, 17 Feb 2004 05:59:03 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040217045903.766DB7D33E@reali.dnsalias.net>
Date: Tue, 17 Feb 2004 05:59:03 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040217 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2004 05:00:52 -0000




From MAILER-DAEMON Tue Feb 17 16:20:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AtCeB-0007vL-Ci
	for mharc-commit-classpath@gnu.org; Tue, 17 Feb 2004 16:20:51 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AtCe8-0007v8-Oz
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:20:48 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AtCdc-0007iD-QZ
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:20:47 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AtCdc-0007i2-Bp
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:20:16 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-078.ewetel.net
	[80.228.95.78])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i1HLKDDx018029
	for <commit-classpath@gnu.org>; Tue, 17 Feb 2004 22:20:14 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AtCdZ-0001i0-00
	for <commit-classpath@gnu.org>; Tue, 17 Feb 2004 22:20:13 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 17 Feb 2004 22:24:06 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_2ZoMARCk9M3pnxD"
Message-Id: <200402172224.06735.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.nio.channels.spi.AbstractInterruptableChannel
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2004 21:20:49 -0000


--Boundary-00=_2ZoMARCk9M3pnxD
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just merged a little fix from Per Bothner in libgcj.


Michael


2004-02-17  Per Bothner  <per@bothner.com>

	* java/nio/channels/spi/AbstractInterruptibleChannel.java (close):
	Set closed before calling implCloseChannel, as in the spec.


--Boundary-00=_2ZoMARCk9M3pnxD
Content-Type: text/x-diff;
  charset="us-ascii";
  name="abstract.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="abstract.diff"

Index: java/nio/channels/spi/AbstractInterruptibleChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 AbstractInterruptibleChannel.java
--- java/nio/channels/spi/AbstractInterruptibleChannel.java	2 Dec 2003 15:37:45 -0000	1.6
+++ java/nio/channels/spi/AbstractInterruptibleChannel.java	17 Feb 2004 21:15:42 -0000
@@ -74,8 +74,8 @@
   {
     if (!closed)
       {
-	implCloseChannel();
 	closed = true;
+	implCloseChannel();
       }
   }
 

--Boundary-00=_2ZoMARCk9M3pnxD--




From MAILER-DAEMON Tue Feb 17 16:39:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AtCvC-0003yq-An
	for mharc-commit-classpath@gnu.org; Tue, 17 Feb 2004 16:38:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AtCul-0003Of-Pg
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:37:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AtCu1-0002Km-8p
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:37:46 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AtCtl-0001yi-P9
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:36:57 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id AC292622DE
	for <commit-classpath@gnu.org>; Tue, 17 Feb 2004 21:36:55 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 11157-01 for <commit-classpath@gnu.org>;
	Tue, 17 Feb 2004 21:36:54 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-176.adsl.solnet.ch
	[212.41.94.176])
	by mail01.solnet.ch (Postfix) with ESMTP id A4EB5622C5
	for <commit-classpath@gnu.org>; Tue, 17 Feb 2004 21:36:53 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id 78C7B667B1; Tue, 17 Feb 2004 22:36:09 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040217213609.78C7B667B1@reali.dnsalias.net>
Date: Tue, 17 Feb 2004 22:36:09 +0100 (CET)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet
Subject: doc/www.gnu.org/faq/faq.wml
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2004 21:38:24 -0000

Hi!

I've merged Sascha's FAQ into the FAQ and added an entry on looking at Sun's sources.

-Patrik



Index: doc/www.gnu.org/faq/faq.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/faq/faq.wml,v
retrieving revision 1.3
diff -u -r1.3 faq.wml
--- doc/www.gnu.org/faq/faq.wml	16 Feb 2004 21:10:20 -0000	1.3
+++ doc/www.gnu.org/faq/faq.wml	17 Feb 2004 21:32:45 -0000
@@ -59,6 +59,63 @@
 <box>
 {#FAQINDEX#}
 
+<faq-section name="introduction">
+<faq question="What is GNU Classpath?">
+<p>GNU Classpath is a set of essential libraries for supporting
+the Java programming language.</p>
+
+<p>Classpath serves the same role that <a
+href="http://www.gnu.org/software/libc/libc.html">libc</a> has for C,
+but is much richer in functionality. The broadness of the standard
+library is an important reason why Java has been so successful. For
+example, the library includes frameworks to convert between character
+encodings, for accessing relational databases, for building Graphical
+User Interfaces, for encryption, for logging, and for numerous other
+tasks that are needed to build complex applications.</p>
+
+</faq>
+
+<faq question="Why Java?">
+<p>On the GNU operating system, we want to run software independent of
+the programming language in which it was written. Because Java is
+widespread, and because Java has some nice features, we want to
+support Java as well.</p>
+
+</faq>
+
+<faq question="But isn't Java free already?">
+<p>Sun Microsystems, the company who has created Java, currently
+distributes the &#x201c;Java Development Kit&#x201d; and &#x201c;Java
+Runtime Environment&#x201d; at no cost. The former even comes with the
+source code of the standard class library. However, the &#x201c;Sun
+Community Source License&#x201d; <a
+href="http://www.gnu.org/licenses/license-list.html#SunCommunitySourceLicense">does
+not grant essential freedoms</a>, for example the right to distribute
+a modified version of the code.</p>
+
+<p>Therefore, Sun&#x2019;s implementation does not qualify as Free
+Software.</p>
+
+
+</faq>
+
+<faq question="Is GNU Classpath all that is needed for running Java programs?">
+<p>GNU Classpath is a free implementation of Java&#x2019;s standard
+library.  To execute Java programs, it is also necessary to have a
+Java Virtual Machine (JVM). This component manages memory, enforces
+security restrictions, compiles Java bytecodes to the instruction set
+of your computer, and provides other runtime services.  There exist
+several projects for <createlink name="free JVMs" url="stories.html#jvm">. Most use GNU Classpath as the
+up-stream source for their library.</p>
+
+<p>Java programs can also be compiled &#x201c;ahead of time,&#x201d;
+like C++ or other compiled languages. The GNU Compiler Collection
+(GCC) does this, and its Java library is mostly derived from GNU
+Classpath.</p>
+</faq>
+
+</faq-section>
+
 <faq-section name="licensing">
 
 <faq question="Under which licence is GNU Classpath released?">
@@ -119,6 +176,18 @@
 </faq-section>
 
 <faq-section name="Classpath Development">
+
+<faq question="I would like to contribute, where shall I start?">
+<p>See the <a
+href="docs/">documentation page</a>, especially the <a
+href="docs/hacking.html">GNU
+Classpath Hacker&#x2019;s Guide</a>.
+</faq>
+
+<faq question="Can I look as Sun's sources to get inspiration?">
+No. In fact, if you read Sun's sources we can't accept any code from you.
+</faq>
+
 <faq question="Why do I have to give the copyright to the FSF?">
 Some contributors of Classpath might be annoyed if their work was being
 used under conditions that are not according to the terms of the license.



From MAILER-DAEMON Tue Feb 17 16:48:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AtD5F-0000Du-Dm
	for mharc-commit-classpath@gnu.org; Tue, 17 Feb 2004 16:48:49 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AtD58-00009R-2T
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:48:42 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AtD4X-0008MF-97
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:48:36 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AtD3e-0008Ax-32
	for commit-classpath@gnu.org; Tue, 17 Feb 2004 16:47:10 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-078.ewetel.net
	[80.228.95.78])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i1HLl6Dx003228
	for <commit-classpath@gnu.org>; Tue, 17 Feb 2004 22:47:06 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AtD3Z-0001lq-00
	for <commit-classpath@gnu.org>; Tue, 17 Feb 2004 22:47:05 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 17 Feb 2004 22:51:02 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_GzoMAPElE38QzGQ"
Message-Id: <200402172251.03496.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.nio - buffer fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2004 21:48:44 -0000


--Boundary-00=_GzoMAPElE38QzGQ
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I merged some fixes made by Per Bothner in libgcj. Its rather bit patch 
but easily understandable.


Michael


2004-02-17  Per Bothner  <per@bothner.com>

	* java/nio/CharBufferImpl.java:  Inline super constructor.
	* java/nio/DoubleBufferImpl.java:  Likewise.
	* java/nio/FloatBufferImpl.java:  Likewise.
	* java/nio/IntBufferImpl.java:  Likewise.
	* java/nio/LongBufferImpl.java:  Likewise.
	* java/nio/ShortBufferImpl.java:  Likewise.
	* java/nio/CharBuffer.java:  Remove unused constructor.
	* java/nio/DoubleBuffer.java:  Likewise.
	* java/nio/FloatBuffer.java:  Likewise.
	* java/nio/IntBuffer.java:  Likewise.
	* java/nio/LongBuffer.java:  Likewise.
	* java/nio/ShortBuffer.java:  Likewise.
	* java/nio/CharViewBufferImpl.java:  New convenience constructor.
	Fix buggy call to super constructor.
	* java/nio/DoubleViewBufferImpl.java:  Likewise.
	* java/nio/FloatViewBufferImpl.java:  Likewise.
	* java/nio/IntViewBufferImpl.java:  Likewise.
	* java/nio/LongViewBufferImpl.java:  Likewise.
	* java/nio/ShortViewBufferImpl.java:  Likewise.
	
	* java/nio/ByteBuffer.java (endian):  Make non-private so other
	java.nio classes can inherit it.
	(<init>):  Don't bother clearing array_offset.
	* java/nio/ByteBuffer.java (allocate):  Re-implement using wrap.
	* java/nio/ByteBuffer.java (get(byte[],int,int)):  Check underflow.
	Remove redundant test.

	* java/nio/ByteBufferImpl.java (asCharBuffer, asShortBuffer,
	asIntBuffer, asLongBuffer, asFloatBuffer, asDoubleBuffer):
	Use new XxxViewBufferImpl constructors.
	* java/nio/MappedByteBufferImpl.java:  Likewise.
	* java/nio/DirectByteBufferImpl.java:  Likewise.

	* java/nio/ByteBufferImpl.java:  Remove one constructor.
	Inline super in remaining constructor.
	* java/nio/ByteBuffer.java:  Remove unused constructor.

	* java/nio/ByteBufferImpl.java (shiftDown):  New optimized method.

	* java/nio/ByteBufferImpl.java (get, put):  Add array_offset.


--Boundary-00=_GzoMAPElE38QzGQ
Content-Type: text/x-diff;
  charset="us-ascii";
  name="nio.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="nio.diff"

Index: java/nio/ByteBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ByteBuffer.java,v
retrieving revision 1.18
diff -u -b -B -r1.18 ByteBuffer.java
--- java/nio/ByteBuffer.java	11 Feb 2004 19:05:14 -0000	1.18
+++ java/nio/ByteBuffer.java	17 Feb 2004 21:43:24 -0000
@@ -44,7 +44,7 @@
 public abstract class ByteBuffer extends Buffer
   implements Comparable
 {
-  private ByteOrder endian = ByteOrder.BIG_ENDIAN;
+  ByteOrder endian = ByteOrder.BIG_ENDIAN;
 
   int array_offset;
   byte[] backing_buffer;
@@ -52,14 +52,6 @@
   ByteBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
-    array_offset = 0;
-  }
-
-  ByteBuffer (byte[] buffer, int offset, int capacity, int limit, int position, int mark)
-  {
-    super (capacity, limit, position, mark);
-    this.backing_buffer = buffer;
-    this.array_offset = offset;
   }
   
   /**
@@ -75,7 +67,7 @@
    */
   public static ByteBuffer allocate (int capacity)
   {
-    return new ByteBufferImpl (capacity);
+    return wrap(new byte[capacity], 0, capacity);
   }
 
   /**
@@ -87,6 +79,14 @@
    */
   final public static ByteBuffer wrap (byte[] array, int offset, int length)
   {
+    // FIXME: In GCJ and other implementations where arrays may not
+    // move we might consider, at least when offset==0:
+    // return new DirectByteBufferImpl(array,
+    //                                 address_of_data(array) + offset,
+    //                                 length, length, 0, false);
+    // This may be more efficient, mainly because we can then use the
+    // same logic for all ByteBuffers.
+
     return new ByteBufferImpl (array, 0, array.length, offset + length, offset, -1, false);
   }
 
@@ -116,11 +116,10 @@
    */
   public ByteBuffer get (byte[] dst, int offset, int length)
   {
-    if ((offset < 0)
-        || (offset > dst.length)
-        || (length < 0)
-        || (length > (dst.length - offset)))
+    if (offset < 0 || length < 0 || offset + length > dst.length)
       throw new IndexOutOfBoundsException ();
+    if (length > remaining())
+      throw new BufferUnderflowException();
 
     for (int i = offset; i < offset + length; i++)
       {
Index: java/nio/ByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ByteBufferImpl.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 ByteBufferImpl.java
--- java/nio/ByteBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.4
+++ java/nio/ByteBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -45,45 +45,42 @@
 {
   private boolean readOnly;
 
-  ByteBufferImpl (int capacity)
-  {
-    this (new byte [capacity], 0, capacity, capacity, 0, -1, false);
-  }
-  
   ByteBufferImpl (byte[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
   {
-    super (buffer, offset, capacity, limit, position, mark);
+    super (capacity, limit, position, mark);
+    this.backing_buffer = buffer;
+    this.array_offset = offset;
     this.readOnly = readOnly;
   }
   
   public CharBuffer asCharBuffer ()
   {
-    return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new CharViewBufferImpl (this, remaining() >> 1);
   }
 
   public ShortBuffer asShortBuffer ()
   {
-    return new ShortViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new ShortViewBufferImpl (this, remaining() >> 1);
   }
 
   public IntBuffer asIntBuffer ()
   {
-    return new IntViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new IntViewBufferImpl (this, remaining() >> 2);
   }
 
   public LongBuffer asLongBuffer ()
   {
-    return new LongViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new LongViewBufferImpl (this, remaining() >> 3);
   }
 
   public FloatBuffer asFloatBuffer ()
   {
-    return new FloatViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new FloatViewBufferImpl (this, remaining() >> 2);
   }
 
   public DoubleBuffer asDoubleBuffer ()
   {
-    return new DoubleViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new DoubleViewBufferImpl (this, remaining() >> 3);
   }
 
   public boolean isReadOnly ()
@@ -106,6 +103,13 @@
     return new ByteBufferImpl (backing_buffer, array_offset, capacity (), limit (), position (), mark, true);
   }
   
+  void shiftDown (int dst_offset, int src_offset, int count)
+  {
+    System.arraycopy(backing_buffer, array_offset + src_offset,
+		     backing_buffer, array_offset + dst_offset,
+		     count);
+  }
+
   public ByteBuffer compact ()
   {
     int pos = position();
@@ -129,7 +133,7 @@
    */
   final public byte get ()
   {
-    byte result = backing_buffer [position ()];
+    byte result = backing_buffer [position () + array_offset];
     position (position () + 1);
     return result;
   }
@@ -145,8 +149,9 @@
     if (readOnly)
       throw new ReadOnlyBufferException ();
 	  	    
-    backing_buffer [position ()] = value;
-    position (position () + 1);
+    int pos = position();
+    backing_buffer [pos + array_offset] = value;
+    position (pos + 1);
     return this;
   }
   
@@ -159,7 +164,7 @@
    */
   final public byte get (int index)
   {
-    return backing_buffer [index];
+    return backing_buffer [index + array_offset];
   }
   
   /**
@@ -175,7 +180,7 @@
     if (readOnly)
       throw new ReadOnlyBufferException ();
     	    
-    backing_buffer [index] = value;
+    backing_buffer [index + array_offset] = value;
     return this;
   }
   
Index: java/nio/CharBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/CharBuffer.java,v
retrieving revision 1.17
diff -u -b -B -r1.17 CharBuffer.java
--- java/nio/CharBuffer.java	11 Jun 2003 15:15:08 -0000	1.17
+++ java/nio/CharBuffer.java	17 Feb 2004 21:43:25 -0000
@@ -53,13 +53,6 @@
     array_offset = 0;
   }
 
-  CharBuffer (char[] buffer, int offset, int capacity, int limit, int position, int mark)
-  {
-    super (capacity, limit, position, mark);
-    this.backing_buffer = buffer;
-    this.array_offset = offset;
-  }
-
   /**
    * Allocates a new <code>CharBuffer</code> object with a given capacity.
    */
Index: java/nio/CharBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/CharBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 CharBufferImpl.java
--- java/nio/CharBufferImpl.java	27 Jun 2003 21:03:52 -0000	1.2
+++ java/nio/CharBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -52,7 +52,9 @@
   
   CharBufferImpl (char[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
   {
-    super (buffer, offset, capacity, limit, position, mark);
+    super (capacity, limit, position, mark);
+    this.backing_buffer = buffer;
+    this.array_offset = offset;
     this.readOnly = readOnly;
   }
   
Index: java/nio/CharViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/CharViewBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 CharViewBufferImpl.java
--- java/nio/CharViewBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.2
+++ java/nio/CharViewBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -46,11 +46,20 @@
   private boolean readOnly;
   private ByteOrder endian;
   
+  CharViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public CharViewBufferImpl (ByteBuffer bb, int offset, int capacity,
 			     int limit, int position, int mark,
 			     boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 1, limit >> 1, position >> 1, mark >> 1);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
Index: java/nio/DoubleBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleBuffer.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 DoubleBuffer.java
--- java/nio/DoubleBuffer.java	11 Jun 2003 15:15:08 -0000	1.13
+++ java/nio/DoubleBuffer.java	17 Feb 2004 21:43:25 -0000
@@ -53,13 +53,6 @@
     array_offset = 0;
   }
 
-  DoubleBuffer (double[] buffer, int offset, int capacity, int limit, int position, int mark)
-  {
-    super (capacity, limit, position, mark);
-    this.backing_buffer = buffer;
-    this.array_offset = offset;
-  }
-
   /**
    * Allocates a new <code>DoubleBuffer</code> object with a given capacity.
    */
Index: java/nio/DoubleBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DoubleBufferImpl.java
--- java/nio/DoubleBufferImpl.java	27 Jun 2003 21:03:52 -0000	1.2
+++ java/nio/DoubleBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -52,7 +52,9 @@
   
   DoubleBufferImpl (double[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
   {
-    super (buffer, offset, capacity, limit, position, mark);
+    super (capacity, limit, position, mark);
+    this.backing_buffer = buffer;
+    this.array_offset = offset;
     this.readOnly = readOnly;
   }
   
Index: java/nio/DoubleViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleViewBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DoubleViewBufferImpl.java
--- java/nio/DoubleViewBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.2
+++ java/nio/DoubleViewBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -46,11 +46,20 @@
   private boolean readOnly;
   private ByteOrder endian;
   
+  DoubleViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public DoubleViewBufferImpl (ByteBuffer bb, int offset, int capacity,
                                int limit, int position, int mark,
                                boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 3, limit >> 3, position >> 3, mark >> 3);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
Index: java/nio/FloatBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatBuffer.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 FloatBuffer.java
--- java/nio/FloatBuffer.java	11 Jun 2003 15:15:08 -0000	1.13
+++ java/nio/FloatBuffer.java	17 Feb 2004 21:43:25 -0000
@@ -53,13 +53,6 @@
     array_offset = 0;
   }
 
-  FloatBuffer (float[] buffer, int offset, int capacity, int limit, int position, int mark)
-  {
-    super (capacity, limit, position, mark);
-    this.backing_buffer = buffer;
-    this.array_offset = offset;
-  }
-
   /**
    * Allocates a new <code>FloatBuffer</code> object with a given capacity.
    */
Index: java/nio/FloatBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 FloatBufferImpl.java
--- java/nio/FloatBufferImpl.java	27 Jun 2003 21:03:52 -0000	1.2
+++ java/nio/FloatBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -52,7 +52,9 @@
   
   FloatBufferImpl (float[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
   {
-    super (buffer, offset, capacity, limit, position, mark);
+    super (capacity, limit, position, mark);
+    this.backing_buffer = buffer;
+    this.array_offset = offset;
     this.readOnly = readOnly;
   }
   
Index: java/nio/FloatViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatViewBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 FloatViewBufferImpl.java
--- java/nio/FloatViewBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.2
+++ java/nio/FloatViewBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -46,11 +46,20 @@
   private boolean readOnly;
   private ByteOrder endian;
   
+  FloatViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public FloatViewBufferImpl (ByteBuffer bb, int offset, int capacity,
 			      int limit, int position, int mark,
 			      boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 2, limit >> 2, position >> 2, mark >> 2);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
Index: java/nio/IntBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntBuffer.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 IntBuffer.java
--- java/nio/IntBuffer.java	11 Jun 2003 15:15:08 -0000	1.13
+++ java/nio/IntBuffer.java	17 Feb 2004 21:43:25 -0000
@@ -53,13 +53,6 @@
     array_offset = 0;
   }
 
-  IntBuffer (int[] buffer, int offset, int capacity, int limit, int position, int mark)
-  {
-    super (capacity, limit, position, mark);
-    this.backing_buffer = buffer;
-    this.array_offset = offset;
-  }
-
   /**
    * Allocates a new <code>IntBuffer</code> object with a given capacity.
    */
Index: java/nio/IntBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 IntBufferImpl.java
--- java/nio/IntBufferImpl.java	27 Jun 2003 21:03:52 -0000	1.2
+++ java/nio/IntBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -52,7 +52,9 @@
   
   IntBufferImpl (int[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
   {
-    super (buffer, offset, capacity, limit, position, mark);
+    super (capacity, limit, position, mark);
+    this.backing_buffer = buffer;
+    this.array_offset = offset;
     this.readOnly = readOnly;
   }
   
Index: java/nio/IntViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntViewBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 IntViewBufferImpl.java
--- java/nio/IntViewBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.2
+++ java/nio/IntViewBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -46,11 +46,20 @@
   private boolean readOnly;
   private ByteOrder endian;
   
+  IntViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public IntViewBufferImpl (ByteBuffer bb, int offset, int capacity,
 			    int limit, int position, int mark,
 			    boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 2, limit >> 2, position >> 2, mark >> 2);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
Index: java/nio/LongBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongBuffer.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 LongBuffer.java
--- java/nio/LongBuffer.java	11 Jun 2003 15:15:08 -0000	1.13
+++ java/nio/LongBuffer.java	17 Feb 2004 21:43:25 -0000
@@ -53,13 +53,6 @@
     array_offset = 0;
   }
 
-  LongBuffer (long[] buffer, int offset, int capacity, int limit, int position, int mark)
-  {
-    super (capacity, limit, position, mark);
-    this.backing_buffer = buffer;
-    this.array_offset = offset;
-  }
-
   /**
    * Allocates a new <code>LongBuffer</code> object with a given capacity.
    */
Index: java/nio/LongBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 LongBufferImpl.java
--- java/nio/LongBufferImpl.java	27 Jun 2003 21:03:52 -0000	1.2
+++ java/nio/LongBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -52,7 +52,9 @@
   
   LongBufferImpl (long[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
   {
-    super (buffer, offset, capacity, limit, position, mark);
+    super (capacity, limit, position, mark);
+    this.backing_buffer = buffer;
+    this.array_offset = offset;
     this.readOnly = readOnly;
   }
   
Index: java/nio/LongViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongViewBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 LongViewBufferImpl.java
--- java/nio/LongViewBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.2
+++ java/nio/LongViewBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -46,11 +46,20 @@
   private boolean readOnly;
   private ByteOrder endian;
   
+  LongViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public LongViewBufferImpl (ByteBuffer bb, int offset, int capacity,
 			     int limit, int position, int mark,
 			     boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 3, limit >> 3, position >> 3, mark >> 3);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;
Index: java/nio/MappedByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/MappedByteBufferImpl.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 MappedByteBufferImpl.java
--- java/nio/MappedByteBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.6
+++ java/nio/MappedByteBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -144,32 +144,32 @@
 
   public CharBuffer asCharBuffer ()
   {
-    return new CharViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new CharViewBufferImpl (this, remaining() >> 1);
   }
 
   public ShortBuffer asShortBuffer ()
   {
-    return new ShortViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new ShortViewBufferImpl (this, remaining() >> 1);
   }
 
   public IntBuffer asIntBuffer ()
   {
-    return new IntViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new IntViewBufferImpl (this, remaining() >> 2);
   }
   
   public LongBuffer asLongBuffer ()
   {
-    return new LongViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new LongViewBufferImpl (this, remaining() >> 3);
   }
 
   public FloatBuffer asFloatBuffer ()
   {
-    return new FloatViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new FloatViewBufferImpl (this, remaining() >> 2);
   }
 
   public DoubleBuffer asDoubleBuffer ()
   {
-    return new DoubleViewBufferImpl (this, position (), remaining(), remaining (), 0, -1, isReadOnly (), order());
+    return new DoubleViewBufferImpl (this, remaining() >> 3);
   }
 
   final public char getChar ()
Index: java/nio/ShortBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortBuffer.java,v
retrieving revision 1.14
diff -u -b -B -r1.14 ShortBuffer.java
--- java/nio/ShortBuffer.java	11 Jun 2003 15:15:08 -0000	1.14
+++ java/nio/ShortBuffer.java	17 Feb 2004 21:43:25 -0000
@@ -53,13 +53,6 @@
     array_offset = 0;
   }
 
-  ShortBuffer (short[] buffer, int offset, int capacity, int limit, int position, int mark)
-  {
-    super (capacity, limit, position, mark);
-    this.backing_buffer = buffer;
-    this.array_offset = offset;
-  }
-
   /**
    * Allocates a new <code>ShortBuffer</code> object with a given capacity.
    */
Index: java/nio/ShortBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ShortBufferImpl.java
--- java/nio/ShortBufferImpl.java	27 Jun 2003 21:03:52 -0000	1.2
+++ java/nio/ShortBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -52,7 +52,9 @@
   
   ShortBufferImpl (short[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
   {
-    super (buffer, offset, capacity, limit, position, mark);
+    super (capacity, limit, position, mark);
+    this.backing_buffer = buffer;
+    this.array_offset = offset;
     this.readOnly = readOnly;
   }
   
Index: java/nio/ShortViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortViewBufferImpl.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ShortViewBufferImpl.java
--- java/nio/ShortViewBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.2
+++ java/nio/ShortViewBufferImpl.java	17 Feb 2004 21:43:25 -0000
@@ -46,11 +46,20 @@
   private boolean readOnly;
   private ByteOrder endian;
   
+  ShortViewBufferImpl (ByteBuffer bb, int capacity)
+  {
+    super (capacity, capacity, 0, -1);
+    this.bb = bb;
+    this.offset = bb.position();
+    this.readOnly = bb.isReadOnly();
+    this.endian = bb.order();
+  }
+  
   public ShortViewBufferImpl (ByteBuffer bb, int offset, int capacity,
 			      int limit, int position, int mark,
 			      boolean readOnly, ByteOrder endian)
   {
-    super (limit >> 1, limit >> 1, position >> 1, mark >> 1);
+    super (capacity, limit, position, mark);
     this.bb = bb;
     this.offset = offset;
     this.readOnly = readOnly;

--Boundary-00=_GzoMAPElE38QzGQ--




From MAILER-DAEMON Wed Feb 18 00:02:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AtJqT-00021o-OK
	for mharc-commit-classpath@gnu.org; Wed, 18 Feb 2004 00:02:01 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AtJqR-000219-Pm
	for commit-classpath@gnu.org; Wed, 18 Feb 2004 00:01:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AtJpv-00016b-8w
	for commit-classpath@gnu.org; Wed, 18 Feb 2004 00:01:58 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AtJpu-00013U-MR
	for commit-classpath@gnu.org; Wed, 18 Feb 2004 00:01:26 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 2243362261; Wed, 18 Feb 2004 05:01:24 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 25798-01; Wed, 18 Feb 2004 05:01:23 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-176.adsl.solnet.ch
	[212.41.94.176]) by mail01.solnet.ch (Postfix) with ESMTP
	id 7E44362262; Wed, 18 Feb 2004 05:00:53 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id C0F207E08F; Wed, 18 Feb 2004 05:58:50 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040218045850.C0F207E08F@reali.dnsalias.net>
Date: Wed, 18 Feb 2004 05:58:50 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040218 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2004 05:02:00 -0000




From MAILER-DAEMON Thu Feb 19 00:00:18 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AtgIM-0001KE-20
	for mharc-commit-classpath@gnu.org; Thu, 19 Feb 2004 00:00:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AtgIJ-0001Iq-Hj
	for commit-classpath@gnu.org; Thu, 19 Feb 2004 00:00:15 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AtgHm-0001C9-BN
	for commit-classpath@gnu.org; Thu, 19 Feb 2004 00:00:13 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AtgHm-0001Bk-1g
	for commit-classpath@gnu.org; Wed, 18 Feb 2004 23:59:42 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 68A5B62301; Thu, 19 Feb 2004 04:59:38 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 39641-01; Thu, 19 Feb 2004 04:59:37 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-176.adsl.solnet.ch
	[212.41.94.176]) by mail01.solnet.ch (Postfix) with ESMTP
	id 5659B622FC; Thu, 19 Feb 2004 04:59:37 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 9BB677EDA8; Thu, 19 Feb 2004 05:58:49 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040219045849.9BB677EDA8@reali.dnsalias.net>
Date: Thu, 19 Feb 2004 05:58:49 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040219 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Feb 2004 05:00:16 -0000




From MAILER-DAEMON Fri Feb 20 00:00:23 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Au2ly-0005qr-KR
	for mharc-commit-classpath@gnu.org; Fri, 20 Feb 2004 00:00:22 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Au2lv-0005k0-A5
	for commit-classpath@gnu.org; Fri, 20 Feb 2004 00:00:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Au2lN-0004z1-HZ
	for commit-classpath@gnu.org; Fri, 20 Feb 2004 00:00:16 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Au2lN-0004uv-3u
	for commit-classpath@gnu.org; Thu, 19 Feb 2004 23:59:45 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 0871662262; Fri, 20 Feb 2004 04:59:41 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 67892-07; Fri, 20 Feb 2004 04:59:40 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-176.adsl.solnet.ch
	[212.41.94.176]) by mail01.solnet.ch (Postfix) with ESMTP
	id 3A07662276; Fri, 20 Feb 2004 04:59:39 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 19657803E5; Fri, 20 Feb 2004 05:58:50 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040220045850.19657803E5@reali.dnsalias.net>
Date: Fri, 20 Feb 2004 05:58:50 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040220 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2004 05:00:20 -0000




From MAILER-DAEMON Sat Feb 21 00:02:18 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AuPHO-0003VH-49
	for mharc-commit-classpath@gnu.org; Sat, 21 Feb 2004 00:02:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AuPHL-0003PZ-0d
	for commit-classpath@gnu.org; Sat, 21 Feb 2004 00:02:15 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AuPGo-00034D-8R
	for commit-classpath@gnu.org; Sat, 21 Feb 2004 00:02:13 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AuPGn-00034A-WF
	for commit-classpath@gnu.org; Sat, 21 Feb 2004 00:01:42 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 13CFB624A3; Sat, 21 Feb 2004 05:01:38 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 83995-02; Sat, 21 Feb 2004 05:01:37 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-230.adsl.solnet.ch
	[212.41.79.230]) by mail01.solnet.ch (Postfix) with ESMTP
	id 57742624AD; Sat, 21 Feb 2004 05:00:51 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 8F85981871; Sat, 21 Feb 2004 05:58:52 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040221045852.8F85981871@reali.dnsalias.net>
Date: Sat, 21 Feb 2004 05:58:52 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040221 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2004 05:02:15 -0000




From MAILER-DAEMON Sat Feb 21 09:12:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AuXsF-0000KN-5j
	for mharc-commit-classpath@gnu.org; Sat, 21 Feb 2004 09:12:55 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AuXsC-0000G4-IE
	for commit-classpath@gnu.org; Sat, 21 Feb 2004 09:12:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AuXrg-0008JA-CM
	for commit-classpath@gnu.org; Sat, 21 Feb 2004 09:12:51 -0500
Received: from [24.25.9.102] (helo=ms-smtp-03-eri0.southeast.rr.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AuXrg-0008J6-1m
	for commit-classpath@gnu.org; Sat, 21 Feb 2004 09:12:20 -0500
Received: from [10.0.0.2] (rdu57-9-048.nc.rr.com [66.57.9.48])
	by ms-smtp-03-eri0.southeast.rr.com (8.12.10/8.12.7) with ESMTP id
	i1LECCaB018984; Sat, 21 Feb 2004 09:12:12 -0500 (EST)
From: "C. Brian Jones" <cbj@gnu.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <20040220045850.19657803E5@reali.dnsalias.net>
References: <20040220045850.19657803E5@reali.dnsalias.net>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-Wv2B43gj0KZX6VYNnxrO"
Message-Id: <1077372731.4096.73.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Sat, 21 Feb 2004 09:12:12 -0500
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Cc: commit-classpath@gnu.org
Subject: Re: classpath daily snapshot 20040220 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: cbj@gnu.org
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2004 14:12:53 -0000


--=-Wv2B43gj0KZX6VYNnxrO
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

I must have missed it, where is this daily snapshot?

Brian

On Thu, 2004-02-19 at 23:58, Michael Koch wrote:
> _______________________________________________
> Commit-classpath mailing list
> Commit-classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/commit-classpath

--=-Wv2B43gj0KZX6VYNnxrO
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQBAN2c7cEcmdY33uzYRAlGyAKCDPl8g9PyGml8Up+yQ1S4jvRPIFgCgjnww
dgiI4C5kOyVsV55inkNCQjQ=
=Hc6B
-----END PGP SIGNATURE-----

--=-Wv2B43gj0KZX6VYNnxrO--




From MAILER-DAEMON Sat Feb 21 10:19:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AuYuK-00020j-26
	for mharc-commit-classpath@gnu.org; Sat, 21 Feb 2004 10:19:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AuYuI-000207-Aw
	for commit-classpath@gnu.org; Sat, 21 Feb 2004 10:19:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AuYtm-0001mC-AI
	for commit-classpath@gnu.org; Sat, 21 Feb 2004 10:19:05 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30)
	id 1AuYtB-0001Cw-RO; Sat, 21 Feb 2004 10:17:58 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-235.ewetel.net
	[80.228.95.235])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i1LFHqfq016872;
	Sat, 21 Feb 2004 16:17:53 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AuYt6-0000Ee-00; Sat, 21 Feb 2004 16:17:52 +0100
From: Michael Koch <konqueror@gmx.de>
To: cbj@gnu.org
Date: Sat, 21 Feb 2004 16:21:52 +0100
User-Agent: KMail/1.5.4
References: <20040220045850.19657803E5@reali.dnsalias.net>
	<1077372731.4096.73.camel@lyta.haphazard.org>
In-Reply-To: <1077372731.4096.73.camel@lyta.haphazard.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200402211621.53828.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: classpath daily snapshot 20040220 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2004 15:19:06 -0000

Am Samstag, 21. Februar 2004 15:12 schrieb C. Brian Jones:
> I must have missed it, where is this daily snapshot?

Its not really official yet. The snapshots are available on Patrick 
Reali's host. The plan is to move the build system to an official host 
then uploads the snapshot to a GNU/FSF server to save Patrick's 
personal bandwidth.

If Mark and Patrick agree and I can announce it as official with full 
paths and all.



Michael




From MAILER-DAEMON Sun Feb 22 00:01:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Auljq-0005KF-24
	for mharc-commit-classpath@gnu.org; Sun, 22 Feb 2004 00:01:10 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Auljk-0005AT-58
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 00:01:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Aulix-0004Zv-3M
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 00:00:46 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Auliq-0004Wa-H7
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 00:00:08 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 38A546246A; Sun, 22 Feb 2004 05:00:04 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 39673-10; Sun, 22 Feb 2004 05:00:03 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-230.adsl.solnet.ch
	[212.41.79.230]) by mail01.solnet.ch (Postfix) with ESMTP
	id 3AC7B62459; Sun, 22 Feb 2004 05:00:03 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id CC6CB82D00; Sun, 22 Feb 2004 05:59:12 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040222045912.CC6CB82D00@reali.dnsalias.net>
Date: Sun, 22 Feb 2004 05:59:12 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040222 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Feb 2004 05:01:07 -0000




From MAILER-DAEMON Sun Feb 22 03:50:42 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AupJx-0004sB-HB
	for mharc-commit-classpath@gnu.org; Sun, 22 Feb 2004 03:50:41 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AupJp-0004nW-8l
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 03:50:33 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AupJH-0003rd-MT
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 03:50:30 -0500
Received: from [62.4.16.100] (helo=kraid.nerim.net)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AupJH-0003qF-1l
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 03:49:59 -0500
Received: from kaffe.org (lavaux.net1.nerim.net [62.212.115.70])
	by kraid.nerim.net (Postfix) with ESMTP
	id 15577414E0; Sun, 22 Feb 2004 09:49:54 +0100 (CET)
Message-ID: <40386D33.1040808@kaffe.org>
Date: Sun, 22 Feb 2004 09:49:55 +0100
From: Guilhem Lavaux <guilhem@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20031007
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath@gnu.org, java-patches@gcc.gnu.org
X-Enigmail-Version: 0.82.5.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: multipart/mixed; boundary="------------040900070303000700030000"
Cc: 
Subject: FYI: Object serialization patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Feb 2004 08:50:34 -0000

This is a multi-part message in MIME format.
--------------040900070303000700030000
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

I am about to commit this fix concerning serialization in classpath.
It will solve again some problems with serialPersistentFields (principally) which has been
introduced by the former optimization patch.

Guilhem.

ChangeLog entry:
2004-02-22  Guilhem Lavaux <guilhem@kaffe.org>

	* java/io/ObjectInputStream.java
	(readClassDescriptor): Fixed field sorting. Keep elements of the
	mapping non null.
	(readFields): Fixed main loop and base logic. Small reindentation.

	* java/io/ObjectStreamField.java
	(lookupField): New method to update the field reference.
	(setBooleanField, setByteField, setCharField, setShortField,
	setIntField, setLongField, setFloatField, setDoubleField,
	setObjectField): Improved exception reporting.

	* java/io/ObjectStreamClass.java
	(setClass, setFields): Call lookupField when building the field
	database.





--------------040900070303000700030000
Content-Type: text/plain;
 name="obj_patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="obj_patch"

Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v
retrieving revision 1.38
diff -u -r1.38 ObjectInputStream.java
--- java/io/ObjectInputStream.java	10 Feb 2004 07:28:09 -0000	1.38
+++ java/io/ObjectInputStream.java	22 Feb 2004 08:44:09 -0000
@@ -513,7 +513,7 @@
 	else
 	  {
 	    int comp_val =
-		real_fields[real_idx].compareTo (stream_fields[stream_idx]);
+		real_fields[real_idx].getName().compareTo (stream_fields[stream_idx].getName());
 
 	    if (comp_val < 0)
 	      {
@@ -527,21 +527,13 @@
 	      {
 		stream_field = stream_fields[stream_idx++];
 		real_field = real_fields[real_idx++];
-		if(stream_field.getType() != real_field.getType())
-		    throw new InvalidClassException
-			("invalid field type for " + real_field.getName() +
-			" in class " + name);
+		if (stream_field.getType() != real_field.getType())
+		  throw new InvalidClassException
+		    ("invalid field type for " + real_field.getName() +
+		     " in class " + name);
 	      }
 	  }
-	if (stream_field != null)
-	  {
-	    if (stream_field.getOffset() < 0)
-		stream_field = null;
-	    else if (!stream_field.isToSet())
-		real_field = null;
-	  }
-	if (real_field != null && !real_field.isToSet())
-	    real_field = null;
+
 	/* If some of stream_fields does not correspond to any of real_fields,
 	 * or the opposite, then fieldmapping will go short.
 	 */
@@ -550,7 +542,7 @@
 	    ObjectStreamField[] newfieldmapping =
 	      new ObjectStreamField[fieldmapping.length + 2];
 	    System.arraycopy(fieldmapping, 0,
-	      newfieldmapping, 0, fieldmapping.length);
+			     newfieldmapping, 0, fieldmapping.length);
 	    fieldmapping = newfieldmapping;
 	  }
 	fieldmapping[map_idx++] = stream_field;
@@ -1576,121 +1568,119 @@
       {
 	ObjectStreamField stream_field = fields[i];
 	ObjectStreamField real_field = fields[i + 1];
-	if(stream_field != null || real_field != null)
-	  {
-	    boolean read_value = stream_field != null;
-	    boolean set_value = real_field != null;
-	    String field_name;
-	    char type;
-	    if (stream_field != null)
-	      {
-		field_name = stream_field.getName();
-		type = stream_field.getTypeCode();
-	      }
-	    else
-	      {
-		field_name = real_field.getName();
-		type = real_field.getTypeCode();
-	      }
+	boolean read_value = (stream_field != null && stream_field.getOffset() >= 0 && stream_field.isToSet());
+	boolean set_value = (real_field != null && real_field.isToSet());
+	String field_name;
+	char type;
 
-	    switch(type)
-	      {
-		case 'Z':
-		  {
-		    boolean value =
-			read_value ? this.realInputStream.readBoolean() : false;
-		    if (dump && read_value && set_value)
-		    dumpElementln("  " + field_name + ": " + value);
-		    if (set_value)
-			real_field.setBooleanField(obj, value);
-		    break;
-		  }
-		case 'B':
-		  {
-		    byte value =
-			read_value ? this.realInputStream.readByte() : 0;
-		    if (dump && read_value && set_value)
-		    dumpElementln("  " + field_name + ": " + value);
-		    if (set_value)
-			real_field.setByteField(obj, value);
-		    break;
-		  }
-		case 'C':
-		  {
-		    char value =
-			read_value ? this.realInputStream.readChar(): 0;
-		    if (dump && read_value && set_value)
-		    dumpElementln("  " + field_name + ": " + value);
-		    if (set_value)
-			real_field.setCharField(obj, value);
-		    break;
-		  }
-		case 'D':
-		  {
-		    double value =
-			read_value ? this.realInputStream.readDouble() : 0;
-		    if (dump && read_value && set_value)
-		    dumpElementln("  " + field_name + ": " + value);
-		    if (set_value)
-			real_field.setDoubleField(obj, value);
-		    break;
-		  }
-		case 'F':
-		  {
-		    float value =
-			read_value ? this.realInputStream.readFloat() : 0;
-		    if (dump && read_value && set_value)
-		    dumpElementln("  " + field_name + ": " + value);
-		    if (set_value)
-			real_field.setFloatField(obj, value);
-		    break;
-		  }
-		case 'I':
-		  {
-		    int value =
-			read_value ? this.realInputStream.readInt() : 0;
-		    if (dump && read_value && set_value)
-		    dumpElementln("  " + field_name + ": " + value);
-		    if (set_value)
-			real_field.setIntField(obj, value);
-		    break;
-		  }
-		case 'J':
-		  {
-		    long value =
-			read_value ? this.realInputStream.readLong() : 0;
-		    if (dump && read_value && set_value)
-		    dumpElementln("  " + field_name + ": " + value);
-		    if (set_value)
-			real_field.setLongField(obj, value);
-		    break;
-		  }
-		case 'S':
-		  {
-		    short value =
-			read_value ? this.realInputStream.readShort() : 0;
-		    if (dump && read_value && set_value)
-		    dumpElementln("  " + field_name + ": " + value);
-		    if (set_value)
-			real_field.setShortField(obj, value);
-		    break;
-		  }
-		case 'L':
-		case '[':
-		  {
-		    Object value =
-			read_value ? readObject() : null;
-		    if (set_value)
-			real_field.setObjectField(obj, value);
-		    break;
-		  }
-		default:
-		    throw new InternalError("Invalid type code: " + type);
-	      }
+	if (stream_field != null)
+	  {
+	    field_name = stream_field.getName();
+	    type = stream_field.getTypeCode();
+	  }
+	else
+	  {
+	    field_name = real_field.getName();
+	    type = real_field.getTypeCode();
+	  }
+	
+	switch(type)
+	  {
+	  case 'Z':
+	    {
+	      boolean value =
+		read_value ? this.realInputStream.readBoolean() : false;
+	      if (dump && read_value && set_value)
+		dumpElementln("  " + field_name + ": " + value);
+	      if (set_value)
+		real_field.setBooleanField(obj, value);
+	      break;
+	    }
+	  case 'B':
+	    {
+	      byte value =
+		read_value ? this.realInputStream.readByte() : 0;
+	      if (dump && read_value && set_value)
+		dumpElementln("  " + field_name + ": " + value);
+	      if (set_value)
+		real_field.setByteField(obj, value);
+	      break;
+	    }
+	  case 'C':
+	    {
+	      char value =
+		read_value ? this.realInputStream.readChar(): 0;
+	      if (dump && read_value && set_value)
+		dumpElementln("  " + field_name + ": " + value);
+	      if (set_value)
+		real_field.setCharField(obj, value);
+	      break;
+	    }
+	  case 'D':
+	    {
+	      double value =
+		read_value ? this.realInputStream.readDouble() : 0;
+	      if (dump && read_value && set_value)
+		dumpElementln("  " + field_name + ": " + value);
+	      if (set_value)
+		real_field.setDoubleField(obj, value);
+	      break;
+	    }
+	  case 'F':
+	    {
+	      float value =
+		read_value ? this.realInputStream.readFloat() : 0;
+	      if (dump && read_value && set_value)
+		dumpElementln("  " + field_name + ": " + value);
+	      if (set_value)
+		real_field.setFloatField(obj, value);
+	      break;
+	    }
+	  case 'I':
+	    {
+	      int value =
+		read_value ? this.realInputStream.readInt() : 0;
+	      if (dump && read_value && set_value)
+		dumpElementln("  " + field_name + ": " + value);
+	      if (set_value)
+		real_field.setIntField(obj, value);
+	      break;
+	    }
+	  case 'J':
+	    {
+	      long value =
+		read_value ? this.realInputStream.readLong() : 0;
+	      if (dump && read_value && set_value)
+		dumpElementln("  " + field_name + ": " + value);
+	      if (set_value)
+		real_field.setLongField(obj, value);
+	      break;
+	    }
+	  case 'S':
+	    {
+	      short value =
+		read_value ? this.realInputStream.readShort() : 0;
+	      if (dump && read_value && set_value)
+		dumpElementln("  " + field_name + ": " + value);
+	      if (set_value)
+		real_field.setShortField(obj, value);
+	      break;
+	    }
+	  case 'L':
+	  case '[':
+	    {
+	      Object value =
+		read_value ? readObject() : null;
+	      if (set_value && stream_field != null)
+		real_field.setObjectField(obj, stream_field.getTypeString(), value);
+	      break;
+	    }
+	  default:
+	    throw new InternalError("Invalid type code: " + type);
 	  }
       }
   }
-
+  
   // Toggles writing primitive data to block-data buffer.
   private boolean setBlockDataMode (boolean on)
   {
@@ -1820,7 +1810,7 @@
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
-	System.loadLibrary ("javaio");
+	System.loadLibrary ("io");
       }
   }
 }
Index: java/io/ObjectOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectOutputStream.java,v
retrieving revision 1.43
diff -u -r1.43 ObjectOutputStream.java
--- java/io/ObjectOutputStream.java	31 Dec 2003 10:28:19 -0000	1.43
+++ java/io/ObjectOutputStream.java	22 Feb 2004 08:44:09 -0000
@@ -1538,7 +1538,7 @@
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
-        System.loadLibrary("javaio");
+        System.loadLibrary("io");
       }
   }
 }
Index: java/io/ObjectStreamClass.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectStreamClass.java,v
retrieving revision 1.30
diff -u -r1.30 ObjectStreamClass.java
--- java/io/ObjectStreamClass.java	2 Feb 2004 10:26:51 -0000	1.30
+++ java/io/ObjectStreamClass.java	22 Feb 2004 08:44:09 -0000
@@ -344,6 +344,7 @@
 		newFieldList[k] = exportedFields[j];
 		newFieldList[k].setPersistent(true);
 		newFieldList[k].setToSet(false);
+		newFieldList[k].lookupField(clazz);
 		j++;
 	      }
 	    else
@@ -554,6 +555,19 @@
 	    if (fields != null)
 	      {
 		Arrays.sort (fields);
+		// Retrieve field reference.
+		for (int i=0; i < fields.length; i++)
+		  {
+		    try
+		      {
+			fields[i].lookupField(cl);
+		      }
+		    catch (NoSuchFieldException _)
+		      {
+			fields[i].setToSet(false);
+		      }
+		  }
+		
 		calculateOffsets();
 		return;
 	      }
@@ -798,7 +812,7 @@
 
     fieldsArray = new ObjectStreamField[ o.length ];
     System.arraycopy(o, 0, fieldsArray, 0, o.length);
-    
+
     return fieldsArray;
   }
 

--------------040900070303000700030000--




From MAILER-DAEMON Sun Feb 22 03:58:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AupRX-0000Pm-7c
	for mharc-commit-classpath@gnu.org; Sun, 22 Feb 2004 03:58:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AupRU-0000Ne-Ej
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 03:58:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AupQu-0007mU-DQ
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 03:58:23 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AupQt-0007iq-Tg
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 03:57:52 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-137.ewetel.net
	[80.228.95.137])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i1M8vDow002455;
	Sun, 22 Feb 2004 09:57:14 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AupQH-0003eP-00; Sun, 22 Feb 2004 09:57:13 +0100
From: Michael Koch <konqueror@gmx.de>
To: Guilhem Lavaux <guilhem@kaffe.org>, commit-classpath@gnu.org,
	java-patches@gcc.gnu.org
Date: Sun, 22 Feb 2004 10:01:14 +0100
User-Agent: KMail/1.5.4
References: <40386D33.1040808@kaffe.org>
In-Reply-To: <40386D33.1040808@kaffe.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200402221001.14711.konqueror@gmx.de>
X-CheckCompat: OK
Cc: 
Subject: Re: FYI: Object serialization patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Feb 2004 08:58:29 -0000

Am Sonntag, 22. Februar 2004 09:49 schrieb Guilhem Lavaux:
> Hi,
>
> I am about to commit this fix concerning serialization in classpath.
> It will solve again some problems with serialPersistentFields
> (principally) which has been introduced by the former optimization
> patch.

Please produce patches with diff "-bB" to ignore whitespace changes in 
the patch and to make it understandable more easy.

       {
-        System.loadLibrary("javaio");
+        System.loadLibrary("io");
       }

This looks just wrong for classpath.


Michael




From MAILER-DAEMON Sun Feb 22 04:18:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Aupl9-0004mE-Bw
	for mharc-commit-classpath@gnu.org; Sun, 22 Feb 2004 04:18:47 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Aupl6-0004lS-NX
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 04:18:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Aupka-0004TZ-ND
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 04:18:43 -0500
Received: from [62.4.16.100] (helo=kraid.nerim.net)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Aupka-0004T3-7o
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 04:18:12 -0500
Received: from kaffe.org (lavaux.net1.nerim.net [62.212.115.70])
	by kraid.nerim.net (Postfix) with ESMTP
	id 637724134D; Sun, 22 Feb 2004 10:18:07 +0100 (CET)
Message-ID: <403873D1.4080107@kaffe.org>
Date: Sun, 22 Feb 2004 10:18:09 +0100
From: Guilhem Lavaux <guilhem@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20031007
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Michael Koch <konqueror@gmx.de>
References: <40386D33.1040808@kaffe.org> <200402221001.14711.konqueror@gmx.de>
In-Reply-To: <200402221001.14711.konqueror@gmx.de>
X-Enigmail-Version: 0.82.5.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: multipart/mixed; boundary="------------050808010404070104000504"
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: FYI: Object serialization patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Feb 2004 09:18:45 -0000

This is a multi-part message in MIME format.
--------------050808010404070104000504
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Michael Koch wrote:

>Am Sonntag, 22. Februar 2004 09:49 schrieb Guilhem Lavaux:
>  
>
>>Hi,
>>
>>I am about to commit this fix concerning serialization in classpath.
>>It will solve again some problems with serialPersistentFields
>>(principally) which has been introduced by the former optimization
>>patch.
>>    
>>
>
>Please produce patches with diff "-bB" to ignore whitespace changes in 
>the patch and to make it understandable more easy.
>
>       {
>-        System.loadLibrary("javaio");
>+        System.loadLibrary("io");
>       }
>
>This looks just wrong for classpath.
>
>  
>
Oops. Thank you very much.

Fixed in this patch.

Guilhem.


--------------050808010404070104000504
Content-Type: text/plain;
 name="obj_patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="obj_patch"

Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v
retrieving revision 1.38
diff -u -b -B -r1.38 ObjectInputStream.java
--- java/io/ObjectInputStream.java	10 Feb 2004 07:28:09 -0000	1.38
+++ java/io/ObjectInputStream.java	22 Feb 2004 09:14:51 -0000
@@ -513,7 +513,7 @@
 	else
 	  {
 	    int comp_val =
-		real_fields[real_idx].compareTo (stream_fields[stream_idx]);
+		real_fields[real_idx].getName().compareTo (stream_fields[stream_idx].getName());
 
 	    if (comp_val < 0)
 	      {
@@ -527,21 +527,13 @@
 	      {
 		stream_field = stream_fields[stream_idx++];
 		real_field = real_fields[real_idx++];
-		if(stream_field.getType() != real_field.getType())
+		if (stream_field.getType() != real_field.getType())
 		    throw new InvalidClassException
 			("invalid field type for " + real_field.getName() +
 			" in class " + name);
 	      }
 	  }
-	if (stream_field != null)
-	  {
-	    if (stream_field.getOffset() < 0)
-		stream_field = null;
-	    else if (!stream_field.isToSet())
-		real_field = null;
-	  }
-	if (real_field != null && !real_field.isToSet())
-	    real_field = null;
+
 	/* If some of stream_fields does not correspond to any of real_fields,
 	 * or the opposite, then fieldmapping will go short.
 	 */
@@ -1576,12 +1568,11 @@
       {
 	ObjectStreamField stream_field = fields[i];
 	ObjectStreamField real_field = fields[i + 1];
-	if(stream_field != null || real_field != null)
-	  {
-	    boolean read_value = stream_field != null;
-	    boolean set_value = real_field != null;
+	boolean read_value = (stream_field != null && stream_field.getOffset() >= 0 && stream_field.isToSet());
+	boolean set_value = (real_field != null && real_field.isToSet());
 	    String field_name;
 	    char type;
+
 	    if (stream_field != null)
 	      {
 		field_name = stream_field.getName();
@@ -1680,8 +1671,8 @@
 		  {
 		    Object value =
 			read_value ? readObject() : null;
-		    if (set_value)
-			real_field.setObjectField(obj, value);
+	      if (set_value && stream_field != null)
+		real_field.setObjectField(obj, stream_field.getTypeString(), value);
 		    break;
 		  }
 		default:
@@ -1689,7 +1680,6 @@
 	      }
 	  }
       }
-  }
 
   // Toggles writing primitive data to block-data buffer.
   private boolean setBlockDataMode (boolean on)
Index: java/io/ObjectStreamClass.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectStreamClass.java,v
retrieving revision 1.30
diff -u -b -B -r1.30 ObjectStreamClass.java
--- java/io/ObjectStreamClass.java	2 Feb 2004 10:26:51 -0000	1.30
+++ java/io/ObjectStreamClass.java	22 Feb 2004 09:14:51 -0000
@@ -344,6 +344,7 @@
 		newFieldList[k] = exportedFields[j];
 		newFieldList[k].setPersistent(true);
 		newFieldList[k].setToSet(false);
+		newFieldList[k].lookupField(clazz);
 		j++;
 	      }
 	    else
@@ -554,6 +555,19 @@
 	    if (fields != null)
 	      {
 		Arrays.sort (fields);
+		// Retrieve field reference.
+		for (int i=0; i < fields.length; i++)
+		  {
+		    try
+		      {
+			fields[i].lookupField(cl);
+		      }
+		    catch (NoSuchFieldException _)
+		      {
+			fields[i].setToSet(false);
+		      }
+		  }
+		
 		calculateOffsets();
 		return;
 	      }

--------------050808010404070104000504--




From MAILER-DAEMON Sun Feb 22 14:19:41 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Auz8f-0001cX-8P
	for mharc-commit-classpath@gnu.org; Sun, 22 Feb 2004 14:19:41 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Auz8a-0001YX-HP
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 14:19:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Auz81-0001A7-Pv
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 14:19:32 -0500
Received: from [24.25.9.100] (helo=ms-smtp-01-eri0.southeast.rr.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Auz81-00019h-Dc
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 14:19:01 -0500
Received: from [10.0.0.2] (rdu57-9-048.nc.rr.com [66.57.9.48])
	by ms-smtp-01-eri0.southeast.rr.com (8.12.10/8.12.7) with ESMTP id
	i1MJIuSm005755
	for <commit-classpath@gnu.org>; Sun, 22 Feb 2004 14:18:57 -0500 (EST)
From: "C. Brian Jones" <cbj@gnu.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-PVqDXCu56f/XHUVWkLuu"
Message-Id: <1077477536.4096.75.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Sun, 22 Feb 2004 14:18:56 -0500
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Subject: [Fwd: 1 Commit-classpath moderator request(s) waiting]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
Reply-To: cbj@gnu.org
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Feb 2004 19:19:38 -0000


--=-PVqDXCu56f/XHUVWkLuu
Content-Type: multipart/mixed; boundary="=-IP1kg9aQPgzVA8GgiIwb"


--=-IP1kg9aQPgzVA8GgiIwb
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Mark, can you change the list to send you these admin messages and take
care of this?

Thanks,
Brian

--=-IP1kg9aQPgzVA8GgiIwb
Content-Disposition: inline
Content-Description: Forwarded message - 1 Commit-classpath moderator
	request(s) waiting
Content-Type: message/rfc822

Return-Path: <mailman-bounces@gnu.org>
Received: from localhost (localhost.localdomain [127.0.0.1]) by
	lyta.haphazard.org (8.12.10/8.12.10) with ESMTP id i1MDK4bv019273 for
	<cbj@localhost>; Sun, 22 Feb 2004 08:20:04 -0500
Received: from pop-server.nc.rr.com [24.25.4.168] by localhost with POP3
	(fetchmail-6.2.0) for cbj@localhost (single-drop); Sun, 22 Feb 2004
	08:20:04 -0500 (EST)
Received: from ms-mta-02-eri0 (ms-mta-02-qfe1 [10.10.5.71]) by
	ms-mss-01.southeast.rr.com (iPlanet Messaging Server 5.2 HotFix 1.21
	(built
	Sep 8 2003)) with ESMTP id <0HTH000V3MBGKW@ms-mss-01.southeast.rr.com>
	for cbj@nc.rr.com; Sun, 22 Feb 2004 08:18:52 -0500 (EST)
Received: from ncmx01.mgw.rr.com (ncmx01.mgw.rr.com [24.25.4.95]) by
	ms-mta-02.southeast.rr.com (iPlanet Messaging Server 5.2 HotFix 1.21
	(built
	Sep 8 2003)) with ESMTP id <0HTH005GLMBGSP@ms-mta-02.southeast.rr.com>
	for cbj@nc.rr.com (ORCPT cbj@nc.rr.com);
	Sun, 22 Feb 2004 08:18:52 -0500 (EST)
Received: from fencepost.gnu.org (fencepost.gnu.org [199.232.76.164]) by
	ncmx01.mgw.rr.com (8.12.10/8.12.8) with ESMTP id i1MDKEUp018798	for
	<cbj@nc.rr.com>; Sun, 22 Feb 2004 08:20:14 -0500 (EST)
Received: from monty-python.gnu.org ([199.232.76.173]) by fencepost.gnu.org
	with esmtp (Exim 4.24) id 1AutUw-0003dL-Jy	for cbj@gnu.org; Sun, 22 Feb
	2004 08:18:18 -0500
Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by
	monty-python.gnu.org with esmtp (Exim 4.30)	id 1AutQb-0005nR-Nh; Sun, 22
	Feb 2004 08:13:49 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AutQS-0005lZ-Cl	for commit-classpath-owner@gnu.org; Sun, 22 Feb 2004
	08:13:40 -0500
Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by
	monty-python.gnu.org with esmtp (Exim 4.30) id 1AutI8-0004BV-QQ	for
	commit-classpath-owner@gnu.org; Sun, 22 Feb 2004 08:05:04 -0500
Date: Sun, 22 Feb 2004 08:01:55 -0500
From: commit-classpath-bounces@gnu.org
Subject: 1 Commit-classpath moderator request(s) waiting
Sender: mailman-bounces@gnu.org
To: commit-classpath-owner@gnu.org
Errors-to: mailman-bounces@gnu.org
Message-id: <mailman.77.1077454915.7400.commit-classpath@gnu.org>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Precedence: bulk
X-BeenThere: commit-classpath@gnu.org
X-List-Administrivia: yes
X-Virus-Scanned: Symantec AntiVirus Scan Engine
X-Mailman-Version: 2.1.2
List-Id: Automatic administrative message (CVS, bugs, regressions)
	.	<commit-classpath.gnu.org>
Original-recipient: rfc822;cbj@nc.rr.com
Content-Transfer-Encoding: quoted-printable

The Commit-classpath@gnu.org mailing list has 1 request(s) waiting for
your consideration at:

	http://mail.gnu.org/mailman/admindb/commit-classpath
=09
Please attend to this at your earliest convenience.  This notice of
pending requests, if any, will be sent out daily.


Pending posts:
From: erica101010@bol.com.br on Thu Feb 19 13:20:59 2004
Subject: Medelos de cartas comerciais: http://www.gueb.de/modelosdecartasco=
merciais
Cause: Post by non-member to a members-only list


--=-IP1kg9aQPgzVA8GgiIwb--

--=-PVqDXCu56f/XHUVWkLuu
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQBAOQCgcEcmdY33uzYRApaVAJ9z/VLW+QvrgLsN/47jgyf3Bo+/sgCeMzeS
UlJqUb0G720IDg3YBeN+eLo=
=ylIP
-----END PGP SIGNATURE-----

--=-PVqDXCu56f/XHUVWkLuu--




From MAILER-DAEMON Mon Feb 23 00:04:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Av8GG-0005rv-Cr
	for mharc-commit-classpath@gnu.org; Mon, 23 Feb 2004 00:04:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Av8GD-0005qc-Ox
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 00:04:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Av8Fg-0005Fx-2b
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 00:04:04 -0500
Received: from [199.232.41.8] (helo=mx20.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1Av8Ff-0005EG-Kv
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 00:03:31 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1Av8C8-000822-Ci
	for commit-classpath@gnu.org; Sun, 22 Feb 2004 23:59:52 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 0AF7D62246; Mon, 23 Feb 2004 04:59:50 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 03229-01; Mon, 23 Feb 2004 04:59:49 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-230.adsl.solnet.ch
	[212.41.79.230]) by mail01.solnet.ch (Postfix) with ESMTP
	id EDA2160E03; Mon, 23 Feb 2004 04:59:48 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 2E03C84191; Mon, 23 Feb 2004 05:58:56 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040223045856.2E03C84191@reali.dnsalias.net>
Date: Mon, 23 Feb 2004 05:58:56 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040223 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Feb 2004 05:04:06 -0000




From MAILER-DAEMON Mon Feb 23 12:14:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AvJfJ-0001QL-3x
	for mharc-commit-classpath@gnu.org; Mon, 23 Feb 2004 12:14:45 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AvJfE-0001NZ-Va
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 12:14:40 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AvJf9-0001MO-N5
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 12:14:36 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30)
	id 1AvJf7-0001L9-6V; Mon, 23 Feb 2004 12:14:33 -0500
Received: from slauerhoff.wildebeest.org ([192.168.1.27] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AvJex-0002Xk-00; Mon, 23 Feb 2004 18:14:23 +0100
From: Mark Wielaard <mark@klomp.org>
To: cbj@gnu.org
In-Reply-To: <1077477536.4096.75.camel@lyta.haphazard.org>
References: <1077477536.4096.75.camel@lyta.haphazard.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-UTQA77a54JtQNGLTnHMJ"
Message-Id: <1077556469.898.12.camel@localhost>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Mon, 23 Feb 2004 18:14:29 +0100
Cc: commit-classpath@gnu.org
Subject: Re: [Fwd: 1 Commit-classpath moderator request(s) waiting]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Feb 2004 17:14:43 -0000


--=-UTQA77a54JtQNGLTnHMJ
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi Brian,

On Sun, 2004-02-22 at 20:18, C. Brian Jones wrote:
> Mark, can you change the list to send you these admin messages and take
> care of this?

Sorry for the delay I was away for FOSDEM last couple of days.
Should be setup correctly now.

Cheers,

Mark

--=-UTQA77a54JtQNGLTnHMJ
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQBAOjT1xVhZCJWr9QwRAgJ+AKCVcwR4i2MrV8VYiESmc9G1QuozWwCghqNc
IYNyF1qjEy2mfau1FjiN3/w=
=92Ea
-----END PGP SIGNATURE-----

--=-UTQA77a54JtQNGLTnHMJ--




From MAILER-DAEMON Mon Feb 23 14:41:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AvLxa-0005Ed-Fk
	for mharc-commit-classpath@gnu.org; Mon, 23 Feb 2004 14:41:46 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AvLxU-0005Ba-Nk
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 14:41:40 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AvLwv-0004tN-TA
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 14:41:37 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30)
	id 1AvLv5-00047v-LK; Mon, 23 Feb 2004 14:39:11 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 20F33622AC; Mon, 23 Feb 2004 19:39:08 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 05719-07; Mon, 23 Feb 2004 19:39:07 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-230.adsl.solnet.ch
	[212.41.79.230]) by mail01.solnet.ch (Postfix) with ESMTP
	id 7FA186227E; Mon, 23 Feb 2004 19:39:05 +0000 (GMT)
Received: from nbprr (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP
	id 131C56F51D; Mon, 23 Feb 2004 20:38:14 +0100 (CET)
Date: Mon, 23 Feb 2004 20:40:01 +0100
From: Patrik Reali <reali@acm.org>
To: Michael Koch <konqueror@gmx.de>, cbj@gnu.org
Message-ID: <110828252.1077568800@[192.168.1.3]>
In-Reply-To: <200402211621.53828.konqueror@gmx.de>
References: <20040220045850.19657803E5@reali.dnsalias.net>
	<1077372731.4096.73.camel@lyta.haphazard.org>
	<200402211621.53828.konqueror@gmx.de>
X-Mailer: Mulberry/3.1.0 (Win32)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-Virus-Scanned: by SolNet
Cc: commit-classpath@gnu.org
Subject: Re: classpath daily snapshot 20040220 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Feb 2004 19:41:42 -0000

Hi there!

Well, we can keep the build on my machine and upload them to some server 
after the build; accessing them directly on my server is an option only for 
extremely patient people, because I have only a 100kbit/s uplink.

So, if the GNU/FSF server is already available, you could try to upload the 
snapshots there, and I could add a link to them on the web-pages.

-Patrik


--On Samstag, 21. Februar 2004 16:21 +0100 Michael Koch <konqueror@gmx.de> 
wrote:

> Am Samstag, 21. Februar 2004 15:12 schrieb C. Brian Jones:
>> I must have missed it, where is this daily snapshot?
>
> Its not really official yet. The snapshots are available on Patrick
> Reali's host. The plan is to move the build system to an official host
> then uploads the snapshot to a GNU/FSF server to save Patrick's
> personal bandwidth.
>
> If Mark and Patrick agree and I can announce it as official with full
> paths and all.
>
>
>
> Michael
>
>
>
> _______________________________________________
> Commit-classpath mailing list
> Commit-classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/commit-classpath
>





From MAILER-DAEMON Mon Feb 23 15:51:32 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AvN35-0005y9-H9
	for mharc-commit-classpath@gnu.org; Mon, 23 Feb 2004 15:51:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AvN32-0005wz-RC
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 15:51:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AvN2U-0005bR-Hn
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 15:51:26 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30)
	id 1AvN1u-0005JJ-EO; Mon, 23 Feb 2004 15:50:18 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-126.ewetel.net
	[80.228.95.126])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i1NKoCow009973;
	Mon, 23 Feb 2004 21:50:13 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AvN1o-00083S-00; Mon, 23 Feb 2004 21:50:12 +0100
From: Michael Koch <konqueror@gmx.de>
To: Patrik Reali <reali@acm.org>, cbj@gnu.org
Date: Mon, 23 Feb 2004 21:54:15 +0100
User-Agent: KMail/1.5.4
References: <20040220045850.19657803E5@reali.dnsalias.net>
	<200402211621.53828.konqueror@gmx.de>
	<110828252.1077568800@[192.168.1.3]>
In-Reply-To: <110828252.1077568800@[192.168.1.3]>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200402232154.15124.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: classpath daily snapshot 20040220 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Feb 2004 20:51:29 -0000

Am Montag, 23. Februar 2004 20:40 schrieb Patrik Reali:
> Hi there!
>
> Well, we can keep the build on my machine and upload them to some
> server after the build; accessing them directly on my server is an
> option only for extremely patient people, because I have only a
> 100kbit/s uplink.
>
> So, if the GNU/FSF server is already available, you could try to
> upload the snapshots there, and I could add a link to them on the
> web-pages.

I dont think the GNU server is available for file upload again. I tried 
some again and it failed and I got no statement that said its 
reactivated now.

I can perhaps provide an option to upload it to another non-FSF 
server .... have to think about it.


Michael




From MAILER-DAEMON Tue Feb 24 00:00:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AvUgG-0003rM-LS
	for mharc-commit-classpath@gnu.org; Tue, 24 Feb 2004 00:00:28 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AvUgE-0003qu-1v
	for commit-classpath@gnu.org; Tue, 24 Feb 2004 00:00:26 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AvUfh-0003kC-GA
	for commit-classpath@gnu.org; Tue, 24 Feb 2004 00:00:24 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AvUfh-0003jW-42
	for commit-classpath@gnu.org; Mon, 23 Feb 2004 23:59:53 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id EFC9762261; Tue, 24 Feb 2004 04:59:49 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 30521-04; Tue, 24 Feb 2004 04:59:49 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-230.adsl.solnet.ch
	[212.41.79.230]) by mail01.solnet.ch (Postfix) with ESMTP
	id EB16D6222B; Tue, 24 Feb 2004 04:59:48 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 185E78561D; Tue, 24 Feb 2004 05:58:55 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040224045855.185E78561D@reali.dnsalias.net>
Date: Tue, 24 Feb 2004 05:58:55 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040224 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Feb 2004 05:00:27 -0000




From MAILER-DAEMON Wed Feb 25 00:00:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Avr9u-00009T-PT
	for mharc-commit-classpath@gnu.org; Wed, 25 Feb 2004 00:00:34 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Avr9r-00007R-Cs
	for commit-classpath@gnu.org; Wed, 25 Feb 2004 00:00:31 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Avr9K-0008OI-Jq
	for commit-classpath@gnu.org; Wed, 25 Feb 2004 00:00:29 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Avr9K-0008N0-79
	for commit-classpath@gnu.org; Tue, 24 Feb 2004 23:59:58 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 55D2062300; Wed, 25 Feb 2004 04:59:50 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 46720-07; Wed, 25 Feb 2004 04:59:49 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-230.adsl.solnet.ch
	[212.41.79.230]) by mail01.solnet.ch (Postfix) with ESMTP
	id 4BBD2622F9; Wed, 25 Feb 2004 04:59:49 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 2236B8A1EA; Wed, 25 Feb 2004 05:58:53 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040225045853.2236B8A1EA@reali.dnsalias.net>
Date: Wed, 25 Feb 2004 05:58:53 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040225 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Feb 2004 05:00:32 -0000




From MAILER-DAEMON Thu Feb 26 00:00:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AwDdY-0001E6-LP
	for mharc-commit-classpath@gnu.org; Thu, 26 Feb 2004 00:00:40 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AwDdV-0001DV-Km
	for commit-classpath@gnu.org; Thu, 26 Feb 2004 00:00:37 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AwDcz-000171-FX
	for commit-classpath@gnu.org; Thu, 26 Feb 2004 00:00:36 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AwDcz-00016v-5y
	for commit-classpath@gnu.org; Thu, 26 Feb 2004 00:00:05 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 3734E622E0; Thu, 26 Feb 2004 05:00:01 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 54416-05; Thu, 26 Feb 2004 05:00:00 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-230.adsl.solnet.ch
	[212.41.79.230]) by mail01.solnet.ch (Postfix) with ESMTP
	id AAE60622DE; Thu, 26 Feb 2004 04:59:59 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 3EEE58B67B; Thu, 26 Feb 2004 05:59:04 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040226045904.3EEE58B67B@reali.dnsalias.net>
Date: Thu, 26 Feb 2004 05:59:04 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040226 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 26 Feb 2004 05:00:38 -0000




From MAILER-DAEMON Fri Feb 27 00:01:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Awa7r-0005vj-AA
	for mharc-commit-classpath@gnu.org; Fri, 27 Feb 2004 00:01:27 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Awa7V-0005p0-3A
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 00:01:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Awa6x-0005cG-9q
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 00:01:02 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Awa6J-0005UA-Eb
	for commit-classpath@gnu.org; Thu, 26 Feb 2004 23:59:51 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 1ADFD622DF; Fri, 27 Feb 2004 04:59:48 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 69665-02; Fri, 27 Feb 2004 04:59:47 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-74-103.adsl.solnet.ch
	[212.41.74.103]) by mail01.solnet.ch (Postfix) with ESMTP
	id 21432622CE; Fri, 27 Feb 2004 04:59:47 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 55F218CB27; Fri, 27 Feb 2004 05:58:50 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040227045850.55F218CB27@reali.dnsalias.net>
Date: Fri, 27 Feb 2004 05:58:50 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Cc: konqueror@gmx.de
Subject: classpath daily snapshot 20040227 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2004 05:01:06 -0000




From MAILER-DAEMON Fri Feb 27 05:59:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Awfhx-0003Kb-Nd
	for mharc-commit-classpath@gnu.org; Fri, 27 Feb 2004 05:59:05 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Awfhq-0003E3-Rj
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 05:58:58 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AwfhI-0002gp-Ba
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 05:58:55 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AwfhH-0002eY-Rn
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 05:58:23 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-131.ewetel.net
	[80.228.95.131])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i1RAwIVA023012
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 11:58:19 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AwfhC-0007Oc-00
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 11:58:18 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 27 Feb 2004 11:58:18 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_KLyPA1uwCXdCcdS"
Message-Id: <200402271158.19584.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.awt
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2004 10:59:00 -0000


--Boundary-00=_KLyPA1uwCXdCcdS
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge with libgcj again.


Michael


2004-02-27  Michael Koch  <konqueror@gmx.de>

	* gnu/java/awt/ComponentDataBlitOp.java
	(INSTANCE): Made final.
	* gnu/java/awt/image/ImageDecoder.java:
	Reworked imports.
	(cm): Unused, removed.


--Boundary-00=_KLyPA1uwCXdCcdS
Content-Type: text/x-diff;
  charset="us-ascii";
  name="awt.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="awt.diff"

Index: gnu/java/awt/ComponentDataBlitOp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/ComponentDataBlitOp.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ComponentDataBlitOp.java
--- gnu/java/awt/ComponentDataBlitOp.java	22 Jan 2002 22:26:56 -0000	1.2
+++ gnu/java/awt/ComponentDataBlitOp.java	27 Feb 2004 10:55:47 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002  Free Software Foundation
+/* Copyright (C) 2000, 2002, 2004  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -52,7 +52,7 @@
  */
 public class ComponentDataBlitOp implements RasterOp
 {
-  public static ComponentDataBlitOp INSTANCE = new ComponentDataBlitOp();
+  public static final ComponentDataBlitOp INSTANCE = new ComponentDataBlitOp();
 
   public WritableRaster filter(Raster src, WritableRaster dest)
   {
Index: gnu/java/awt/image/ImageDecoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/image/ImageDecoder.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 ImageDecoder.java
--- gnu/java/awt/image/ImageDecoder.java	2 Dec 2003 19:42:09 -0000	1.9
+++ gnu/java/awt/image/ImageDecoder.java	27 Feb 2004 10:55:47 -0000
@@ -1,5 +1,5 @@
 /* ImageDecoder.java
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,11 +37,14 @@
 
 package gnu.java.awt.image;
 
-import java.awt.*;
-import java.awt.image.*;
-import java.util.*;
-import java.io.*;
+import java.awt.image.ImageConsumer;
+import java.awt.image.ImageProducer;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 import java.net.URL;
+import java.util.Vector;
 
 public abstract class ImageDecoder implements ImageProducer 
 {
@@ -52,8 +55,6 @@
   int offset;
   int length;
   InputStream input;
-
-  public static ColorModel cm;
 
   static
   {

--Boundary-00=_KLyPA1uwCXdCcdS--




From MAILER-DAEMON Fri Feb 27 06:05:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AwfoT-0005hC-Tv
	for mharc-commit-classpath@gnu.org; Fri, 27 Feb 2004 06:05:49 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AwfoR-0005gO-7P
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:05:47 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Awfnu-0005au-MM
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:05:45 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Awfnu-0005an-5Q
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:05:14 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-131.ewetel.net
	[80.228.95.131])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i1RB59ow014660
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:05:10 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Awfnp-0007VP-00
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:05:09 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 27 Feb 2004 12:05:10 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_mRyPAJiAyt7UBbQ"
Message-Id: <200402271205.11261.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.net.URLConnection
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2004 11:05:48 -0000


--Boundary-00=_mRyPAJiAyt7UBbQ
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


After much thinking about it I just commited the attached patch to 
classspath. Its a merge from libgcj and fixes some issues with date 
parsing in java.net.URLConnection.


Michael


2004-02-27  Michael Koch  <konqueror@gmx.de>

	* java/net/URLConnection.java
	(dateFormat1, dateformat2, dateformat3): New fields.
	(dateformats_initialized): New field for lazy initialization of date
	format fields.
	(getHeaderFieldDate): Rewritten to use DateFormat.parse() instead of
	the deprecated Date(String) constructor. This implementation
	(initializeDateFormats): New method,


--Boundary-00=_mRyPAJiAyt7UBbQ
Content-Type: text/x-diff;
  charset="us-ascii";
  name="url.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="url.diff"

Index: java/net/URLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLConnection.java,v
retrieving revision 1.22
diff -u -b -B -r1.22 URLConnection.java
--- java/net/URLConnection.java	25 Jan 2004 13:39:34 -0000	1.22
+++ java/net/URLConnection.java	27 Feb 2004 11:01:48 -0000
@@ -43,6 +43,8 @@
 import java.io.OutputStream;
 import java.security.AllPermission;
 import java.security.Permission;
+import java.text.ParsePosition;
+import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Hashtable;
@@ -161,6 +163,8 @@
    */
   protected URL url;
 
+  private static SimpleDateFormat dateFormat1, dateFormat2, dateFormat3;
+  private static boolean dateformats_initialized = false;
 
   /**
    * Creates a URL connection to a given URL. A real connection is not made.
@@ -352,23 +356,24 @@
    */
   public long getHeaderFieldDate (String name, long defaultValue)
   {
-    String str = getHeaderField (name);
-    
-    if (str == null)
-      return defaultValue;
+    if (! dateformats_initialized)
+      initializeDateFormats ();
     
-    // This needs to change since Date(String) is deprecated, but DateFormat
-    // doesn't seem to be working for some reason
-    //DateFormat df = DateFormat.getDateInstance (DateFormat.FULL, Locale.US);
-    //df.setLenient (true);
-
-    //Date date = df.parse (value, new ParsePosition (0));
-    Date date = new Date (str);
+    long result = defaultValue;
+    String str = getHeaderField (name);
 
-    if (date == null)
-      return defaultValue;
+    if (str != null)
+      {
+	Date date;
+	if ((date = dateFormat1.parse (str, new ParsePosition (0))) != null)
+	  result = date.getTime ();
+	else if ((date = dateFormat2.parse (str, new ParsePosition (0))) != null)
+	  result = date.getTime ();
+	else if ((date = dateFormat3.parse (str, new ParsePosition (0))) != null)
+	  result = date.getTime ();
+      }
        
-    return (date.getTime() / 1000);
+    return result;
   }
 
   /**
@@ -952,5 +957,22 @@
       s.checkSetFactory();
 
     fileNameMap = map;
+  }
+  
+  // We don't put these in a static initializer, because it creates problems
+  // with initializer co-dependency: SimpleDateFormat's constructors eventually 
+  // depend on URLConnection (via the java.text.*Symbols classes).
+  private synchronized void initializeDateFormats()
+  {
+    if (dateformats_initialized)
+      return;
+
+    Locale locale = new Locale("En", "Us", "Unix");
+    dateFormat1 = new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'", 
+                                       locale);
+    dateFormat2 = new SimpleDateFormat("EEEE, dd-MMM-yy hh:mm:ss 'GMT'", 
+                                       locale);
+    dateFormat3 = new SimpleDateFormat("EEE MMM d hh:mm:ss yyyy", locale);
+    dateformats_initialized = true;
   }
 }

--Boundary-00=_mRyPAJiAyt7UBbQ--




From MAILER-DAEMON Fri Feb 27 06:13:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Awfvt-0000JI-8E
	for mharc-commit-classpath@gnu.org; Fri, 27 Feb 2004 06:13:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Awfvp-0000Hj-UV
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:13:25 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AwfvI-00009X-W1
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:13:24 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AwfvI-00009T-EE
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:12:52 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-131.ewetel.net
	[80.228.95.131])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i1RBClVA002245
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:12:48 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AwfvD-0007WH-00
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:12:47 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 27 Feb 2004 12:12:48 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_wYyPAsCqtg95ybj"
Message-Id: <200402271212.49304.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.net.protocol.jar.Handler
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2004 11:13:27 -0000


--Boundary-00=_wYyPAsCqtg95ybj
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch which removes a redundant check for 
null.


Michael



--Boundary-00=_wYyPAsCqtg95ybj
Content-Type: text/x-diff;
  charset="us-ascii";
  name="jar.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="jar.diff"

Index: gnu/java/net/protocol/jar/Handler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/jar/Handler.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 Handler.java
--- gnu/java/net/protocol/jar/Handler.java	25 Dec 2003 16:36:55 -0000	1.8
+++ gnu/java/net/protocol/jar/Handler.java	27 Feb 2004 11:09:43 -0000
@@ -86,8 +86,7 @@
     // doing anything.
     String file = url.getFile();
     
-    if (file != null
-        && file != "")
+    if (!file.equals(""))
       { //has context url
 	url_string = url_string.substring (start, end);
         if (url_string.startsWith("/"))

--Boundary-00=_wYyPAsCqtg95ybj--




From MAILER-DAEMON Fri Feb 27 06:22:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Awg51-0003zW-Am
	for mharc-commit-classpath@gnu.org; Fri, 27 Feb 2004 06:22:55 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Awg4x-0003x4-EV
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:22:51 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Awg4F-0003l3-D4
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:22:38 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Awg4E-0003kv-Be
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:22:06 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-131.ewetel.net
	[80.228.95.131])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i1RBM1fq017974
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:22:02 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Awg49-0007XJ-00
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:22:01 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 27 Feb 2004 12:22:03 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_bhyPAx20CXg307u"
Message-Id: <200402271222.03096.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch:
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2004 11:22:52 -0000


--Boundary-00=_bhyPAx20CXg307u
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge some fixes for java.nio in 
libgcj trunk.


Michael


2004-02-27  Michael Koch  <konqueror@gmx.de>

	* gnu/java/nio/DatagramChannelImpl.java
	(send): Check if target address is resolved.
	* gnu/java/nio/FileLockImpl.java
	(finalize): Made protected.
	* java/nio/channels/FileChannel.java
	(MapMode.READ_ONLY): Made final.
	(MapMode.READ_WRITE): Made final.
	(MapMode.PRIVATE): Made final.
	* java/nio/channels/SocketChannel.java
	(open): Simplified code.
	* java/nio/channels/spi/AbstractSelectableChannel.java
	(registered): Unused, removed.
	(keyFor): Check channel is open, only locate key
	and not add a new one.
	(register): Don't delete attachments.


--Boundary-00=_bhyPAx20CXg307u
Content-Type: text/x-diff;
  charset="us-ascii";
  name="nio.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="nio.diff"

Index: gnu/java/nio/DatagramChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/DatagramChannelImpl.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 DatagramChannelImpl.java
--- gnu/java/nio/DatagramChannelImpl.java	6 Feb 2004 09:13:24 -0000	1.11
+++ gnu/java/nio/DatagramChannelImpl.java	27 Feb 2004 11:18:45 -0000
@@ -1,5 +1,5 @@
 /* DatagramChannelImpl.java -- 
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,10 +38,11 @@
 
 package gnu.java.nio;
 
+import gnu.java.net.PlainDatagramSocketImpl;
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
-import gnu.java.net.PlainDatagramSocketImpl;
+import java.net.InetSocketAddress;
 import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
 import java.nio.ByteBuffer;
@@ -256,6 +257,10 @@
     if (!isOpen())
       throw new ClosedChannelException();
     
+    if (target instanceof InetSocketAddress
+	&& ((InetSocketAddress) target).isUnresolved())
+      throw new IOException("Target address not resolved");
+
     byte[] buffer;
     int offset = 0;
     int len = src.remaining();
Index: gnu/java/nio/FileLockImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/FileLockImpl.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 FileLockImpl.java
--- gnu/java/nio/FileLockImpl.java	25 Jan 2004 13:26:08 -0000	1.4
+++ gnu/java/nio/FileLockImpl.java	27 Feb 2004 11:18:45 -0000
@@ -68,7 +68,7 @@
     this.fd = fd;
   }
 
-  public void finalize()
+  protected void finalize()
   {
     try
       {
Index: java/nio/channels/FileChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/FileChannel.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 FileChannel.java
--- java/nio/channels/FileChannel.java	14 Jul 2003 05:56:27 -0000	1.11
+++ java/nio/channels/FileChannel.java	27 Feb 2004 11:18:45 -0000
@@ -53,9 +53,9 @@
   {
     int m;
 
-    public static MapMode READ_ONLY  = new MapMode(0);
-    public static MapMode READ_WRITE = new MapMode(1);
-    public static MapMode PRIVATE    = new MapMode(2);
+    public static final MapMode READ_ONLY  = new MapMode(0);
+    public static final MapMode READ_WRITE = new MapMode(1);
+    public static final MapMode PRIVATE    = new MapMode(2);
 
     /**
      * Initializes the MapMode.
Index: java/nio/channels/SocketChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/SocketChannel.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 SocketChannel.java
--- java/nio/channels/SocketChannel.java	21 Dec 2002 11:42:37 -0000	1.9
+++ java/nio/channels/SocketChannel.java	27 Feb 2004 11:18:45 -0000
@@ -87,11 +87,7 @@
   public static SocketChannel open (SocketAddress remote) throws IOException
   {
     SocketChannel ch = open ();
-	
-    if (ch.connect (remote))
-      {
-      }
-    
+    ch.connect(remote);
     return ch;
   }
     
Index: java/nio/channels/spi/AbstractSelectableChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractSelectableChannel.java,v
retrieving revision 1.12
diff -u -b -B -r1.12 AbstractSelectableChannel.java
--- java/nio/channels/spi/AbstractSelectableChannel.java	6 Feb 2004 09:13:24 -0000	1.12
+++ java/nio/channels/spi/AbstractSelectableChannel.java	27 Feb 2004 11:18:45 -0000
@@ -48,7 +48,6 @@
 
 public abstract class AbstractSelectableChannel extends SelectableChannel
 {
-  private int registered;
   private boolean blocking = true;
   private Object LOCK = new Object();
   private SelectorProvider provider;
@@ -135,9 +134,15 @@
    */
   public final SelectionKey keyFor(Selector selector)
   {
+    if (! isOpen())
+      return null;
+    
     try
       {
-        return register (selector, 0, null);
+        synchronized(blockingLock())
+	  {
+	    return locate (selector);
+	  }
       }
     catch (Exception e)
       {
@@ -196,6 +201,7 @@
 
         if (key != null)
           {
+	    if (att != null)
             key.attach (att);
           }
         else

--Boundary-00=_bhyPAx20CXg307u--




From MAILER-DAEMON Fri Feb 27 06:33:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AwgFK-000288-6o
	for mharc-commit-classpath@gnu.org; Fri, 27 Feb 2004 06:33:34 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AwgFE-0001zY-N9
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:33:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AwgEc-0001Rb-HD
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:33:23 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AwgEb-0001O7-A5
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:32:49 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-131.ewetel.net
	[80.228.95.131])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i1RBWafq024232
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:32:36 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AwgEO-0007Xx-00
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:32:36 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 27 Feb 2004 12:32:38 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_WryPAi6tKEuohK/"
Message-Id: <200402271232.38147.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.StringBuffer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2004 11:33:32 -0000


--Boundary-00=_WryPAi6tKEuohK/
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just merged the attached patch written by Anthony Green from libgcj.


Michael


2004-02-27  Anthony Green  <green@redhat.com>

	* java/lang/StringBuffer.java: No need to NULL out remainder of
	buffer since ensureCapacity_unsynchronized will have done this for
	us.

 

--Boundary-00=_WryPAi6tKEuohK/
Content-Type: text/x-diff;
  charset="us-ascii";
  name="jlsb.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="jlsb.diff"

Index: java/lang/StringBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/StringBuffer.java,v
retrieving revision 1.25
diff -u -b -B -r1.25 StringBuffer.java
--- java/lang/StringBuffer.java	18 Oct 2003 08:45:37 -0000	1.25
+++ java/lang/StringBuffer.java	27 Feb 2004 11:29:51 -0000
@@ -1,5 +1,6 @@
 /* StringBuffer.java -- Growable strings
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -205,10 +206,26 @@
     if (newLength < 0)
       throw new StringIndexOutOfBoundsException(newLength);
 
+    int valueLength = value.length;
+
+    /* Always call ensureCapacity_unsynchronized in order to preserve
+       copy-on-write semantics.  */
     ensureCapacity_unsynchronized(newLength);
+
+    if (newLength < valueLength)
+      {
+        /* If the StringBuffer's value just grew, then we know that
+           value is newly allocated and the region between count and
+           newLength is filled with '\0'.  */
+	count = newLength;
+      }
+    else
+      {
+	/* The StringBuffer's value doesn't need to grow.  However,
+	   we should clear out any cruft that may exist.  */
     while (count < newLength)
       value[count++] = '\0';
-    count = newLength;
+      }
   }
 
   /**

--Boundary-00=_WryPAi6tKEuohK/--




From MAILER-DAEMON Fri Feb 27 06:44:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AwgPt-0004lB-1t
	for mharc-commit-classpath@gnu.org; Fri, 27 Feb 2004 06:44:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AwgPo-0004kC-Ht
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:44:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AwgPH-0004h9-Jv
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:44:23 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AwgOe-0004bQ-8h
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 06:43:12 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-131.ewetel.net
	[80.228.95.131])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i1RBh7MN015057
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:43:08 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AwgOZ-0007YZ-00
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 12:43:07 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 27 Feb 2004 12:43:09 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_N1yPAdc/wz0+++h"
Message-Id: <200402271243.09643.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing.AbstractButton
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2004 11:44:25 -0000


--Boundary-00=_N1yPAdc/wz0+++h
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to merge som changes I made to libgcj 
some time ago.


Michael


2004-02-27  Michael Koch  <konqueror@gmx.de>

	* javax/swing/AbstractButton.java: Made several constants final.


--Boundary-00=_N1yPAdc/wz0+++h
Content-Type: text/x-diff;
  charset="us-ascii";
  name="swing.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="swing.diff"

Index: javax/swing/AbstractButton.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractButton.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 AbstractButton.java
--- javax/swing/AbstractButton.java	14 Feb 2004 22:17:18 -0000	1.11
+++ javax/swing/AbstractButton.java	27 Feb 2004 11:40:19 -0000
@@ -233,61 +233,61 @@
   PropertyChangeListener actionPropertyChangeListener;
   
   /** Fired in a PropertyChangeEvent when the "borderPainted" property changes. */
-  public static String BORDER_PAINTED_CHANGED_PROPERTY = "borderPainted";
+  public static final String BORDER_PAINTED_CHANGED_PROPERTY = "borderPainted";
   
   /** Fired in a PropertyChangeEvent when the "contentAreaFilled" property changes. */
-  public static String CONTENT_AREA_FILLED_CHANGED_PROPERTY = "contentAreaFilled";
+  public static final String CONTENT_AREA_FILLED_CHANGED_PROPERTY = "contentAreaFilled";
   
   /** Fired in a PropertyChangeEvent when the "disabledIcon" property changes. */
-  public static String DISABLED_ICON_CHANGED_PROPERTY = "disabledIcon";
+  public static final String DISABLED_ICON_CHANGED_PROPERTY = "disabledIcon";
   
   /** Fired in a PropertyChangeEvent when the "disabledSelectedIcon" property changes. */
-  public static String DISABLED_SELECTED_ICON_CHANGED_PROPERTY = "disabledSelectedIcon";
+  public static final String DISABLED_SELECTED_ICON_CHANGED_PROPERTY = "disabledSelectedIcon";
   
   /** Fired in a PropertyChangeEvent when the "focusPainted" property changes. */
-  public static String FOCUS_PAINTED_CHANGED_PROPERTY = "focusPainted";
+  public static final String FOCUS_PAINTED_CHANGED_PROPERTY = "focusPainted";
 
   /** Fired in a PropertyChangeEvent when the "horizontalAlignment" property changes. */
-  public static String HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY = "horizontalAlignment";
+  public static final String HORIZONTAL_ALIGNMENT_CHANGED_PROPERTY = "horizontalAlignment";
 
   /** Fired in a PropertyChangeEvent when the "horizontalTextPosition" property changes. */
-  public static String HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY = "horizontalTextPosition";
+  public static final String HORIZONTAL_TEXT_POSITION_CHANGED_PROPERTY = "horizontalTextPosition";
 
   /** Fired in a PropertyChangeEvent when the "icon" property changes. */
-  public static String ICON_CHANGED_PROPERTY = "icon";
+  public static final String ICON_CHANGED_PROPERTY = "icon";
 
   /** Fired in a PropertyChangeEvent when the "margin" property changes. */
-  public static String MARGIN_CHANGED_PROPERTY = "margin";
+  public static final String MARGIN_CHANGED_PROPERTY = "margin";
 
   /** Fired in a PropertyChangeEvent when the "mnemonic" property changes. */
-  public static String MNEMONIC_CHANGED_PROPERTY = "mnemonic";
+  public static final String MNEMONIC_CHANGED_PROPERTY = "mnemonic";
 
   /** Fired in a PropertyChangeEvent when the "model" property changes. */
-  public static String MODEL_CHANGED_PROPERTY = "model";
+  public static final String MODEL_CHANGED_PROPERTY = "model";
 
   /** Fired in a PropertyChangeEvent when the "pressedIcon" property changes. */
-  public static String PRESSED_ICON_CHANGED_PROPERTY = "pressedIcon";
+  public static final String PRESSED_ICON_CHANGED_PROPERTY = "pressedIcon";
 
   /** Fired in a PropertyChangeEvent when the "rolloverEnabled" property changes. */
-  public static String ROLLOVER_ENABLED_CHANGED_PROPERTY = "rolloverEnabled";
+  public static final String ROLLOVER_ENABLED_CHANGED_PROPERTY = "rolloverEnabled";
 
   /** Fired in a PropertyChangeEvent when the "rolloverIcon" property changes. */
-  public static String ROLLOVER_ICON_CHANGED_PROPERTY = "rolloverIcon";
+  public static final String ROLLOVER_ICON_CHANGED_PROPERTY = "rolloverIcon";
   
   /** Fired in a PropertyChangeEvent when the "rolloverSelectedIcon" property changes. */
-  public static String ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY = "rolloverSelectedIcon";
+  public static final String ROLLOVER_SELECTED_ICON_CHANGED_PROPERTY = "rolloverSelectedIcon";
   
   /** Fired in a PropertyChangeEvent when the "selectedIcon" property changes. */
-  public static String SELECTED_ICON_CHANGED_PROPERTY = "selectedIcon";
+  public static final String SELECTED_ICON_CHANGED_PROPERTY = "selectedIcon";
 
   /** Fired in a PropertyChangeEvent when the "text" property changes. */
-  public static String TEXT_CHANGED_PROPERTY = "text";
+  public static final String TEXT_CHANGED_PROPERTY = "text";
 
   /** Fired in a PropertyChangeEvent when the "verticalAlignment" property changes. */
-  public static String VERTICAL_ALIGNMENT_CHANGED_PROPERTY = "verticalAlignment";
+  public static final String VERTICAL_ALIGNMENT_CHANGED_PROPERTY = "verticalAlignment";
 
   /** Fired in a PropertyChangeEvent when the "verticalTextPosition" property changes. */
-  public static String VERTICAL_TEXT_POSITION_CHANGED_PROPERTY = "verticalTextPosition";
+  public static final String VERTICAL_TEXT_POSITION_CHANGED_PROPERTY = "verticalTextPosition";
 
     /**
    * A Java Accessibility extension of the AbstractButton.

--Boundary-00=_N1yPAdc/wz0+++h--




From MAILER-DAEMON Fri Feb 27 07:11:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Awgpq-0006r6-EO
	for mharc-commit-classpath@gnu.org; Fri, 27 Feb 2004 07:11:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Awgpa-0006nc-VC
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 07:11:03 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Awgp3-0006hG-Dm
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 07:11:00 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Awgp2-0006hA-Oc
	for commit-classpath@gnu.org; Fri, 27 Feb 2004 07:10:28 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-131.ewetel.net
	[80.228.95.131])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i1RCANqb002273
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 13:10:24 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Awgox-0007h9-00
	for <commit-classpath@gnu.org>; Fri, 27 Feb 2004 13:10:23 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 27 Feb 2004 13:10:25 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_xOzPA66tLaUSslN"
Message-Id: <200402271310.25571.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.Thread
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2004 12:11:15 -0000


--Boundary-00=_xOzPA66tLaUSslN
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to make java.lang.Thread more merged 
with libgcj's version.


Michael


2004-02-27  Michael Koch  <konqueror@gmx.de>

	* java/lang/Thread.java: Rearranged some methods. Renamed some
	variables.
	(runnable): Renamed from 'toRun'.
	(destroy): Just throw NoSuchMedthodError as Sun does.
	(setContextClassLoader): Made sychronized.


--Boundary-00=_xOzPA66tLaUSslN
Content-Type: text/x-diff;
  charset="us-ascii";
  name="thread.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="thread.diff"

Index: java/lang/Thread.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Thread.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 Thread.java
--- java/lang/Thread.java	4 Feb 2004 08:45:38 -0000	1.5
+++ java/lang/Thread.java	27 Feb 2004 12:07:30 -0000
@@ -107,7 +107,7 @@
   volatile ThreadGroup group;
 
   /** The object to run(), null if this is the target. */
-  final Runnable toRun;
+  final Runnable runnable;
 
   /** The thread name, non-null. */
   volatile String name;
@@ -183,50 +183,55 @@
   }
 
   /**
-   * Allocate a new Thread object, as if by
-   * <code>Thread(null, toRun, <i>fake name</i>)</code>, where the fake name
-   * is "Thread-" + <i>unique integer</i>.
+   * Allocates a new <code>Thread</code> object. This constructor has
+   * the same effect as <code>Thread(null, target,</code>
+   * <i>gname</i><code>)</code>, where <i>gname</i> is
+   * a newly generated name. Automatically generated names are of the
+   * form <code>"Thread-"+</code><i>n</i>, where <i>n</i> is an integer.
    *
-   * @param toRun the Runnable object to execute
-   * @see #Thread(ThreadGroup, Runnable, String)
+   * @param target the object whose <code>run</code> method is called.
+   * @see java.lang.Thread#Thread(java.lang.ThreadGroup,
+   *                              java.lang.Runnable, java.lang.String)
    */
-  public Thread(Runnable toRun)
+  public Thread(Runnable target)
   {
-    this(null, toRun);
+    this(null, target);
   }
   
   /**
-   * Allocate a new Thread object, as if by
-   * <code>Thread(group, toRun, <i>fake name</i>)</code>, where the fake name
-   * is "Thread-" + <i>unique integer</i>.
+   * Allocates a new <code>Thread</code> object. This constructor has
+   * the same effect as <code>Thread(null, null, name)</code>.
    *
-   * @param group the group to put the Thread into
-   * @param target the Runnable object to execute
-   * @throws SecurityException if this thread cannot access <code>group</code>
-   * @throws IllegalThreadStateException if group is destroyed
-   * @see #Thread(ThreadGroup, Runnable, String)
+   * @param   name   the name of the new thread.
+   * @see     java.lang.Thread#Thread(java.lang.ThreadGroup,
+   *          java.lang.Runnable, java.lang.String)
    */
-  public Thread(ThreadGroup group, Runnable toRun)
+  public Thread(String name)
   {
-    this(group, toRun, "Thread-" + ++numAnonymousThreadsCreated, 0);
+    this(null, null, name, 0);
   }
 
   /**
-   * Allocate a new Thread object, as if by
-   * <code>Thread(null, null, name)</code>.
+   * Allocates a new <code>Thread</code> object. This constructor has
+   * the same effect as <code>Thread(group, target,</code>
+   * <i>gname</i><code>)</code>, where <i>gname</i> is
+   * a newly generated name. Automatically generated names are of the
+   * form <code>"Thread-"+</code><i>n</i>, where <i>n</i> is an integer.
    *
-   * @param name the name for the Thread
-   * @throws NullPointerException if name is null
+   * @param group the group to put the Thread into
+   * @param target the Runnable object to execute
+   * @throws SecurityException if this thread cannot access <code>group</code>
+   * @throws IllegalThreadStateException if group is destroyed
    * @see #Thread(ThreadGroup, Runnable, String)
    */
-  public Thread(String name)
+  public Thread(ThreadGroup group, Runnable target)
   {
-    this(null, null, name, 0);
+    this(group, target, "Thread-" + ++numAnonymousThreadsCreated, 0);
   }
 
   /**
-   * Allocate a new Thread object, as if by
-   * <code>Thread(group, null, name)</code>.
+   * Allocates a new <code>Thread</code> object. This constructor has
+   * the same effect as <code>Thread(group, null, name)</code>
    *
    * @param group the group to put the Thread into
    * @param name the name for the Thread
@@ -241,17 +246,17 @@
   }
 
   /**
-   * Allocate a new Thread object, as if by
-   * <code>Thread(group, null, name)</code>.
+   * Allocates a new <code>Thread</code> object. This constructor has
+   * the same effect as <code>Thread(null, target, name)</code>.
    *
-   * @param toRun the Runnable object to execute
+   * @param target the Runnable object to execute
    * @param name the name for the Thread
    * @throws NullPointerException if name is null
    * @see #Thread(ThreadGroup, Runnable, String)
    */
-  public Thread(Runnable toRun, String name)
+  public Thread(Runnable target, String name)
   {
-    this(null, toRun, name, 0);
+    this(null, target, name, 0);
   }
 
   /**
@@ -283,9 +288,9 @@
    * @see SecurityManager#checkAccess(ThreadGroup)
    * @see ThreadGroup#checkAccess()
    */
-  public Thread(ThreadGroup group, Runnable toRun, String name)
+  public Thread(ThreadGroup group, Runnable target, String name)
   {
-    this(group, toRun, name, 0);
+    this(group, target, name, 0);
   }
 
   /**
@@ -308,7 +313,7 @@
    * @throws IllegalThreadStateException if group is destroyed
    * @since 1.4
    */
-  public Thread(ThreadGroup group, Runnable toRun, String name, long size)
+  public Thread(ThreadGroup group, Runnable target, String name, long size)
   {
     // Bypass System.getSecurityManager, for bootstrap efficiency.
     SecurityManager sm = Runtime.securityManager;
@@ -326,7 +331,7 @@
     this.group = group;
     // Use toString hack to detect null.
     this.name = name.toString();
-    this.toRun = toRun;
+    this.runnable = target;
     this.stacksize = size;
 
     priority = current.priority;
@@ -350,7 +355,7 @@
   Thread(VMThread vmThread, String name, int priority, boolean daemon)
   {
     this.vmThread = vmThread;
-    this.toRun = null;
+    this.runnable = null;
     if (name == null)
 	name = "Thread-" + ++numAnonymousThreadsCreated;
     this.name = name;
@@ -423,6 +428,7 @@
    */
   public void destroy()
   {
+    throw new NoSuchMethodError();
   }
   
   /**
@@ -492,7 +498,7 @@
    * Checks whether the current thread holds the monitor on a given object.
    * This allows you to do <code>assert Thread.holdsLock(obj)</code>.
    *
-   * @param obj the object to check
+   * @param obj the object to test lock ownership on.
    * @return true if the current thread is currently synchronized on obj
    * @throws NullPointerException if obj is null
    * @since 1.4
@@ -655,14 +661,14 @@
    */
   public void run()
   {
-    if (toRun != null)
-      toRun.run();
+    if (runnable != null)
+      runnable.run();
   }
 
   /**
    * Set the daemon status of this Thread.  If this is a daemon Thread, then
    * the VM may exit even if it is still running.  This may only be called
-   * while the Thread is not running. There may be a security check,
+   * before the Thread starts running. There may be a security check,
    * <code>checkAccess</code>.
    *
    * @param daemon whether this should be a daemon thread or not
@@ -693,7 +699,7 @@
    * @see setContextClassLoader(ClassLoader)
    * @since 1.2
    */
-  public ClassLoader getContextClassLoader()
+  public synchronized ClassLoader getContextClassLoader()
   {
     // Bypass System.getSecurityManager, for bootstrap efficiency.
     SecurityManager sm = Runtime.securityManager;
@@ -715,7 +721,7 @@
    * @see getContextClassLoader()
    * @since 1.2
    */
-  public void setContextClassLoader(ClassLoader classloader)
+  public synchronized void setContextClassLoader(ClassLoader classloader)
   {
     SecurityManager sm = System.getSecurityManager();
     if (sm != null)

--Boundary-00=_xOzPA66tLaUSslN--




From MAILER-DAEMON Sat Feb 28 00:00:41 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Awwaf-0000Kb-2o
	for mharc-commit-classpath@gnu.org; Sat, 28 Feb 2004 00:00:41 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Awwab-0000Go-CQ
	for commit-classpath@gnu.org; Sat, 28 Feb 2004 00:00:37 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Awwa2-00087T-3Y
	for commit-classpath@gnu.org; Sat, 28 Feb 2004 00:00:33 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Awwa1-000868-Da
	for commit-classpath@gnu.org; Sat, 28 Feb 2004 00:00:01 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 857A4622CE
	for <commit-classpath@gnu.org>; Sat, 28 Feb 2004 04:59:57 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 79707-01 for <commit-classpath@gnu.org>;
	Sat, 28 Feb 2004 04:59:57 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-66-179.adsl.solnet.ch
	[212.41.66.179])
	by mail01.solnet.ch (Postfix) with ESMTP id 8443C622B9
	for <commit-classpath@gnu.org>; Sat, 28 Feb 2004 04:59:56 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 68C7D8DFC4; Sat, 28 Feb 2004 05:58:58 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040228045858.68C7D8DFC4@reali.dnsalias.net>
Date: Sat, 28 Feb 2004 05:58:58 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Subject: classpath daily snapshot 20040228 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Feb 2004 05:00:39 -0000




From MAILER-DAEMON Sat Feb 28 09:36:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1Ax5Vl-0000Vz-5g
	for mharc-commit-classpath@gnu.org; Sat, 28 Feb 2004 09:32:13 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1Ax5RU-0007eO-8X
	for commit-classpath@gnu.org; Sat, 28 Feb 2004 09:27:48 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1Ax5K8-0005dL-Ju
	for commit-classpath@gnu.org; Sat, 28 Feb 2004 09:20:44 -0500
Received: from [62.4.17.106] (helo=mallaury.noc.nerim.net)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1Ax5K7-0005cM-VT
	for commit-classpath@gnu.org; Sat, 28 Feb 2004 09:20:12 -0500
Received: from kaffe.org (lavaux.net1.nerim.net [62.212.115.70])
	by mallaury.noc.nerim.net (Postfix) with ESMTP id 5E0AC62D98
	for <commit-classpath@gnu.org>; Sat, 28 Feb 2004 15:20:06 +0100 (CET)
Message-ID: <4040A397.9090401@kaffe.org>
Date: Sat, 28 Feb 2004 15:20:07 +0100
From: Guilhem Lavaux <guilhem@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.5) Gecko/20031007
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath@gnu.org
X-Enigmail-Version: 0.82.5.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: multipart/mixed; boundary="------------040501050901060104050006"
Subject: FYI: java.text.AttributedStringIterator
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Feb 2004 14:27:50 -0000

This is a multi-part message in MIME format.
--------------040501050901060104050006
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Hi,

Here is an obvious fix concerning AttributedStringIterator. 
end_index represents the first character which is not 
concerned by the attribute and so we must have a strict 
inequality.

ChangeLog:

2004-02-28    Guilhem Lavaux <guilhem@kaffe.org>

     * java/text/AttributedStringIterator.java
     (getAllAttributesKey): Return only keys concerned
     by the current iterator.
     (getAttributes): Use strict inequality for
     end_index.



--------------040501050901060104050006
Content-Type: text/plain;
 name="text_patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="text_patch"

Index: java/text/AttributedStringIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedStringIterator.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 AttributedStringIterator.java
--- java/text/AttributedStringIterator.java	22 Jan 2002 22:27:01 -0000	1.4
+++ java/text/AttributedStringIterator.java	28 Feb 2004 11:14:42 -0000
@@ -181,6 +181,10 @@
 
   for (int i = 0; i < attribs.length; i++)
     {
+      if (attribs[i].begin_index > getEndIndex()
+	  || attribs[i].end_index <= getBeginIndex())
+	continue;
+
       Set key_set = attribs[i].attribs.keySet();
       Iterator iter = key_set.iterator();
       while (iter.hasNext())
@@ -327,7 +331,7 @@
           // Check for attribute match and range match
           if (obj.equals(attrib))
             if ((ci.getIndex() >= attribs[i].begin_index) &&
-                (ci.getIndex() <= attribs[i].end_index))
+                (ci.getIndex() < attribs[i].end_index))
               return(attribs[i].attribs.get(obj));
         }
     }
@@ -351,7 +355,7 @@
   for (int i = 0; i < attribs.length; i++)
     {
        if ((ci.getIndex() >= attribs[i].begin_index) &&
-           (ci.getIndex() <= attribs[i].end_index))
+           (ci.getIndex() < attribs[i].end_index))
          m.putAll(attribs[i].attribs);
     }
 

--------------040501050901060104050006--




From MAILER-DAEMON Sun Feb 29 00:00:22 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1AxJ3t-0001n6-G0
	for mharc-commit-classpath@gnu.org; Sun, 29 Feb 2004 00:00:21 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1AxJ3r-0001mM-6W
	for commit-classpath@gnu.org; Sun, 29 Feb 2004 00:00:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1AxJ3K-0001Xe-CG
	for commit-classpath@gnu.org; Sun, 29 Feb 2004 00:00:18 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1AxJ3K-0001XW-1N
	for commit-classpath@gnu.org; Sat, 28 Feb 2004 23:59:46 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id C55E362260
	for <commit-classpath@gnu.org>; Sun, 29 Feb 2004 04:59:41 +0000 (GMT)
Received: from localhost ([127.0.0.1])
	by localhost (mail01.solnet.ch [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 37145-04 for <commit-classpath@gnu.org>;
	Sun, 29 Feb 2004 04:59:41 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-66-179.adsl.solnet.ch
	[212.41.66.179])
	by mail01.solnet.ch (Postfix) with ESMTP id C7DD162252
	for <commit-classpath@gnu.org>; Sun, 29 Feb 2004 04:59:40 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 0FDC48F457; Sun, 29 Feb 2004 05:58:40 +0100 (CET)
To: commit-classpath@gnu.org
Message-Id: <20040229045840.0FDC48F457@reali.dnsalias.net>
Date: Sun, 29 Feb 2004 05:58:40 +0100 (CET)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Subject: classpath daily snapshot 20040229 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Feb 2004 05:00:19 -0000




