From MAILER-DAEMON Thu Apr 01 05:48:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B8zkI-0005VS-6D
	for mharc-commit-classpath@gnu.org; Thu, 01 Apr 2004 05:48:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B8zkA-0005RQ-OM
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 05:48:18 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B8zk5-0005NG-Bi
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 05:48:15 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B8zjy-0005MS-Lb
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 05:48:06 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1B8zjt-0006l3-00
	for <commit-classpath@gnu.org>; Thu, 01 Apr 2004 12:48:01 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-OSNC+vYzfwMiCKxav2Yc"
Message-Id: <1080816483.26699.151.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Thu, 01 Apr 2004 12:48:03 +0200
Subject: Tiny JViewport fix
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 01 Apr 2004 10:48:20 -0000


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

Hi,

The following makes the swingtest (see main mailinglist) actually
compilable.

2004-04-01  Mark Wielaard  <mark@klomp.org>

       * javax/swing/JViewport.java (JViewport): Make constructor public.

Discussed on irc with Graydon. Committed.

Cheers,

Mark

--- javax/swing/JViewport.java  19 Mar 2004 21:22:24 -0000      1.5
+++ javax/swing/JViewport.java  1 Apr 2004 10:46:22 -0000
@@ -121,7 +121,7 @@
                                                                           =
    =20
   Point lastPaintPosition;
 =20
-  JViewport()
+  public JViewport()
   {
     setOpaque(true);
     updateUI();


--=-OSNC+vYzfwMiCKxav2Yc
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)

iD8DBQBAa/NixVhZCJWr9QwRAr46AJ90aw6eU0Nq5xN+dpB1ExPD6skCQACfcZtf
xaCLCCSzdwwiMrjY9SMqSlE=
=0KQL
-----END PGP SIGNATURE-----

--=-OSNC+vYzfwMiCKxav2Yc--




From MAILER-DAEMON Thu Apr 01 08:49:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B92Zp-000846-8f
	for mharc-commit-classpath@gnu.org; Thu, 01 Apr 2004 08:49:49 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B92Zl-00082n-Rq
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 08:49:45 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B91kj-0000vK-On
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 07:57:32 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B91Ik-0007Oh-OV
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 07:28:06 -0500
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Thu, 1 Apr 2004 14:26:56 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADCB6@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: java.text.DecimalFormat
Thread-Index: AcQX5J8qgOzDjaCxQS+h8eJvrQ7zXw==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "commit-classpath" <commit-classpath@gnu.org>
Subject: FYI: Patch: java.text.DecimalFormat
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 01 Apr 2004 13:49:46 -0000

Hi,

I committed below patch.

Regards,
Jeroen

2004-04-01  Jeroen Frijters  <jeroen@frijters.net>

        * java/text/DecimalFormat.java (scanFix): Removed suffix check
        for percent and permill check.


Index: java/text/DecimalFormat.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/text/DecimalFormat.java,v
retrieving revision 1.11
diff -u -r1.11 DecimalFormat.java
--- java/text/DecimalFormat.java	15 Nov 2003 21:45:27 -0000
1.11
+++ java/text/DecimalFormat.java	1 Apr 2004 12:20:04 -0000
@@ -90,7 +90,7 @@
 	    else
 	      buf.append(syms.getCurrencySymbol());
 	  }
-	else if (is_suffix && c =3D=3D syms.getPercent())
+	else if (c =3D=3D syms.getPercent())
 	  {
 	    if (multiplierSet)
 	      throw new IllegalArgumentException ("multiplier already
set " +
@@ -99,7 +99,7 @@
 	    multiplier =3D 100;
 	    buf.append(c);
 	  }
-	else if (is_suffix && c =3D=3D syms.getPerMill())
+	else if (c =3D=3D syms.getPerMill())
 	  {
 	    if (multiplierSet)
 	      throw new IllegalArgumentException ("multiplier already
set " +



From MAILER-DAEMON Thu Apr 01 12:08:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B95gF-0000ru-ML
	for mharc-commit-classpath@gnu.org; Thu, 01 Apr 2004 12:08:39 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B95gC-0000qp-T3
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 12:08:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B95ab-0008Ae-7u
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 12:03:20 -0500
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1B95Yw-0007k4-Ui
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 12:01:06 -0500
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1B95Z9-0001ri-9k
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 12:01:19 -0500
From: "anonymous" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:80 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8413
User-Agent: Mozilla/5.0 (Macintosh; U; PPC; en-US;
	rv:1.3.1) Gecko/20030723 wamcom.org
X-Apparently-From: 216.254.85.72
X-Copy-To: Array
Message-Id: <E1B95Z9-0001ri-9k@savannah.gnu.org>
Date: Thu, 01 Apr 2004 12:01:20 -0500
Subject: [bugs #8413] IntBuffer.compareTo is non-transitive
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 01 Apr 2004 17:08:38 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.




/**************************************************************************/
[bugs #8413] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8413>
Project: classpath
Submitted by: 0
On: Thu 04/01/04 at 12:01

Severity:  5 - Average
Resolution:  None
Assigned to:  None
Status:  Open
Platform Version:  None


Summary:  IntBuffer.compareTo is non-transitive

Original Submission:  
I think I noticed a bug in the Gnu Classpath implementation of java.nio.IntBuffer while browsing CVS and I wouldn't be surprised if the same bug is present in the other buffer classes as well. FYI, I have never seen the Sun source code for the java.nio classes.

The compareTo method begins like this:

  public int compareTo (Object obj)
  {
    IntBuffer a = (IntBuffer) obj;

    if (a.remaining () != remaining ())
      return 1;

This fails transitivity. Consider two buffers a and b with different remaining sizes:

a.compareTo(b) returns 1 and b.compareTo(a) returns 1. In other words a > b and b > a. 

I have not actually written test code for this, so possibly I'm missing something. If so, I apologize. Also my apologies if this is a duplicate report. Savannah was acting up and I couldn't search the bug database. :-(

I suspect you need something like this instead:

    if (a.remaining () != remaining ()) {
        if (a.remaining() > b.remaining) return 1;
        else return -1;
  }

However, I don't yet know which case should return 1 and which one should return -1. 












For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8413>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Thu Apr 01 13:31:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B96y0-0004KV-Q1
	for mharc-commit-classpath@gnu.org; Thu, 01 Apr 2004 13:31:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B96mW-0000RR-8e
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 13:19:12 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B96gX-0006Sc-0M
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 13:13:32 -0500
Received: from [207.174.178.92] (helo=email2.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1B96X1-0002MZ-0q
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 13:03:11 -0500
Received: (qmail 1135 invoked from network); 1 Apr 2004 18:04:20 -0000
Received: from tf0229.peakpeak.com (HELO fleche.redhat.com) ([204.144.239.229])
	(envelope-sender <tromey@redhat.com>)
	by email2.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 1 Apr 2004 18:04:20 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 537A74F8080; Thu,  1 Apr 2004 10:49:42 -0700 (MST)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Yow!  Am I in Milwaukee?
Date: 01 Apr 2004 10:49:42 -0700
Message-ID: <877jwzegg9.fsf@fleche.redhat.com>
Lines: 32
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: remove unused label
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 01 Apr 2004 18:30:56 -0000

I'm checking this in.  This removes an unused label.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* java/security/Security.java (provides): Removed unused label.

Index: java/security/Security.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/Security.java,v
retrieving revision 1.26
diff -u -r1.26 Security.java
--- java/security/Security.java 30 Nov 2003 14:49:59 -0000 1.26
+++ java/security/Security.java 1 Apr 2004 17:32:31 -0000
@@ -1,5 +1,5 @@
 /* Security.java --- Java base security class implementation
-   Copyright (C) 1999, 2001, 2002, 2003, Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -670,7 +670,7 @@
     outer: for (int r = 0; r < 3; r++) // guard against circularity
       {
         serviceDotAlgorithm = (svc+"."+String.valueOf(algo)).trim();
-        inner: for (it = p.keySet().iterator(); it.hasNext(); )
+        for (it = p.keySet().iterator(); it.hasNext(); )
           {
             key = (String) it.next();
             if (key.equalsIgnoreCase(serviceDotAlgorithm)) // eureka



From MAILER-DAEMON Thu Apr 01 23:01:25 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9FrS-00050D-GI
	for mharc-commit-classpath@gnu.org; Thu, 01 Apr 2004 23:00:54 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9Fr9-0004WO-G0
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 23:00:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9FqP-0002tn-J6
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 23:00:23 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9FqO-0002qp-5d
	for commit-classpath@gnu.org; Thu, 01 Apr 2004 22:59:48 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 642C86223F
	for <commit-classpath@gnu.org>; Fri,  2 Apr 2004 03:59:47 +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 54008-05 for <commit-classpath@gnu.org>;
	Fri,  2 Apr 2004 03:59:46 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-89.adsl.solnet.ch [212.41.79.89])
	by mail01.solnet.ch (Postfix) with ESMTP id 4CB4B6224D
	for <commit-classpath@gnu.org>; Fri,  2 Apr 2004 03:59:46 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 00C68B67EB; Fri,  2 Apr 2004 05:58:04 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040402035804.00C68B67EB@reali.dnsalias.net>
Date: Fri,  2 Apr 2004 05:58:04 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Subject: classpath daily snapshot 20040402 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 04:00:50 -0000




From MAILER-DAEMON Fri Apr 02 03:50:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9KNb-0002UG-N5
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 03:50:23 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9KNV-0002Q3-Gk
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 03:50:17 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9KLv-0001mU-IT
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 03:49:11 -0500
Received: from [132.208.250.6] (helo=anis.telecom.uqam.ca)
	by monty-python.gnu.org with esmtp (Exim 4.30)
	id 1B9KLu-0001iW-2A; Fri, 02 Apr 2004 03:48:38 -0500
Received: from anis4.telecom.uqam.ca (anis4.telecom.uqam.ca [132.208.250.236])
	by sortant.uqam.ca (8.12.10/8.12.1) with SMTP id i328jRKx009432;
	Fri, 2 Apr 2004 03:45:37 -0500 (EST)
Received: from antivirus.uqam.ca ([132.208.250.6])
	by anis4.telecom.uqam.ca (SAVSMTP 3.1.1.32) with SMTP id
	M2004040203465108446 ; Fri, 02 Apr 2004 03:46:51 -0500
Received: from perseval.info.uqam.ca (perseval.info.uqam.ca [132.208.137.96])
	by intrant.uqam.ca (8.12.10/8.12.2/uqam-filtres) with ESMTP id
	i328fvk0004103; Fri, 2 Apr 2004 03:41:58 -0500 (EST)
X-Spam-Filter: Filtre-Uqam re:  abuse@uqam.ca
Received: from localhost ([127.0.0.1] helo=uqam.ca)
	by perseval.info.uqam.ca with esmtp (Exim 4.30)
	id 1B9KFS-0006ZX-1w; Fri, 02 Apr 2004 03:41:58 -0500
Message-ID: <406D1FCF.5080208@uqam.ca>
Date: Fri, 02 Apr 2004 03:09:51 -0500
From: Etienne Gagnon <gagnon.etienne_m@uqam.ca>
Organization: UQAM
User-Agent: Mozilla/5.0 (X11; U; Linux ppc; en-US;
	rv:1.6) Gecko/20040314 Debian/1.6-3
X-Accept-Language: en
MIME-Version: 1.0
To: tromey@redhat.com
References: <40671825.1070100@uqam.ca>
	<406719C5.2030806@uqam.ca>	<40671B8B.7000209@uqam.ca>
	<87d66sfp9m.fsf@fleche.redhat.com>
In-Reply-To: <87d66sfp9m.fsf@fleche.redhat.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: GNU Classpath <classpath@gnu.org>, commit-classpath@gnu.org
Subject: Re: Rant [Was: Unresolved CVS conflict]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 08:50:19 -0000

Tom Tromey wrote:
> Etienne> It would be so much easier if we had something like:
> Etienne> $ svn st
> 
> I don't know what this is.
> 
> If it is some kind of "what is the status of my working tree?" query,
> I recommend the cvsutils (or is it cvs-utils?  I recommend both...)
> for this sort of thing.  I probably use "cvsu" 50 times a day.

It is somewhat similar, but this is a "client-side"-only operation
with Subversion (much faster and does not require network access).

> Etienne> I vote for Subversion (I see no need for distributed
> Etienne> classpath repository).
> 
> I've been hoping to use monotone (http://www.venge.net/monotone/) to
> help with classpath/libgcj merges.  A system like this would help us a
> lot...  unfortunately it isn't quite ready for this yet.

Subversion is now stable.  I have been using it since May 2003, and have
had no problem with it.  It has many interesting features.  It is not
a "patches flowing across the Internet" find of system (like arch,
monotone, bit-keeper), but a more traditional "central repository"
system.  But, this central repository is stored in a database, which
is very good for many reasons:
1- real transactions on commits
2- no problems associated with the number of created files for huge
    projects (e.g. granularity of space allocation in file system, etc).
3- easy to back-up (even *hot* backups!)

I think the best way to see what it is all about is to look at
  http://subversion.tigris.org/
and read the *excellent* Free online book at:
  http://svnbook.red-bean.com/


> Etienne> Arch is nice but does not allow a single file to be split
> Etienne> (which does happen regularly, specially when doing
> Etienne> Object-Oriented development, e.g. spin-off package classes
> Etienne> [Method=> Method + VMMethod]).
> 
> Subversion can do this?

Of course!  Arch's main architect thinks that this should not be needed
(and argues strongly about "splitting" files), as it would break Arch's
view of "merging".  But, my experience is that splitting a file *does*
happen.  It has happened in the past in Classpath, and I have also
experienced a few file splits in my SableCC project.  Preserving history
in case of splits is, in my opinion, as needed as preserving history
in case of file rename/move (which is broken in CVS).

Etienne

-- 
Etienne M. Gagnon, Ph.D.             http://www.info.uqam.ca/~egagnon/
SableVM:                                       http://www.sablevm.org/
SableCC:                                       http://www.sablecc.org/



From MAILER-DAEMON Fri Apr 02 08:51:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9NrC-0006ab-AA
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 07:33:10 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9NIa-0003CF-Sj
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 06:57:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9NGz-0002CH-2m
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 06:56:16 -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 1B9NEi-0001Sw-Vv; Fri, 02 Apr 2004 06:53:25 -0500
Received: from [195.18.123.2] (helo=kiev.dev.factotummedia.nl)
	by mx20.gnu.org with esmtp (Exim 4.30)
	id 1B9N3L-0001Tc-OF; Fri, 02 Apr 2004 06:41:39 -0500
Received: from amavis by kiev.dev.factotummedia.nl with scanned-ok (Exim 3.35
	#1 (Debian)) id 1B9N0l-0002bF-00; Fri, 02 Apr 2004 13:38:59 +0200
Received: from kiev.dev.factotummedia.nl ([127.0.0.1])
	by localhost (kiev [127.0.0.1]) (amavisd-new, port 10024) with ESMTP
	id 09933-01; Fri, 2 Apr 2004 13:38:58 +0200 (CEST)
Received: from pc-thomas.dev.factotummedia.nl ([192.168.3.104])
	by kiev.dev.factotummedia.nl with esmtp (Exim 3.35 #1 (Debian))
	id 1B9N0k-0002b8-00; Fri, 02 Apr 2004 13:38:58 +0200
From: Thomas <zander@javalobby.org>
To: classpath@gnu.org
Date: Fri, 2 Apr 2004 13:41:56 +0200
User-Agent: KMail/1.6.1
References: <40671825.1070100@uqam.ca> <87d66sfp9m.fsf@fleche.redhat.com>
	<406D1FCF.5080208@uqam.ca>
In-Reply-To: <406D1FCF.5080208@uqam.ca>
MIME-Version: 1.0
Content-Disposition: inline
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Message-Id: <200404021342.23992.zander@javalobby.org>
X-Virus-Scanned: by amavisd-new (Debian) at dev.factotummedia.nl
X-Mailman-Approved-At: Fri, 02 Apr 2004 07:33:07 -0500
Cc: commit-classpath@gnu.org
Subject: Re: Rant [Was: Unresolved CVS conflict]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 11:59:11 -0000

=2D----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On Friday 02 April 2004 10:09, Etienne Gagnon wrote:
> > Etienne> Arch is nice but does not allow a single file to be split
> > Etienne> (which does happen regularly, specially when doing
> > Etienne> Object-Oriented development, e.g. spin-off package classes
> > Etienne> [Method=3D> Method + VMMethod]).
> >
> > Subversion can do this?
>
> Of course! =A0Arch's main architect thinks that this should not be needed
> (and argues strongly about "splitting" files), as it would break Arch's
> view of "merging". =A0But, my experience is that splitting a file *does*
> happen.

I tried Arch and found it impossible to use; and really impossible to expla=
in=20
to co-workers that just want to commit. Its very clear the main architect i=
s=20
a long time c-hacker. As arch does not really fit OO code structuring very=
=20
well.  It certainly failed miserably in the error handling and (therefor)=20
usability department.

I never tried subversion; but I still plan to do a pilot on it for my=20
companies development team.

=2D --=20
Regards
Thomas
=2D----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQFAbVGaCojCW6H2z/QRAjjrAKC5lmyUxjKfJyJOxJd/JVNaeiMJ5wCfcg3P
pHSD95TDlzNfyoVseQEax7k=3D
=3D6Jce
=2D----END PGP SIGNATURE-----



From MAILER-DAEMON Fri Apr 02 10:14:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9QNA-0002Gq-Fu
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 10:14:20 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9QN5-0002EF-B1
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:14:15 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9QN2-0002Bu-EJ
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:14:13 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9QLh-00022H-O5
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:12:49 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1B9QLc-0002EN-00
	for <commit-classpath@gnu.org>; Fri, 02 Apr 2004 17:12:44 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-5cxqhWWezCPRCpZeHKBh"
Message-Id: <1080918766.26699.1726.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 02 Apr 2004 17:12:46 +0200
Subject: Updated the Hacker Guide
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 15:14:16 -0000


--=-5cxqhWWezCPRCpZeHKBh
Content-Type: multipart/mixed; boundary="=-wqP+P3s/7qWOwArs2dwD"


--=-wqP+P3s/7qWOwArs2dwD
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi all,

We are growing and attracting more and more developers. And we had some
miscommunication last week. So I have updated the Hacker Guide with all
information that people requested. If something is still missing please
ask!

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

       * doc/hacking.texi: Added sections on needed libraries, coding
       conventions, hacking on the code, writing ChangeLog
       entries. Updated old/deprecated information.

       * HACKING: Moved all content to doc/hacking.text. Add pointer to
       above document.

HTML version should be up at
http://www.gnu.org/software/classpath/docs/hacking.html when the site
updates.

Cheers,

Mark

--=-wqP+P3s/7qWOwArs2dwD
Content-Disposition: inline; filename=hacking.patch
Content-Type: text/x-patch; name=hacking.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0
aC9jbGFzc3BhdGgvQ2hhbmdlTG9nLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xOTcxDQpkaWZm
IC11IC1yMS4xOTcxIENoYW5nZUxvZw0KLS0tIENoYW5nZUxvZwkxIEFwciAyMDA0IDIzOjA5OjAz
IC0wMDAwCTEuMTk3MQ0KKysrIENoYW5nZUxvZwkyIEFwciAyMDA0IDE1OjA4OjM5IC0wMDAwDQpA
QCAtMSwzICsxLDEyIEBADQorMjAwNC0wNC0wMiAgTWFyayBXaWVsYWFyZCAgPG1hcmtAa2xvbXAu
b3JnPg0KKw0KKwkqIGRvYy9oYWNraW5nLnRleGk6IEFkZGVkIHNlY3Rpb25zIG9uIG5lZWRlZCBs
aWJyYXJpZXMsIGNvZGluZw0KKwljb252ZW50aW9ucywgaGFja2luZyBvbiB0aGUgY29kZSwgd3Jp
dGluZyBDaGFuZ2VMb2cNCisJZW50cmllcy4gVXBkYXRlZCBvbGQvZGVwcmVjYXRlZCBpbmZvcm1h
dGlvbi4NCisNCisJKiBIQUNLSU5HOiBNb3ZlZCBhbGwgY29udGVudCB0byBkb2MvaGFja2luZy50
ZXh0LiBBZGQgcG9pbnRlciB0bw0KKwlhYm92ZSBkb2N1bWVudC4NCisNCiAyMDA0LTA0LTAxICBN
YXJrIFdpZWxhYXJkICA8bWFya0BrbG9tcC5vcmc+DQogDQogCSogamF2YXgvc3dpbmcvSlZpZXdw
b3J0LmphdmEgKEpWaWV3cG9ydCk6IE1ha2UgY29uc3RydWN0b3IgcHVibGljLg0KSW5kZXg6IEhB
Q0tJTkcNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRo
L0hBQ0tJTkcsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjI0DQpkaWZmIC11IC1yMS4yNCBIQUNL
SU5HDQotLS0gSEFDS0lORwkyOSBNYXIgMjAwNCAwNzowNzoyNCAtMDAwMAkxLjI0DQorKysgSEFD
S0lORwkyIEFwciAyMDA0IDE1OjA4OjM5IC0wMDAwDQpAQCAtMSw3NCArMSwxMyBAQA0KLUhBQ0tJ
TkcgR05VIENsYXNzcGF0aCAtIExhc3QgdXBkYXRlZDogQXVndXN0IDE1LCAyMDAzDQorSEFDS0lO
RyBHTlUgQ2xhc3NwYXRoIC0gTGFzdCB1cGRhdGVkOiBBcHJpbCAyLCAyMDA0DQogUGxlYXNlIHJl
YWQgdGhlIFJFQURNRSBhbmQgSU5TVEFMTCBmaWxlcyBmaXJzdC4NCiANCiBZb3Ugb25seSBuZWVk
IHRoZSBpbmZvcm1hdGlvbiBpbiB0aGlzIGZpbGUgd2hlbiB3b3JraW5nIG9uIG5vbi1yZWxlYXNl
ZCAoQ1ZTKQ0KIHZlcnNpb25zIG9mIEdOVSBDbGFzc3BhdGguIEluc3RhbGxhdGlvbiBpbmZvcm1h
dGlvbiBmb3IgcmVsZWFzZWQgdmVyc2lvbnMNCiBvZiBHTlUgQ2xhc3NwYXRoIGNhbiBiZSBmb3Vu
ZCBpbiB0aGUgSU5TVEFMTCBmaWxlLg0KIA0KLUlmIHlvdSB3YW50IHRvIGhhY2sgb24gR05VIENs
YXNzcGF0aCBpdCB3aWxsIG1ha2UgdGhpbmdzIGVhc2llciBpZiB5b3UNCi1oYXZlIHRoZSBmb2xs
b3dpbmcgaW5zdGFsbGVkOg0KLQ0KLUZvciBhbnkgYnVpbGQgZW52aXJvbm1lbnQgaW52b2x2aW5n
IG5hdGl2ZSBsaWJyYXJpZXMsIHRoZXNlIG5ldyB2ZXJzaW9ucyBvZiANCi1hdXRvY29uZiwgYXV0
b21ha2UsIGFuZCBsaWJ0b29sIGFyZSByZXF1aXJlZC4NCi0NCi0gICAgICAgIC0gR05VIGF1dG9j
b25mIDIuNTkNCi0gICAgICAgIC0gR05VIGF1dG9tYWtlIDEuNy54DQotCSgxLjgueCBhbHNvIHdv
cmtzKQ0KLSAgICAgICAgLSBHTlUgbGlidG9vbCAxLjQuMg0KLQkoMS40LjMgYW5kIDEuNWEgYWxz
byB3b3JrKQ0KLQ0KLUZvciBidWlsZGluZyB0aGUgSmF2YSBieXRlY29kZSAoLmNsYXNzIGZpbGVz
KSwgb25lIG9mIHRoZXNlIGNvbXBpbGVycw0KLWlzIHJlcXVpcmVkLg0KLQ0KLSAgICAgICAgLSBH
TlUgR0NKIDMuMysNCi0gICAgICAgIC0gSUJNIGppa2VzIDEuMTgrDQotDQotRm9yIGJ1aWxkaW5n
IHRoZSBKTkkgbmF0aXZlIGxpYnJhcmllcywgdGhlIGZvbGxvd2luZyBhcmUgcmVxdWlyZWQuDQot
DQotICAgICAgICAtIEdUSysgMi4yLngNCi0JLSBsaWJhcnRfbGdwbCAyLjEuMA0KLQktIGdkay1w
aXhidWYgKE9ubHkgbmVlZGVkIGlmIHlvdSB3YW50IHRvIGNvbXBpbGUgdGhlIG5hdGl2ZSBsaWJy
YXJ5KQ0KLQ0KLVlvdSBjYW4gZ2V0IENWUyAoZGV2ZWxvcG1lbnQpIHZlcnNpb25zIG9mIEdOVSBD
bGFzc3BhdGggYnkgZ2l2aW5nIGN2cyB0aGUNCi0tZCBvcHRpb24gd2l0aCAob3Igc2V0dGluZyB0
aGUgZW52aXJvbm1lbnQgdmFyaWFibGUgQ1ZTUk9PVCB0bykNCi06cHNlcnZlcjphbm9uY3ZzQHN1
YnZlcnNpb25zLmdudS5vcmc6L2N2c3Jvb3QvY2xhc3NwYXRoDQotICAgIC0tPiBGaXJzdCBkbyAi
Y3ZzIGxvZ2luIi4gIEhpdCA8UmV0dXJuPiB3aGVuIHByb21wdGVkIGZvciBhIHBhc3N3b3JkDQot
ICAgIC0tPiBUaGVuIGRvICJjdnMgY2hlY2tvdXQgY2xhc3NwYXRoIg0KLSAgICAtLT4gTW9yZSBk
ZXRhaWxlZCBpbnN0cnVjdGlvbnMgYXZhaWxhYmxlIG9uIHRoZSBTYXZhbm5haCBwcm9qZWN0IHdl
YnNpdGUuDQotICAgICAgICA8aHR0cDovL3NhdmFubmFoLmdudS5vcmcvcHJvamVjdHMvY2xhc3Nw
YXRoLz4NCi0NCi1JZiB5b3Ugc3RhcnQgZnJvbSB0aGUgY3VycmVudCBDVlMgdmVyc2lvbiwgeW91
IHdpbGwgaGF2ZSB0byBydW4gdGhlDQotZm9sbG93aW5nIGZyb20gdGhlIHRvcGxldmVsIGRpcmVj
dG9yeS4gIFRoZSBhdXRvcmVjb25mIHNjcmlwdCBkb2VzIG5vdA0KLWFsd2F5cyBydW4gdGhlc2Ug
YXMgbWlnaHQgYmUgZXhwZWN0ZWQuDQotDQotICAgICAgICBhY2xvY2FsOyBhdXRvaGVhZGVyOyBh
dXRvbWFrZTsgYXV0b2NvbmYNCi0NCi1Gb3IgdGhvc2UgdGhhdCBkbyBub3QgdW5kZXJzdGFuZCB3
aHkgdGhlc2UgcHJvZ3JhbXMgbXVzdCBiZSBleGVjdXRlZCwgaGVyZQ0KLWlzIGEgYnJpZWYgbGVz
c29uLiAgDQotDQotCWFjbG9jYWwgICAgLSBjb21iaW5lcyBhY2luY2x1ZGUubTQgYW5kIHN5c3Rl
bSBtYWNyb3MgdG8gcHJvZHVjZSANCi0gICAgICAgICAgICAgICAgICAgICBhY2xvY2FsLm00DQot
CWF1dG9oZWFkZXIgLSBnZW5lcmF0ZXMgY29uZmlnLmguaW4gaW4gdGhlIGluY2x1ZGUvIGRpcmVj
dG9yeQ0KLQlhdXRvbWFrZSAgIC0gZ2VuZXJhdGVzIE1ha2VmaWxlLmluIGZyb20gTWFrZWZpbGUu
YW0gZm9yIGV2ZXJ5IGZpbGUNCi0gICAgICAgICAgICAgICAgICAgICBzcGVjaWZpZWQgYXMgb3V0
cHV0IGluIGNvbmZpZ3VyZS5pbg0KLSAgICAgICAgYXV0b2NvbmYgICAtIGdlbmVyYXRlcyBjb25m
aWd1cmUNCi0NCi1OZXh0IHlvdSBydW4gY29uZmlndXJlLiAgT3B0aW9ucyB5b3UnbGwgcHJvYmFi
bHkgd2FudCB0byBzcGVjaWZ5DQotbWF5IGluY2x1ZGUgLS1lbmFibGUtam5pLg0KLQ0KLUJ5IGRl
ZmF1bHQgdGhlIGNvcmUgY2xhc3NlcyBhcmUgY29tcGlsZWQgdXNpbmcgdm0vcmVmZXJlbmNlIEpW
TSBzcGVjaWZpYw0KLWNsYXNzZXMuICBBcyBhIFZNIHdyaXRlciB5b3UgbWF5IHRha2UgdGhlc2Ug
cmVmZXJlbmNlIGNsYXNzZXMgYW5kIG1vZGlmeQ0KLXRoZW0gYXMgeW91IHdpc2guICBBcyBsb25n
IGFzIHRoZSBwdWJsaWMgaW50ZXJmYWNlIHJlbWFpbnMgdGhlIHNhbWUgDQotbm8gbW9kaWZpY2F0
aW9ucyB0byBvdGhlciBjb3JlIHBhcnRzIG9mIENsYXNzcGF0aCBzaG91bGQgYmUgbmVlZGVkLg0K
LQ0KLUdub21lIGN2cyBjYW4gYmUgb2J0YWluZWQgd2l0aCANCi06cHNlcnZlcjphbm9ueW1vdXNA
YW5vbmN2cy5nbm9tZS5vcmc6L2N2cy9nbm9tZSBhbmQgYSBibGFuayBwYXNzd29yZC4gIA0KLVRo
ZSBtb2R1bGUgbmFtZSBmb3IgZ2RrLXBpeGJ1ZiBpcyBnZGstcGl4YnVmLg0KLQ0KLVRoZXJlIHNo
b3VsZCBiZSBubyBjb21waWxpbmcgZXJyb3JzIHdpdGhpbiBKYXZhIHNvdXJjZSBjb2RlIHdoaWNo
IGlzDQotY2hlY2tlZCBpbi4gIENvZGUgc2hvdWxkIGJlIGNvbXBpbGVkIGluIHRoZSBidWlsZCBw
cm9jZXNzIGJlZm9yZQ0KLWNoZWNraW5nIGl0IGluLg0KK0V2ZXJ5dGhpbmcgeW91IGV2ZXIgd2Fu
dGVkIHRvIGtub3cgYWJvdXQgaGFja2luZyBvbiBHTlUgQ2xhc3NwYXRoIGFuZA0KK2hvdyB0byBv
YnRhaW4gQ1ZTIGNoZWNrb3V0cyBjYW4gYmUgZm91bmQgaW4gZG9jL2hhY2tpbmcudGV4aSBhbmQv
b3INCitvbiB0aGUgd2Vic2l0ZSBodHRwOi8vd3d3LmdudS5vcmcvc29mdHdhcmUvY2xhc3NwYXRo
L2RvY3MvaGFja2luZy5odG1sDQogDQogSWYgeW91IGhhdmUgYW55IHF1ZXN0aW9ucywgc3VnZ2Vz
dGlvbnMsIGV0Yy4sIHNlbmQgdGhlbSB0bw0KIGNsYXNzcGF0aEBnbnUub3JnLg0KLQ0KSW5kZXg6
IGRvYy9oYWNraW5nLnRleGluZm8NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFz
c3BhdGgvY2xhc3NwYXRoL2RvYy9oYWNraW5nLnRleGluZm8sdg0KcmV0cmlldmluZyByZXZpc2lv
biAxLjIzDQpkaWZmIC11IC1yMS4yMyBoYWNraW5nLnRleGluZm8NCi0tLSBkb2MvaGFja2luZy50
ZXhpbmZvCTI5IE1hciAyMDA0IDIwOjM5OjUyIC0wMDAwCTEuMjMNCisrKyBkb2MvaGFja2luZy50
ZXhpbmZvCTIgQXByIDIwMDQgMTU6MDg6MzkgLTAwMDANCkBAIC0yNywxMCArMjcsMTEgQEANCiBA
YXV0aG9yIFBhdWwgTi4gRmlzaGVyDQogQGF1dGhvciBKb2huIEtlaXNlcg0KIEBhdXRob3IgQy4g
QnJpYW4gSm9uZXMNCitAYXV0aG9yIE1hcmsgSi4gV2llbGFhcmQNCiANCiBAcGFnZQ0KIEB2c2tp
cCAwcHQgcGx1cyAxZmlsbGwNCi1Db3B5cmlnaHQgQGNvcHlyaWdodHt9IDE5OTgsMTk5OSwyMDAw
LDIwMDEsMjAwMiwyMDAzIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KK0NvcHlyaWdo
dCBAY29weXJpZ2h0e30gMTk5OCwxOTk5LDIwMDAsMjAwMSwyMDAyLDIwMDMsMjAwNCBGcmVlIFNv
ZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiBAc3AgMg0KIFBlcm1pc3Npb24gaXMgZ3JhbnRlZCB0
byBtYWtlIGFuZCBkaXN0cmlidXRlIHZlcmJhdGltIGNvcGllcyBvZg0KIHRoaXMgZG9jdW1lbnQg
cHJvdmlkZWQgdGhlIGNvcHlyaWdodCBub3RpY2UgYW5kIHRoaXMgcGVybWlzc2lvbiBub3RpY2UN
CkBAIC01MiwyOCArNTMsMzggQEANCiBAbm9kZSBUb3AsIEludHJvZHVjdGlvbiwgKGRpciksIChk
aXIpDQogQHRvcCBHTlUgQ2xhc3NwYXRoIEhhY2tlcidzIEd1aWRlDQogDQotVGhpcyBkb2N1bWVu
dCBjb250YWlucyBpbXBvcnRhbnQgaW5mb3JtYXRpb24geW91J2xsIHdhbnQgdG8ga25vdyBpZiB5
b3UNCi13YW50IHRvIGhhY2sgb24gR05VIENsYXNzcGF0aCwgdGhlIGZyZWUgaW1wbGVtZW50YXRp
b24gb2YgdGhlIEphdmEgc3RhbmRhcmQNCi1jbGFzcyBsaWJyYXJpZXMuDQorVGhpcyBkb2N1bWVu
dCBjb250YWlucyBpbXBvcnRhbnQgaW5mb3JtYXRpb24geW91J2xsIHdhbnQgdG8ga25vdyBpZg0K
K3lvdSB3YW50IHRvIGhhY2sgb24gR05VIENsYXNzcGF0aCwgRXNzZW50aWFsIExpYnJhcmllcyBm
b3IgSmF2YSwgdG8NCitoZWxwIGNyZWF0ZSBmcmVlIGNvcmUgY2xhc3MgbGlicmFyaWVzIGZvciB1
c2Ugd2l0aCB2aXJ0dWFsIG1hY2hpbmVzDQorYW5kIGNvbXBpbGVycyBmb3IgdGhlIGphdmEgcHJv
Z3JhbW1pbmcgbGFuZ3VhZ2UuDQogQGVuZCBpZmluZm8NCiANCiBAbWVudQ0KLSogSW50cm9kdWN0
aW9uOjogICAgICAgICAgICAgICAgQW4gaW50cm9kdWN0aW9uIHRvIHRoZSBDbGFzc3BhdGggcHJv
amVjdA0KKyogSW50cm9kdWN0aW9uOjogICAgICAgICAgICAgICAgQW4gaW50cm9kdWN0aW9uIHRv
IHRoZSBHTlUgQ2xhc3NwYXRoIHByb2plY3QNCiAqIFJlcXVpcmVtZW50czo6ICAgICAgICAgICAg
ICAgIFZlcnkgaW1wb3J0YW50IHJ1bGVzIHRoYXQgbXVzdCBiZSBmb2xsb3dlZA0KICogVm9sdW50
ZWVyaW5nOjogICAgICAgICAgICAgICAgU28geW91IHdhbnQgdG8gaGVscCBvdXQNCi0qIFByb2pl
Y3QgR29hbHM6OiAgICAgICAgICAgICAgIEdvYWxzIG9mIHRoZSBDbGFzc3BhdGggcHJvamVjdA0K
LSogUHJvZ3JhbW1pbmcgVG9vbHM6OiAgICAgICAgICAgQSBsaXN0IG9mIHRvb2xzIHlvdSB3aWxs
IG5lZWQgZm9yIGhhY2tpbmcNCi0qIFByb2dyYW1taW5nIFN0YW5kYXJkczo6ICAgICAgIFN0YW5k
YXJkcyB0byB1c2Ugd2hlbiB3cml0aW5nIGNvZGUgZm9yIENsYXNzcGF0aA0KLSogUHJvZ3JhbW1p
bmcgR29hbHM6OiAgICAgICAgICAgV2hhdCB0byBjb25zaWRlciB3aGVuIHdyaXRpbmcgY29kZSBm
b3IgQ2xhc3NwYXRoDQorKiBQcm9qZWN0IEdvYWxzOjogICAgICAgICAgICAgICBHb2FscyBvZiB0
aGUgR05VIENsYXNzcGF0aCBwcm9qZWN0DQorKiBOZWVkZWQgVG9vbHMgYW5kIExpYnJhcmllczo6
ICBBIGxpc3Qgb2YgcHJvZ3JhbXMgYW5kIGxpYnJhcmllcyB5b3Ugd2lsbCBuZWVkDQorKiBQcm9n
cmFtbWluZyBTdGFuZGFyZHM6OiAgICAgICBTdGFuZGFyZHMgdG8gdXNlIHdoZW4gd3JpdGluZyBj
b2RlDQorKiBIYWNraW5nIENvZGU6OiAgICAgICAgICAgICAgICBXb3JraW5nIG9uIGNvZGUsIFdv
cmtpbmcgd2l0aCBvdGhlcnMNCisqIFByb2dyYW1taW5nIEdvYWxzOjogICAgICAgICAgIFdoYXQg
dG8gY29uc2lkZXIgd2hlbiB3cml0aW5nIGNvZGUNCiAqIEFQSSBDb21wYXRpYmlsaXR5OjogICAg
ICAgICAgIEhvdyB0byBoYW5kbGUgc2VyaWFsaXphdGlvbiBhbmQgZGVwcmVjYXRlZCBtZXRob2Rz
DQotKiBTcGVjaWZpY2F0aW9uIFNvdXJjZXM6OiAgICAgICBXaGVyZSB0byBmaW5kIHRoZSBKYXZh
IGNsYXNzIGxpYnJhcnkgc3BlY3MNCi0qIE5hbWluZyBDb252ZW50aW9uczo6ICAgICAgICAgIEhv
dyBmaWxlcyBhbmQgZGlyZWN0b3JpZXMgYXJlIG5hbWVkIGluIENsYXNzcGF0aA0KKyogU3BlY2lm
aWNhdGlvbiBTb3VyY2VzOjogICAgICAgV2hlcmUgdG8gZmluZCBjbGFzcyBsaWJyYXJ5IHNwZWNz
DQorKiBOYW1pbmcgQ29udmVudGlvbnM6OiAgICAgICAgICBIb3cgZmlsZXMgYW5kIGRpcmVjdG9y
aWVzIGFyZSBuYW1lZA0KICogQ2hhcmFjdGVyIENvbnZlcnNpb25zOjogICAgICAgV29ya2luZyBv
biBDaGFyYWN0ZXIgY29udmVyc2lvbnMNCi0qIExvY2FsaXphdGlvbjo6ICAgICAgICAgICAgICAg
IEhvdyBDbGFzc3BhdGggaGFuZGxlcyBsb2NhbGl6YXRpb24vaW50ZXJuYXRpb25hbGl6YXRpb24N
CisqIExvY2FsaXphdGlvbjo6ICAgICAgICAgICAgICAgIEhvdyB0byBoYW5kbGUgbG9jYWxpemF0
aW9uL2ludGVybmF0aW9uYWxpemF0aW9uDQogDQogQGRldGFpbG1lbnUNCiAgLS0tIFRoZSBEZXRh
aWxlZCBOb2RlIExpc3RpbmcgLS0tDQogDQorUHJvZ3JhbW1pbmcgU3RhbmRhcmRzDQorDQorKiBT
b3VyY2UgQ29kZSBTdHlsZSBHdWlkZTo6ICAgICANCisNCitXb3JraW5nIG9uIHRoZSBjb2RlLCBX
b3JraW5nIHdpdGggb3RoZXJzDQorDQorKiBXcml0aW5nIENoYW5nZUxvZ3M6OiAgICAgICAgICAN
CisNCiBQcm9ncmFtbWluZyBHb2Fscw0KIA0KICogUG9ydGFiaWxpdHk6OiAgICAgICAgICAgICAg
ICAgV3JpdGluZyBQb3J0YWJsZSBTb2Z0d2FyZSAgICAgICAgICAgICAgICANCkBAIC04Miw2ICs5
MywxMSBAQA0KICogTmF0aXZlIEVmZmljaWVuY3k6OiAgICAgICAgICAgV3JpdGluZyBFZmZpY2ll
bnQgSk5JICAgICAgICAgIA0KICogU2VjdXJpdHk6OiAgICAgICAgICAgICAgICAgICAgV3JpdGlu
ZyBTZWN1cmUgU29mdHdhcmUNCiANCitBUEkgQ29tcGF0aWJpbGl0eQ0KKw0KKyogU2VyaWFsaXph
dGlvbjo6ICAgICAgICAgICAgICAgU2VyaWFsaXphdGlvbg0KKyogRGVwcmVjYXRlZCBNZXRob2Rz
OjogICAgICAgICAgRGVwcmVjYXRlZCBtZXRob2RzDQorDQogTG9jYWxpemF0aW9uDQogDQogKiBT
dHJpbmcgQ29sbGF0aW9uOjogICAgICAgICAgICBTb3J0aW5nIHN0cmluZ3MgaW4gZGlmZmVyZW50
IGxvY2FsZXMNCkBAIC05Niw2NyArMTEyLDgwIEBADQogQGNvbW1lbnQgbm9kZS1uYW1lLCBuZXh0
LCBwcmV2aW91cywgdXANCiBAY2hhcHRlciBJbnRyb2R1Y3Rpb24NCiANCi1UaGUgQ2xhc3NwYXRo
IFByb2plY3QgaXMgYSBkZWRpY2F0ZWQgdG8gcHJvdmlkaW5nIGEgMTAwJSBmcmVlLCBjbGVhbg0K
LXJvb20gaW1wbGVtZW50YXRpb24gb2YgdGhlIHN0YW5kYXJkIEphdmEgY2xhc3MgbGlicmFyaWVz
IHdoaWNoIG9mZmVyDQotZnJlZSBzb2Z0d2FyZSBkZXZlbG9wZXJzIGFuIGFsdGVybmF0aXZlIHRv
IFN1bidzIHByb3ByaWV0YXJ5DQotbGlicmFyaWVzLiAgVGhlIENsYXNzcGF0aCBQcm9qZWN0IHdh
cyBzdGFydGVkIGluIHRoZSBTcHJpbmcgb2YgMTk5OCBhcw0KLWFuIG9mZmljaWFsIEZyZWUgU29m
dHdhcmUgRm91bmRhdGlvbiBwcm9qZWN0LiAgTW9zdCBvZiB0aGUgdm9sdW50ZWVycw0KLXdvcmtp
bmcgb24gR05VIENsYXNzcGF0aCBkbyBzbyBpbiB0aGVpciBzcGFyZSB0aW1lLiAgV2UgYXBwcmVj
aWF0ZQ0KLWV2ZXJ5b25lJ3MgZWZmb3J0cyBpbiB0aGUgcGFzdCB0byBpbXByb3ZlIGFuZCBoZWxw
IHRoZSBwcm9qZWN0IGFuZA0KLWxvb2sgZm9yd2FyZCB0byBmdXR1cmUgY29udHJpYnV0aW9ucyBi
eSBvbGQgYW5kIG5ldyBtZW1iZXJzIGFsaWtlLg0KK1RoZSBHTlUgQ2xhc3NwYXRoIFByb2plY3Qg
aXMgYSBkZWRpY2F0ZWQgdG8gcHJvdmlkaW5nIGEgMTAwJSBmcmVlLA0KK2NsZWFuIHJvb20gaW1w
bGVtZW50YXRpb24gb2YgdGhlIHN0YW5kYXJkIGNvcmUgY2xhc3MgbGlicmFyaWVzIGZvcg0KK2Nv
bXBpbGVycyBhbmQgcnVudGltZSBlbnZpcm9ubWVudHMgZm9yIHRoZSBqYXZhIHByb2dyYW1taW5n
IGxhbmd1YWdlLg0KK0l0IG9mZmVycyBmcmVlIHNvZnR3YXJlIGRldmVsb3BlcnMgYW4gYWx0ZXJu
YXRpdmUgY29yZSBsaWJyYXJ5DQoraW1wbGVtZW50YXRpb24gdXBvbiB3aGljaCBsYXJnZXIgamF2
YS1saWtlIHByb2dyYW1taW5nIGVudmlyb25tZW50cw0KK2NhbiBiZSBidWlsZC4gIFRoZSBHTlUg
Q2xhc3NwYXRoIFByb2plY3Qgd2FzIHN0YXJ0ZWQgaW4gdGhlIFNwcmluZyBvZg0KKzE5OTggYXMg
YW4gb2ZmaWNpYWwgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uIHByb2plY3QuICBNb3N0IG9mIHRo
ZQ0KK3ZvbHVudGVlcnMgd29ya2luZyBvbiBHTlUgQ2xhc3NwYXRoIGRvIHNvIGluIHRoZWlyIHNw
YXJlIHRpbWUsIGJ1dCBhDQorY291cGxlIG9mIHByb2plY3RzIGJhc2VkIG9uIEdOVSBDbGFzc3Bh
dGggaGF2ZSBwYWlkIHByb2dyYW1tZXJzIHRvDQoraW1wcm92ZSB0aGUgY29yZSBsaWJyYXJpZXMu
ICBXZSBhcHByZWNpYXRlIGV2ZXJ5b25lJ3MgZWZmb3J0cyBpbiB0aGUNCitwYXN0IHRvIGltcHJv
dmUgYW5kIGhlbHAgdGhlIHByb2plY3QgYW5kIGxvb2sgZm9yd2FyZCB0byBmdXR1cmUNCitjb250
cmlidXRpb25zIGJ5IG9sZCBhbmQgbmV3IG1lbWJlcnMgYWxpa2UuDQogDQogQG5vZGUgUmVxdWly
ZW1lbnRzLCBWb2x1bnRlZXJpbmcsIEludHJvZHVjdGlvbiwgVG9wDQogQGNvbW1lbnQgbm9kZS1u
YW1lLCBuZXh0LCBwcmV2aW91cywgdXANCiBAY2hhcHRlciBSZXF1aXJlbWVudHMNCiANCi1BbHRo
b3VnaCBDbGFzc3BhdGggaXMgZm9sbG93aW5nIGFuIG9wZW4gZGV2ZWxvcG1lbnQgbW9kZWwgd2hl
cmUgaW5wdXQNCitBbHRob3VnaCBHTlUgQ2xhc3NwYXRoIGlzIGZvbGxvd2luZyBhbiBvcGVuIGRl
dmVsb3BtZW50IG1vZGVsIHdoZXJlIGlucHV0DQogZnJvbSBkZXZlbG9wZXJzIGlzIHdlbGNvbWUs
IHRoZXJlIGFyZSBjZXJ0YWluIGJhc2UgcmVxdWlyZW1lbnRzIHRoYXQNCiBuZWVkIHRvIGJlIG1l
dCBieSBhbnlvbmUgd2hvIHdhbnRzIHRvIGNvbnRyaWJ1dGUgY29kZSB0byB0aGlzIHByb2plY3Qu
DQogVGhleSBhcmUgbW9zdGx5IGRpY3RhdGVkIGJ5IGxlZ2FsIHJlcXVpcmVtZW50cyBhbmQgYXJl
IG5vdCBhcmJpdHJhcnkNCi1yZXN0cmljdGlvbnMgY2hvc2VuIGJ5IHRoZSBDbGFzc3BhdGggdGVh
bS4NCityZXN0cmljdGlvbnMgY2hvc2VuIGJ5IHRoZSBHTlUgQ2xhc3NwYXRoIHRlYW0uDQogDQog
WW91IHdpbGwgbmVlZCB0byBhZGhlcmUgdG8gdGhlIGZvbGxvd2luZyB0aGluZ3MgaWYgeW91IHdh
bnQgdG8gZG9uYXRlDQotY29kZSB0byB0aGUgQ2xhc3NwYXRoIHByb2plY3Q6DQorY29kZSB0byB0
aGUgR05VIENsYXNzcGF0aCBwcm9qZWN0Og0KIA0KIEBpdGVtaXplIEBidWxsZXQNCiBAaXRlbQ0K
LUBie05ldmVyIHVuZGVyIGFueSBjaXJjdW1zdGFuY2VzIHJlZmVyIHRvIFN1bidzIGNvZGUgd2hp
bGUgd29ya2luZyBvbg0KLUNsYXNzcGF0aC59ICBJdCBpcyBiZXN0IGlmIHlvdSBoYXZlIG5ldmVy
IGxvb2tlZCBhdCBTdW4ncyBjb2RlIGF0IGFsbC4NCi1UbyByZWR1Y2UgdGVtcHRhdGlvbiwgaXQg
d291bGQgYmUgYmVzdCBpZiB5b3UgZGVsZXRlZCB0aGUgQHNhbXB7c3JjLnppcH0NCi1maWxlIGZy
b20geW91ciBKREsgZGlzdHJpYnV0aW9uLiAgSWYgeW91IGhhdmUgc2lnbmVkIFN1bidzDQotbm9u
LWRpc2Nsb3N1cmUgc3RhdGVtZW50LCB0aGVuIHlvdSB1bmZvcnR1bmF0ZWx5IGNhbm5vdCB3b3Jr
IG9uDQotQ2xhc3NwYXRoIGNvZGUgYXQgYWxsLiAgSWYgeW91IGhhdmUgYW55IHJlYXNvbiB0byBi
ZWxpZXZlIHRoYXQgeW91ciBjb2RlDQotbWlnaHQgYmUgYGB0YWludGVkJycsIHBsZWFzZSBzYXkg
c29tZXRoaW5nIG9uIHRoZSBtYWlsaW5nIGxpc3QgYmVmb3JlDQotd3JpdGluZyBhbnl0aGluZy4g
IElmIGl0IHR1cm5zIG91dCB0aGF0IHlvdXIgY29kZSB3YXMgbm90IGRldmVsb3BlZCBpbiBhDQot
Y2xlYW4gcm9vbSBlbnZpcm9ubWVudCwgd2UgY291bGQgYmUgdmVyeSBlbWJhcnJhc3NlZCBzb21l
ZGF5IGluIGNvdXJ0Lg0KLVBsZWFzZSBkb24ndCBsZXQgdGhhdCBoYXBwZW4uDQotDQotQGl0ZW0N
Ci1AYntOZXZlciBkZWNvbXBpbGUgU3VuJ3MgY2xhc3MgbGlicmFyaWVzLn0gIFdoaWxlIHRoZSB3
b3JkaW5nIG9mIHRoZQ0KLWxpY2Vuc2UgaW4gU3VuJ3MgSmF2YSAyIHJlbGVhc2VzIGhhcyBjaGFu
Z2VkLCBpdCBpcyBub3QgYWNjZXB0YWJsZSwgdW5kZXINCi1hbnkgY2lyY3Vtc3RhbmNlcywgZm9y
IGEgcGVyc29uIHdvcmtpbmcgb24gQ2xhc3NwYXRoIHRvIGRlY29tcGlsZSBTdW4ncw0KLWNsYXNz
IGxpYnJhcmllcy4gIEFsbG93aW5nIHRoZSB1c2Ugb2YgZGVjb21waWxhdGlvbiBpbiB0aGUgQ2xh
c3NwYXRoDQotcHJvamVjdCB3b3VsZCBvcGVuIHVwIGEgZ2lhbnQgY2FuIG9mIGxlZ2FsIHdvcm1z
LCB3aGljaCB3ZSB3aXNoIHRvDQotYXZvaWQuDQorQGJ7TmV2ZXIgdW5kZXIgYW55IGNpcmN1bXN0
YW5jZXMgcmVmZXIgdG8gcHJvcHJpZXRhcnkgY29kZSB3aGlsZQ0KK3dvcmtpbmcgb24gR05VIENs
YXNzcGF0aC59ICBJdCBpcyBiZXN0IGlmIHlvdSBoYXZlIG5ldmVyIGxvb2tlZCBhdA0KK2FsdGVy
bmF0aXZlIHByb3ByaWV0YXJ5IGNvcmUgbGlicmFyeSBjb2RlIGF0IGFsbC4gIFRvIHJlZHVjZQ0K
K3RlbXB0YXRpb24sIGl0IHdvdWxkIGJlIGJlc3QgaWYgeW91IGRlbGV0ZWQgdGhlIEBzYW1we3Ny
Yy56aXB9IGZpbGUNCitmcm9tIHlvdXIgcHJvcHJpZXRhcnkgSkRLIGRpc3RyaWJ1dGlvbiAobm90
ZSB0aGF0IHJlY2VudCB2ZXJzaW9ucyBvZg0KK0dOVSBDbGFzc3BhdGggYW5kIHRoZSBjb21waWxl
cnMgYW5kIGVudmlyb25tZW50cyBidWlsZCBvbiBpdCBhcmUNCittYXR1cmUgZW5vdWdoIHRvIG5v
dCBuZWVkIGFueSBwcm9wcmlldGFyeSBpbXBsZW1lbnRhdGlvbiBhdCBhbGwgd2hlbg0KK3dvcmtp
bmcgb24gR05VIENsYXNzcGF0aCwgZXhjZXB0IGluIGV4Y2VwdGlvbmFsIGNhc2VzIHdoZXJlIHlv
dSBuZWVkDQordG8gdGVzdCBjb21wYXRpYmlsaXR5IGlzc3VlcyBwb2ludGVkIG91dCBieSB1c2Vy
cykuICBJZiB5b3UgaGF2ZQ0KK3NpZ25lZCBTdW4ncyBub24tZGlzY2xvc3VyZSBzdGF0ZW1lbnQs
IHRoZW4geW91IHVuZm9ydHVuYXRlbHkgY2Fubm90DQord29yayBvbiBDbGFzc3BhdGggY29kZSBh
dCBhbGwuICBJZiB5b3UgaGF2ZSBhbnkgcmVhc29uIHRvIGJlbGlldmUgdGhhdA0KK3lvdXIgY29k
ZSBtaWdodCBiZSBgYHRhaW50ZWQnJywgcGxlYXNlIHNheSBzb21ldGhpbmcgb24gdGhlIG1haWxp
bmcNCitsaXN0IGJlZm9yZSB3cml0aW5nIGFueXRoaW5nLiAgSWYgaXQgdHVybnMgb3V0IHRoYXQg
eW91ciBjb2RlIHdhcyBub3QNCitkZXZlbG9wZWQgaW4gYSBjbGVhbiByb29tIGVudmlyb25tZW50
LCB3ZSBjb3VsZCBiZSB2ZXJ5IGVtYmFycmFzc2VkDQorc29tZWRheSBpbiBjb3VydC4gIFBsZWFz
ZSBkb24ndCBsZXQgdGhhdCBoYXBwZW4uDQorDQorQGl0ZW0NCitAYntOZXZlciBkZWNvbXBpbGUg
cHJvcHJpZXRhcnkgY2xhc3MgbGlicmFyeSBpbXBsZW1lbnRhdGlvbnMufSAgV2hpbGUNCit0aGUg
d29yZGluZyBvZiB0aGUgbGljZW5zZSBpbiBTdW4ncyBKYXZhIDIgcmVsZWFzZXMgaGFzIGNoYW5n
ZWQsIGl0IGlzDQorbm90IGFjY2VwdGFibGUsIHVuZGVyIGFueSBjaXJjdW1zdGFuY2VzLCBmb3Ig
YSBwZXJzb24gd29ya2luZyBvbg0KK0dOVSBDbGFzc3BhdGggdG8gZGVjb21waWxlIFN1bidzIGNs
YXNzIGxpYnJhcmllcy4gIEFsbG93aW5nIHRoZSB1c2Ugb2YNCitkZWNvbXBpbGF0aW9uIGluIHRo
ZSBHTlUgQ2xhc3NwYXRoIHByb2plY3Qgd291bGQgb3BlbiB1cCBhIGdpYW50IGNhbiBvZg0KK2xl
Z2FsIHdvcm1zLCB3aGljaCB3ZSB3aXNoIHRvIGF2b2lkLg0KIA0KIEBpdGVtDQogQ2xhc3NwYXRo
IGlzIGxpY2Vuc2VkIHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUNCi1AdXJlZntodHRwOi8vd3d3LmZz
Zi5vcmcvY29weWxlZnQvZ3BsLmh0bWwsR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2V9LA0KLXdp
dGggYSBzcGVjaWFsIGV4Y2VwdGlvbiBpbmNsdWRlZCB0byBhbGxvdyBsaW5raW5nIHdpdGggbm9u
LUdQTCBsaWNlbnNlZA0KLXdvcmtzIGFzIGxvbmcgYXMgbm8gb3RoZXIgbGljZW5zZSB3b3VsZCBy
ZXN0cmljdCBzdWNoIGxpbmtpbmcuICBUbw0KLXByZXNlcnZlIGZyZWVkb20gZm9yIGFsbCB1c2Vy
cyBhbmQgdG8gbWFpbnRhaW4gdW5pZm9ybSBsaWNlbnNpbmcgb2YNCi1DbGFzc3BhdGgsIHdlIHdp
bGwgbm90IGFjY2VwdCBjb2RlIGludG8gdGhlIG1haW4gZGlzdHJpYnV0aW9uIHRoYXQgaXMNCi1u
b3QgbGljZW5zZWQgdW5kZXIgdGhlc2UgdGVybXMuICBUaGUgbGljZW5zZSBjYW4gYmUgcmVhZCBm
cm9tIGFueQ0KLWFscGhhIHJlbGVhc2UgZGlzdHJpYnV0ZWQgZnJvbSBAdXJlZntmdHA6Ly9hbHBo
YS5nbnUub3JnL2dudS9jbGFzc3BhdGgvfQ0KLW9yIGJ5IG9idGFpbmluZyBhIGNvcHkgb2YgdGhl
IGN1cnJlbnQgQ1ZTIHRyZWUuDQorQHVyZWZ7aHR0cDovL3d3dy5mc2Yub3JnL2NvcHlsZWZ0L2dw
bC5odG1sLEdOVSBHZW5lcmFsIFB1YmxpYw0KK0xpY2Vuc2V9LCB3aXRoIGEgc3BlY2lhbCBleGNl
cHRpb24gaW5jbHVkZWQgdG8gYWxsb3cgbGlua2luZyB3aXRoDQorbm9uLUdQTCBsaWNlbnNlZCB3
b3JrcyBhcyBsb25nIGFzIG5vIG90aGVyIGxpY2Vuc2Ugd291bGQgcmVzdHJpY3Qgc3VjaA0KK2xp
bmtpbmcuICBUbyBwcmVzZXJ2ZSBmcmVlZG9tIGZvciBhbGwgdXNlcnMgYW5kIHRvIG1haW50YWlu
IHVuaWZvcm0NCitsaWNlbnNpbmcgb2YgQ2xhc3NwYXRoLCB3ZSB3aWxsIG5vdCBhY2NlcHQgY29k
ZSBpbnRvIHRoZSBtYWluDQorZGlzdHJpYnV0aW9uIHRoYXQgaXMgbm90IGxpY2Vuc2VkIHVuZGVy
IHRoZXNlIHRlcm1zLiAgVGhlIGV4YWN0DQord29yZGluZyBvZiB0aGUgbGljZW5zZSBvZiB0aGUg
Y3VycmVudCB2ZXJzaW9uIG9mIEdOVSBDbGFzc3BhdGggY2FuIGJlDQorZm91bmQgb25saW5lIGZy
b20gdGhlDQorQHVyZWZ7aHR0cDovL3d3dy5nbnUub3JnL3NvZnR3YXJlL2NsYXNzcGF0aC9saWNl
bnNlLmh0bWwsIEdOVQ0KK0NsYXNzcGF0aCBsaWNlbnNlIHBhZ2V9IGFuZCBpcyBvZiBjb3Vyc2Ug
ZGlzdHJpYnV0ZWQgd2l0aCBjdXJyZW50DQorc25hcHNob3QgcmVsZWFzZSBmcm9tIEB1cmVme2Z0
cDovL2Z0cC5nbnUub3JnL2dudS9jbGFzc3BhdGgvfSBvciBieQ0KK29idGFpbmluZyBhIGNvcHkg
b2YgdGhlIGN1cnJlbnQgQ1ZTIHRyZWUuDQogDQogQGl0ZW0NCi1DbGFzc3BhdGggaXMgR05VIHNv
ZnR3YXJlIGFuZCB0aGlzIHByb2plY3QgaXMgYmVpbmcgb2ZmaWNpYWxseSBzcG9uc29yZWQNCitH
TlUgQ2xhc3NwYXRoIGlzIEdOVSBzb2Z0d2FyZSBhbmQgdGhpcyBwcm9qZWN0IGlzIGJlaW5nIG9m
ZmljaWFsbHkgc3BvbnNvcmVkDQogYnkgdGhlIEB1cmVme2h0dHA6Ly93d3cuZnNmLm9yZy8sRnJl
ZSBTb2Z0d2FyZSBGb3VuZGF0aW9ufS4gIEJlY2F1c2Ugb2YNCiB0aGlzLCB0aGUgRlNGIHdpbGwg
aG9sZCBjb3B5cmlnaHQgdG8gYWxsIGNvZGUgZGV2ZWxvcGVkIGFzIHBhcnQgb2YNCi1DbGFzc3Bh
dGguICBUaGlzIHdpbGwgYWxsb3cgdGhlbSB0byBwdXJzdWUgY29weXJpZ2h0IHZpb2xhdG9ycyBp
biBjb3VydCwNCitHTlUgQ2xhc3NwYXRoLiAgVGhpcyB3aWxsIGFsbG93IHRoZW0gdG8gcHVyc3Vl
IGNvcHlyaWdodCB2aW9sYXRvcnMgaW4gY291cnQsDQogc29tZXRoaW5nIGFuIGluZGl2aWR1YWwg
ZGV2ZWxvcGVyIG1heSBuZWl0aGVyIGhhdmUgdGhlIHRpbWUgbm9yDQotcmVzb3VyY2VzIHRvIGRv
LiAgRXZlcnlvbmUgY29udHJpYnV0aW5nIGNvZGUgdG8gQ2xhc3NwYXRoIHdpbGwgbmVlZCB0bw0K
K3Jlc291cmNlcyB0byBkby4gIEV2ZXJ5b25lIGNvbnRyaWJ1dGluZyBjb2RlIHRvIEdOVSBDbGFz
c3BhdGggd2lsbCBuZWVkIHRvDQogc2lnbiBhIGNvcHlyaWdodCBhc3NpZ25tZW50IHN0YXRlbWVu
dC4gIEFkZGl0aW9uYWxseSwgaWYgeW91IGFyZQ0KIGVtcGxveWVkIGFzIGEgcHJvZ3JhbW1lciwg
eW91ciBlbXBsb3llciBtYXkgbmVlZCB0byBzaWduIGEgY29weXJpZ2h0DQogd2FpdmVyIGRpc2Ns
YWltaW5nIGFsbCBpbnRlcmVzdCBpbiB0aGUgc29mdHdhcmUuICBUaGlzIG1heSBzb3VuZCBoYXJz
aCwNCkBAIC0xNjgsMTAgKzE5NywxMSBAQA0KIEBjb21tZW50IG5vZGUtbmFtZSwgbmV4dCwgcHJl
dmlvdXMsIHVwDQogQGNoYXB0ZXIgVm9sdW50ZWVyaW5nIHRvIEhlbHANCiANCi1UaGUgQ2xhc3Nw
YXRoIHByb2plY3QgbmVlZHMgdm9sdW50ZWVycyB0byBoZWxwIHVzIG91dC4gIFBlb3BsZSBhcmUN
Ci1uZWVkZWQgdG8gd3JpdGUgdW5pbXBsZW1lbnRlZCBKYXZhIHBhY2thZ2VzLCB0byB0ZXN0IENs
YXNzcGF0aCBvbg0KLXZhcmlvdXMgcGxhdGZvcm1zLCBhbmQgdG8gcG9ydCBpdCB0byBwbGF0Zm9y
bXMgdGhhdCBhcmUgY3VycmVudGx5DQotdW5zdXBwb3J0ZWQuDQorVGhlIEdOVSBDbGFzc3BhdGgg
cHJvamVjdCBuZWVkcyB2b2x1bnRlZXJzIHRvIGhlbHAgdXMgb3V0LiAgUGVvcGxlIGFyZQ0KK25l
ZWRlZCB0byB3cml0ZSB1bmltcGxlbWVudGVkIGNvcmUgcGFja2FnZXMsIHRvIHRlc3QgR05VIENs
YXNzcGF0aCBvbg0KK2ZyZWUgc29mdHdhcmUgcHJvZ3JhbXMgd3JpdHRlbiBpbiB0aGUgamF2YSBw
cm9ncmFtbWluZyBsYW5ndWFnZSwgdG8NCit0ZXN0IGl0IG9uIHZhcmlvdXMgcGxhdGZvcm1zLCBh
bmQgdG8gcG9ydCBpdCB0byBwbGF0Zm9ybXMgdGhhdCBhcmUNCitjdXJyZW50bHkgdW5zdXBwb3J0
ZWQuDQogDQogV2hpbGUgcHJldHR5IG11Y2ggYWxsIGNvbnRyaWJ1dGlvbnMgYXJlIHdlbGNvbWUg
KGJ1dCBzZWUgDQogQHB4cmVme1JlcXVpcmVtZW50c30pIGl0IGlzIGFsd2F5cyBwcmVmZXJhYmxl
IHRoYXQgdm9sdW50ZWVycyBkbyB0aGUNCkBAIC0xODQsMTUgKzIxNCwxNiBAQA0KIFRoYXQgbWVh
bnMgaW1wbGVtZW50aW5nIGFueSBgYGludGVybmFsJycgY2xhc3Nlcy4gIEZvciBleGFtcGxlLCBp
biB0aGUNCiBqYXZhLm5ldCBwYWNrYWdlLCB0aGVyZSBhcmUgbm9uLXB1YmxpYyBjbGFzc2VzIGZv
ciBpbXBsZW1lbnRpbmcgc29ja2V0cy4NCiBXaXRob3V0IHRob3NlIGNsYXNzZXMsIHRoZSBwdWJs
aWMgc29ja2V0IGludGVyZmFjZSBpcyB1c2VsZXNzLiAgQnV0IGRvDQotbm90IGZlZWwgb2JsaWdh
dGVkIHRvIGNvbXBsZXRlbHkgcmVwbGFjZSBhbGwgb2YgU3VuJ3MgZnVuY3Rpb25hbGl0eSBhdA0K
K25vdCBmZWVsIG9ibGlnYXRlZCB0byBjb21wbGV0ZWx5IGltcGxlbWVudCBhbGwgb2YgdGhlIGZ1
bmN0aW9uYWxpdHkgYXQNCiBvbmNlLiAgRm9yIGV4YW1wbGUsIGluIHRoZSBqYXZhLm5ldCBwYWNr
YWdlLCB0aGVyZSBhcmUgZGlmZmVyZW50IHR5cGVzDQogb2YgcHJvdG9jb2wgaGFuZGxlcnMgZm9y
IGRpZmZlcmVudCB0eXBlcyBvZiBVUkwncy4gIE5vdCBhbGwgb2YgdGhlc2UNCiBuZWVkIHRvIGJl
IHdyaXR0ZW4gYXQgb25jZS4NCiANCiBAaXRlbQ0KLVBsZWFzZSB3cml0ZSBjb21wbGV0ZSBhbmQg
dGhvcm91Z2ggamF2YWRvYyBjb21tZW50cyBmb3IgZXZlcnkgcHVibGljIGFuZA0KLXByb3RlY3Rl
ZCBtZXRob2QgYW5kIHZhcmlhYmxlLiAgVGhlc2Ugc2hvdWxkIGJlIHN1cGVyaW9yIHRvIFN1bidz
IGFuZA0KLWNvdmVyIGV2ZXJ5dGhpbmcgYWJvdXQgdGhlIGl0ZW0gYmVpbmcgZG9jdW1lbnRlZC4N
CitQbGVhc2Ugd3JpdGUgY29tcGxldGUgYW5kIHRob3JvdWdoIEFQSSBkb2N1bWVudGF0aW9uIGNv
bW1lbnRzIGZvcg0KK2V2ZXJ5IHB1YmxpYyBhbmQgcHJvdGVjdGVkIG1ldGhvZCBhbmQgdmFyaWFi
bGUuICBUaGVzZSBzaG91bGQgYmUNCitzdXBlcmlvciB0byBTdW4ncyBhbmQgY292ZXIgZXZlcnl0
aGluZyBhYm91dCB0aGUgaXRlbSBiZWluZw0KK2RvY3VtZW50ZWQuDQogDQogQGl0ZW0NCiBQbGVh
c2Ugd3JpdGUgYSByZWdyZXNzaW9uIHRlc3QgcGFja2FnZSB0aGF0IGNhbiBiZSB1c2VkIHRvIHJ1
biB0ZXN0cw0KQEAgLTIwNCwxMSArMjM1LDExIEBADQogZW5zdXJlIGNvcnJlY3RuZXNzIGFuZCBw
cmV2ZW50IHJlZ3Jlc3Npb25zLiAgDQogQGVuZCBpdGVtaXplDQogDQotV2l0aCB0aGUgZXhjZXB0
aW9uIG9mIHRoZSBBV1QsIHdyaXRpbmcgdGVzdHMgYW5kIGZpeGluZyBidWdzIHNob3VsZCBiZQ0K
LWV2ZXJ5IGRldmVsb3BlcidzIHRvcCBwcmlvcml0eSBpbiBvcmRlciB0byByZWFjaCB0aGUgZWx1
c2l2ZSByZWxlYXNlDQotb2YgdmVyc2lvbiAxLjAuICANCitXcml0aW5nIGdvb2QgZG9jdW1lbnRh
dGlvbiwgdGVzdHMgYW5kIGZpeGluZyBidWdzIHNob3VsZCBiZSBldmVyeQ0KK2RldmVsb3Blcidz
IHRvcCBwcmlvcml0eSBpbiBvcmRlciB0byByZWFjaCB0aGUgZWx1c2l2ZSByZWxlYXNlIG9mDQor
dmVyc2lvbiAxLjAuDQogDQotQG5vZGUgUHJvamVjdCBHb2FscywgUHJvZ3JhbW1pbmcgVG9vbHMs
IFZvbHVudGVlcmluZywgVG9wDQorQG5vZGUgUHJvamVjdCBHb2FscywgTmVlZGVkIFRvb2xzIGFu
ZCBMaWJyYXJpZXMsIFZvbHVudGVlcmluZywgVG9wDQogQGNvbW1lbnQgbm9kZS1uYW1lLCBuZXh0
LCBwcmV2aW91cywgdXANCiBAY2hhcHRlciBQcm9qZWN0IEdvYWxzDQogDQpAQCAtMjM4LDExICsy
NjksMTkgQEANCiBjYW4gc2hpZnQgZGVwZW5kaW5nIG9uIHdoZXRoZXIgb3Igbm90IHRoZXJlIGlz
IGEgdm9sdW50ZWVyIHRvIHBvcnQNCiBDbGFzc3BhdGggdG8gdGhvc2UgcGxhdGZvcm1zIGFuZCB0
byB0ZXN0IHJlbGVhc2VzLg0KIA0KLUV2ZW50dWFsbHkgd2UgaG9wZSB0aGUgQ2xhc3NwYXRoIHdp
bGwgc3VwcG9ydCBhbGwgSlZNJ3MgdGhhdCBwcm92aWRlIEpOSQ0KLW9yIENOSSBzdXBwb3J0LiAg
SG93ZXZlciwgdGhlIHRvcCBwcmlvcml0eSBpcyBmcmVlIEpWTSdzLiAgQSBzbWFsbCwgYW5kDQot
cHJvYmFibHkgaW5jb21wbGV0ZSBsaXN0IGlzIGJlbG93Lg0KK0V2ZW50dWFsbHkgd2UgaG9wZSB0
aGUgQ2xhc3NwYXRoIHdpbGwgc3VwcG9ydCBhbGwgSlZNJ3MgdGhhdCBwcm92aWRlDQorSk5JIG9y
IENOSSBzdXBwb3J0LiAgSG93ZXZlciwgdGhlIHRvcCBwcmlvcml0eSBpcyBmcmVlIEpWTSdzLiAg
QSBzbWFsbA0KK2xpc3Qgb2YgQ29tcGlsZXIvVk0gZW52aXJvbm1lbnRzIHRoYXQgYXJlIGN1cnJl
bnRseSBhY3RpdmVseQ0KK2luY29ycG9yYXRpbmcgR05VIENsYXNzcGF0aCBpcyBiZWxvdy4gIEEg
bW9yZSBjb21wbGV0ZSBvdmVydmlldyBvZg0KK3Byb2plY3RzIGJhc2VkIG9uIEdOVSBjbGFzc3Bh
dGggY2FuIGJlIGZvdW5kIG9ubGluZSBhdA0KK0B1cmVme2h0dHA6Ly93d3cuZ251Lm9yZy9zb2Z0
d2FyZS9jbGFzc3BhdGgvc3Rvcmllcy5odG1sLHRoZSBHTlUNCitDbGFzc3BhdGggc3RvcmllcyBw
YWdlfS4NCiANCiBAZW51bWVyYXRlDQorQGl0ZW0NCitAdXJlZntodHRwOi8vZ2NjLmdudS5vcmcv
amF2YS8sR0NKfQ0KK0BpdGVtIA0KK0B1cmVme2h0dHA6Ly9qYW12bS5zb3VyY2Vmb3JnZS5uZXQv
LGphbXZtfQ0KIEBpdGVtIA0KIEB1cmVme2h0dHA6Ly9raXNzbWUuc291cmNlZm9yZ2UubmV0LyxL
aXNzbWV9DQogQGl0ZW0NCkBAIC0yNTAsMzUgKzI4OSw1MiBAQA0KIEBpdGVtDQogQHVyZWZ7aHR0
cDovL3d3dy5zYWJsZXZtLm9yZy8sU2FibGVWTX0NCiBAaXRlbQ0KLUB1cmVme2h0dHA6Ly93d3cu
aW50ZWwuY29tL3Jlc2VhcmNoL21ybC9vcnAvLEludGVsJ3MgT3BlbiBSdW50aW1lIFBsYXRmb3Jt
fQ0KLUBpdGVtDQogQHVyZWZ7aHR0cDovL3d3dy5rYWZmZS5vcmcvLEthZmZlfQ0KLUBpdGVtDQot
QHVyZWZ7aHR0cDovL3d3dy5qYXBoYXIub3JnLyxKYXBoYXJ9DQotQGl0ZW0NCi1AdXJlZntodHRw
Oi8vbGF0dGUuc251LmFjLmtyLyxMYVRUZX0NCiBAZW5kIGVudW1lcmF0ZQ0KIA0KIEFzIHdpdGgg
T1MgcGxhdGZvcm0gc3VwcG9ydCwgdGhpcyBwcmlvcml0eSBsaXN0IGNvdWxkIGNoYW5nZSBpZiBh
DQogdm9sdW50ZWVyIGNvbWVzIGZvcndhcmQgdG8gcG9ydCwgbWFpbnRhaW4sIGFuZCB0ZXN0IHJl
bGVhc2VzIGZvciBhDQotcGFydGljdWxhciBKVk0uICBLYWZmZSBpcyBub3cgZGV2ZWxvcGluZyBp
dHMgb3duIGNsYXNzIGxpYnJhcnksIHNvIHRoZQ0KLXByaW9yaXR5IG9mIHN1cHBvcnRpbmcgdGhh
dCBwbGF0Zm9ybSBpcyBub3QgYXMgaGlnaCBhcyBmb3Igb3RoZXIgZnJlZSBWTXMuDQotDQotVGhl
IGluaXRpYWwgdGFyZ2V0IHZlcnNpb24gZm9yIENsYXNzcGF0aCBpcyBKYXZhIDEuMS4gIEphdmEg
MiBjYW4gYmUNCi1pbXBsZW1lbnRlZCBpZiBkZXNpcmVkLCBidXQgcGxlYXNlIGRvIG5vdCBjcmVh
dGUgY2xhc3NlcyB0aGF0IGRlcGVuZCBvbg0KLUphdmEgMiBmZWF0dXJlcyBpbiBvdGhlciBwYWNr
YWdlcyB1bmxlc3MgQ2xhc3NwYXRoIGFscmVhZHkgY29udGFpbnMNCi10aG9zZSBmZWF0dXJlcy4N
CitwYXJ0aWN1bGFyIEpWTS4gIFNpbmNlIGdjaiBpcyBwYXJ0IG9mIHRoZSBHTlUgQ29tcGlsZXIg
Q29sbGVjdGl2ZSBpdA0KK2lzIG9uZSBvZiB0aGUgbW9zdCBpbXBvcnRhbnQgdGFyZ2V0cy4gIEJ1
dCBzaW5jZSBpdCBkb2Vzbid0IGN1cnJlbnRseQ0KK3dvcmsgb3V0IG9mIHRoZSBib3ggd2l0aCBH
TlUgQ2xhc3NwYXRoIGl0IGlzIGN1cnJlbnRseSBub3QgdGhlIGVhc2llc3QNCit0YXJnZXQuICBX
aGVuIGhhY2tpbmcgb24gR05VIENsYXNzcGF0aCB0aGUgZWFzaWVzdCBpcyB0byB1c2UNCitjb21w
aWxlcnMgYW5kIHJ1bnRpbWUgZW52aXJvbm1lbnRzIHRoYXQgdGhhdCB3b3JrIG91dCBvZiB0aGUg
Ym94IHdpdGgNCitpdCwgc3VjaCBhcyB0aGUgamlrZXMgY29tcGlsZXIgYW5kIHRoZSBydW50aW1l
IGVudmlyb25tZW50cyBqYW12bSBhbmQNCitraXNzbWUuICBCdXQgeW91IGNhbiBhbHNvIHdvcmsg
ZGlyZWN0bHkgd2l0aCB0YXJnZXRzIGxpa2UgZ2NqIGFuZA0KK2thZmZlIHRoYXQgaGF2ZSB0aGVp
ciBvd24gY29weSBvZiBHTlUgQ2xhc3NwYXRoIGN1cnJlbnRseS4gIEluIHRoYXQNCitjYXNlIGNo
YW5nZXMgaGF2ZSB0byBiZSBtZXJnZWQgYmFjayBpbnRvIEdOVSBDbGFzc3BhdGggcHJvcGVyIHRo
b3VnaCwNCit3aGljaCBpcyBzb21ldGltZXMgbW9yZSB3b3JrLiAgU2FibGVWTSBpcyBzdGFydGlu
ZyB0byBtaWdyYXRlIGZyb20gYW4NCitpbnRlZ3JhdGVkIEdOVSBDbGFzc3BhdGggdmVyc2lvbiB0
byBiZWluZyB1c2FibGUgd2l0aCBHTlUgQ2xhc3NwYXRoDQorb3V0IG9mIHRoZSBib3guDQorDQor
DQorVGhlIGluaXRpYWwgdGFyZ2V0IHZlcnNpb24gZm9yIENsYXNzcGF0aCBpcyB0aGUgMS4xIHNw
ZWMuICBIaWdoZXINCit2ZXJzaW9ucyBjYW4gYmUgaW1wbGVtZW50ZWQgKGFuZCBoYXZlIGJlZW4g
aW1wbGVtZW50ZWQsIGluY2x1ZGluZyBsb3RzDQorb2YgMS40IGZ1bmN0aW9uYWxpdHkpIGlmIGRl
c2lyZWQsIGJ1dCBwbGVhc2UgZG8gbm90IGNyZWF0ZSBjbGFzc2VzDQordGhhdCBkZXBlbmQgb24g
ZmVhdHVyZXMgaW4gdGhvc2UgcGFja2FnZXMgdW5sZXNzIEdOVSBDbGFzc3BhdGggYWxyZWFkeQ0K
K2NvbnRhaW5zIHRob3NlIGZlYXR1cmVzLiAgR05VIENsYXNzcGF0aCBoYXMgYmVlbiBmcmVlIG9m
IGFueQ0KK3Byb3ByaWV0YXJ5IGRlcGVuZGVuY2llcyBmb3IgYSBsb25nIHRpbWUgbm93IGFuZCB3
ZSBsaWtlIHRvIGtlZXAgaXQNCit0aGF0IHdheS4gIEJ1dCBmaW5pc2hpbmcsIHBvbGlzaGluZyB1
cCwgZG9jdW1lbnRpbmcsIHRlc3RpbmcgYW5kDQorZGVidWdnaW5nIGN1cnJlbnQgZnVuY3Rpb25h
bGl0eSBpcyBvZiBoaWdoZXIgcHJpb3JpdHkgdGhlbiBhZGRpbmcgbmV3DQorZnVuY3Rpb25hbGl0
eS4NCiANCi1Abm9kZSBQcm9ncmFtbWluZyBUb29scywgUHJvZ3JhbW1pbmcgU3RhbmRhcmRzLCBQ
cm9qZWN0IEdvYWxzLCBUb3ANCitAbm9kZSBOZWVkZWQgVG9vbHMgYW5kIExpYnJhcmllcywgUHJv
Z3JhbW1pbmcgU3RhbmRhcmRzLCBQcm9qZWN0IEdvYWxzLCBUb3ANCiBAY29tbWVudCBub2RlLW5h
bWUsIG5leHQsIHByZXZpb3VzLCB1cA0KLUBjaGFwdGVyIFByb2dyYW1taW5nIFRvb2xzDQorQGNo
YXB0ZXIgTmVlZGVkIFRvb2xzIGFuZCBMaWJyYXJpZXMNCiANCi1JZiB5b3Ugd2FudCB0byBoYWNr
IG9uIENsYXNzcGF0aCwgeW91IHNob3VsZCBkb3dubG9hZCwgaW5zdGFsbCwgYW5kDQotZmFtaWxp
YXJpemUgeW91cnNlbGYgd2l0aCB0aGUgZm9sbG93aW5nIHRvb2xzOg0KK0lmIHlvdSB3YW50IHRv
IGhhY2sgb24gQ2xhc3NwYXRoLCB5b3Ugc2hvdWxkIGF0IGxlYXN0IGRvd25sb2FkIGFuZA0KK2lu
c3RhbGwgdGhlIGZvbGxvd2luZyB0b29scy4gIEFuZCB0cnkgdG8gZmFtaWxpYXJpemUgeW91cnNl
bGYgd2l0aA0KK3RoZW0uICBBbHRob3VnaCBpbiBtb3N0IGNhc2VzIGhhdmluZyB0aGVzZSB0b29s
cyBpbnN0YWxsZWQgd2lsbCBiZSBhbGwNCit5b3UgcmVhbGx5IG5lZWQgdG8ga25vdyBhYm91dCB0
aGVtLiAgQWxzbyBub3RlIHRoYXQgd2hlbiB3b3JraW5nIG9uDQorKHNuYXBzaG90KSByZWxlYXNl
cyBvbmx5IEdDQyAzLjMrIChwbHVzIGEgZnJlZSBWTSBmcm9tIHRoZSBsaXN0IGFib3ZlDQorYW5k
IHRoZSBsaWJyYXJpZXMgbGlzdGVkIGJlbG93KSBpcyBuZWVkZWQuICBUaGUgb3RoZXIgdG9vbHMg
YXJlIG9ubHkNCituZWVkZWQgd2hlbiB3b3JraW5nIGRpcmVjdGx5IG9uIHRoZSBDVlMgdmVyc2lv
bi4NCiANCiBAaXRlbWl6ZSBAYnVsbGV0DQogQGl0ZW0NCi1DVlMgMS4xMQ0KK0dDQyAzLjMrDQor
QGl0ZW0NCitDVlMgMS4xMSsNCiBAaXRlbQ0KIGF1dG9tYWtlIDEuNysNCiBAaXRlbQ0KQEAgLTMw
MSwxMSArMzU3LDE3IEBADQogDQogQHRhYmxlIEBiDQogDQorQGl0ZW0gR0NDDQorVGhlIEdOVSBD
b21waWxlciBDb2xsZWN0aW9uLiBUaGlzIGNvbnRhaW5zIGEgQyBjb21waWxlciAoZ2NjKSBmb3IN
Citjb21waWxpbmcgdGhlIG5hdGl2ZSBDIGNvZGUgYW5kIGEgY29tcGlsZXIgZm9yIHRoZSBqYXZh
IHByb2dyYW1taW5nDQorbGFuZ3VhZ2UgKGdjaikuICBZb3Ugd2lsbCBuZWVkIGF0IGxlYXN0IGdj
aiB2ZXJzaW9uIDMuMyBvciBoaWdoZXIuICBJZg0KK3RoYXQgdmVyc2lvbiBpcyBub3QgYXZhaWxh
YmxlIGZvciB5b3VyIHBsYXRmb3JtIHlvdSBjYW4gdHJ5IHRoZQ0KK0B1cmVme2h0dHA6Ly93d3cu
amlrZXMub3JnLywgamlrZXMgY29tcGlsZXJ9LiAgV2UgdHJ5IHRvIGtlZXAgYWxsIGNvZGUNCitj
b21waWxhYmxlIHdpdGggYm90aCBnY2ogYW5kIGppa2VzIGF0IGFsbCB0aW1lcy4NCisNCiBAaXRl
bSBDVlMgIA0KIEEgdmVyc2lvbiBjb250cm9sIHN5c3RlbSB0aGF0IG1haW50YWlucyBhIGNlbnRy
YWxpemVkIEludGVybmV0DQotcmVwb3NpdG9yeSBvZiBhbGwgY29kZSBpbiB0aGUgQ2xhc3NwYXRo
IHN5c3RlbS4gIEFjY2VzcyB0byB0aGUNCi1yZXBvc2l0b3J5IHJlcXVpcmVzIGFuIGFjY291bnQu
ICBDb250YWN0IEMuIEJyaWFuIEpvbmVzDQotKEBlbWFpbHtjYmpAQGdudS5vcmd9KSBmb3IgZGV0
YWlscy4NCityZXBvc2l0b3J5IG9mIGFsbCBjb2RlIGluIHRoZSBDbGFzc3BhdGggc3lzdGVtLg0K
IA0KIEBpdGVtIGF1dG9tYWtlICANCiBUaGlzIHRvb2wgYXV0b21hdGljYWxseSBjcmVhdGVzIE1h
a2VmaWxlLmluIGZpbGVzIGZyb20gTWFrZWZpbGUuYW0NCkBAIC0zMzQsMzYgKzM5NiwxNjcgQEAN
CiBMYXJyeSBXYWxsJ3Mgc2NyaXB0aW5nIGxhbmd1YWdlLiAgSXQgaXMgdXNlZCBpbnRlcm5hbGx5
IGJ5IGF1dG9tYWtlLg0KIEBlbmQgdGFibGUNCiANCi1Abm9kZSBQcm9ncmFtbWluZyBTdGFuZGFy
ZHMsIFByb2dyYW1taW5nIEdvYWxzLCBQcm9ncmFtbWluZyBUb29scywgVG9wDQorDQorRm9yIGNv
bXBpbGluZyB0aGUgbmF0aXZlIEFXVCBsaWJyYXJpZXMgeW91IG5lZWQgdG8gaGF2ZSB0aGUgZm9s
bG93aW5nDQorbGlicmFyaWVzIGluc3RhbGxlZDoNCisNCitAdGFibGUgQGINCitAaXRlbSBHVEsr
IDIuMi54DQorQHVyZWZ7aHR0cDovL3d3dy5ndGsub3JnLyxHVEsrfSBpcyBhIG11bHRpLXBsYXRm
b3JtIHRvb2xraXQgZm9yDQorY3JlYXRpbmcgZ3JhcGhpY2FsIHVzZXIgaW50ZXJmYWNlcy4gIEl0
IGlzIHVzZWQgYXMgdGhlIGJhc2lzIG9mIHRoZQ0KK0dOVSBkZXNrdG9wIHByb2plY3QgR05PTUUu
DQorDQorQGl0ZW0gbGliYXJ0LWxncGwgMi4xKw0KK0B1cmVme2h0dHA6Ly93d3cuZ25vbWUub3Jn
L3N0YXJ0LyxsaWJhcnR9IGlzIGEgR05PTUUgbGlicmFyeSBvZg0KK2Z1bmN0aW9ucyBmb3IgMkQg
Z3JhcGhpY3MuDQorDQorQGl0ZW0gZ2RrLXBpeGJ1Zg0KK0B1cmVme2h0dHA6Ly93d3cuZ25vbWUu
b3JnL3N0YXJ0LyxnZGstcGl4YnVmfSBpcyBhIEdOT01FIGxpYnJhcnkgZm9yDQorcmVwcmVzZW50
aW5nIGltYWdlcy4NCitAZW5kIHRhYmxlDQorDQorDQorR05VIENsYXNzcGF0aCBjb21lcyB3aXRo
IGEgY291cGxlIG9mIGxpYnJhcmllcyBpbmNsdWRlZCBpbiB0aGUgc291cmNlDQordGhhdCBhcmUg
bm90IHBhcnQgb2YgR05VIENsYXNzcGF0aCBwcm9wZXIsIGJ1dCB0aGF0IGhhdmUgYmVlbiBpbmNs
dWRlZA0KK3RvIHByb3ZpZGUgY2VydGFpbiBuZWVkZWQgZnVuY3Rpb25hbGl0eS4gIEFsbCB0aGVz
ZSBleHRlcm5hbCBsaWJyYXJpZXMNCitzaG91bGQgYmUgY2xlYXJseSBtYXJrZWQgYXMgc3VjaC4g
IEluIGdlbmVyYWwgd2UgdHJ5IHRvIHVzZSBhcyBtdWNoIGFzDQorcG9zc2libGUgdGhlIGNsZWFu
IHVwc3RyZWFtIHZlcnNpb25zIG9mIHRoZXNlIHNvdXJjZXMuICBUaGF0IHdheQ0KK21lcmdpbmcg
aW4gbmV3IHZlcnNpb25zIHdpbGwgYmUgZWFzaWVzdC4gIFlvdSBzaG91bGQgYWx3YXlzIHRyeSB0
byBnZXQNCitidWcgZml4ZXMgdG8gdGhlc2UgZmlsZXMgYWNjZXB0ZWQgdXBzdHJlYW0gZmlyc3Qu
ICBDdXJyZW50bHkgd2UNCitpbmNsdWRlIHRoZSBmb2xsb3dpbmcgJ2V4dGVybmFsJyBsaWJyYXJp
ZXMuICBNb3N0IG9mIHRoZXNlIHNvdXJjZXMgYXJlDQoraW5jbHVkZWQgaW4gdGhlIEBmaWxle2V4
dGVybmFsfSBkaXJlY3RvcnkuICBUaGF0IGRpcmVjdG9yeSBhbHNvDQorY29udGFpbnMgYSBAZmls
ZXtSRUFETUV9IGZpbGUgZXhwbGFpbmluZyBob3cgdG8gaW1wb3J0IG5ld2VyIHZlcnNpb25zLg0K
Kw0KK0B0YWJsZSBAYg0KKw0KK0BpdGVtIEdOVSBqYXhwDQorQ2FuIGJlIGZvdW5kIGluIEBmaWxl
e2V4dGVybmFsL2pheHB9LiAgUHJvdmlkZXMgamF2YXgueG1sLCBvcmcudzNjIGFuZA0KK29yZy54
bWwgcGFja2FnZXMuICBVcHN0cmVhbSBpcw0KK0B1cmVme2h0dHA6Ly93d3cuZ251Lm9yZy9zb2Z0
d2FyZS9jbGFzc3BhdGh4LyxHTlUgQ2xhc3NwYXRoWH0uDQorDQorQGl0ZW0gZmRsaWJtDQorQ2Fu
IGJlIGZvdW5kIGluIEBmaWxle25hdGl2ZS9mZGxpYm19LiAgUHJvdmlkZXMgbmF0aXZlIGltcGxl
bWVudGF0aW9ucw0KK29mIHNvbWUgb2YgdGhlIEZsb2F0IGFuZCBEb3VibGUgb3BlcmF0aW9ucy4g
IFVwc3RyZWFtIGlzDQorQHVyZWZ7aHR0cDovL2djYy5nbnUub3JnL2phdmEvLGxpYmdjan0sIHRo
ZXkgc3luYyBhZ2FpbiB3aXRoIHRoZQ0KKydyZWFsJyB1cHN0cmVhbSBAdXJlZntodHRwOi8vd3d3
Lm5ldGxpYi5vcmcvZmRsaWJtL3JlYWRtZX0uICBTZWUgYWxzbw0KK2phdmEubGFuZy5TdHJpY3RN
YXRoLg0KKw0KK0BlbmQgdGFibGUNCisNCisNCitAbm9kZSBQcm9ncmFtbWluZyBTdGFuZGFyZHMs
IEhhY2tpbmcgQ29kZSwgTmVlZGVkIFRvb2xzIGFuZCBMaWJyYXJpZXMsIFRvcA0KIEBjb21tZW50
IG5vZGUtbmFtZSwgbmV4dCwgcHJldmlvdXMsIHVwDQogQGNoYXB0ZXIgUHJvZ3JhbW1pbmcgU3Rh
bmRhcmRzDQogDQotRm9yIEMgY29kZSwgZm9sbG93IHRoZQ0KK0ZvciBDIHNvdXJjZSBjb2RlLCBm
b2xsb3cgdGhlDQogQHVyZWZ7aHR0cDovL3d3dy5mc2Yub3JnL3ByZXAvc3RhbmRhcmRzX3RvYy5o
dG1sLEdOVSBDb2RpbmcgU3RhbmRhcmRzfS4NCiBUaGUgc3RhbmRhcmRzIGFsc28gc3BlY2lmeSB2
YXJpb3VzIHRoaW5ncyBsaWtlIHRoZSBpbnN0YWxsIGRpcmVjdG9yeQ0KIHN0cnVjdHVyZS4gIFRo
ZXNlIHNob3VsZCBiZSBmb2xsb3dlZCBpZiBwb3NzaWJsZS4NCiANCi1Gb3IgSmF2YSBjb2RlLCBw
bGVhc2UgZm9sbG93IHRoZQ0KLUB1cmVme2h0dHA6Ly93d3cuZnNmLm9yZy9wcmVwL3N0YW5kYXJk
c190b2MuaHRtbCxHTlUgQ29kaW5nIFN0YW5kYXJkc30sDQotd2l0aCB0aGUgZXhjZXB0aW9uIG9m
IG5hbWluZyBjb252ZW50aW9ucy4gIFBsZWFzZSBmb2xsb3cNCi1AdXJlZntodHRwOi8vamF2YS5z
dW4uY29tL2RvY3MvY29kZWNvbnYvaHRtbC9Db2RlQ29udmVudGlvbnMuZG9jOC5odG1sLFN1bidz
DQotbmFtaW5nIGNvbnZlbnRpb25zfS4gIFRoZXJlIGFyZSBhIG51bWJlciBvZiBleGNlcHRpb25z
IHRvIHRoZSBHTlUNCi1Db2RpbmcgU3RhbmRhcmRzIHRoYXQgd2UgbWFrZSBmb3IgR05VIENsYXNz
cGF0aCBhbmQgdGhlc2Ugd2lsbCBiZQ0KLWRvY3VtZW50ZWQgc29vbiBhcyB3ZWxsIGFzIGhvcGVm
dWxseSBwcm92aWRpbmcgZGV2ZWxvcGVycyB3aXRoIGEgY29kZQ0KLWZvcm1hdHRpbmcgdG9vbCB0
aGF0IGNsb3NlbHkgbWF0Y2hlcyB0aG9zZSBydWxlcy4NCitGb3IgSmF2YSBzb3VyY2UgY29kZSwg
cGxlYXNlIGZvbGxvdyB0aGUNCitAdXJlZntodHRwOi8vd3d3LmZzZi5vcmcvcHJlcC9zdGFuZGFy
ZHNfdG9jLmh0bWwsR05VIENvZGluZw0KK1N0YW5kYXJkc30sIGFzIG11Y2ggYXMgcG9zc2libGUu
ICBUaGVyZSBhcmUgYSBudW1iZXIgb2YgZXhjZXB0aW9ucyB0bw0KK3RoZSBHTlUgQ29kaW5nIFN0
YW5kYXJkcyB0aGF0IHdlIG1ha2UgZm9yIEdOVSBDbGFzc3BhdGggYXMgZG9jdW1lbnRlZA0KK2lu
IHRoaXMgZ3VpZGUuICBXZSB3aWxsIGhvcGVmdWxseSBiZSBwcm92aWRpbmcgZGV2ZWxvcGVycyB3
aXRoIGEgY29kZQ0KK2Zvcm1hdHRpbmcgdG9vbCB0aGF0IGNsb3NlbHkgbWF0Y2hlcyB0aG9zZSBy
dWxlcyBzb29uLg0KIA0KLUZvciBkb2N1bWVudGF0aW9uIGNvbW1lbnRzLCBwbGVhc2UgZm9sbG93
DQorRm9yIEFQSSBkb2N1bWVudGF0aW9uIGNvbW1lbnRzLCBwbGVhc2UgZm9sbG93DQogQHVyZWZ7
aHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9qZGsvamF2YWRvYy93cml0aW5nZG9jY29tbWVu
dHMuaHRtbCxIb3cNCi10byBXcml0ZSBEb2MgQ29tbWVudHMgZm9yIEphdmFkb2N9Lg0KK3RvIFdy
aXRlIERvYyBDb21tZW50cyBmb3IgSmF2YWRvY30uICBXZSB3b3VsZCBsaWtlIHRvIGhhdmUgYSBz
ZXQgb2YNCitndWlkZWxpbmVzIG1vcmUgdGFpbG9yZWQgdG8gR05VIENsYXNzcGF0aCBhcyBwYXJ0
IG9mIHRoaXMgZG9jdW1lbnQuDQorDQorQG1lbnUNCisqIFNvdXJjZSBDb2RlIFN0eWxlIEd1aWRl
OjogICAgIA0KK0BlbmQgbWVudQ0KKw0KK0Bub2RlIFNvdXJjZSBDb2RlIFN0eWxlIEd1aWRlLCAg
LCBQcm9ncmFtbWluZyBTdGFuZGFyZHMsIFByb2dyYW1taW5nIFN0YW5kYXJkcw0KK0Bjb21tZW50
IG5vZGUtbmFtZSwgbmV4dCwgcHJldmlvdXMsIHVwDQorQHNlY3Rpb24gSmF2YSBzb3VyY2UgY29k
aW5nIHN0eWxlDQogDQorSGVyZSBpcyBhIGxpc3Qgb2Ygc29tZSBzcGVjaWZpYyBydWxlcyB1c2Vk
IHdoZW4gaGFja2luZyBvbiBHTlUNCitDbGFzc3BhdGggamF2YSBzb3VyY2UgY29kZS4gV2UgdHJ5
IHRvIGZvbGxvdyB0aGUgc3RhbmRhcmQNCitAdXJlZntodHRwOi8vd3d3LmdudS5vcmcvcHJlcC9z
dGFuZGFyZHNfMjMuaHRtbCxHTlUgQ29kaW5nIFN0YW5kYXJkc30NCitmb3IgdGhhdC4gVGhlcmUg
YXJlIGxvdHMgb2YgdG9vbHMgdGhhdCBjYW4gYXV0b21hdGljYWxseSBnZW5lcmF0ZSBpdA0KKyhh
bHRob3VnaCBtb3N0IHRvb2xzIGFzc3VtZSBDIHNvdXJjZSwgbm90IGphdmEgc291cmNlIGNvZGUp
IGFuZCBpdA0KK3NlZW1zIGFzIGdvb2QgYSBzdGFuZGFyZCBhcyBhbnkuIFRoZXJlIGFyZSBhIGNv
dXBsZSBvZiBleGNlcHRpb25zIGFuZA0KK3NwZWNpZmljIHJ1bGVzIHdoZW4gaGFja2luZyBvbiBH
TlUgQ2xhc3NwYXRoIGphdmEgc291cmNlIGNvZGUgaG93ZXZlci4NCitUaGUgZm9sbG93aW5nIGxp
c3RzIGhvdyBjb2RlIGlzIGZvcm1hdHRlZCAoYW5kIHNvbWUgb3RoZXIgY29kZQ0KK2NvbnZlbnRp
b25zKToNCiANCi1IZXJlIGlzIGEgbGlzdCBvZiBzb21lIHNwZWNpZmljIHJ1bGVzIHVzZWQgd2hl
biBoYWNraW5nIG9uIENsYXNzcGF0aC4NCiANCi1AYyBGSVhNRSBmb3Igbm93IHRoZXJlIGlzIG9u
bHkgb25lLCBzbyBqdXN0IHB1dCBpdCBoZXJlDQotQGMgcmVhbGx5IHdlIG5lZWQgYSBuZXcgbm9k
ZSwgYW5kIGEgY29sbGVjdGVkIGxpc3Qgb2Ygc3VjaCBydWxlcw0KIEBpdGVtaXplDQogDQogQGl0
ZW0NCitJZiBwb3NzaWJsZSwgZ2VuZXJhdGUgc3BlY2lmaWMgaW1wb3J0cyAoZXhwYW5kKSBvdmVy
IGphdmEuaW8uKiB0eXBlDQoraW1wb3J0cy4gIE9yZGVyIGJ5IGdudSwgamF2YSwgamF2YXgsIG9y
Zy4NCisNCitAaXRlbQ0KK0JsYW5rIGxpbmUgYWZ0ZXIgcGFja2FnZSBzdGF0ZW1lbnQsIGxhc3Qg
aW1wb3J0IHN0YXRlbWVudCwgY2xhc3NlcywNCitpbnRlcmZhY2VzLCBtZXRob2RzLg0KKw0KK0Bp
dGVtDQorT3BlbmluZy9jbG9zaW5nIGJyYWNlIGZvciBjbGFzcyBhbmQgbWV0aG9kIGlzIGF0IHRo
ZSBzYW1lIGxldmVsIG9mDQoraW5kZW50IGFzIHRoZSBkZWNsYXJhdGlvbi4gIEFsbCBvdGhlciBi
cmFjZXMgYXJlIGluZGVudGVkIGFuZCBjb250ZW50DQorYmV0d2VlbiBicmFjZXMgaW5kZW50ZWQg
YWdhaW4uDQorDQorQGl0ZW0NCitTaW5jZSBtZXRob2QgZGVmaW5pdGlvbnMgZG9uJ3Qgc3RhcnQg
aW4gY29sdW1uIHplcm8gYW55d2F5IChzaW5jZSB0aGV5DQorYXJlIGFsd2F5cyBpbnNpZGUgYSBj
bGFzcyBkZWZpbml0aW9uKSwgdGhlIHJhdGlvbmFsIGZvciBlYXN5IGdyZXBwaW5nDQorZm9yIGBg
Xm1ldGhvZF9kZWYnJyBpcyBtb3N0bHkgZ29uZSBhbHJlYWR5LiBTaW5jZSBpdCBpcyBjdXN0b21h
cnkgZm9yDQorYWxtb3N0IGV2ZXJ5Ym9keSB3aG8gd3JpdGVzIGphdmEgc291cmNlIGNvZGUgdG8g
cHV0IG1vZGlmaWVycywgcmV0dXJuDQordmFsdWUgYW5kIG1ldGhvZCBuYW1lIG9uIHRoZSBzYW1l
IGxpbmUsIHdlIGRvIHRvby4NCisNCitAYyBmaXhtZSBBbm90aGVyIHJhdGlvbmFsIGZvciBhbHdh
eXMgaW5kZW50aW5nIHRoZSBtZXRob2QgZGVmaW5pdGlvbiBpcyB0aGF0IGl0bWFrZXMgaXQgYSBi
aXQgZWFzaWVyIHRvIGRpc3Rpbmd1aXNoIG1ldGhvZHMgaW4gaW5uZXIgYW5kIGFub255bW91c2Ns
YXNzZXMgZnJvbSBjb2RlIGluIHRoZWlyIGVuY2xvc2luZyBjb250ZXh0LiBORUVEIEVYQU1QTEUu
DQorDQorQGl0ZW0NCitJbXBsZW1lbnRzIGFuZCBleHRlbmRzIG9uIHNlcGFyYXRlIGxpbmVzLCB0
aHJvd3MgdG9vLiAgSW5kZW50IGV4dGVuZHMsDQoraW1wbGVtZW50cywgdGhyb3dzLiAgQXBwbHkg
ZGVlcCBpbmRlbnRhdGlvbiBmb3IgbWV0aG9kIGFyZ3VtZW50cy4NCisNCitAYyBmaXhtZSBOZWVk
cyBleGFtcGxlLg0KKw0KK0BpdGVtDQorRG9uJ3QgYWRkIGEgc3BhY2UgYmV0d2VlbiBhIG1ldGhv
ZCBvciBjb25zdHJ1Y3RvciBjYWxsL2RlZmluaXRpb24gYW5kDQordGhlIG9wZW4tYnJhY2tldC4g
VGhpcyBpcyBiZWNhdXNlIG9mdGVuIHRoZSByZXR1cm4gdmFsdWUgaXMgYW4gb2JqZWN0IG9uDQor
d2hpY2ggeW91IHdhbnQgdG8gYXBwbHkgYW5vdGhlciBtZXRob2Qgb3IgZnJvbSB3aGljaCB5b3Ug
d2FudCB0byBhY2Nlc3MNCithIGZpZWxkLg0KKyAgICAgICAgDQorRG9uJ3Qgd3JpdGU6DQorDQor
QGV4YW1wbGUNCisgIGdldFRvb2xraXQgKCkuY3JlYXRlV2luZG93ICh0aGlzKTsNCitAZW5kIGV4
YW1wbGUNCisNCitCdXQgd3JpdGU6DQorQGV4YW1wbGUNCisgIGdldFRvb2xraXQoKS5jcmVhdGVX
aW5kb3codGhpcyk7DQorQGVuZCBleGFtcGxlDQorDQorQGl0ZW0NCitUaGUgR05VIENvZGluZyBT
dGFuZGFyZCBpdCBnaXZlcyBleGFtcGxlcyBmb3IgYWxtb3N0IGV2ZXJ5IGNvbnN0cnVjdA0KKyhp
Ziwgc3dpdGNoLCBkbywgd2hpbGUsIGV0Yy4pLiAgT25lIG1pc3NpbmcgaXMgdGhlIHRyeS1jYXRj
aCBjb25zdHJ1Y3QNCit3aGljaCBzaG91bGQgYmUgZm9ybWF0dGVkIGFzOg0KKw0KK0BleGFtcGxl
DQorICB0cnkNCisgICAgQHsNCisgICAgICAvLw0KKyAgICBAfQ0KKyAgY2F0Y2ggKC4uLikNCisg
ICAgQHsNCisgICAgICAvLw0KKyAgICBAfQ0KK0BlbmQgZXhhbXBsZQ0KKw0KK0BpdGVtDQorV3Jh
cCBsaW5lcyBhdCA4MCBjaGFyYWN0ZXJzIGFmdGVyIGFzc2lnbm1lbnRzIGFuZCBiZWZvcmUgb3Bl
cmF0b3JzLg0KK1dyYXAgYWx3YXlzIGJlZm9yZSBleHRlbmRzLCBpbXBsZW1lbnRzLCB0aHJvd3Ms
IGFuZCBsYWJlbHMuDQorDQorQGl0ZW0NCitEb24ndCBwdXQgbXVsdGlwbGUgY2xhc3MgZGVmaW5p
dGlvbnMgaW4gdGhlIHNhbWUgZmlsZSwgZXhjZXB0IGZvcg0KK2lubmVyIGNsYXNzZXMuIEZpbGUg
bmFtZXMgKHBsdXMgLmphdmEpIGFuZCBjbGFzcyBuYW1lcyBzaG91bGQgYmUgdGhlDQorc2FtZS4N
CisNCitAaXRlbQ0KIERvbid0IGNhdGNoIGEgQGNvZGV7TnVsbFBvaW50ZXJFeGNlcHRpb259IGFz
IGFuIGFsdGVybmF0aXZlIHRvIHNpbXBseQ0KIGNoZWNraW5nIGZvciBAY29kZXtudWxsfS4gIEl0
IGlzIGNsZWFyZXIgYW5kIHVzdWFsbHkgbW9yZSBlZmZpY2llbnQNCiB0byBzaW1wbHkgd3JpdGUg
YW4gZXhwbGljaXQgY2hlY2suDQpAQCAtNDMzLDEwICs2MjYsMjQwIEBADQogV2hlbiBvdmVycmlk
aW5nIEBjb2Rle09iamVjdC5lcXVhbHN9LCByZW1lbWJlciB0aGF0IEBjb2Rle2luc3RhbmNlb2Z9
DQogZmlsdGVycyBvdXQgQGNvZGV7bnVsbH0sIHNvIGFuIGV4cGxpY2l0IGNoZWNrIGlzIG5vdCBu
ZWVkZWQuDQogDQorQGl0ZW0NCitXaGVuIGNhdGNoaW5nIGFuIGV4Y2VwdGlvbiBhbmQgcmV0aHJv
d2luZyBhIG5ldyBleGNlcHRpb24geW91IHNob3VsZA0KK2BgY2hhaW4nJyB0aGUgVGhyb3dhYmxl
cy4gIERvbid0IGp1c3QgYWRkIHRoZSBTdHJpbmcgcmVwcmVzZW50YXRpb24gb2YNCit0aGUgY2F0
Y2hlZCBleGNlcHRpb24uDQorDQorQGV4YW1wbGUNCisgIHRyeQ0KKyAgICBAew0KKyAgICAgIC8v
IFNvbWUgY29kZSB0aGF0IGNhbiB0aHJvdw0KKyAgICBAfQ0KKyAgY2F0Y2ggKElPRXhjZXB0aW9u
IGlvZSkNCisgICAgQHsNCisgICAgICB0aHJvdyAoU1FMRXhjZXB0aW9uKSBuZXcgU1FMRXhjZXB0
aW9uKCJEYXRhYmFzZSBjb3JydXB0Iikuc2V0Q2F1c2UoaW9lKTsNCisgICAgQH0NCitAZW5kIGV4
YW1wbGUNCisNCitAYyBmaXhtZSBEZXNjcmliZSBBbm9ueW1vdXMgY2xhc3NlcyAoZXhhbXBsZSku
DQorQGMgZml4bWUgRGVzY2liZSBOYW1pbmcgY29udmVudGlvbnMgd2hlbiBkaWZmZXJlbnQgZnJv
bSBHTlUgQ29kaW5nIFN0YW5kYXJkcy4NCitAYyBmaXhtZSBEZXNjcmliZWUgQVBJIGRvYyBqYXZh
ZG9jIHRhZ3MgdXNlZC4NCisNCitAZW5kIGl0ZW1pemUNCisNCitTb21lIHRoaW5ncyBhcmUgdGhl
IHNhbWUgYXMgaW4gdGhlIG5vcm1hbCBHTlUgQ29kaW5nIFN0YW5kYXJkczoNCisNCitAaXRlbWl6
ZQ0KKw0KK0BpdGVtDQorVW5uZWNlc3NhcnkgYnJhY2VzIGNhbiBiZSByZW1vdmVkLCBvbmUgbGlu
ZSBhZnRlciBhbiBpZiwgZm9yLCB3aGlsZSBhcw0KK2V4YW1wbGVzLg0KKw0KK0BpdGVtDQorU3Bh
Y2UgYXJvdW5kIG9wZXJhdG9ycyAoYXNzaWdubWVudCwgbG9naWNhbCwgcmVsYXRpb25hbCwgYml0
d2lzZSwNCittYXRoZW1hdGljYWwsIHNoaWZ0KS4NCisNCitAaXRlbQ0KK0JsYW5rIGxpbmUgYmVm
b3JlIHNpbmdsZS1saW5lIGNvbW1lbnRzLCBtdWx0aS1saW5lIGNvbW1lbnRzLCBqYXZhZG9jDQor
Y29tbWVudHMuDQorDQorQGl0ZW0NCitJZiBtb3JlIHRoYW4gMiBibGFuayBsaW5lcywgdHJpbSB0
byAyLg0KKw0KK0BpdGVtDQorRG9uJ3Qga2VlcCBjb21tZW50ZWQgb3V0IGNvZGUuICBKdXN0IHJl
bW92ZSBpdCBvciBhZGQgYSByZWFsIGNvbW1lbnQNCitkZXNjcmliaW5nIHdoYXQgaXQgdXNlZCB0
byBkbyBhbmQgd2h5IGl0IGlzIGNoYW5nZWQgdG8gdGhlIGN1cnJlbnQNCitpbXBsZW1lbnRhdGlv
bi4NCitAZW5kIGl0ZW1pemUNCisNCisNCitAbm9kZSBIYWNraW5nIENvZGUsIFByb2dyYW1taW5n
IEdvYWxzLCBQcm9ncmFtbWluZyBTdGFuZGFyZHMsIFRvcA0KK0Bjb21tZW50IG5vZGUtbmFtZSwg
bmV4dCwgcHJldmlvdXMsIHVwDQorQGNoYXB0ZXIgV29ya2luZyBvbiB0aGUgY29kZSwgV29ya2lu
ZyB3aXRoIG90aGVycw0KKw0KK1RoZXJlIGFyZSBhIGxvdCBvZiBwZW9wbGUgaGVscGluZyBvdXQg
d2l0aCBHTlUgQ2xhc3NwYXRoLiAgSGVyZSBhcmUgYQ0KK2NvdXBsZSBvZiBwcmFjdGljYWwgZ3Vp
ZGVsaW5lcyB0byBtYWtlIHdvcmtpbmcgdG9nZXRoZXIgb24gdGhlIGNvZGUNCitzbW9vdGhlci4N
CisNCitUaGUgbWFpbiB0aGluZyBpcyB0byBhbHdheXMgZGlzY3VzcyB3aGF0IHlvdSBhcmUgdXAg
dG8gb24gdGhlDQorbWFpbGluZ2xpc3QuICBNYWtpbmcgc3VyZSB0aGF0IGV2ZXJ5Ym9keSBrbm93
cyB3aG8gaXMgd29ya2luZyBvbiB3aGF0DQoraXMgdGhlIG1vc3QgaW1wb3J0YW50IHRoaW5nIHRv
IG1ha2Ugc3VyZSB3ZSBjb29wZXJhdGUgbW9zdA0KK2VmZmVjdGl2ZWx5Lg0KKw0KK1dlIG1haW50
YWluIGENCitAdXJlZntodHRwOi8vd3d3LmdudS5vcmcvc29mdHdhcmUvY2xhc3NwYXRoL3Rhc2tz
Lmh0bWwsVGFzayBMaXN0fQ0KK3doaWNoIGNvbnRhaW5zIGl0ZW1zIHRoYXQgeW91IG1pZ2h0IHdh
bnQgdG8gd29yayBvbi4NCisNCitCZWZvcmUgc3RhcnRpbmcgdG8gd29yayBvbiBzb21ldGhpbmcg
cGxlYXNlIG1ha2Ugc3VyZSB5b3UgcmVhZCB0aGlzDQorY29tcGxldGUgZ3VpZGUuICBBbmQgZGlz
Y3VzcyBpdCBvbiBsaXN0IHRvIG1ha2Ugc3VyZSB5b3VyIHdvcmsgZG9lcw0KK25vdCBkdXBsaWNh
dGUgb3IgaW50ZXJmZXJlcyB3aXRoIHdvcmsgc29tZW9uZSBlbHNlIGlzIGFscmVhZHkgZG9pbmcu
DQorQWx3YXlzIG1ha2Ugc3VyZSB0aGF0IHlvdSBzdWJtaXQgdGhpbmdzIHRoYXQgYXJlIHlvdXIg
b3duIHdvcmsuICBBbmQNCit0aGF0IHlvdSBoYXZlIHBhcGVyd29yayBvbiBmaWxlIChhcyBzdGF0
ZWQgaW4gdGhlIHJlcXVpcmVtZW50cw0KK3NlY3Rpb24pIHdpdGggdGhlIEZTRiBhdXRob3Jpemlu
ZyB0aGUgdXNlIG9mIHlvdXIgYWRkaXRpb25zLg0KKw0KK1RlY2huaWNhbGx5IHRoZSBHTlUgQ2xh
c3NwYXRoIHByb2plY3QgaXMgaG9zdGVkIG9uDQorQHVyZWZ7aHR0cDovL3NhdmFubmFoLmdudS5v
cmcvLFNhdmFubmFofSBhIGNlbnRyYWwgcG9pbnQgZm9yDQorZGV2ZWxvcG1lbnQsIGRpc3RyaWJ1
dGlvbiBhbmQgbWFpbnRlbmFuY2Ugb2YgR05VIFNvZnR3YXJlLiAgSGVyZSB5b3UNCit3aWxsIGZp
bmQgdGhlDQorQHVyZWZ7aHR0cHM6Ly9zYXZhbm5haC5nbnUub3JnL3Byb2plY3RzL2NsYXNzcGF0
aC8scHJvamVjdCBwYWdlfSwgYnVnDQorcmVwb3J0cywgcGVuZGluZyBwYXRjaGVzLCBsaW5rcyB0
byBtYWlsaW5nIGxpc3RzLCBuZXdzIGl0ZW1zIGFuZCBDVlMuDQorDQorWW91IGNhbiBmaW5kIGlu
c3RydWN0aW9ucyBvbiBnZXR0aW5nIGEgQ1ZTIGNoZWNrb3V0IGZvciBjbGFzc3BhdGggYXQNCitA
dXJlZntodHRwczovL3NhdmFubmFoLmdudS5vcmcvY3ZzLz9ncm91cD1jbGFzc3BhdGh9Lg0KKw0K
K1lvdSBkb24ndCBoYXZlIHRvIGdldCBDVlMgY29tbWl0IHdyaXRlIGFjY2VzcyB0byBjb250cmli
dXRlLCBidXQgaXQgaXMNCitzb21ldGltZXMgbW9yZSBjb252ZW5pZW50IHRvIGJlIGFibGUgdG8g
YWRkIHlvdXIgY2hhbmdlcyBkaXJlY3RseSB0bw0KK3RoZSBwcm9qZWN0IENWUy4gUGxlYXNlIGNv
bnRhY3QgdGhlIEdOVSBDbGFzc3BhdGggc2F2YW5uYWggYWRtaW5zIHRvDQorYXJyYW5nZSBDVlMg
YWNjZXNzIGlmIHlvdSB3b3VsZCBsaWtlIHRvIGhhdmUgaXQuDQorDQorTWFrZSBzdXJlIHRvIGJl
IHN1YnNjcmliZWQgdG8gdGhlIGNvbW1pdC1jbGFzc3BhdGggbWFpbGluZ2xpc3Qgd2hpbGUNCit5
b3UgYXJlIGFjdGl2ZWx5IGhhY2tpbmcgb24gQ2xhc3NwYXRoLiAgWW91IGhhdmUgdG8gc2VuZCBw
YXRjaGVzIChjdnMNCitkaWZmIC11TikgdG8gdGhpcyBsaXN0IGJlZm9yZSBjb21taXR0aW5nLg0K
Kw0KK1dlIHJlYWxseSB3YW50IHRvIGhhdmUgYSBwcmV0dHkgb3BlbiBjaGVjay1pbiBwb2xpY3ku
ICBCdXQgdGhpcyBtZWFucw0KK3RoYXQgeW91IHNob3VsZCBiZSBleHRyYSBjYXJlZnVsIGlmIHlv
dSBjaGVjayBzb21ldGhpbmcgaW4uICBJZiBhdCBhbGwNCitpbiBkb3VidCBvciBpZiB5b3UgdGhp
bmsgdGhhdCBzb21ldGhpbmcgbWlnaHQgbmVlZCBleHRyYSBleHBsYWluaW5nDQorc2luY2UgaXQg
aXMgbm90IGNvbXBsZXRlbHkgb2J2aW91cyBwbGVhc2UgbWFrZSBhIGxpdHRsZSBhbm5vdW5jZW1l
bnQNCithYm91dCB0aGUgY2hhbmdlIG9uIHRoZSBtYWlsaW5nbGlzdC4gIEFuZCBpZiB5b3UgZG8g
Y29tbWl0IHNvbWV0aGluZw0KK3dpdGhvdXQgZGlzY3Vzc2luZyBpdCBmaXJzdCBhbmQgYW5vdGhl
ciBHTlUgQ2xhc3NwYXRoIGhhY2tlcnMgYXNrcyBmb3INCitleHRyYSBleHBsYW5hdGlvbiBvciBz
dWdnZXN0cyB0byByZXZlcnQgYSBjZXJ0YWluIGNvbW1pdCB0aGVuIHBsZWFzZQ0KK3JlcGx5IHRv
IHRoZSByZXF1ZXN0IGJ5IGV4cGxhaW5pbmcgd2h5IHNvbWV0aGluZyBzaG91bGQgYmUgc28gb3Ig
aWYNCit5b3UgYWdyZWUgdG8gcmV2ZXJ0IGl0LiAgKEp1c3QgcmV2ZXJ0aW5nIGltbWVkaWF0ZWx5
IGlzIE9LIHdpdGhvdXQNCitkaXNjdXNzaW9uLCBidXQgdGhlbiBwbGVhc2UgZG9uJ3QgbWl4IGl0
IHdpdGggb3RoZXIgY2hhbmdlcyBhbmQgcGxlYXNlDQorc2F5IHNvIG9uIGxpc3QuKQ0KKw0KK1Bh
dGNoZXMgdGhhdCBhcmUgYWxyZWFkeSBhcHByb3ZlZCBmb3IgbGliZ2NqIG9yIGFsc28gT0sgZm9y
IENsYXNzcGF0aC4NCisoQnV0IHlvdSBzdGlsbCBoYXZlIHRvIHNlbmQgYSBwYXRjaC9kaWZmIHRv
IHRoZSBsaXN0LikgIEFsbCBvdGhlcg0KK3BhdGNoZXMgcmVxdWlyZSB5b3UgdG8gdGhpbmsgd2hl
dGhlciBvciBub3QgdGhleSBhcmUgcmVhbGx5IE9LIGFuZA0KK25vbi1jb250cm92ZXJzaWFsLCBv
ciBpZiB5b3Ugd291bGQgbGlrZSBzb21lIGZlZWRiYWNrIGZpcnN0IG9uIHRoZW0NCitiZWZvcmUg
Y29tbWl0dGluZy4gIFdlIG1pZ2h0IGdldCByZWFsIGNvbW1pdCBydWxlcyBpbiB0aGUgZnV0dXJl
LCBmb3INCitub3cgdXNlIHlvdXIgb3duIGp1ZGdtZW50LCBidXQgYmUgYSBiaXQgY29uc2VydmF0
aXZlLg0KKw0KK0Fsd2F5cyBjb250YWN0IHRoZSBHTlUgQ2xhc3NwYXRoIG1haW50YWluZXIgYmVm
b3JlIGFkZGluZyBhbnl0aGluZw0KK25vbi10cml2aWFsIHRoYXQgeW91IGRpZG4ndCB3cml0ZSB5
b3Vyc2VsZiBhbmQgdGhhdCBkb2VzIG5vdCBjb21lIGZyb20NCitsaWJnY2ogb3IgZnJvbSBhbm90
aGVyIGtub3duIEdOVSBDbGFzc3BhdGggb3IgbGliZ2NqIGhhY2tlci4gIElmIHlvdQ0KK2hhdmUg
YmVlbiBhc3NpZ25lZCB0byBjb21taXQgY2hhbmdlcyBvbiBiZWhhbGYgb2YgYW5vdGhlciBwcm9q
ZWN0IG9yDQorYSBjb21wYW55IGFsd2F5cyBtYWtlIHN1cmUgdGhleSBjb21lIGZyb20gcGVvcGxl
IHdobyBoYXZlIHNpZ25lZCB0aGUNCitwYXBlcnMgZm9yIHRoZSBGU0YgYW5kL29yIGZhbGwgdW5k
ZXIgdGhlIGFycmFuZ2VtZW50IHlvdXIgY29tcGFueSBtYWRlDQord2l0aCB0aGUgRlNGIGZvciBj
b250cmlidXRpb25zLiAgTWVudGlvbiBpbiB0aGUgQ2hhbmdlTG9nIHdobyBhY3R1YWxseQ0KK3dy
b3RlIHRoZSBwYXRjaC4NCisNCitDb21taXRzIGZvciBjb21wbGV0ZWx5IHVucmVsYXRlZCBjaGFu
Z2VzIHRoZXkgc2hvdWxkIGJlIGNvbW1pdHRlZA0KK3NlcGFyYXRlbHkgKGVzcGVjaWFsbHkgd2hl
biBkb2luZyBhIGZvcm1hdHRpbmcgY2hhbmdlIGFuZCBhIGxvZ2ljYWwNCitjaGFuZ2UsIGRvIHRo
ZW0gaW4gdHdvIHNlcGFyYXRlIGNvbW1pdHMpLiBCdXQgZG8gdHJ5IHRvIGRvIGEgY29tbWl0IG9m
DQorYXMgbXVjaCB0aGluZ3MvZmlsZXMgdGhhdCBhcmUgZG9uZSBhdCB0aGUgc2FtZSB0aW1lIHdo
aWNoIGNhbg0KK2xvZ2ljYWxseSBiZSBzZWVuIGFzIHBhcnQgb2YgdGhlIHNhbWUgY2hhbmdlL2Ns
ZWFudXAgZXRjLg0KKw0KK1doZW4gdGhlIGNoYW5nZSBmaXhlcyBhbiBpbXBvcnRhbnQgYnVnIG9y
IGFkZHMgbmljZSBuZXcgZnVuY3Rpb25hbGl0eQ0KK3BsZWFzZSB3cml0ZSBhIHNob3J0IGVudHJ5
IGZvciBpbmNsdXNpb24gaW4gdGhlIE5FV1MgZmlsZS4gIElmIGl0DQorY2hhbmdlcyB0aGUgVk0g
aW50ZXJmYWNlIHlvdSBtdXN0IG1lbnRpb24gdGhhdCBpbiBib3RoIHRoZSBORVdTIGZpbGUNCith
bmQgdGhlIFZNIEludGVncmF0aW9uIEd1aWRlLg0KKw0KK0FsbCB0aGUgYGBydWxlcycnIGFyZSBy
ZWFsbHkgbWVhbnQgdG8gbWFrZSBzdXJlIHRoYXQgR05VIENsYXNzcGF0aA0KK3dpbGwgYmUgbWFp
bnRhaW5hYmxlIGluIHRoZSBsb25nIHJ1biBhbmQgdG8gZ2l2ZSBhbGwgdGhlIHByb2plY3RzIHRo
YXQNCithcmUgbm93IHVzaW5nIEdOVSBDbGFzc3BhdGggYW4gYWNjdXJhdGUgdmlldyBvZiB0aGUg
Y2hhbmdlcyB3ZSBtYWtlIHRvDQordGhlIGNvZGUgYW5kIHRvIHNlZSB3aGF0IGNoYW5nZWQgd2hl
bi4gIElmIHlvdSB0aGluayB0aGUgcmVxdWlyZW1lbnRzDQorYXJlIGBgdW53b3JrYWJsZScnIHBs
ZWFzZSB0cnkgaXQgZmlyc3QgZm9yIGEgY291cGxlIG9mIHdlZWtzLiAgSWYgeW91DQorc3RpbGwg
ZmVlbCB0aGUgc2FtZSBhZnRlciBoYXZpbmcgc29tZSBtb3JlIGV4cGVyaWVuY2Ugd2l0aCB0aGUg
cHJvamVjdA0KK3BsZWFzZSBmZWVsIGZyZWUgdG8gYnJpbmcgdXAgc3VnZ2VzdGlvbnMgZm9yIGlt
cHJvdmVtZW50cyBvbiB0aGUgbGlzdC4NCitCdXQgZG9uJ3QganVzdCBpZ25vcmUgdGhlIHJ1bGVz
ISAgT3RoZXIgaGFja2VycyBkZXBlbmQgb24gdGhlbSBiZWluZw0KK2ZvbGxvd2VkIHRvIGJlIHRo
ZSBtb3N0IHByb2R1Y3RpdmUgdGhleSBjYW4gYmUgKGdpdmVuIHRoZSBhYm92ZQ0KK2NvbnN0cmFp
bnRzKS4NCisNCitAbWVudQ0KKyogV3JpdGluZyBDaGFuZ2VMb2dzOjogICAgICAgICAgDQorQGVu
ZCBtZW51DQorDQorQG5vZGUgV3JpdGluZyBDaGFuZ2VMb2dzLCAgLCBIYWNraW5nIENvZGUsIEhh
Y2tpbmcgQ29kZQ0KK0Bjb21tZW50IG5vZGUtbmFtZSwgbmV4dCwgcHJldmlvdXMsIHVwDQorQHNl
Y3Rpb24gRG9jdW1lbnRpbmcgd2hhdCBjaGFuZ2VkIHdoZW4gd2l0aCBDaGFuZ2VMb2cgZW50cmll
cw0KKw0KK1RvIGtlZXAgdHJhY2sgb2Ygd2hvIGRpZCB3aGF0IHdoZW4gd2Uga2VlcCBhbiBleHBs
aWNpdCBDaGFuZ2VMb2cgZW50cnkNCit0b2dldGhlciB3aXRoIHRoZSBjb2RlLiAgVGhpcyBtaXJy
b3JzIHRoZSBDVlMgY29tbWl0IG1lc3NhZ2VzIGFuZCBpbg0KK2dlbmVyYWwgdGhlIENoYW5nZUxv
ZyBlbnRyeSBpcyB0aGUgc2FtZSBhcyB0aGUgQ1ZTIGNvbW1pdCBtZXNzYWdlLg0KK1RoaXMgcHJv
dmlkZXMgYW4gZWFzeSB3YXkgZm9yIHBlb3BsZSBnZXR0aW5nIGEgKHNuYXBzaG90KSByZWxlYXNl
IG9yDQord2l0aG91dCBhY2Nlc3MgdG8gdGhlIENWUyBzZXJ2ZXIgdG8gc2VlIHdoYXQgaGFwcGVu
ZWQgd2hlbi4gIFdlIGRvIG5vdA0KK2dlbmVyYXRlIHRoZSBDaGFuZ2VMb2cgZmlsZSBhdXRvbWF0
aWNhbGx5IGZyb20gdGhlIENWUyBzZXJ2ZXIgc2luY2UNCit0aGF0IGlzIG5vdCByZWxpYWJsZS4N
CisNCitBIGdvb2QgQ2hhbmdlTG9nIGVudHJ5IGd1aWRlbGluZSBjYW4gYmUgZm91bmQgaW4gdGhl
IEd1aWxlIE1hbnVhbCBhdA0KK0B1cmVme2h0dHA6Ly93d3cuZ251Lm9yZy9zb2Z0d2FyZS9ndWls
ZS9jaGFuZ2Vsb2dzL2d1aWxlLWNoYW5nZWxvZ3NfMy5odG1sfS4NCisNCitIZXJlIGFyZSBzb21l
IGV4YW1wbGUgdG8gZXhwbGFpbiB3aGF0IHNob3VsZCBvciBzaG91bGRuJ3QgYmUgaW4gYQ0KK0No
YW5nZUxvZyBlbnRyeSAoYW5kIHRoZSBjb3JyZXNwb25kaW5nIGNvbW1pdCBtZXNzYWdlKToNCisN
CitAaXRlbWl6ZQ0KKw0KK0BpdGVtDQorVGhlIGZpcnN0IGxpbmUgb2YgYSBDaGFuZ2VMb2cgZW50
cnkgc2hvdWxkIGJlOg0KKw0KK0BleGFtcGxlDQorW2RhdGVdIDx0d28gc3BhY2VzPiBbZnVsbCBu
YW1lXSA8dHdvIHNwYWNlcz4gW2VtYWlsLWNvbnRhY3RdDQorQGVuZCBleGFtcGxlDQorDQorVGhl
IHNlY29uZCBsaW5lIHNob3VsZCBiZSBibGFuay4gQWxsIG90aGVyIGxpbmVzIHNob3VsZCBiZSBp
bmRlbnRlZA0KK3dpdGggb25lIHRhYi4NCisNCitAaXRlbQ0KK0p1c3Qgc3RhdGUgd2hhdCB3YXMg
Y2hhbmdlZC4gIFdoeSBzb21ldGhpbmcgaXMgZG9uZSBhcyBpdCBpcyBkb25lIGluDQordGhlIGN1
cnJlbnQgY29kZSBzaG91bGQgYmUgZWl0aGVyIHN0YXRlZCBpbiB0aGUgY29kZSBpdHNlbGYgb3Ig
YmUNCithZGRlZCB0byBvbmUgb2YgdGhlIGRvY3VtZW50YXRpb24gZmlsZXMgKGxpa2UgdGhpcyBI
YWNraW5nIEd1aWRlKS4NCisNCitTbyBkb24ndCB3cml0ZToNCisNCitAZXhhbXBsZQ0KKyAgICAg
ICAgKiBqYXZhL2F3dC9mb250L09wZW5UeXBlLmphdmE6IFJlbW92ZSAncHVibGljIHN0YXRpYyBm
aW5hbCcNCisgICAgICAgIGZyb20gT3BlblR5cGUgdGFncywgcmV2ZXJ0aW5nIHRoZSBjaGFuZ2Ug
b2YgMjAwMy0wOC0xMS4gIFNlZQ0KKyAgICAgICAgQ2xhc3NwYXRoIGRpc2N1c3Npb24gbGlzdCBv
ZiAyMDAzLTA4LTExLg0KK0BlbmQgZXhhbXBsZQ0KKw0KK0p1c3Qgc3RhdGU6DQorDQorQGV4YW1w
bGUNCisgICAgICAgICogamF2YS9hd3QvZm9udC9PcGVuVHlwZS5qYXZhOiBSZW1vdmUgJ3B1Ymxp
YyBzdGF0aWMgZmluYWwnIGZyb20NCisgICAgICAgIGFsbCBtZW1iZXIgZmllbGRzLg0KK0BlbmQg
ZXhhbXBsZQ0KKw0KK0luIHRoaXMgY2FzZSB0aGUgcmVhc29uIGZvciB0aGUgY2hhbmdlIHdhcyBh
ZGRlZCB0byB0aGlzIGd1aWRlLg0KKw0KK0BpdGVtDQorSnVzdCBhcyB3aXRoIHRoZSBub3JtYWwg
Y29kZSBzdHlsZSBndWlkZSwgZG9uJ3QgbWFrZSBsaW5lcyBsb25nZXIgdGhlbg0KKzgwIGNoYXJh
Y3RlcnMuDQorDQorQGl0ZW0NCitKdXN0IGFzIHdpdGggY29tbWVudHMgaW4gdGhlIGNvZGUuIFRo
ZSBDaGFuZ2VMb2cgZW50cnkgc2hvdWxkIGJlIGENCitmdWxsIHNlbnRlbmNlLCBzdGFydGluZyB3
aXRoIGEgY2FwdGl0YWwgYW5kIGVuZGluZyB3aXRoIGEgcGVyaW9kLg0KKw0KK0BpdGVtDQorQmUg
cHJlY2lzZSBpbiB3aGF0IGNoYW5nZWQsIG5vdCB0aGUgZWZmZWN0IG9mIHRoZSBjaGFuZ2UgKHdo
aWNoIHNob3VsZA0KK2JlIGNsZWFyIGZyb20gdGhlIGNvZGUvcGF0Y2gpLiAgU28gZG9uJ3Qgd3Jp
dGU6DQorDQorQGV4YW1wbGUNCisgICAgICAgICogamF2YS9pby9PYmplY3RPdXRwdXRTdHJlYW0u
amF2YSA6IEFsbG93IHB1dEZpZWxkcyBiZSBjYWxsZWQgbW9yZSANCisgICAgICAgIHRoYW4gb25j
ZS4NCitAZW5kIGV4YW1wbGUNCisNCitCdXQgZXhwbGFpbiB3aGF0IGNoYW5nZWQgYW5kIGluIHdo
aWNoIG1ldGhvZHMgaXQgd2FzIGNoYW5nZWQ6DQorDQorQGV4YW1wbGUNCisgICAgICAgICogamF2
YS9pby9PYmplY3RPdXRwdXRTdHJlYW0uamF2YSAocHV0RmllbGRzKTogRG9uJ3QgY2FsbA0KKyAg
ICAgICAgbWFya0ZpZWxkc1dyaXR0ZW4oKS4gT25seSBjcmVhdGUgbmV3IFB1dEZpZWxkIHdoZW4N
CisgICAgICAgIGN1cnJlbnRQdXRGaWVsZCBpcyBudWxsLg0KKyAgICAgICAgKHdyaXRlRmllbGRz
KTogQ2FsbCBtYXJrRmllbGRzV3JpdHRlbigpLg0KK0BlbmQgZXhhbXBsZQ0KKw0KIEBlbmQgaXRl
bWl6ZQ0KIA0KK1RoZSBhYm92ZSBhcmUgYWxsIGp1c3QgZ3VpZGVsaW5lcy4gIFdlIGFsbCBhcHBy
ZWNpYXRlIHRoZSBmYWN0IHRoYXQgd3JpdGluZw0KK0NoYW5nZUxvZyBlbnRyaWVzLCB1c2luZyBh
IGNvZGluZyBzdHlsZSB0aGF0IGlzIG5vdCBgYHlvdXIgb3duJycgYW5kIHRoZQ0KK0NWUywgcGF0
Y2ggYW5kIGRpZmYgdG9vbHMgZG8gdGFrZSBzb21lIHRpbWUgdG8gZ2V0dGluZyB1c2VkIHRvLiAg
U28gZG9uJ3QNCitmZWVsIGxpa2UgeW91IGhhdmUgdG8gZG8gaXQgcGVyZmVjdCByaWdodCBhd2F5
IG9yIHRoYXQgY29udHJpYnV0aW9ucw0KK2FyZW4ndCB3ZWxjb21lIGlmIHRoZXkgYXJlbid0IGBg
cGVyZmVjdCcnLiAgV2UgYWxsIGxlYXJuIGJ5IGRvaW5nIGFuZA0KK2ludGVyYWN0aW5nIHdpdGgg
ZWFjaCBvdGhlci4NCisNCiANCi1Abm9kZSBQcm9ncmFtbWluZyBHb2FscywgQVBJIENvbXBhdGli
aWxpdHksIFByb2dyYW1taW5nIFN0YW5kYXJkcywgVG9wDQorQG5vZGUgUHJvZ3JhbW1pbmcgR29h
bHMsIEFQSSBDb21wYXRpYmlsaXR5LCBIYWNraW5nIENvZGUsIFRvcA0KIEBjb21tZW50IG5vZGUt
bmFtZSwgbmV4dCwgcHJldmlvdXMsIHVwDQogQGNoYXB0ZXIgUHJvZ3JhbW1pbmcgR29hbHMNCiAN
CkBAIC02MjEsMTEgKzEwNDQsMTEgQEANCiBAY2hhcHRlciBBUEkgQ29tcGF0aWJpbGl0eQ0KIA0K
IEBtZW51DQotKiBTZXJpYWxpemF0aW9uOjoJCVNlcmlhbGl6YXRpb24NCi0qIERlcHJlY2F0ZWQg
TWV0aG9kczo6CQlEZXByZWNhdGVkIG1ldGhvZHMNCisqIFNlcmlhbGl6YXRpb246OiAgICAgICAg
ICAgICAgIFNlcmlhbGl6YXRpb24NCisqIERlcHJlY2F0ZWQgTWV0aG9kczo6ICAgICAgICAgIERl
cHJlY2F0ZWQgbWV0aG9kcw0KIEBlbmQgbWVudQ0KIA0KLUBub2RlIFNlcmlhbGl6YXRpb24sIERl
cHJlY2F0ZWQgTWV0aG9kcywgLCBBUEkgQ29tcGF0aWJpbGl0eQ0KK0Bub2RlIFNlcmlhbGl6YXRp
b24sIERlcHJlY2F0ZWQgTWV0aG9kcywgQVBJIENvbXBhdGliaWxpdHksIEFQSSBDb21wYXRpYmls
aXR5DQogQGNvbW1lbnQgIG5vZGUtbmFtZSwgIG5leHQsICBwcmV2aW91cywgIHVwDQogQHNlY3Rp
b24gU2VyaWFsaXphdGlvbg0KIA0KQEAgLTY1NCw3ICsxMDc3LDcgQEANCiBpbnN0ZWFkLiAgSmFw
aXRvb2xzIGlzIGFsc28gdGhlIHByaW1hcnkgbWVhbnMgb2YgY2hlY2tpbmcgQVBJDQogY29tcGF0
aWJpbGl0eSBmb3IgR05VIENsYXNzcGF0aCB3aXRoIFN1bidzIEphdmEgUGxhdGZvcm0uDQogDQot
QG5vZGUgRGVwcmVjYXRlZCBNZXRob2RzLCAsIFNlcmlhbGl6YXRpb24sIEFQSSBDb21wYXRpYmls
aXR5DQorQG5vZGUgRGVwcmVjYXRlZCBNZXRob2RzLCAgLCBTZXJpYWxpemF0aW9uLCBBUEkgQ29t
cGF0aWJpbGl0eQ0KIEBjb21tZW50ICBub2RlLW5hbWUsICBuZXh0LCAgcHJldmlvdXMsICB1cA0K
IEBzZWN0aW9uIERlcHJlY2F0ZWQgTWV0aG9kcw0KIA0K

--=-wqP+P3s/7qWOwArs2dwD--

--=-5cxqhWWezCPRCpZeHKBh
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)

iD4DBQBAbYLuxVhZCJWr9QwRAj+UAJ0WKQOafhaZoUGW4O7UFWWKunFE3ACYvQSg
2Xr1A58fYC8NdbBbuwvaOA==
=5NO0
-----END PGP SIGNATURE-----

--=-5cxqhWWezCPRCpZeHKBh--




From MAILER-DAEMON Fri Apr 02 10:31:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9QeA-0007n3-0E
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 10:31:54 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9Qe6-0007lg-N2
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:31:50 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9Qe1-0007kO-Vo
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:31:46 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9Qe1-0007kG-F4
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:31:45 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1B9Qdn-0002FG-00; Fri, 02 Apr 2004 17:31:31 +0200
From: Mark Wielaard <mark@klomp.org>
To: Etienne Gagnon <gagnon.etienne_m@uqam.ca>
In-Reply-To: <40675584.6000207@uqam.ca>
References: <4065D116.60308@uqam.ca>
	<1080501381.17922.148.camel@elsschot.wildebeest.org>
	<40675584.6000207@uqam.ca>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-9N8tZhkcFmyaGm3rjUrq"
Message-Id: <1080919892.26699.1747.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 02 Apr 2004 17:31:33 +0200
Cc: commit-classpath@gnu.org, graydon@redhat.com
Subject: Re: GNU indent for C code
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 15:31:51 -0000


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

Hi,

On Mon, 2004-03-29 at 00:45, Etienne Gagnon wrote:
> Mark Wielaard wrote:
> > Yes, the rule is that all proposed patches should be send to this list
> > first. And in general it is seen as polite to wait a little while befor=
e
> > committing, even though you might think it is obviously correct, if the
> > change hasn't been discussed or mentioned before on this or the main
> > mailinglist.
>=20
> Could this be clearly documented on the web site, in a very visible locat=
ion?

Added to the hacking guide.

Normally new hackers also get a welcome email from me explaining what to
do/what not to do, how to interact with the other hackers on the
project. I hadn't realized that you had gotten cvs commit access so long
ago so I never send you an email about what the current customs are.

Since there are actually quite some old hackers with CVS access that
might also not have kept up with current practices this is now actually
in the guide. Please read it if you have commit access but never emailed
with me about it.

> >>2- Add autogen.sh for hackers (script that calls auto* tools).
> >=20
> > Thanks. Could you also update the HACKING file with this info?
>=20
> Already done.

Thanks. But I saw that you removed it again.
I folded all the information of the HACKING file into the Hacking Guide
to make sure all relevant information is in the same place. So if you
readd it please add it to doc/hacking.texinfo instead.

> >>4- Actually make indent.
> >>[...]
> >>2004-03-27  Etienne M. Gagnon <gagnon.etienne_m@uqam.ca>
> >=20
> >=20
> > Little nitpick. It should be
> > [date] <two spaces> [full name] <two spaces> [email-contact]
> > Some tools depend on the two spaces between each item.
> > (Although there are more ChangeLog entries were this is wrong.)
>=20
> Nitpiking of my own: This could be documented in a visible place too.
>=20
> I much prefer automatic changelogs, by I guess you people prefer
> hand written fine-grain ChangeLog entries with even the name every
> single modified function. :-(

I added a complete new section about how to create ChangeLog entries
based on the emails on the classpath-commit list from the last couple of
months.

> > In this particular case there are two unfortunate things:
> > - The native/fdlibm library isn't actually part of GNU Classpath, but a
> > upstream library we use. This isn't clearly documented, I have put it o=
n
> > my list. In this case I think reverting it is the right thing to do. It
> > makes diffs with the original library easier.
>=20
> I disagree.  You can simply apply GNU Indent to the upstream code and com=
pare
> the diffs to the result.  I have done this with Classpath->sablevm-native=
-library
> imports for over a year without problems.
>=20
> Why?  fdlibm is one of the worstly indented pices of code I have seen.
> I won't comment on the general readability (I'll let you make your own
> opinion of that), but I really think that applying GNU indentation does
> very much help.
>=20
> If you really want to get "direct" diffs, I would rather encourage upstre=
am
> to start using GNU indent!

That would be the correct solution indeed.
As it happens for us (as now also documented in the Hacking Guide)
libgcj is the upstream. It should not be hard to convince them to
reindent. But I am not sure they will be able to do the same for their
upstream.

> > - The native/jni/gtk-peer files are a proper part of GNU Classpath, but
> > currently mostly hacked on (maintained) on the libgcj gui branch.
> > Graydon said that he takes full responsibility for any inconvenience
> > this creates, but in this case I think this does make merging for him
> > much harder then it should be. The next merge/sync date for this code i=
s
> > April 15 if I remember correctly. Maybe it is better to reverse this
> > till just after this merge point. Graydon?
>=20
> Same trick as above works pretty well.  I see no problem there.

It is about not making other hackers go to much more trouble then is
necessary. It is often a bit difficult when you are in the middle of an
hacking session on some part of the code to see a reindentation going on
at that same code without getting a proper warning that it is going to
happen. Since Graydon hasn't commented at all on this issue I want to
wait till he has a chance to give his opinion. But if he keeps ignoring
the issue we can go ahead anyway.

Cheers,

Mark

--=-9N8tZhkcFmyaGm3rjUrq
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)

iD8DBQBAbYdUxVhZCJWr9QwRApsEAJ9F8Ep6Mw1NgrpbDza+nVBz52iNlACfd8k9
39vH3r8ePzYPB2mp9Q0O4Ug=
=TEsV
-----END PGP SIGNATURE-----

--=-9N8tZhkcFmyaGm3rjUrq--




From MAILER-DAEMON Fri Apr 02 11:02:28 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9R7P-00067e-Ju
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 11:02:07 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9Qzs-00026n-81
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:54:20 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9Qyn-0001w6-FR
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:53:15 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9Qwq-0000iS-36
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 10:51:12 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1B9Qwe-0002HX-00; Fri, 02 Apr 2004 17:51:00 +0200
From: Mark Wielaard <mark@klomp.org>
To: Etienne Gagnon <gagnon.etienne_m@uqam.ca>
In-Reply-To: <406767CD.5080604@uqam.ca>
References: <4065D116.60308@uqam.ca>
	<1080501381.17922.148.camel@elsschot.wildebeest.org>
	<40675584.6000207@uqam.ca>  <406767CD.5080604@uqam.ca>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-HsBydymoGHgmR0S29ox6"
Message-Id: <1080921062.26699.1760.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 02 Apr 2004 17:51:03 +0200
Cc: commit-classpath@gnu.org, graydon@redhat.com
Subject: Re: GNU indent for C code
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 16:02:03 -0000


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

Hi,

On Mon, 2004-03-29 at 02:03, Etienne Gagnon wrote:
> OK, to be fair, it can make "pushing" changes upstream a little more
> difficult, if one does not want to "reindent" GNU-style the whole modifie=
d
> function sent upstream.
>=20
> This begs quite a few questions:
> 1- Why is the fdlibm library source code in the Classpath repository at a=
ll?
>     Shouldn't this library simply be a "static" or even "dynamic" library
>     of Classpath?  What the strong argument here, other than: "but we wou=
ld
>     have to tell users where to get it" ?
> 2- If 1- has a good motivation, why isn't there a vendor branch, to allow
>     easy extraction of any improvement to send upstream?

I looked into this because these are fair questions.
(I also added this info to the Hacker's Guide)
We provide the fdlibm source code since this library is actually used to
define of some of the mathematical algorithms should behave.

See the spec for java.lang.Math and java.lang.StrictMath:
"The Java math library is defined with respect to the version of fdlibm
dated January 4, 1995. Where fdlibm provides more than one definition
for a function (such as acos), use the "IEEE 754 core function" version
(residing in a file whose name begins with the letter e)."

For us the "upstream" for these functions is actually libgcj since they
test against a lot more platforms then we do at the moment. But they
haven't actually been applying patches to it for years. Which isn't
surprising seen the fact that the spec is so specific about a particular
version of fdlibm.

As far as I could see there isn't a real distribution (package) of
fdlibm except for the raw sources at http://www.netlib.org/fdlibm/
which is the reason we ship it together with GNU Classpath.

A vendor branch might be nice and I guess nobody ever knew how to do
that or thought it wasn't necessary when it was first imported (before
my time). But given the above I don't think it really matters.

Cheers,

Mark

--=-HsBydymoGHgmR0S29ox6
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)

iD8DBQBAbYvmxVhZCJWr9QwRAkp0AKCQBtdSOjN/KXfFAvQuxlg9GNu9KgCfVhb8
3X/07kNUTxp65YqpRi8j69E=
=4aG0
-----END PGP SIGNATURE-----

--=-HsBydymoGHgmR0S29ox6--




From MAILER-DAEMON Fri Apr 02 11:03:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9R8y-0007Qy-GR
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 11:03:44 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9R8q-0007G7-N4
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 11:03:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9R8h-0007BE-3Z
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 11:03:27 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9R7V-0006G1-6i
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 11:02:13 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1B9R7K-0002JH-00; Fri, 02 Apr 2004 18:02:02 +0200
From: Mark Wielaard <mark@klomp.org>
To: Etienne Gagnon <gagnon.etienne_m@uqam.ca>
In-Reply-To: <40676953.2030502@uqam.ca>
References: <4065D116.60308@uqam.ca>
	<1080501381.17922.148.camel@elsschot.wildebeest.org>
	<40676953.2030502@uqam.ca>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-U6KMAhezE/XflV1SI3Sy"
Message-Id: <1080921724.26699.1772.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 02 Apr 2004 18:02:04 +0200
Cc: commit-classpath@gnu.org, graydon@redhat.com
Subject: Re: GNU indent for C code
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 16:03:40 -0000


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

Hi,

On Mon, 2004-03-29 at 02:09, Etienne Gagnon wrote:
> This is the greatest pitfall of the CVS single trunk of development appro=
ach;
> any change to the trunk potentially break all the other developer's code.
>=20
> It is highly time to move development away from CVS.  What are the proble=
ms to
> do so *NOW*?  Political ones? e.g. GNU's savannah does not support it, so=
 we
> won't do it?

Partially, yes. Savannah doesn't provide it yet so we also don't provide
it. The other reason of course is that CVS is much more well known then
any of the other version management systems. We don't want to introduce
extra barriers for people to hack on GNU Classpath.

That said I would love to experiment with monotone for distributed GNU
Classpath development across projects. But time is always a factor.

> I don't care
> whether it's hosted on savannah or not; the development site should be ho=
sted
> in the best way for the project as a whole.

Since Savannah is the central point for development, distribution and
maintenance of GNU Software it is natural for GNU Classpath to be hosted
there. And I think this is better for the project as a whole (whether
you see that as the GNU project or just GNU Classpath). Savannah is
sponsored by the FSF which means there are people keeping it up to date
and fixing issues with it. Paul Fisher (one of the original founders if
GNU Classpath!) is now employed by the FSF to improve savannah. He sends
weekly status updates to the savannah-hackers mailinglist. If you want
to make subversion or any other improvement to savannah happen please
hop on the savannah-hackers@gnu.org mailing list. I think they would
love to add support for other ways for Free Software hackers to
collaborate.

Cheers,

MArk

--=-U6KMAhezE/XflV1SI3Sy
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)

iD8DBQBAbY57xVhZCJWr9QwRAg0vAJ9KhI55osRxpDe8LyYxQy5xNakkDgCggwbV
SG5tTvx4o2EJk/WQAmu8Gr0=
=9zQl
-----END PGP SIGNATURE-----

--=-U6KMAhezE/XflV1SI3Sy--




From MAILER-DAEMON Fri Apr 02 12:09:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9S6M-0007jh-Hd
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 12:05:06 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9S5p-00075h-Ud
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 12:04:34 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9S4f-0005rO-P9
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 12:03:37 -0500
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9S34-0004Wo-Iv
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 12:01:42 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1B9S2s-0002RS-00; Fri, 02 Apr 2004 19:01:30 +0200
From: Mark Wielaard <mark@klomp.org>
To: Etienne Gagnon <gagnon.etienne_m@uqam.ca>
In-Reply-To: <4067D070.1020402@uqam.ca>
References: <4067D070.1020402@uqam.ca>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-0HPg66CEr+RDQ8G/kgpL"
Message-Id: <1080925292.26699.1821.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 02 Apr 2004 19:01:32 +0200
Cc: commit-classpath <commit-classpath@gnu.org>
Subject: Re: Reverting changes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 17:05:03 -0000


--=-0HPg66CEr+RDQ8G/kgpL
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi Etienne,

On Mon, 2004-03-29 at 09:29, Etienne Gagnon wrote:
> As you requested, I have reverted all the changes that have caused
> troubles.

Thanks! But you also reverted a lot more that wasn't causing trouble.
Some people did have comments about particular parts but not everything
Grzegorz and you did was bad or causing troubles. I actually think most
of what you wanted to do was good. But some needed some more discussion
and/or be adapted to the be incorporated. The main thing people objected
to was committing without discussing changes first on the mailinglist.

Working together is hard sometimes. I tried to add some guidelines for
working together on GNU Classpath to the Hacker's Guide. Hope that is
helpful. And I do realize that it wasn't properly documented in the
past. Sorry for not having done this earlier.

Lets go through what you reverted and see how we can get these
improvements in at the end.

--- ChangeLog	28 Mar 2004 20:22:07 -0000	1.1966
+++ ChangeLog	29 Mar 2004 07:07:23 -0000	1.1967
@@ -1,167 +1,13 @@
-2004-03-28  Etienne M. Gagnon <gagnon.etienne_m@uqam.ca>
-
-	* HACKING: Updated information about regenerating auto* files and
-	documented the existence of autogen.sh.

That was a good change (in combination with the addition of a working
autogen.sh script of course). I have now moved all info in this file
into the doc/hacking.texinfo to keep all this kind of information in the
same place.

-2004-03-28  Etienne M. Gagnon <gagnon.etienne_m@uqam.ca>
+2004-03-28  Etienne M. Gagnon  <gagnon.etienne_m@uqam.ca>
=20
 	* doc/vmintegration.texinfo, doc/www.gnu.org/stories.wml: Update
 	SableVM related descriptions.

You didn't revert this since it was a good change.
But to update the webpages you need to do an extra dance as described in
doc/www.gnu.org/README. Normally we let Patrik take care of this since
he is more or less or official webmaster. I have taken care of this now
since I was updating the other guide anyway.

BTW. We probably should move the descriptions of the Compilers/Runtime
Environments to stories and just keep a little reference to the tool in
question in the integration guide (or just remove the redundant
information at all from that document).

-2004-03-28  Grzegorz B. Prokopski <gadek@debian.org>
-
-        * Merged vm/reference implementation of these reflection elements,
-        that can be realized in Java:
-        vm/reference/java/lang/reflect/Constructor.java,
-        vm/reference/java/lang/reflect/Field.java,
-        vm/reference/java/lang/reflect/Makefile.am,
-        vm/reference/java/lang/reflect/Method.java,
-        vm/reference/java/lang/reflect/ReflectUtil.java.

Thanks for reverting this. There is code in there that is good and that
I think is a valuable contribution to GNU Classpath. Let see if we can
get answers to the questions raised in
http://mail.gnu.org/archive/html/commit-classpath/2004-03/msg00105.html
And see if we can agree on a revised patch with the other VM-hackers
(like Jeroen) who have some experience with integrating these things.


-2004-03-27  Grzegorz B. Prokopski <gadek@debian.org>
-
-        * configure.ac: Added --with-jvm=3D handling defaulting to none.
-	* acinclude.m4: Don't build .zip for --with-jvm=3Dsablevm.

I think this one wasn't very useful indeed. It might be nice to try to
come up with something like Michael and I suggested that takes as an
argument the source or installation dir of a particular VM so we don't
have to encode any VM/Compiler specific things in GNU Classpath. On the
other hand if this is only about --disable-zip then it is probably not
worth to spend much time on. Just document that configure option in the
SableVM INSTALL document then.

-2004-03-27  Grzegorz B. Prokopski <gadek@debian.org>
-
-	* java/lang/Object.java (static): Remove static initializer.
-	* java/lang/reflect/Array.java (static): Remove static initializer.
-	* java/lang/Throwable.java (nl): Remove static field.
-	(StaticData): New private static inner class.
-	(stackTraceStringBuffer): Use StaticData.nl.

I liked this patch and Grzegorz fixed the small indentation issues with
it. Could that be recommitted? I can do this if neither of you has time
or trouble reverting a reverted commit.

-2004-03-27  Etienne M. Gagnon <gagnon.etienne_m@uqam.ca>
-
-	* native/fdlibm/dtoa.c, native/fdlibm/e_acos.c,
-	native/fdlibm/e_asin.c, native/fdlibm/e_atan2.c,
-	native/fdlibm/e_exp.c, native/fdlibm/e_fmod.c,
-	native/fdlibm/e_log.c, native/fdlibm/e_pow.c,
-	native/fdlibm/e_rem_pio2.c, native/fdlibm/e_remainder.c,
-	native/fdlibm/e_scalb.c, native/fdlibm/e_sqrt.c,
-	native/fdlibm/fdlibm.h, native/fdlibm/k_cos.c,
-	native/fdlibm/k_rem_pio2.c, native/fdlibm/k_sin.c,
-	native/fdlibm/k_tan.c, native/fdlibm/mprec.c,
-	native/fdlibm/mprec.h, native/fdlibm/s_atan.c,
-	native/fdlibm/s_ceil.c, native/fdlibm/s_copysign.c,
-	native/fdlibm/s_cos.c, native/fdlibm/s_fabs.c,
-	native/fdlibm/s_floor.c, native/fdlibm/s_rint.c,
-	native/fdlibm/s_scalbn.c, native/fdlibm/s_sin.c,
-	native/fdlibm/s_tan.c, native/fdlibm/sf_fabs.c,
-	native/fdlibm/sf_rint.c, native/fdlibm/strtod.c,
-	native/fdlibm/w_acos.c, native/fdlibm/w_asin.c,
-	native/fdlibm/w_atan2.c, native/fdlibm/w_exp.c,
-	native/fdlibm/w_fmod.c, native/fdlibm/w_log.c,
-	native/fdlibm/w_pow.c, native/fdlibm/w_remainder.c,
-	native/fdlibm/w_sqrt.c, native/jni/classpath/jcl.c,
-	native/jni/classpath/jcl.h, native/jni/classpath/jnilink.c,
-	native/jni/classpath/jnilink.h,
-	native/jni/classpath/native_state.c,
-	native/jni/classpath/native_state.h,
-	native/jni/classpath/primlib.c, native/jni/classpath/primlib.h,
-	native/jni/gtk-peer/gdkfont.h,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
-	native/jni/gtk-peer/gthread-jni.c, native/jni/gtk-peer/gtkpeer.h,
-	native/jni/java-awt/gnu_java_awt_EmbeddedWindow.c,
-	native/jni/java-io/FileDescriptor.c,
-	native/jni/java-io/java_io_File.c,
-	native/jni/java-io/java_io_ObjectInputStream.c,
-	native/jni/java-io/java_io_VMObjectStreamClass.c,
-	native/jni/java-io/javaio.c, native/jni/java-io/javaio.h,
-	native/jni/java-lang/java_lang_Double.c,
-	native/jni/java-lang/java_lang_Math.c,
-	native/jni/java-lang/java_lang_Object.c,
-	native/jni/java-lang/java_lang_VMDouble.c,
-	native/jni/java-lang/java_lang_VMFloat.c,
-	native/jni/java-lang/java_lang_VMSystem.c,
-	native/jni/java-lang/java_lang_reflect_Array.c,
-	native/jni/java-net/gnu_java_net_PlainDatagramSocketImpl.c,
-	native/jni/java-net/gnu_java_net_PlainSocketImpl.c,
-	native/jni/java-net/java_net_InetAddress.c,
-	native/jni/java-net/java_net_NetworkInterface.c,
-	native/jni/java-net/javanet.c, native/jni/java-net/javanet.h,
-	native/jni/java-nio/gnu_java_nio_NIOServerSocket.c,
-	native/jni/java-nio/java_nio.c,
-	native/jni/java-nio/java_nio_DirectByteBufferImpl.c,
-	native/jni/java-nio/java_nio_FileChannelImpl.c,
-	native/jni/java-nio/java_nio_FileLockImpl.c,
-	native/jni/java-util/java_util_TimeZone.c,
-	native/target/Linux/target_native.h,
-	native/target/Linux/target_native_file.h,
-	native/target/Linux/target_native_io.h,
-	native/target/Linux/target_native_math_float.h,
-	native/target/Linux/target_native_math_int.h,
-	native/target/Linux/target_native_misc.h,
-	native/target/Linux/target_native_network.h,
-	native/target/generic/target_generic.h,
-	native/target/generic/target_generic_file.h,
-	native/target/generic/target_generic_io.h,
-	native/target/generic/target_generic_math_float.h,
-	native/target/generic/target_generic_math_int.h,
-	native/target/generic/target_generic_misc.h,
-	native/target/generic/target_generic_network.h,
-	native/testsuite/guile-jvm.c, native/vmi/vmi.c, native/vmi/vmi.h:
-	Indented using GNU indent.

There was only a question of whether this was bad for native/fdlibm
and/or native/gtk-peer/ The rest was actually fine. Lets wait what
Graydon says about native/gtk-peer/ and then redo the indenting for the
non-contested files.

-2004-03-27  Etienne M. Gagnon <gagnon.etienne_m@uqam.ca>
-
-	* autogen.sh: Useful script for hackers to call auto* tools on
-	fresh CVS copy.
-	* Makefile.am: Only indent C files below native/ directory.

Both these were useful additions in principle. The C indent target has
to be adapted to not run over native/fdlibm, but is fine otherwise.
autogen.sh probably could need some input from Brian, Michael and
Dalibor who have some more experience with the build system. But it was
a good idea in general.

-2004-03-27  Etienne M. Gagnon <gagnon.etienne_m@uqam.ca>
-
-	* .cvsignore: Ignore some additional generated files.
-	* config.guess, config.sub, depcomp, install-sh, ltmain.sh,
-	missing, mkinstalldirs: Removed these generated files.

In combination with the above autogen.sh script fine.
The only criticism was that it wasn't properly announced before it was
committed which caused some people a nasty surprise when they updated.
But now that people know about it, it can go in (or could have stayed
in).

-2004-03-27  Etienne M. Gagnon <gagnon.etienne_m@uqam.ca>
-
-	* .indent.pro: Added typedef file for GNU indent.
-	* Makefile.am: Added indent target.
-	* include/jni.h.in, native/fdlibm/fdlibm.h,
-	native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c,
-	native/vmi/vmi.h: Separate typedef declarations from struct/union
-	declarations.
=20
Same as above. Fine except for the native/fdlibm.h one (although that
can probably be pushed upstream if it is an important clarification).

Cheers,

Mark

--=-0HPg66CEr+RDQ8G/kgpL
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)

iD8DBQBAbZxrxVhZCJWr9QwRAhEVAJ9sLln3ngnbK6yVd/pO2dCsr1in6wCfcf/g
07spuVnbSJszyCavppIR9T8=
=qZGR
-----END PGP SIGNATURE-----

--=-0HPg66CEr+RDQ8G/kgpL--




From MAILER-DAEMON Fri Apr 02 12:11:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9SCO-0003uX-NP
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 12:11:20 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9Rt6-0007Ve-TH
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 11:51:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9RsM-0006vS-50
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 11:51:10 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1B9RoD-0003pd-7v; Fri, 02 Apr 2004 11:46:21 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i32GkFjj021819;
	Fri, 2 Apr 2004 11:46:15 -0500
Received: from redhat.com (sebastian-int.corp.redhat.com [172.16.52.221])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i32GkFj17621; 
	Fri, 2 Apr 2004 11:46:15 -0500
Message-ID: <406D98A3.1010901@redhat.com>
Date: Fri, 02 Apr 2004 11:45:23 -0500
From: graydon hoare <graydon@redhat.com>
User-Agent: Mozilla Thunderbird 0.5 (X11/20040208)
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: classpath@gnu.org
References: <4065D116.60308@uqam.ca>
	<1080501381.17922.148.camel@elsschot.wildebeest.org>
	<87ptauku6o.fsf@fleche.redhat.com>
In-Reply-To: <87ptauku6o.fsf@fleche.redhat.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Mailman-Approved-At: Fri, 02 Apr 2004 12:11:15 -0500
Cc: commit-classpath@gnu.org
Subject: Re: GNU indent for C code
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 16:54:58 -0000

Tom Tromey wrote:

> Perhaps we could just run indent on the code there now.
> Graydon?  Anyone?
> 
> I think it is great to have an indentation style that can be handled
> automatically.

I agree. I am perfectly happy to merge indentation changes to the gui 
branch's C files, I just need to know when you want it to happen and 
what indentation style is preferred. an automatic one would be best; we 
are already committed to reformatting things under jalopy whenever 
possible. I'll need to warn a few people around here to get any 
uncommitted C code changes in (essentially a "flag day" around the office).

managing the divergence caused by java-gui-branch is my responsibility; 
I'll merge it as necessary. it's a choice we made to speed up our 
development, nobody else should pay for that choice.

-graydon




From MAILER-DAEMON Fri Apr 02 13:36:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9TWn-00073Y-Fa
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 13:36:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9TWk-000734-Nf
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 13:36:26 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9TWE-0006q8-BD
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 13:36:25 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9TWD-0006pg-SQ
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 13:35:54 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-140.ewetel.net
	[80.228.94.140])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i32IZnX3023418;
	Fri, 2 Apr 2004 20:35:50 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1B9SaD-0004TD-00; Fri, 02 Apr 2004 19:35:57 +0200
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 2 Apr 2004 20:35:36 +0200
User-Agent: KMail/1.5.4
References: <4067D070.1020402@uqam.ca>
	<1080925292.26699.1821.camel@elsschot.wildebeest.org>
In-Reply-To: <1080925292.26699.1821.camel@elsschot.wildebeest.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404022035.37498.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath <commit-classpath@gnu.org>
Subject: Re: Reverting changes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 18:36:27 -0000

Am Freitag, 2. April 2004 19:01 schrieb Mark Wielaard:

> -	* HACKING: Updated information about regenerating auto* files and
> -	documented the existence of autogen.sh.

I really wonder if autogen.sh is really needed. We can just use 
"autoreconf" too. I tried it and I found no reason yet to dont use it.
When this is properly domentated it should be okay ofr our usage.

Any opinions on this ?


Michael




From MAILER-DAEMON Fri Apr 02 14:14:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9U7e-0000W5-Me
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 14:14:34 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9U7c-0000Vr-Ps
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 14:14:32 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9U76-0000RJ-Sd
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 14:14:31 -0500
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9U76-0000RF-HQ
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 14:14:00 -0500
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1B9U76-0001uS-00
	for <commit-classpath@gnu.org>; Fri, 02 Apr 2004 21:14:00 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1B9U73-0001tr-00; Fri, 02 Apr 2004 21:13:57 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i32JDuLT029282;
	Fri, 2 Apr 2004 21:13:57 +0200 (MEST)
Message-ID: <406DBB72.7000005@kaffe.org>
Date: Fri, 02 Apr 2004 21:13:54 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Michael Koch <konqueror@gmx.de>
References: <4067D070.1020402@uqam.ca>	<1080925292.26699.1821.camel@elsschot.wildebeest.org>
	<200404022035.37498.konqueror@gmx.de>
In-Reply-To: <200404022035.37498.konqueror@gmx.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by AMaViS perl-11
Cc: Mark Wielaard <mark@klomp.org>, commit-classpath <commit-classpath@gnu.org>
Subject: Re: Reverting changes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 19:14:33 -0000

Michael Koch wrote:
> Am Freitag, 2. April 2004 19:01 schrieb Mark Wielaard:
> 
> 
>>-	* HACKING: Updated information about regenerating auto* files and
>>-	documented the existence of autogen.sh.
> 
> 
> I really wonder if autogen.sh is really needed. We can just use 
> "autoreconf" too. I tried it and I found no reason yet to dont use it.
> When this is properly domentated it should be okay ofr our usage.
> 
> Any opinions on this ?

I agree.

But I must admit that I haven't looked at the patch that added 
autogen.sh, so there may be a good reason to have the script instead.

cheers,
dalibor topic



From MAILER-DAEMON Fri Apr 02 14:45:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9UX5-0001Tf-2c
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 14:40:51 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9UWJ-00016a-BG
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 14:40:03 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9USC-0007OB-Pd
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 14:36:21 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9UDY-000259-OI
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 14:20:40 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-140.ewetel.net
	[80.228.94.140])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i32JJwPZ008452;
	Fri, 2 Apr 2004 21:20:01 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1B9TGw-0004bE-00; Fri, 02 Apr 2004 20:20:06 +0200
From: Michael Koch <konqueror@gmx.de>
To: Dalibor Topic <robilad@kaffe.org>
Date: Fri, 2 Apr 2004 21:19:46 +0200
User-Agent: KMail/1.5.4
References: <4067D070.1020402@uqam.ca> <200404022035.37498.konqueror@gmx.de>
	<406DBB72.7000005@kaffe.org>
In-Reply-To: <406DBB72.7000005@kaffe.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404022119.47014.konqueror@gmx.de>
X-CheckCompat: OK
Cc: Mark Wielaard <mark@klomp.org>, commit-classpath <commit-classpath@gnu.org>
Subject: Re: Reverting changes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 19:40:49 -0000

Am Freitag, 2. April 2004 21:13 schrieb Dalibor Topic:
> Michael Koch wrote:
> > Am Freitag, 2. April 2004 19:01 schrieb Mark Wielaard:
> >>-	* HACKING: Updated information about regenerating auto* files and
> >>-	documented the existence of autogen.sh.
> >
> > I really wonder if autogen.sh is really needed. We can just use
> > "autoreconf" too. I tried it and I found no reason yet to dont use
> > it. When this is properly domentated it should be okay ofr our
> > usage.
> >
> > Any opinions on this ?
>
> I agree.
>
> But I must admit that I haven't looked at the patch that added
> autogen.sh, so there may be a good reason to have the script instead.

Well, it was more or less the usual commands in a row, autoreconf can do 
this better from what I saw in its source.


Michael




From MAILER-DAEMON Fri Apr 02 16:17:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9Vyf-0006M2-Lg
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 16:13:25 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9VyR-0006H3-19
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:13:11 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9Vtz-0004X1-6U
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:09:06 -0500
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by monty-python.gnu.org with smtp (Exim 4.30) id 1B9Vsm-0003fs-LQ
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:07:20 -0500
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id cb1b7118_84e5_11d8_922e_00304811e8c8_3115;
	Fri, 02 Apr 2004 14:39:09 -0600 (CST)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i32KmwB4022386; 
	Fri, 2 Apr 2004 14:48:59 -0600 (CST)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i32Kmu4k022385;
	Fri, 2 Apr 2004 14:48:56 -0600 (CST) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404022048.i32Kmu4k022385@arch20m.dellroad.org>
In-Reply-To: <200404022119.47014.konqueror@gmx.de>
To: Michael Koch <konqueror@gmx.de>
Date: Fri, 2 Apr 2004 14:48:56 -0600 (CST)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: Mark Wielaard <mark@klomp.org>, commit-classpath <commit-classpath@gnu.org>
Subject: Re: Reverting changes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 21:13:14 -0000

Michael Koch wrote:
> > But I must admit that I haven't looked at the patch that added
> > autogen.sh, so there may be a good reason to have the script instead.
> 
> Well, it was more or less the usual commands in a row, autoreconf can do 
> this better from what I saw in its source.

It would be nice if the script or autoreconf or whatever would check
that the right versions of all the auto* tools are installed first before
trying to run them.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Fri Apr 02 16:24:42 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9W6W-0000oa-3i
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 16:21:32 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9W6I-0000jI-TW
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:21:18 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9W5h-0000Lr-Gd
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:21:14 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9W5g-0000LE-9s
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:20:40 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-140.ewetel.net
	[80.228.94.140])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i32LKZNj022430;
	Fri, 2 Apr 2004 23:20:36 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1B9V9f-0004rU-00; Fri, 02 Apr 2004 22:20:43 +0200
From: Michael Koch <konqueror@gmx.de>
To: Archie Cobbs <archie@dellroad.org>
Date: Fri, 2 Apr 2004 23:20:23 +0200
User-Agent: KMail/1.5.4
References: <200404022048.i32Kmu4k022385@arch20m.dellroad.org>
In-Reply-To: <200404022048.i32Kmu4k022385@arch20m.dellroad.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404022320.24053.konqueror@gmx.de>
X-CheckCompat: OK
Cc: Mark Wielaard <mark@klomp.org>, commit-classpath <commit-classpath@gnu.org>
Subject: Re: Reverting changes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 02 Apr 2004 21:21:21 -0000

Am Freitag, 2. April 2004 22:48 schrieb Archie Cobbs:
> Michael Koch wrote:
> > > But I must admit that I haven't looked at the patch that added
> > > autogen.sh, so there may be a good reason to have the script
> > > instead.
> >
> > Well, it was more or less the usual commands in a row, autoreconf
> > can do this better from what I saw in its source.
>
> It would be nice if the script or autoreconf or whatever would check
> that the right versions of all the auto* tools are installed first
> before trying to run them.

autoreconf checks versions of auto* software by executing tests from 
configure.ac. Developers are supposed to read HACKING anyway when using 
CVS before trying to build it.


Michael




From MAILER-DAEMON Fri Apr 02 16:33:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9WIB-0005zP-Re
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 16:33:35 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9WI4-0005yQ-2f
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:33:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9WAl-0003hR-0L
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:26:26 -0500
Received: from [207.189.223.52] (helo=email3.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1B9WAk-0003fG-06
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:25:54 -0500
Received: (qmail 11393 invoked from network); 2 Apr 2004 21:37:28 -0000
Received: from tf0229.peakpeak.com (HELO fleche.redhat.com) ([204.144.239.229])
	(envelope-sender <tromey@redhat.com>)
	by email3.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 2 Apr 2004 21:37:28 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id F3B7D4F82A2; Fri,  2 Apr 2004 14:12:27 -0700 (MST)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Look into my eyes and try to forget that you have a Macy's charge
	card!
Date: 02 Apr 2004 14:12:27 -0700
Message-ID: <87brmaaxtw.fsf@fleche.redhat.com>
Lines: 252
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: minor cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 02 Apr 2004 21:33:33 -0000

I'm checking this in.

This removes some redundant modifiers and some `extends Object'
occurrences.  As such it is just a minor cleanup.

FYI there are some remaining redundant modifiers in java.util.zip.

This includes my patchlet from yesterday that I didn't commit as cvs
was down for a while.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>

	* java/rmi/MarshalledObject.java (MarshalledObject): Removed
	redundant `extends'.
	* java/security/Security.java (Security): Removed redundant
	`extends'.
	* java/security/spec/DSAPublicKeySpec.java (DSAPublicKeySpec):
	Removed redundant `extends'.
	* java/security/spec/DSAPrivateKeySpec.java (DSAPrivateKeySpec):
	Removed redundant `extends'.
	* java/security/spec/DSAParameterSpec.java (DSAParameterSpec):
	Removed redundant `extends'.
	* javax/naming/directory/SearchControls.java (SearchControls):
	Removed redundant `extends'.
	* javax/naming/spi/DirStateFactory.java (Result): Removed
	redundant modifiers.
	* java/util/Map.java (Entry): Removed redundant modifiers.
	* java/text/AttributedCharacterIterator.java (Attribute): Removed
	redundant modifiers.
	* java/security/Security.java (provides): Removed unused label.

Index: java/rmi/MarshalledObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/MarshalledObject.java,v
retrieving revision 1.5
diff -u -r1.5 MarshalledObject.java
--- java/rmi/MarshalledObject.java 15 Nov 2003 22:41:59 -0000 1.5
+++ java/rmi/MarshalledObject.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -46,8 +46,7 @@
 /**
  * FIXME - doc missing
  */
-public final class MarshalledObject
-  extends Object implements Serializable 
+public final class MarshalledObject implements Serializable 
 {
   
   //The following fields are from Java API Documentation "Serialized form"
Index: java/security/Security.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/Security.java,v
retrieving revision 1.26
diff -u -r1.26 Security.java
--- java/security/Security.java 30 Nov 2003 14:49:59 -0000 1.26
+++ java/security/Security.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* Security.java --- Java base security class implementation
-   Copyright (C) 1999, 2001, 2002, 2003, Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -59,7 +59,7 @@
  *
  * @author Mark Benvenuto <ivymccough@worldnet.att.net>
  */
-public final class Security extends Object
+public final class Security
 {
   private static final String ALG_ALIAS = "Alg.Alias.";
 
@@ -670,7 +670,7 @@
     outer: for (int r = 0; r < 3; r++) // guard against circularity
       {
         serviceDotAlgorithm = (svc+"."+String.valueOf(algo)).trim();
-        inner: for (it = p.keySet().iterator(); it.hasNext(); )
+        for (it = p.keySet().iterator(); it.hasNext(); )
           {
             key = (String) it.next();
             if (key.equalsIgnoreCase(serviceDotAlgorithm)) // eureka
Index: java/security/spec/DSAParameterSpec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/spec/DSAParameterSpec.java,v
retrieving revision 1.4
diff -u -r1.4 DSAParameterSpec.java
--- java/security/spec/DSAParameterSpec.java 5 Dec 2002 11:15:06 -0000 1.4
+++ java/security/spec/DSAParameterSpec.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* DSAParameterSpec.java --- DSA Parameter Specificaton class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -48,7 +48,7 @@
 
 	@author Mark Benvenuto
 */
-public class DSAParameterSpec extends Object implements AlgorithmParameterSpec, DSAParams
+public class DSAParameterSpec implements AlgorithmParameterSpec, DSAParams
 {
   private BigInteger p = null;
   private BigInteger q = null;
Index: java/security/spec/DSAPrivateKeySpec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/spec/DSAPrivateKeySpec.java,v
retrieving revision 1.4
diff -u -r1.4 DSAPrivateKeySpec.java
--- java/security/spec/DSAPrivateKeySpec.java 5 Dec 2002 11:15:06 -0000 1.4
+++ java/security/spec/DSAPrivateKeySpec.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* DSAPrivateKeySpec.java --- DSA Private Key Specificaton class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@
 
 	@author Mark Benvenuto
 */
-public class DSAPrivateKeySpec extends Object implements KeySpec 
+public class DSAPrivateKeySpec implements KeySpec 
 {
   private BigInteger x = null;
   private BigInteger p = null;
Index: java/security/spec/DSAPublicKeySpec.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/spec/DSAPublicKeySpec.java,v
retrieving revision 1.5
diff -u -r1.5 DSAPublicKeySpec.java
--- java/security/spec/DSAPublicKeySpec.java 25 Apr 2003 04:58:12 -0000 1.5
+++ java/security/spec/DSAPublicKeySpec.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* DSAPublicKeySpec.java --- DSA Public Key Specificaton class
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -47,7 +47,7 @@
 
 	@author Mark Benvenuto
 */
-public class DSAPublicKeySpec extends Object implements KeySpec 
+public class DSAPublicKeySpec implements KeySpec 
 {
   private BigInteger y = null;
   private BigInteger p = null;
Index: java/text/AttributedCharacterIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedCharacterIterator.java,v
retrieving revision 1.7
diff -u -r1.7 AttributedCharacterIterator.java
--- java/text/AttributedCharacterIterator.java 15 Oct 2003 13:28:21 -0000 1.7
+++ java/text/AttributedCharacterIterator.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* AttributedCharacterIterator.java -- Iterate over attributes
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -60,7 +60,7 @@
   /**
    * This class defines attribute keys that are used as text attributes.
    */
-  public static class Attribute implements Serializable
+  class Attribute implements Serializable
   {
     private static final long serialVersionUID = -9142742483513960612L;
 
Index: java/util/Map.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Map.java,v
retrieving revision 1.11
diff -u -r1.11 Map.java
--- java/util/Map.java 15 Oct 2003 12:29:35 -0000 1.11
+++ java/util/Map.java 2 Apr 2004 21:19:13 -0000
@@ -1,6 +1,6 @@
 /* Map.java: interface Map -- An object that maps keys to values
              interface Map.Entry -- an Entry in a Map
-   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -264,7 +264,7 @@
    * @since 1.2
    * @status updated to 1.4
    */
-  static interface Entry
+  interface Entry
   {
     /**
      * Get the key corresponding to this entry.
Index: javax/naming/directory/SearchControls.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/directory/SearchControls.java,v
retrieving revision 1.1
diff -u -r1.1 SearchControls.java
--- javax/naming/directory/SearchControls.java 23 Nov 2002 21:44:28 -0000 1.1
+++ javax/naming/directory/SearchControls.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* SearchControls.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,7 +44,7 @@
  * @date June 5, 2001
  */
 
-public class SearchControls extends Object implements Serializable
+public class SearchControls implements Serializable
 {
   public static final int OBJECT_SCOPE = 0;
   public static final int ONELEVEL_SCOPE = 1;
Index: javax/naming/spi/DirStateFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/DirStateFactory.java,v
retrieving revision 1.3
diff -u -r1.3 DirStateFactory.java
--- javax/naming/spi/DirStateFactory.java 26 Dec 2003 20:27:04 -0000 1.3
+++ javax/naming/spi/DirStateFactory.java 2 Apr 2004 21:19:13 -0000
@@ -1,5 +1,5 @@
 /* DirStateFactory.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -53,7 +53,7 @@
 {
   // Inner class
 
-  public static class Result
+  class Result
   {
     private Object obj;
     private Attributes outAttrs;



From MAILER-DAEMON Fri Apr 02 16:36:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9WJO-0006Vc-Um
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 16:34:50 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9WIo-0006Ew-Vj
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:34:15 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9WIC-0005zb-7k
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:34:07 -0500
Received: from [207.174.178.92] (helo=email2.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1B9WIB-0005yi-2w
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 16:33:35 -0500
Received: (qmail 16807 invoked from network); 2 Apr 2004 21:34:55 -0000
Received: from tf0229.peakpeak.com (HELO fleche.redhat.com) ([204.144.239.229])
	(envelope-sender <tromey@redhat.com>)
	by email2.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 2 Apr 2004 21:34:55 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id E526A4F82A2; Fri,  2 Apr 2004 14:20:08 -0700 (MST)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Bo Derek ruined my life!
Date: 02 Apr 2004 14:20:08 -0700
Message-ID: <877jwyaxh3.fsf@fleche.redhat.com>
Lines: 50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: hacking update
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 02 Apr 2004 21:34:42 -0000

I'm checking this in.  This documents a couple more redundant bits
that we can omit in our coding standard.

Let me know if you object to this change; I'm assuming everybody will
pretty much find it unobjectionable, but if I'm wrong I will back it
out.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* doc/hacking.texinfo (Source Code Style Guide): Mention `extends
	Object' and `import java.lang.Integer' as redundant.

Index: doc/hacking.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/hacking.texinfo,v
retrieving revision 1.24
diff -u -r1.24 hacking.texinfo
--- doc/hacking.texinfo 2 Apr 2004 16:23:13 -0000 1.24
+++ doc/hacking.texinfo 2 Apr 2004 21:31:55 -0000
@@ -585,22 +585,23 @@
 @end example
 
 @item
-Don't use redundant modifiers.  Here is some sample code that shows
-redundant modifiers in comments:
+Don't use redundant modifiers or other redundant constructs.  Here is
+some sample code that shows various redundant items in comments:
 
 @example
+/*import java.lang.Integer;*/
 /*abstract*/ interface I @{
    /*public abstract*/ void m();
    /*public static final*/ int i = 1;
    /*public static*/ class Inner @{@}
 @}
-final class C @{
+final class C /*extends Object*/ @{
    /*final*/ void m() @{@}
 @}
 @end example
 
-Note that Jikes will generate warnings for these if you use
-@code{+Predundant-modifiers} on the command line.
+Note that Jikes will generate warnings for redundant modifiers if you
+use @code{+Predundant-modifiers} on the command line.
 
 @item
 Modifiers should be listed in the standard order recommended by the



From MAILER-DAEMON Fri Apr 02 23:01:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9cLZ-0003of-EW
	for mharc-commit-classpath@gnu.org; Fri, 02 Apr 2004 23:01:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9cLX-0003nc-3T
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 23:01:27 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9cL1-0003Wk-GL
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 23:01:26 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9cL1-0003Wa-6G
	for commit-classpath@gnu.org; Fri, 02 Apr 2004 23:00:55 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 9DB056236D
	for <commit-classpath@gnu.org>; Sat,  3 Apr 2004 04:00:54 +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 69922-02 for <commit-classpath@gnu.org>;
	Sat,  3 Apr 2004 04:00:53 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-89.adsl.solnet.ch [212.41.79.89])
	by mail01.solnet.ch (Postfix) with ESMTP id 7BB236230B
	for <commit-classpath@gnu.org>; Sat,  3 Apr 2004 04:00:53 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 24A3EB6995; Sat,  3 Apr 2004 05:58:46 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040403035846.24A3EB6995@reali.dnsalias.net>
Date: Sat,  3 Apr 2004 05:58:46 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Subject: classpath daily snapshot 20040403 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 03 Apr 2004 04:01:27 -0000




From MAILER-DAEMON Sat Apr 03 23:02:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1B9ypb-0001OT-VZ
	for mharc-commit-classpath@gnu.org; Sat, 03 Apr 2004 23:01:59 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1B9ypV-0001DT-NH
	for commit-classpath@gnu.org; Sat, 03 Apr 2004 23:01:53 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1B9yox-0000dM-0t
	for commit-classpath@gnu.org; Sat, 03 Apr 2004 23:01:50 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1B9yow-0000bX-MO
	for commit-classpath@gnu.org; Sat, 03 Apr 2004 23:01:18 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 4B24262203
	for <commit-classpath@gnu.org>; Sun,  4 Apr 2004 04:01: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 19802-09 for <commit-classpath@gnu.org>;
	Sun,  4 Apr 2004 04:01:16 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-89.adsl.solnet.ch [212.41.79.89])
	by mail01.solnet.ch (Postfix) with ESMTP id 30CD862223
	for <commit-classpath@gnu.org>; Sun,  4 Apr 2004 04:01:16 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id ABA29B6C07; Sun,  4 Apr 2004 05:59:32 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040404035932.ABA29B6C07@reali.dnsalias.net>
Date: Sun,  4 Apr 2004 05:59:32 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet
Subject: classpath daily snapshot 20040404 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 04 Apr 2004 04:01:57 -0000




From MAILER-DAEMON Sun Apr 04 16:17:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAE3J-0007UK-M8
	for mharc-commit-classpath@gnu.org; Sun, 04 Apr 2004 16:17:09 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAE3E-0007Oh-5g
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:17:04 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAE39-0007LK-BI
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:17:00 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAE38-0007KX-P8
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:16:58 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BAE2l-0001LL-00; Sun, 04 Apr 2004 22:16:35 +0200
From: Mark Wielaard <mark@klomp.org>
To: Dalibor Topic <robilad@kaffe.org>
In-Reply-To: <406DBB72.7000005@kaffe.org>
References: <4067D070.1020402@uqam.ca>
	<1080925292.26699.1821.camel@elsschot.wildebeest.org>
	<200404022035.37498.konqueror@gmx.de>  <406DBB72.7000005@kaffe.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-0VHdTDlIn3WO1W6F/y/D"
Message-Id: <1081109797.7548.208.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 04 Apr 2004 22:16:37 +0200
Cc: commit-classpath <commit-classpath@gnu.org>,
	Michael Koch <konqueror@gmx.de>
Subject: Re: Reverting changes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 04 Apr 2004 20:17:05 -0000


--=-0VHdTDlIn3WO1W6F/y/D
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Fri, 2004-04-02 at 21:13, Dalibor Topic wrote:
> Michael Koch wrote:
> > Am Freitag, 2. April 2004 19:01 schrieb Mark Wielaard:
> >=20
> >>-	* HACKING: Updated information about regenerating auto* files and
> >>-	documented the existence of autogen.sh.
> >=20
> > I really wonder if autogen.sh is really needed. We can just use=20
> > "autoreconf" too. I tried it and I found no reason yet to dont use it.
> > When this is properly domentated it should be okay ofr our usage.
> >=20
> > Any opinions on this ?
>=20
> I agree.
>=20
> But I must admit that I haven't looked at the patch that added=20
> autogen.sh, so there may be a good reason to have the script instead.

It seems to be a common standard to have a script to generate the auto*
files from scratch in CVS by that name and some auto CVS builders (like
jhbuild which Thomas is working on) depend on a script with that name.
So if someone can come up with a good/working autogen.sh then I would
love to see it in CVS.

BTW. autoreconf picks up the wrong automake on my system and then fails
horribly. So some kind of version checking is needed in this script.

Cheers,

Mark

--=-0VHdTDlIn3WO1W6F/y/D
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)

iD8DBQBAcG0kxVhZCJWr9QwRAvBzAJoDUFTW/uvoc6bLHHYgh8bS2lk2awCcC3sB
eOu7yB1PtL/XKg8M59WN5w0=
=wdmm
-----END PGP SIGNATURE-----

--=-0VHdTDlIn3WO1W6F/y/D--




From MAILER-DAEMON Sun Apr 04 16:23:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAE8v-0004rj-Px
	for mharc-commit-classpath@gnu.org; Sun, 04 Apr 2004 16:22:57 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAE8q-0004kw-NQ
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:22:52 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAE8H-0004EQ-8o
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:22:49 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAE8D-0004Cx-I6
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:22:13 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-151.ewetel.net
	[80.228.94.151])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i34KMAPZ009431;
	Sun, 4 Apr 2004 22:22:10 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BADCF-000524-00; Sun, 04 Apr 2004 21:22:19 +0200
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Date: Sun, 4 Apr 2004 22:21:59 +0200
User-Agent: KMail/1.5.4
References: <4067D070.1020402@uqam.ca> <406DBB72.7000005@kaffe.org>
	<1081109797.7548.208.camel@elsschot.wildebeest.org>
In-Reply-To: <1081109797.7548.208.camel@elsschot.wildebeest.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404042221.59163.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath <commit-classpath@gnu.org>
Subject: Re: Reverting changes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 04 Apr 2004 20:22:55 -0000

Am Sonntag, 4. April 2004 22:16 schrieben Sie:
> Hi,
>
> On Fri, 2004-04-02 at 21:13, Dalibor Topic wrote:
> > Michael Koch wrote:
> > > Am Freitag, 2. April 2004 19:01 schrieb Mark Wielaard:
> > >>-	* HACKING: Updated information about regenerating auto* files
> > >> and -	documented the existence of autogen.sh.
> > >
> > > I really wonder if autogen.sh is really needed. We can just use
> > > "autoreconf" too. I tried it and I found no reason yet to dont
> > > use it. When this is properly domentated it should be okay ofr
> > > our usage.
> > >
> > > Any opinions on this ?
> >
> > I agree.
> >
> > But I must admit that I haven't looked at the patch that added
> > autogen.sh, so there may be a good reason to have the script
> > instead.
>
> It seems to be a common standard to have a script to generate the
> auto* files from scratch in CVS by that name and some auto CVS
> builders (like jhbuild which Thomas is working on) depend on a script
> with that name. So if someone can come up with a good/working
> autogen.sh then I would love to see it in CVS.

Okay, will provide one tomorrow with version checking before it actually 
runs something for discussion.

> BTW. autoreconf picks up the wrong automake on my system and then
> fails horribly. So some kind of version checking is needed in this
> script.

autoreconf depends on the correct setting of $AUTOMAKE, $AUTOCONF, 
$ACLOCAL, $AUTOHEADER and $LIBTOOLIZE when multiple versions are 
present.


Michael




From MAILER-DAEMON Sun Apr 04 16:40:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAEPj-0007gl-Bp
	for mharc-commit-classpath@gnu.org; Sun, 04 Apr 2004 16:40:19 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAEPe-0007e6-U7
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:40:14 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAEPX-0007aX-3V
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:40:09 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAENp-00072j-0e
	for commit-classpath@gnu.org; Sun, 04 Apr 2004 16:38:21 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BAENV-0001NL-00; Sun, 04 Apr 2004 22:38:01 +0200
From: Mark Wielaard <mark@klomp.org>
To: tromey@redhat.com
In-Reply-To: <87ad1wha5a.fsf@fleche.redhat.com>
References: <1080451330.25203.42.camel@gadek.homelinux.org>
	<1080505658.17922.182.camel@elsschot.wildebeest.org>
	<87ad1wha5a.fsf@fleche.redhat.com>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-5N6nzaOLS/+etBIQWjcQ"
Message-Id: <1081111083.7548.218.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 04 Apr 2004 22:38:03 +0200
Cc: commit-classpath <commit-classpath@gnu.org>
Subject: Re: vm/reference reflection update
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 04 Apr 2004 20:40:16 -0000


--=-5N6nzaOLS/+etBIQWjcQ
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Thu, 2004-04-01 at 01:25, Tom Tromey wrote:
> The status is that savannah hasn't processed new projects since
> November.  I've been waiting for a project to be made so that we have
> a public place to work on jalopy changes.
>=20
> It's time for us to consider other hosting options.  Sourceforge
> processed my last account request same-day -- how about we do that?
> Unless someone has a better idea I'll do that, perhaps next week.

https://gna.org/ seems to be the FSF France mirror/backup of Savannah in
Europe. One of the nice things they have is backup and migration of
projects:

        Because Gna! is philosophically and technically compatible with
        Savannah, we started to implement an import/export procedure so
        that projects can move freely between Gna! and Savannah. The
        compromission of Savannah last year showed that it is critical
        to have many Free Software development facilities where projects
        can be backed up easily.

Cheers,

Mark

--=-5N6nzaOLS/+etBIQWjcQ
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)

iD8DBQBAcHIrxVhZCJWr9QwRApbGAJ9RR7MiUo7JY59k7+ja+CaAM0OGPgCfYPnb
fSfG8+87RTHoYgNNx1FEBF8=
=g4lL
-----END PGP SIGNATURE-----

--=-5N6nzaOLS/+etBIQWjcQ--




From MAILER-DAEMON Mon Apr 05 00:13:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BALUV-0000nF-Gb
	for mharc-commit-classpath@gnu.org; Mon, 05 Apr 2004 00:13:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BALUT-0000mO-8U
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 00:13:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BALHQ-0006ft-DF
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 00:00:46 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BALHP-0006fU-Nn
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 00:00:11 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id D60B362244
	for <commit-classpath@gnu.org>; Mon,  5 Apr 2004 04:00:10 +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 77628-08 for <commit-classpath@gnu.org>;
	Mon,  5 Apr 2004 04:00:10 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-89.adsl.solnet.ch [212.41.79.89])
	by mail01.solnet.ch (Postfix) with ESMTP id B4A986222C
	for <commit-classpath@gnu.org>; Mon,  5 Apr 2004 04:00:09 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id EE0CFB6DCF; Mon,  5 Apr 2004 05:58:24 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040405035824.EE0CFB6DCF@reali.dnsalias.net>
Date: Mon,  5 Apr 2004 05:58:24 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040405 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 05 Apr 2004 04:13:41 -0000




From MAILER-DAEMON Mon Apr 05 15:55:32 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAaBq-000578-9o
	for mharc-commit-classpath@gnu.org; Mon, 05 Apr 2004 15:55:26 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAaBn-00055Y-VG
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 15:55:23 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAaBF-0004ob-PS
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 15:55:21 -0400
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 1BAaBF-0004oI-8v
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 15:54:49 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BAa9a-0004UU-7H
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 15:53:06 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-109.ewetel.net
	[80.228.94.109])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i35JqwPZ009220
	for <commit-classpath@gnu.org>; Mon, 5 Apr 2004 21:52:59 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BAZDZ-0002DL-00
	for <commit-classpath@gnu.org>; Mon, 05 Apr 2004 20:53:09 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath <commit-classpath@gnu.org>
Date: Mon, 5 Apr 2004 21:52:42 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404052152.42786.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch for discussion: The big NIO merge
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 05 Apr 2004 19:55:24 -0000

Hi list,


Here is a little NIO patch for classpath. Its mainly to merge with 
current libgcj to get differences smaller. It uses java.nio now 
internally in java.io to access files. This surely needs a NEWS item 
for the next release.

Any comments ? Okay to commit ?


Michael




From MAILER-DAEMON Mon Apr 05 16:08:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAaOH-0005VG-6o
	for mharc-commit-classpath@gnu.org; Mon, 05 Apr 2004 16:08:17 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAaOC-0005SS-AB
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 16:08:12 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAaME-0003so-Fh
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 16:06:42 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAaLy-0003cR-9x
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 16:05:54 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-109.ewetel.net
	[80.228.94.109])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i35K5ppH002404
	for <commit-classpath@gnu.org>; Mon, 5 Apr 2004 22:05:51 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BAZQ1-0002Jr-00
	for <commit-classpath@gnu.org>; Mon, 05 Apr 2004 21:06:01 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath <commit-classpath@gnu.org>
Date: Mon, 5 Apr 2004 22:05:35 +0200
User-Agent: KMail/1.5.4
References: <200404052152.42786.konqueror@gmx.de>
In-Reply-To: <200404052152.42786.konqueror@gmx.de>
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_PwbcAdEpORppyn7"
Message-Id: <200404052205.35549.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Re: Patch for discussion: The big NIO merge
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 05 Apr 2004 20:08:13 -0000


--Boundary-00=_PwbcAdEpORppyn7
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Am Montag, 5. April 2004 21:52 schrieb Michael Koch:
> Hi list,
>
>
> Here is a little NIO patch for classpath. Its mainly to merge with
> current libgcj to get differences smaller. It uses java.nio now
> internally in java.io to access files. This surely needs a NEWS item
> for the next release.
>
> Any comments ? Okay to commit ?

Sorry, I forgot to add the patch.


Michael

--Boundary-00=_PwbcAdEpORppyn7
Content-Type: application/x-bzip2;
  name="nio.diff.bz2"
Content-Transfer-Encoding: base64
Content-Disposition: attachment;
	filename="nio.diff.bz2"

QlpoOTFBWSZTWbq90d4ATel/gH/wBqt////////f/r////5gXp3177X3btF1sz527cfWffPntFPv
j6GhSgFvl7V97b7zdvu+zvV5dz6dzzjfbvGdqwr2O97uzc91tzPt9991PeZ1dgHb7zdsb776eL1s
+5rF0AR6fe14ZfQY3de9x9Y3zx6uQABr6+26euvfT48xvZvXpuaq+u9tc910Io9XqtQ72O2a7vvN
3oVCmm2yZRXt07WvuXpvSO73cAdDvDzo+vvtFS+rrrbV2t7uV7xpUhu7ttZ3dUdrUa+vID3q+855
evrueDLbdupFa2bZW1saWF23ZZVHc6Jcs3u29eiu9rHbm7NLWmXU7O5ApLYY0T3u9T2CRQQAmQaJ
kGpgJPSU/0U9pHpT1JvVG1PTUG1NHoRowmmDSeoCRCBBNI0U9CE8lMyaaSeo2o008k2oe1RoeoB+
qAA0GgAJBKJMRpBG0xJjU9FNPTRDTTyaGk00AAABoAAAIUkTUBomkwptRmmg1U/CeqZptVPFMYp+
pGeqM9UYT9UxpoGkyGjCJIQgQ0yIyYgajTA1AnpU9hI9SZqZk1NqPap6npMQHqGnpMFRJCTEBRqP
yKZpTxNMFPTU8VHmKj0ARpkDR6hoyAAB6lDxiwQyp1q4IpQgoxCKlKJ98swoixSFiSPgfCote+ns
Ij///+LZ3IOMuF0aI+Lh2DSQRMpgzNIyT94uNIPl/OH8Bh+pSUtlrrUlbtUCak1s0U1FUkYjpB/I
z+6ZhyMYKcsJsWqiX/PH8KbbBz40a3glYgn+yc7swp8IgF5In+Dm/OjWw4/xxaf+P8qQ2EAmcEeu
xueQCvMt7kkMZTiAF6XKKohChpBBrnKMNshVMZefiO4PSQEtXU7Lv7NphXDNccNmIWg3xoA6oAyC
cg6FUyQSStD5OSc4KqlUoUf9743oPy9XUXunSwjO07Vgdh5XGDQbi6ocTarTTljjR3F/n3Pm1V+3
ODv5GZVdXZ/F5/MH2RvJYdnd0nirWpP9bxb+9yfyXPYwgkiJaHcp031e5sA7TZBFEZUURsQRemDR
MsGxjNrkjkabGxjEzHDTL6dYfYend25/My2m0FfDFbUz5IuJi2sbYqSwwG20Oaucd+0YieOIRy8Q
OOGGy5RRvSLrqxIaYQZGi1mo1oYmywYsldSuXKDaSinRBMDDf5k8yIwmiUBe9yUeu5AH87bVGEjZ
jGjnB9B8CCBhVcG420/rJw6A2jCLo2U3Gb5hVhFRpamlooNMQtzE+gjGCzEBni72gPiJpBxI08gV
BKExsCyCgwZHKkSNS6qB4lculqn0dv2bCzV+U4ElpGieMLGWvTphpy5Nfa42UArW6hZ3EpO1+rlg
ElTCDpPDNf22iJ10UWqoOQSEknfa1jvlglwlb35qZpLU5ti0ATb3jwk7DJZw0jEmrwFSizBtyGJc
yEIyMirYxZHnYIFNXRz1z2LjpqPmsICKiHbmVG8hQLt4YauEHXfMJjYw3tdEaWA2riLY32n09mX1
fTtcV6dWp6++BGapjAkw75ekiHNruu+X8eXOSeUerVU/qi4EqKrksGDW/xIp74a9kYh+QZPVzkam
f8jsQ2ylq/tg9+XHrfLiq7G6vrfA+JfEnFT4XEYgNoVB/UUFYvIo+0xhYUlRxvEHTd5M3NtDnnZa
4+n6DzYfUes4OiQOyCgxmKiIqqPPmRVPZ5vXtvtrP92e8cO8mPGcasUok1FvpaHpvKfflTgcpQxq
lxA6M754sGSZUDR67DMwqx0TUaVYnLKNpdxaX2394wDTWAluNFmxmWeqY10f18HDvd6Y8zL0mY7j
PDUebtbN7A1iPlaaLRBm8Wim2zg/pnvKNj6SD/GfwAjDWHy4YpbYSRGxJwUWLHB2IQgwMT9ZYnTp
xqoFQNEGhjUz9MSJtEKTRsQZxEkeFGjiMyla6WBbNSBbENpobTcQQnAKUyiYY8N9zigY2DoQuZg2
reMbYi4veM9HU+G/36CMSKgBAifIHhVVlsj4NB4An3VQ8HTnVDs4bnuEqWFDQxon1zrWXhTw7aar
0HJagt2Z3HMQCFkpT1hLr7fTS+Psk3s794UbO420GxYmcWU3dHNq66mVm2rG+W+OixvXVEg7FXBS
4QPckijPEzPZj4+TI+z2vy9pA8j+iA1CSQkvoRvaCDAVqLR7FhPy6jMMPT14je+/r7fi7Htrlf3u
b33qvk+LpOvcOggiRoiIIiIiqqZKGyHICVUVyhukusaLiBNpSKpgpVRXc2vVKhpF1tAwecx92QK4
xIMZ9nuyLmImNxSVJBCUa9LpsVQRSTCTBNJOY4EySMFIBRJLUOsyCCGiakoGAompCgiqqqqKlTYs
ogooiomlikCYoBoBtw5aVgltwxJ9JcaaNEGllNVINjgwxmYiBpMMwSmiMxQwGEhiYjMEMdYIYz2u
zuhoJY2uVlGGFI5I1pl/t/Z2aA3lN4oExiDnIqGTRQBREhQRTKPk2iG/+v8ax4uOVtqq4TqlRHks
MioAuuqGQAxgaRQpRoUjDy6KiQdQctk80aRjQjgpiZUGFltMdb164aaY2nYZIzivfVHyrNyXejcc
JjWpMzWg0shaj8ROSeWDxs8hUhUoIhZqHZI8hGGnAxxoySJaCywjHIyzDAkGyMzMySJqwzCbDMwM
AhwsChopKQMnLGMwwqqrJpzBwizMhnFiJTLFJLYwwog0iOjFwgSmNMUDLRUDQUtMTE2gwyFB1qXI
QpzWQmoZZivDzeiLJh7kF87+t9X6fvk6+1ss++e2Ydah/YuP0rGz2PNrKFgbBtgy/jyfybq0c5HY
9Wv+H2nWCdY+U9P4pJpRwe/hUkiiig+YZie0m0F6bYMYbTMssGBkXpvDjAVsNV+mFb9MXQYDJOCi
tS4DEGFLdaipnJC0NIWgZkvuA4h3HcXmBeO4FoR/S9FgXqEDCC56a/wWQ/YzQaoUFRn74dafiqG4
J+o/nm17EuLhTZWsXOmcPt28iaJXRjVCss/Tk4CuPfCf3TC4oHPJi5iSdiXrMYPXBxFEkzAzOozk
KQ0QfRMyw7WFk35EHuN8j26tcpuUTe6TYDCGhZjYUodIwpSGlbVdjY0Nijm705T/8xjX5L6p8dc2
gueaYm0LkrPnRjyggZwbz0qfVBIVBRUoco8oLc1gON9hamFOBBkCFQoU0czs91VQ9ZEMRBQUEBDQ
0zGxsbEMapZ4VQPO/33UVT9ZT8KKish6Zxu7i8lcNjJ7LrZXgnbTBAukYfMAIz+OFoMNYRGDKYQx
P0engfSH8IP0vT91cnxS9szTHNLprra0WhWp0ssi3wqlOYpwXdsW8e/ufaH2nzljweD3nSSkcxEz
PGgONYrviG3Tnp3EHDabJuMZEcwmDIJUHgh6hDWhyRU9b4yK0KHeNcB/FAVAa3ugeDD0w85dbWZF
hK2kqmAg/uQfgfof7zk/Bidx9mDEW0ryJPxT8qdD4nocmQIyL7x5dwbDFBrDITni6GqaUZkuPEcz
JUwfohmazGbAzgT3vqh5qLhcIjgvhSMghDcQuvHcoq1XRO49p3GS8qKCpYncXKP+PcLGiLNyMhED
+X/s/lPuPj8VyGCTQihDY92ZYN/deTCySP5YEolvxNR8W2bGmMuKqke0NPEC8Vyj6eTkLg1lTyPA
UprAt1SN7WpSG425n1Ch8AzU9w9JddvEtWCw6kphHORGhzFXBbHqaawhQy3jqbZxJQ934/d9zzns
wp5vN5mv4oBjFe0X+6fuwGblWy5ik4MRCi15q14zbNYlevvBE875ngfeeV+nWif7DT5mhK6X5h7C
IK8DlAXbJe1hEYVmBRfb7naZ3l5IrA+RY/3oCSChVsViR3QLyeDdH9ZfyHdQaExYmnTze2goXIVH
PiOR28kO5fI/QeI9tRFVBqjqeg/kuIYdKw6xyMq1X8iyPDRA0IboCBSyZ8TTW4cWaffC/5TrvA6T
AGjFkICMJLnGSrwHhBuGDMMIcKqq/o7+fJ4ZGD8dSpGPOftzkscTcQfYsfbEQiUQIj4gPE0ht9KF
9DI7Mm9muRRNp51SCdNlC5QKXQcOkHJA5PQZK2Pk31nVHxjo5gxB0dJ1vzs5KErTk4MtRCSRmUJW
pFHBwsKXBhaiEw7bBJjQHULo6PDtXZ0wPxpJHBcx6KFuW3ahZli2M8McYZh32FLuLMcIKRR1+pa8
TvrP8Tjh49RT6lkFZEzAqUodXRsogNGomfOvFYqa7NwLqPkXCfNoKi6JHSInIGlFgqjYyEWNzkKd
ETQfIXOeuGsdRB9kJGk+g7xtqqzUh9b353Opw/B1x6RKjyVTxYbRydymYM7kMixRgsmoxOKpI0v6
1WX2m4NdFJYQWfq4BAouZqm7leh30Hc8aL8WZZjZyi1e2SeQ0ebViYF9yn2UlWpkqIgkZTAsOn4C
7N4Rga2O6YrAzkZGNiD961vjO/7FmNlu+gFNdyowxflXbktbFBSL6PQwSMYzdZjbqFmgUV7iJ5vC
sUDzGilTV2hM0EweLgDuIhOG2cFsZANNVBTPmzIKhOMAiPQYB9wRPYGJFVbRqO7iTZ2mXqwnqHJ8
inZHdFe5RxJh5HQtHotiQIpwRR+z356KqqKp/OvbSkfHA/gpTn7HQ5SrNnDzT9CxOfvKtXTM0Vkz
DXgmKZAOl2WfAGwbHgv7BwaDGYjHlaBctWAxD32k2XqaoCSiQksdXl0ZHnd+C2tK9WqKuH0lhp5H
mQmuWFcYCyOEVhK3PCgMtpO+2tQDdaAGTn0Om1bVaSKxuk3cFIXMTCZa1wAwDRzpwOgzqCc0YgxY
qvjcFh0rLaOusmQtzMjbALglRY5yPDkR5MBSfvGFPwfs+AhXUnZeFO7QztUJ0ie8bsyW9CyjaBY0
U0jBnQSUIihgRNZnrzt5SaziQWEdvCoxYQm7rsuINznQ6tSj2XOKQYDP8tA5zf9aSODBt1MfXPuE
AxJD0ip4oXqYDpNUGJUAz0Gw4PVkwWCF3gLnJFNOWyIVrrktTChnr8Tx327LAGAWadBp1451rNhu
ij0mx0p12k/iWWlTnDq8fXba/khJDOPdu8BtY90dc4+UL22tV4YPkERabGDS1Q8C0+YLbhzhoOw2
4Z5D288sixpC+W5K9RB5EBfuRgkoaPpKCh559/v8n74JnMzM1jieE+ec5JOihVkVSkpUnX2dDz7N
U1lstOeZpvPw8qSIpLYMy0SxTgBAAgwTinASgNOI3FRAgaC+wMgvuIGUl5fiuU9x4yLuUZuQFKEE
y1eT9Zg3F0IdLGD3EQNN9bEYHXG0DYKadPRJJJJJJJJJJJJ8Hv8PR5lwRzkUEBGAyJLuVCSgBSMa
kSQF21ZSypUQHaYYernz3HN0D3Fz01Q7E2FA13g85esmXHoGLi6w+LKWKsdJOu3sPI35qGmIQdBw
BoNBC553ufPR36jYdHy1seu88XOMBvhVIBLYJy0OYwgPiMDdwPUI4CstIDpKzEg1BMoPYqVkymwU
wKES3m7LEv0zAHHqxz0WVsEErsqXSalNNRf6afZbHWxYk9sFvCPSSGbNC9DepBkkyBOuMT2tEuDa
cZDl6uqexC2Sw28nAOxHI3vlzG68GQ3mNF7N9Xy+Ap3wWoNBuIhttRBEg+O2JVmYkII0Z3nkjya8
5zzGwfIZFDY+vZVa3c7GlCWR+Yg8/gyYTuvtjoy0GPYy2OdWp3/veqPFYnT6fDlswTzla0MDc1hr
iXMDk4GjHcBGijI4F3A4SLnGt5gc4dJHYEwpr1cpGtZEEKYwggi5xaocygZudW/fOwj43g0dxZye
6xFbTA6C+9/HdmOaX5yBJaBEyw9ypUB9pMSFmtullZsm+W0xxfaK6Z6IOO/qbDRfvnF0tC2McDPn
IIs4QcX0z1aLljIjBAxlBAiFQ12KvpCRqFeRXXUI7kREREREREREREREQO2oxVZjFVZFWKqqKqrB
VVUkdpscqJzlE6dJeuXy4jt7rq6vJJYvcXIy4/xbBpZ0rLvlcFyEkeZsSQPPlz3Ojju1jk3EmqRK
gVIkA4hQ2RtHZVICYURqJehWlYx7sidJuvtpTttYxtuzqAqQm/Yf5FBaVv7r7HIqv+JQ9oM+jhvT
qYRCM7KsU9pcKCyVZCZeoCwGgcTZXbzQqPbtFyF4W+V2DygNVFVVV3xm2EWfed3gjs6jvnJpTGg2
KrvXncffg5fuC4YNFEl87kgr+FBuT4LVdrrLhXieV84esHdW2MrgFGhlg2PJOjbkuYRjTwQQODSi
khsGUb4ibi6dbBhBIexOxSggN43XONtyykySScHItlLXE87EmV/a1PCfMcBe1tx2LG11wvyr1VhU
8jMmFCQHCv6k7e9IFcxJWCZyZOYO91U1JUKEeZzHY2WTarbI8bqtw2kNF6Bg25UQy0ZYSUWTWxwK
fcnRtBvhaT2X7q92VZX/Of0jS2u569cXbwnZyYYbjwKZGimDRTHhCikGMj1njMOXrgesvoRfwPjK
bz8JQOQrIWQcZHB8/YOOmqnZ6Ba6e09ToO+Tw7TVXXUrga8L8uNa3NpqgyNqxFB9ayyWiouiue4j
aUBkrqSmRgx1mAWQL3YmK9ZK5MUVWsFh2aUIwEgjEfBH1MT98u5Ng/QbQbqhybAd1kDBtnu/5IxB
VsT2zrX9NZc2QdQ6LvHirvPbQIlpG9X2yC9mHopSKCSRGR3xht5c3T3P6zx4wMz9shjqMmIQyTH7
pDF+JWZPmqyDCCgwjCKKszKqoiP+w6DU6JcJX9Kkif0hCbXr7fe/Rs9PTxhpI4xFpiWWbLpZ5F8u
GDigriC9EhOJHvlv6Qy6oXDxUV8y+Uo74apIbZmHu63Yec7T33OAJQToVjQCkYUwRsP7UqIkppYm
MFvLBCbbZvXZ2cLMvJvuB/egztksVeFEt2MnEJKhlcwEouoIZEBEkQNKc5qn2P205pMssRlkMpxm
p+dge5MOQRSG/GA+uTx8Z5CiDCE/NftGUDySKdkPknjqyjsrMA0WVBvTUVuQ/ih8VQnODMwPyQbE
px0GJhKci5V1ASzZsSGINJNHiIltgqv0VWXa0Gw/2U7rHJW9kDstUtrFZVP+1OV2c+o9+/6Ca97v
bCppsRubigbaYI1jJh5eiteQH8JXd9eOGYfgOweceKXuI1GoOydEUrFknSyqTctWHdvkMV7FVSmM
KrHqVidiybK0qq4ekJymmvyzP4jkMwwGaKNhn74dRjtKFHABeZoGMYxjGMY16ZwZoVwuQB5uT5fN
K+Re19Xyt+MaTUe7243vrc3IK5G7PR/4YxaJlcX5JSCQPOxBP4l+zfHHPb5XKORsWUzw7XUTM8lV
VVVUYzzpuW+SxBA1m7Z5X7kNx6YiP7ckFvF5//Yn6NKtRniOA0DIMIxjCGoxxV5rLLm9F7bdCIS0
O/YTCMstfoe/uzVA6kj7RP5gVRa2rpJUBsKhsvgfiNpxJhSM0hrq0zBfDjTHhQqImbCDW4KmJG1w
HxyH4V9x6fp2Pmnj2MAjf4g75KWhqfcdB0nYbnOAdQLkZKn66uRO3bgpZ5tILoAcv3P2DzQKBB2P
qfDg53x+abYrMHPS7KBFogFFQ3M+hjNQeWDD39Yht+8dGww/dMfYwRVqnaMcz9EONX5Octk7HY4K
NlvG2PdakJsW0HqHtvVrRrVVgr1hXxdWKjuNT4g8X5kItHiJnOZf00fjGB2DXjVYfMGp6IgKZa0D
ZD3zkxRLGsPROLQfS7+Ku8kMyOyCAhv728ae3wngkrEag9Ro29PHFjmyNa3gLq7v51G039vW5Txt
l9mve022S9vx882yZOSMjs/mavaDdqfTVZ1a55/NcvY5kjMPB00FfhFpsuPlEZdRfy2GwtHbaogn
l3XPjr/dv1CH1oU+wUcTIyQSRxPa4CEQCUrGs0TocMGQohipNGYNI0zfswwdgrbLWIQDargQylrU
GoDVlG0CDDKkDAP2Sq4pJQajkASAn1igBSCItIJ+IwSEISYTFB+7SD5TQo3IQFCAq+IiK+Xo6O3x
Bxzv02nH8xp66SLEdalUc+/nmW21+t2BO2AgfOqhrDjZgojYRClu9duzW/bi9nLlv+U07ex+4z+Y
w9UX4SqPWlNfBY6FimZAcl+c67atOkb1pINSwTSUWrS2/kwULafuzeYU1m/vYSt0utIwq9l8A3k7
rgktm4aR55/aqF7zk/MMzf+HkijX8Ek6DlSdg8DEKJIJHCR0vC/FZFh9gg8GBXnQSddhsXHGLfnw
QdjomQodPwAogOI4RIPYdBqKs4eCQiYnvobY36sujDNcb8RQFHRYSb7VHSKZLVrKwgHjQdsefMO0
jR2xdocGrt+WPU6m4ZCdSvNQcmYep2PMVFHvXkbT0twTk6qpVVVVXRNsjFHuN+ZJ2lQNepdKzFSX
lOTZqAwSNGwYiyNohZUJzC2Men8JBpYNKBEAmbB4XAuNdfh/k/j+TtFoPqgr6rWHa2qJVsTVWi8f
hUWjMQTiQllDQZxq1Zy8RqqJvhzFtRkMavfLeIL50anE1L1CpkWJh6zOovh1m0k+7yPRdeRM/j9j
5388g3Llnxg/XB64UTCBEEhxGkohiBkpMUJwJlCxRhBp7Hy4h88xUK6YQPMMp4m0yhMvugHCLiVO
6WSHZWq6BiZ66ZBZYPIXARgjQHLjRDmtINWz1QVJ+YrJEuNIWOanG+yZo4xbWfrjjit6qMbtHtvc
8yihyRdbOrznWLZGH7F2q1T020YBDHuUjPWq1We+qjXKw1Ay3FWiQoX4WQKyLbwxjA3WSIwSMIGp
iWvWWCjZdw1WPBvvtvTNVWt0jX9mxsA9Rvx18K7jNM+u6Pym6EoR/lFpaWgz534Nw9uZAymGEMIY
c6WpCw23LhjYDcacadrTNDiIloj9Ec+f66Kqp4oWvcks9qNrVMzHDcFTTG0nS2vHMMteOsjeV9vD
nkr1IaXVh2klydIdxmcq/ixkXPIMQlYJd4uuzMDTWQV1A7beOuRrloOW7TWDVa+kVfdlF9p78CwE
v0g5MXxVntiNYGiNE6MwDIjEwQyRGYPaYE4TL/DgY1zD3EaBgjeEnCdyxjkjkjJCMD0aEDTpikag
8oP6guOckeel6JwVNaRaWx5yHvBo9htmIssxYZc3hwVKQBycEEH2D/b43Gwxb2CptH2fISj9P7At
ckcD9Q0fPg+oyhfQf8Ig/QRGQG7EPKHcbM/rmr6z660HIVP2jahU1CpQmbEFuOBWCUmLbqFuZwCJ
BGWQ0gLQZWMttXiWbtpkDi4v8Iwinon36axk4Vr5K4VT3jMh8z02CUxtDS7BAQkYzEQyvKmxnhwD
D0axl1uZoty2C2bzb5ZJJJJCEJJJJJJHHIQhCEIQhOU40npv7ShKYtCbVyrNNXouUgeKu7jaoxci
QpzBjw2ZVqtFVjN7DxgkkchN5puqLTSnDwUXAKaETds4wU/CbgIAIEbyX3GzzzJmG4XTDh3byjzN
HcTD0u27bK1D8Q4WTQ9zvskAPpA7XUE0q7uaIJerTPlVzR1UdtFsGVequWd5ossm9dt2zyCBEKVZ
ZudPshKoeJFGFCJbtbQSttPK5la/Qfxq0kDD+oM70QvNRI/Ihx577bl4RINna68wM7DPIyXvL8oS
S3sQFK/B8x7sLPpm9nrR2OxKmXPXhOzSFNt+jKQdgwGdPqVD9EItVo7xfvHe/E8Lsp7EQ4taVRUc
Wt2V7k90Zi+/JEQaAsyXVM7RU45fPUHHHCiIXeV4NcwhdCmzq/XCghM7BaxLQoYNNCJiY3XPPlqh
tz1uLt1sojiY4qnHII2Tav7u1jFbQp3zxSbu7cCwczMFr7vXOOYcXUuL9E7gPc4cyzrC3XJGHcrm
oL5RF4Faoi5XHEi0KGQAHrPIdxCeceWkDx8fetoH1fyI2kYSMijY/sEHwt7AvQEPoheh6nunzq00
pgomoGCIZuTJbaQ8OWRzmAjYT+eKgjvDqjizkN8OygdllY/b6+1CQa/LC3jLkUMRTXE8yrFiBxCI
EazK2bESEoueGMSZL7e3l9V045nPlvBwaP7Bhg02KhqgYBQwlDPXoFGYebiyTq/JB3wiAbRzLhS2
/vY2buWI1seJFZoDmK1NUMqoVxAS1NH2ThDUaUfb+m/M0Ve8ef29zlBEQlumhXYwzaSzQf3x+jLY
O3HFkG1md+5MGPg4JAs9vhk/s1aTEQvb4/V1SON29Zo6N3JTnHWmMsHFy6v7l2MQZsTa9aG5ux9+
E3xjbeESmrsTaSpw22l3f0xM14kXdnUwk3CcDWzfKDaCqzXXrcxLBMQrDQqUEcnY8QwjUEZVT014
UK21rfmSFYPRrcZEavYEfexAfdB9qmWMZLQ4BkgVSYmYQfcfzra0aDZfu0gy/1Cn2LH8KxHDegsW
JTaUr3oFP4lTdEDxIeBHgbvUsuDETPdiv1aCApZf0CS6I/V0qnQX950Hx+P5vyMv3iIfrgiH7RsI
hxEQign+TE/g+R9ngg/3sSlT/mub9aAlO0/IB+l2P4n9BRDU7QFMfyf5OqzMAmx3E2zcrhQC/aK3
BSrN4HFLQkLqQHQjxYlE7Tq80Rkv2K9f3AfnUB8BflRSvsD56xttHt+GR4ODJEmMZjthhCCfKEgB
9qMovSJF0ZVbkmaYn5T+MxNETKjhGJ8VgD84DwmiKQiKRImqpE3OFLfHquL7w9w/EzBofyhzoodA
Uv60E7u9EjSX9CiGl2NNDGlBZJGAyppHI9z1Dv0xnTQOXuaMaKaA8KSKiKRROHozD+cqLgB9JoP6
YeUXDiJw+pxDafE4GI+ODv9U7pGU6yjgwI3W14pS3IM9rf+86Hrac2qvVebnJ6oP11wUvtsZ6lvu
RJHdfXEd5WxYWtLL0tQvcl0DpxoA0UlBcfKhaB9/0vwIqDX7Rz7aO+SFBlBEkv9oyYho6QAzRNpk
NCdT1D2L2Imj4fAhxmskjIjqV3oJubOEHMPBXGvN1s3L8ygOgi6nESH15w5hYlSIo9Syyz6ZPb6L
dAAknxdCxHwofHLVC0BQbff3TFkLCM0cCEqaLkserjApNh9fRwJ0GKAcgqe3SiwEmGVAfz+ofFse
Cm4u/2sY8Bsm3yypgiyB6sPeCKCIiLTi5h+pfWiFw1lpRz+GdLZTWT1IRCgIlB8sYGsMITdTJXSZ
sP37f6Y3TeMhL5CjqtcD4QygIQimFyKhjgXVu3G28yhE0YsUZZyNVqsINtzTiAbAdhgaQgrsNlPV
51SvUkUignO05GULhH0d9Q5KaRu36zvlpW6fnE4n3PXCLwBRX1cW1ewf0SMDOcepEkJBWucXBLXJ
Coe0Dr34QEs6InqaMwDc7E63l+lkgEVVfSbEHb77JDiyK8YR9FLPFsj/wgj6D3lDrbByIB1BweDq
AvsUBuLsV3TcCF8z7vSQa96eDpdzrHqRYPBmNNa5KDkMxELIYSESUSTHpCDT10eikG3rRuRuOSvI
i1mVJRFDFVQbVa1i5mUVmXFuGYtZGYwUsMshoNOEsKwQzCcCH5lT8OF7vS6vaVfCoZ6rJU6oYqXA
fmqo7R9JTVA0us7RoQ+tT9f9C4FrcAlUPmkg+YxDHDFMMcHAIwkDgAT4TEOll3qqqqqqqqqpKEp3
sqzMLMqqqqqqH2KH0DnvivzsqkT9iMHzuH0elU+x5QTUkhc90VQ9N39GES7qRQozoMO8dtFn5fsE
LiJGcr3Pd5E6WLNQYe+QgPiPF2h5fPBTUA2yeePqdavn+94EU2m3AZOb5UT2IGBCczq0joozBwo5
4HOK9cQPKdg7R5tjcBPaUcigPgL2JkQIj5ETucgDQIw7QUXQsBbpRLPI2W6jdgRiJ86LeguLdtQa
gY+wsQ6gOAWDUMNjC32QUWh8oqEEQ/c92w7F61kAhWpIgiWGvQiWWt4Nn5HuTxveihQJpToSXj7A
wkgRwSDrF2+mflj80d4Ubjtkq0kuVBviQIQr84dGe48OF3Y15YJvvvUjXVzAMF3l6yEeCEg5V1AV
TQI7QrVS17FnJbR4AaNhkM6yIkklFaQhBjgaJsFvRvXBMInyryBwJYr7ySMCs0i2xUU4jYxqJ1Fy
BIrAPJAPHyOx5EHc5tkXykwihZoXRMgslwRwWDb7vhHBJgaDENUUh+RuFxAI0ip3hyOgRtSbBivs
5jnOB8j41TpbDxDncmcDW7detwRJk6NJD3UAep8QJArw+FbD3BU2yVWvlDH3+mnrecqnoouA9ZS+
k/DrsiYUGP+fYmqzGJUNUn2fGVyp1czynUdaKHje35/FZkmooE6Z7UT8rUydwf6f3r/pi7obEqdr
78sUpVSeFM7XXqePJwcSTxnzQj4zUgnlh1qHwNgB+ZsXdrdUpNusLq7ALuA4KA2G5mSBHcngxEDv
O+hcCJAh7PP61u6Iux3vBttTeECwHHe6OQWf0Tm2iQwXtfXmlj3Gz13CUEJE0xIXSHWYO9tkYv79
yNz0z6E72LGMP8ermmlXw0PalbfMmPeqXwdo14NwjBPOeYVOAsVQosccu3pfnfNYKbdz51ek6fxO
RfvN6vYcp4QQ/3fhXwPp/YFzBf81FDKJk5AfZ/6JfWc/f1CNyzDsD8gvwhmUC93Ozp/c+FvMF/yW
xjvKdirbkDJIAaIJiylkgnSDM5iL0gzgcHoKqikaVGSdOrmm6rE+M/lkmP07tzRjDHMjx/dkrX82
AukqSQLc5W21KyQad7HXVEEM/zBKyZhYWLEA0VKg9zJkZL/AiBFkoNTVohHgeqccShRiOYcPoHA1
i7yJ4kgnIbfSC5kEkcF5+iIf8Dqmc5/ynTC1LQc5ecnE9EkxA90xUOkkCBNiocWJhhgKKDzazZpo
ELNj2qxzDAwEX6P68/7MiSryFZmVyHvFkdl5oMP2n5tjs6zA4E/vRMnpJU9wzOZDo1jhKYjgmSFO
TMKVhmEGIMQAMSgyuxggL5Ng7dk1D5eTizfK3l0xFVRVNRa+I0D7Eg8wZsd7nwf0hxQc6XmKcuEB
YRCkoRhlU4Oo28/54owwiGQyr+AstFoTNcwCjK/01dTs7HoXxzpJzHIcAeHjBPQt21zio46ndb9S
rE2A9IMQ6mKHKkVTsQI8ZrP7oKQg1kwhGJd0h1/jOkt44Zuxwv3n38TJwHFWk3IC6wTnDeoSCSQR
BMymBIuRew7CFiJC2T9wFNbkopFqUJTVAUkU8lJT0G4DDzkDsIrUbGY7PeB1fI8yYFEHadJmdfx1
nbZ2+bzxtyKjxShzgyE6fC4c9sPbgEsEBClQ6tx2vIIZoRyR4Kcwa3cLlk9TmibENEz80EczEScZ
QPi3kA9I8rkoPSbcnSKxo5HD6gGNiQwCEyMFj3ZcPzV7h88FWyVSk5B7iDZVKO4obRorzPF3G95U
p/CDGKAdB68Ar1HV3Rh8s9yuxqtl03wbADMKsQCPRw8P2/1qp8MMMBBAokKwDCDBFfF8hEPIU2Hx
vxj2PeqbTlSPdQJ0sih29YbjIloEOs7Sy/IQV++GQBHFM+wfamxyH3LEq1xLkgqoSvrTXyGFIrKY
KlFklKiWbMyCLTHBYhxfwKXZuoP86KT6Mv/1mpHR2CssLgqqJVUsnrpk6MYr+tY/asnKFh2LZYjg
qcVdMlSVjXaw67Az9uZq4qqszMHX31s5lyrY+Ip5z7d4otgiqJd/ngX8hlb01V/Lg1asA6o3XFLp
p0jJKidbJSnf5tpwVUphWLN1rY9v5AIDB72AuECk0o0nCwqICWQnTKbBqbiF05T9yqAYtZDEdPl6
DcE4sd72kdj2ho8Q7RJMEsQbsZOMsErj6nTF3qgVFsSCP9YpPIIhYHrxqsUEJakwZRK2LHeDveZ3
FIkMIHhcELxTQpl5uUd9TIKVVqxeadEDtDSBzl2Hn2iLoeSP7QCdHXERVVeu/6nbg9byfk1u3ydF
OlSqDvTxw9iItLw8Vw2BWXKdUAM4iISc0OlIQbOhp4TD3FmCaTug5PkaxVS3O78Oe66zERomDRG/
YJEHfMa1KTE1UwIoCpp08lIkW0aRxxgYjQcORBmAd2hdJT5cNyY10OsIC2Tg1o4sKZzcpEhi1ZkN
mKoYzRpkhooaYVFWwigY3ZNBBEJonUpCzWskCaWBqJdGbhMGBoWCKRWtyoibNGUo4m1g5YtHMUMa
NaVFEiq6hQxgVoNXHqoOyIcogiip6ORRo2KDkMq5pSkjFMMN+/kP/VSk5rdmYh5TRIEVCQdvjAkC
UkVlQkQ6A09ho7nDQc+ioY/1EeAxR4N2TjE0+Ao7GmbQm7OZuFkA4DdAQ/eqXHILHQg5LtYMbDrw
NDrfNW5Hboi2QiPEIfQgtl0DbCMNhTYMZQDn/TSWmEHKkM2PwDyHNtFBJ++SEnL69aLlEIB4gsM6
PLF6xEReJkpdi4kCpSkbcJ7uqZWqNxuOOEJYYrajJ0U56YLLVFnGYnPOXLaabmiJpVrLa1zWBhoo
GKfZIaxDYy9A6y8q6pF9FlB2EH2Lg2Mmhl522/UhrCtxvRcIawrUSRljJE0MspINSoPj/q3NysZN
ShraFoQoWi1QGtFqQLIB3cAHWtkw2RHBASA1YDsSQrCp6lUEMIlZCzVKw0iVdGxYwBaZlAyzSgO7
Iy023k2pXTEmIGKViAWe3BoINjS4N8hrUSTKlMYxxuqTCQNUEy+b1x3XXBlCjKuYP7FguNBsrr9S
2I2E1TXnW0m3Qzs5ExjW1k4CUMGFu7NGEKmFuxohZViyNsWbhecRaBvCsHJVwGiutyC39oEtB6gw
FDjlg22EhLY2YHFVToJmaqrmLYsEGHF4qLIqVIO5YwqbgtdgKLqVQEQqMUXoPMa41i+LGtoC9DhG
XYbDKIAWxIQqcvcmENlJIJAI2lwgMMwMKoybRvBa1Vrd2cpxrhZXAK7JDiUbqqxETdMQIxTGqaiy
DKqpBU0wKmYiFLozuI6w2dwBmUIHeHGHqd0DER0vUPjetPqlgJJlKGIWEIiRiCUKCCCadoRYVIHp
D7nkODd5uIDwHIMpPdlFZFTkIgNIAQyLDncPifAePjbmqb3QbQlNPO83ILc9LR6Gtw+SCrJ77KSH
tUKTFwlmgKTUpHZQS7k2UcgzlEvKjy0aNIOgljJbtawyehooU5nNo1/nCDYLxAkkHiacrrB1m9Vp
RydqBsc9HTRDxO4V2qdkFADFCr3IY719IApoQB5+m1nV+fvkpE1YZG/lpLBEIo8ZTxFDg0f1Ou51
KF6YQWtvSLCG6pZMDKkaJfIxYSA2JRtyKJcm6Kb7LciY+1SeBP4PPiTZ/AT5HTrFQjAYsRdeDyCG
ZY6nexDXz8CJz4vmUhtLEm61rJPn/AKkShFOh0nQnvc0+BuhB+o19U61yea+OibaWVWjMzUe2ttY
kxZKsbMzD+RjibGxp8QUg09NJe0eL8l0LwzaeNqyAXOqISOu5shKsk578aNxKlE1vbplOKiDhYbg
4IQNELYXITK9BhC6IGre/3ctT4lAJjNmpQ+U1p7jkwJsIyPDGCwaQqoFKq4eyeTY+vc7N8PhvHCm
bSw96WZHNgsP0SkhSxISyhSqdYPnQN3pcQmD+On59JEdDvFSPZkxLHlkyg9zAp970YFtrUyF8BoA
0wMk5NDGhLBgEb1wtLZKhR1gEugVHhXe82IcA5lQHYgcEqB70IhSxCQhCArB9o5j1N/DpQKQNqoB
SMpyzFA5D8ErxIiZKmQT9aDrA/4HwRIhNV0YCzGxoaGNAyRRJqQkZ1d7rTtIRig9pARO9Ui2bEU6
2UFIfYibROwBvBgwM6TDGiVoBJUqhjgIkEkH7kwc67EfyD7lrw9XgWdJ7jivy8jF0YpklRZGUThO
fjYDdtMfs0xG8i3Zh4jH2HI2ndII/PYECRHJU3u9BUOBQjzsVW6YIA5H6l777EnZGLUL/sMA8JYN
CeE1aAYIiCr8WIHoqVA8Hko+J1/8sM/tj9e4gIsBm8RktFpIQFAMbg2+gzQoLHfSL0AqagrpRN7V
l2KAhCCWBKe38Cbq2sx3Ud5apMKKUq2il6qMnfWjQyLCxaUU2juOYHRwjrH3XbKP80kCd1VH4+Ok
oLJUSeWo3vdA8vFJ1SDl3wdSeEk+yvyMpKBgoCh4aiDAYvnQSsUjsBmAVChIRDEyEFNErJThK4Aw
gYOIZDJikOXA/YuggSgiopolqZmIVBlGWQBycAUiiql3iZiUtGpvvD999LEfdSbjKOMJEEMlCrEq
SMQxAwRJBKNBwh0OG5QkJuRjMTW5iVdpopuaJsKWlhRWEIYCCVQMd3ZnXsAOQhCySrh58EyCOUiK
iHUSsnZ9/P/xzxbniR9yP4XuHbOqLNk7HrMloqk3hvDFEJloQigiSQoQ2wxggJAloVimCCVT3yTI
ZPyO2lNmfM8A4Psfq3NHRC8kAoWJQpIX84Wys36iCJOvsIE/6i+1fD4ySoR+Qi9qhBQXiJRlhPja
WJr2cgJxqJKEFpcJVo5p/MYRIBSpsRKeAWNsDueE0T2lnnT4PRwT8/mUjJJOhQn5FpQKUaIYBgAE
ggWXSy9ylB+HmdyL8pzjDvIFSolcbWksCG4nrn67MqplMimVkwuRZ50k+j9HZ+nb5la8w7zwBU9g
dvoUOH6FgmZJmCDy4Pc8cjuKSWlUiWk5onmenWce8endPmAZHvHtK1UEKD74X0xkWaS/yoGhRdwp
hr3VnDIeKj5Dm7P0UJz9w+17S4ifFWCSM5lGP8clIwnUwKbhiWME7GmNoCJga0JpJ9ZfZbE/Yf1G
cqkKFgjYenCMlq6Wq7FVSkyqgx4PrDEfJJ5zxwp8bEMVSgfCBJLIEEIYVIcqlSLFoR+aIHmRSAUs
wJMiiUREwTCjMMec8p6MFF91B9p9eSAFe8ek7iaCQkZlZlGCGUoCiCGIJAA3UH3IUUDxPam2McxD
UmPWhSHylLvbz1bMSq+V8uHA4OGI4G2NvIR5SkCxEHar70gYEscVEdrFW1D8DWGBdaDukdKp5QEP
hYEQ6nToTpOTVRGJFE1AUmrSKPAUDqAIcqBJ1pkjOUBUkFDTTqbWOYY5kGFSk00ylVQFGXuqzEar
9zHINIEGsoTIqojayFGMeTuq+tYTESKkj0VJI0bhhEceSdO53neWqmYcMnNRWu5/BrRBG5hlOARZ
ykEiaA+Zu6aSWiQ+2UXzUF1GfMWA3rDAyKAKpAKBJ8yXQJQuwuGDaYDAYNkRXWhikKveyUSMJYR0
SRSxqMqx0KmIbE22SNQkTDIsd3HCdZOQAHBDkqVEgdPLNSRTRMUNyOEDGdIAORxgjm5iiHuczQJ/
A/MDHi6ew/NDMg0jCwCTB3u/VjpQ7XsYSXmpM51p5EjRKGZmDEyQNIa8Zmg6G15xwR2RgI3cFNid
RKWnDGTWJjpsZgMYVcoEgSElEEmXp4RDRDebsLSBrVf2LoeJ1QIJzwJA+0gn+lG1/HpGaflYYpMW
KozJ8LSeM3qdK3t+Z5B8gl+GFHNAVwp1Nho4IBG782yD2NtpuHaO1Mv+JjDRMLX8cFkCoK23inB+
QCtAGLcLnUi6mMW/v8hnGh+pAM3kMBMqScijIMTqdbLKDrqUTnttTDJG3a5/1lGKjGcFKgTH4F1M
RBC5cOYTrAGzGBxaEEKVvE4iiZiLSAuOkeJB4vAW8KflOezRgtd68OBIHxdKHqAkoaDmQ5I2sdEO
iXICZMUmc1GlI0RiEVIwRYUBuGy8il1Gdx66O31uLUazrLVP43Drsnv3U9jGlYpydmR3u8LJXeZV
KQ6GF20cBhAiIV6i5S+SLkxOdDRFspP29292545YvUiBWkGwclU2xKhgUywS0U4RDiVQ0VQcrGHm
AQDaKxRDHFXsGShBztVjnzOOc8KHEobuDCZXKVNQsSPpZmZMQ1KyjVxoMg2SyqNGlxuyd1jaRNgm
6gJKjBgwqjI664i6BSIMBhhSWQLaCgCbB1CskloeuFoVkm+xmhJmtSrSAYygilIGFqWMTQZENRQw
+toZYRmg1VYEZTUhEGJAYQCFKtQzLaRmNUHyzu0Qa6wGxM68DCVOLZNGABENDMTSGpo5acIqIhzH
CIhHIXWuwjQFmcmhGGo4EaHpDQqTKXIRBjSG0Vlii1NU/r5NkPk4YgWZvocTlKr8G0ECB3k+aWgy
K+TwzPMejYHYgZ3hjG/ekGxsbG8kkg3JI/wSYaIF7T981Yog6XhNqm46VaXuBs8sODEgb5gG4i7H
soLlvkTNAfyvGbWylE6JwmU42RiyHzzYmxNJ5ouIidJE2JxQ8DkhLuGjcRoiZ7fT53kefk7ruMQn
rTdJ6es7fdOSB7tlsBuUxS088mLYPO+S+CTuhShZCqFgTJMkjETC0tCESwEoUyBKywBAyhEJHixx
iXsUA0/ACaAO4lNHWAtzR9JVSrA6d6JJsw3eFVSdBYe7HtDSWDB+nneLfpFEHgg3DyEvMh+miIlD
CE35hm7QGhMxuUQQ0KomFxSnO3S6psAdhiC8rZhRYSDRKOAQVkLpgymw2mSFWDbMg2bLBGABesm4
BUilsYLgRSz0oI8460dzIRA6gBMlFDPUpJA1jNQ+Y9fKRO7yD+nR6I5ERMerDvk4lDrtyAy3Z0Kh
lNXNJhzWQ1pMidZpLIGygUuQQQvB+ZT74xgqaG8U8igQgqQo9Ry4G4j+7a6XCSEWAkD8Qmz86vpS
H8v2SskMWWsLDAlGpO6YkObaPUdTQEgqlNNKdYej0SiwNRUgQUhUlTBHMQ73q6386oH4/zhDJxrw
6aT6sZyT80Q5yPGoUfa7JO0VH5ogj29LgyNRQrIwB+7xiIB5WBU/UJEz+DpQ5Gj+9sfYsTsFOxBA
hAWngOE3w6E58k2Sw7Z4RDiDEk5cnlMPNR6r7ajmnQlnPnFthUUWbSnxrkLmRzxp+47OOJvN2Ki1
nxymbCY4w7EjiUaCEgkUwJWA0KnwGn1w2dJp0g8VFCW1IpV40rsNHvSKlUxTKtWwtvugwMGAKIhS
IBomYlWXDb+p+MXqixiBCC9iBSFRNB5FtXWif4vYA9gBFxh5RZ+dR2BvE1A5Br+uaB4V3+gprZR5
XnNjcf2nENdhVKEiDbmak1a9chYBD3azzlD0pBWIMQO7JC3+9UKRo0o+MccScXIAdMnrYA/mPwCO
wfUhFEhENMcD2QVKfRFj7YAsRni5Dx+def0cu9+ogKkgCbULFDyj1jRhfjcwXAGDwDcYJmJkJkLz
586FpZ8cBhsYZlXEtNmFtVk0siVXp6IO0V+KJfQZqIKnmIJxgdJgFFjFQ0moUX2I8mSKPRBempSC
Ps5qDf6S9qKoC4opRS/UXct1MFKKUU23KZKoiKqKqqJqqqu1E7A8Ly6x9+wAggJjZgMwlooDGSyl
lmGZWC3d/mahqeqIuzW7imQVUjMXg4hgxFIQbgYOFCYyZKUZkJiFmpZhEpSrKpIw0xCSaA207Mzf
HuLm39Gk0osEUUVRyAzgz3EHlu7MRBvC7yYlIwLLRVRSD4IEZG++o04XQKkkBQ2hEKjKkt5rmAmk
g99djC6P6/mFebRdizCDbsFDaBDQoUY8mdCEhWbVwlMTlw2Ymhd6NwcZ0RsMUsEMKWysZEwo+KeK
JM7/suTvkDoroVtpS4e4Q8iUm6B2kF5CKdWpClocFre9BYeZA9BS4ks0j6WP3DEMQDWET9yBWZj9
n+n9Jn64J7zQBxbSOGYFlhwyghdsHZNYF2ZC3VZRssZaqbWYklXMXs2uspXTRjaeFg9UHqkfPBR1
IdFNIF/oVyDyl0bw0OsUX0IHxZEYZSmKhhggKQloZl9JsinJ6g6GEhyIB2iAGVSBFJI9ZBrTL4wd
yHbFD6ge9A1AjmOS3dnLo1IE6SbTyS0K7XcqLtE/EWJKXURrDbWqwjUTUFVEmQtWEQtDgXwHgq/o
CqqO3c+U+eLEwzYMpF8shQxsTGKfs2MjHYNiWOSzGwnWobyjEmdz2PfkZSe7WPjIWON3AXF2FUkP
kYKrhQCcJwO3c57mOjpKczRj43QRV5/QKlnEBccDITYD6hUgO6gAsurhUWIho4c3MZhiTjUDkgJQ
7UER3yyhwvIWFCnChdibgZY1Ci55FyS1QOxBkcmY0qt6dtrfCbjnY7zvjx3nidTsizlclDTYxhdk
Sm3s1RW9pVCgExgmjHeBF2A2UCaGJjIGlwtSSC457cl3zHDe04sIWQPs/2v8HOLJQIYkZJOKAB7X
bt57uC+MtdTQyaL4DITDOaIdiQrHqoASV6Fo2mJky4g/TcLKi0C8pE6G08TmjdTddyA4TTPEPI6W
jYTpT2EPl95JNVg7CDYmjNo06QhxDzItyCjCTQMC2mdE9dtQvo/dhIlV0tUCuMYwDGrT5L74e3Wl
DmgbXEYwNCNJygoGzKG0MeyDTAZIaJMwwncehNJXgkumUkVkTqHvM4g+fM8J6UG1+hA8RwUnaYgG
NUJEoVQQEJQJPYjhMQNujwunmTEsaG8kH8+73Q5TZfpiGpD+jrjqU17Ztc0sKJzm88ISXDNkGfIY
25UIC6x6nBqaZ3NHRMzLSRhAYok9jBJJJQvzAmrZTO+AbMGCiSSSxJo0U220bDQ7GuK04VsWzhjE
roTeYqqhmqhwIOkODYOWG2YdApA2Ln5AzuGvYM60LVoJ0oZqQkHOylbHBolXAYEgLE4vurm1Al9Z
yUIAuL792F5xnUHZwJu7mRyqRt3sjvrdDZgDdlAi47DELZMuTAc9ttzFgkZo3L5Oxjm0GHGMlfqe
dlxlFBgICAgM7yrhdQ4cNZOJZenEKs4cFKqts2q7WYTrBhtlHca3323t1Y6mInkVmFBTyq3zZDiZ
MbG8ZC5bLSpaJg2qqCEtJwBT1HIYKLIIMGhMlcVsbIClq6vBKZiZSs5ck11465ZmNOsBRyKUqqqy
UpSqqvgMnzRxIxDO+ZxA8gggiIjrQzKaiqqqqqCqHeAwCIiJEgIgiUpKKqqqwTs44zM2OaxZqaiB
aAYHWr6rlyMMhOA+hKVX7SDedmjGoyWZbjFFLlkYGRjGJjKwlGpgpS7pTQWdThMC4ClhQUUUUmKU
KYgoxgJZIDSXLjfbNtw3Ng0VpVksoCkhXMUNSYAJXByrDSPIFwOcrYwyW8SslRwT7338oJsnXvRy
SlWSlKoj8Ob5kbKymRjLkxgwmNFlEAECsTQ9QidR1YIdpFUDI3saDKx9sLLr3lJ2kXWa6EDvYxAC
+yLRBosoGQhx2hZ+ue0pQzQzAaFLWY5jDqFqKAiIGqiSKlNhOYK+BwHpPvpueXc2RDUrCypTUVEQ
hIkoNyIyy8WY6EwwnHCAxkDAaiggIiVYGmakKHFYBxwMMwIrJDCKQJijyaCl0Coxh0vIgA5hCURV
gRB82nU2Ym9B1gOkFSEVaQNHGntRdlPyRvwegHGUkhGE8aBgZJNA9JsFL+MJ+b04fN5HPA6OZT3V
Y2lAX89xcdBDozFRY7EShwmjOaK8HqQIiXQR7XzJuf/4WwqmignSDERDf1sHcp6EV6JRcZqiIRmI
Vg/ffQlKFQsUS2KsJLIIQiSKKEF1Bg63+Cc77jAuwU5gT8dwolCkOZA5AdMxM4If8epaDzFdpH+w
tcS2tc0IBquD5A2Lx8WTZLlhUWAhc9pAs5BZ1djFMESD8HwGz159TQ0ddUE6pwcJlEPmCRXsHZDq
+fwOHhR/SgedRF+AeEFF9UpEHabKU3nGwJAH4AkiCNk+N18Kg6ZVOvImwCLUBkoczUvrbycqnYm5
vBqWBKga70DbkbigZKLDNMChm+hehUg2BGUS0PmRIN2U1B8jKukhTQM7DPYnyYnhI5AeAQk0vJyE
L2TnJ3urA1KSrRRD6rCf9UsfiFWCLJFhLKqxRYBpgAxtJAfLxLvHWc47e0y5lFgNBV0KFTOA9YgJ
X1MvVlEThYUr44gVN4utKtSEEz/4s7J20UPEQaYNLBj0QGy7IZcoON8PoPmgxCA6OEA3K7rjgCHI
+YgKQQsCKwJEAwSj3c1DyIoao7pAT2lhR8IJ4CwVsKUH84P0KF2YKFAxhx50Lkj/iH00mIBZGJ/U
QcLP2LMXsVEc6BXIuDNps0WypKzHUARsUah29RUGxsGzvjTo2kcnrQkd3MN4a/2F3JFOFCQur3R3
gA==

--Boundary-00=_PwbcAdEpORppyn7--




From MAILER-DAEMON Mon Apr 05 16:41:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAaty-0008Jm-30
	for mharc-commit-classpath@gnu.org; Mon, 05 Apr 2004 16:41:02 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAate-0008Bq-Nf
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 16:40:42 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAat5-0007ku-UM
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 16:40:39 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAat5-0007kL-Ho
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 16:40:07 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP
	id C26FD62195; Mon,  5 Apr 2004 20:40:06 +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 78358-09; Mon,  5 Apr 2004 20:40:05 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-89.adsl.solnet.ch [212.41.79.89])
	by mail01.solnet.ch (Postfix) with ESMTP
	id 98E4060DC0; Mon,  5 Apr 2004 20:40:02 +0000 (GMT)
Received: from mc-reali (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP
	id 980B5B542D; Mon,  5 Apr 2004 22:38:11 +0200 (CEST)
Date: Mon, 05 Apr 2004 22:40:55 +0200
From: Patrik Reali <reali@acm.org>
To: Mark Wielaard <mark@klomp.org>, tromey@redhat.com
Message-ID: <283660512.1081204855@[192.168.1.4]>
In-Reply-To: <1081111083.7548.218.camel@elsschot.wildebeest.org>
References: <1080451330.25203.42.camel@gadek.homelinux.org>
	<1080505658.17922.182.camel@elsschot.wildebeest.org>
	<87ad1wha5a.fsf@fleche.redhat.com>
	<1081111083.7548.218.camel@elsschot.wildebeest.org>
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 mail01.solnet.ch
Cc: commit-classpath <commit-classpath@gnu.org>
Subject: Re: vm/reference reflection update
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 05 Apr 2004 20:40:46 -0000



--On Sonntag, 4. April 2004 22:38 +0200 Mark Wielaard <mark@klomp.org> 
wrote:

> Hi,
>
> On Thu, 2004-04-01 at 01:25, Tom Tromey wrote:
>> The status is that savannah hasn't processed new projects since
>> November.  I've been waiting for a project to be made so that we have
>> a public place to work on jalopy changes.
>>
>> It's time for us to consider other hosting options.  Sourceforge
>> processed my last account request same-day -- how about we do that?
>> Unless someone has a better idea I'll do that, perhaps next week.
>

But sourceforge has other problems. Their response to bugs is quite slow: 
they have problems with their statistic computation since last year. And 
sometimes the anonymous CVS is delayed up to 2 days from the developer CVS.

I also had troubles with the mailing lists with messages delayed up to 4 
days (but gnu.org already trained us to this).

The website hosting is interesting: they are much more flexible (support of 
php and locally installed software), but pages are served quite slowly.

What would RMS think of hosting an official project on a commercial server?

JNode, which is hosted there, whas considering whether to search for 
another hosting server.

All in all sourceforge is a good place for projects, although I'm not sure 
what will happen in the long range: they are more and more pushing their 
commercial services.

> https://gna.org/ seems to be the FSF France mirror/backup of Savannah in
> Europe. One of the nice things they have is backup and migration of
> projects:

Sounds interesting. Is it a problem or rather a solution (e.g. with the 
cryptographic stuff) to host Classpath outside of the U.S.A?

-Patrik



From MAILER-DAEMON Mon Apr 05 17:14:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAbQK-0000rM-UM
	for mharc-commit-classpath@gnu.org; Mon, 05 Apr 2004 17:14:28 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAbQI-0000pu-C0
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 17:14:26 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAbPh-0000YJ-BF
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 17:14:20 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAbPg-0000Xm-E2
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 17:13:48 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id CE4FE6221A
	for <commit-classpath@gnu.org>; Mon,  5 Apr 2004 21:13:47 +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 80601-07 for <commit-classpath@gnu.org>;
	Mon,  5 Apr 2004 21:13:46 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-89.adsl.solnet.ch [212.41.79.89])
	by mail01.solnet.ch (Postfix) with ESMTP id D199360DC0
	for <commit-classpath@gnu.org>; Mon,  5 Apr 2004 21:13:40 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id 4D8306200B; Mon,  5 Apr 2004 23:11:56 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040405211156.4D8306200B@reali.dnsalias.net>
Date: Mon,  5 Apr 2004 23:11:56 +0200 (CEST)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: doc/www.gnu.org/README doc/www.gnu.org/newsitems.txt
	doc/www.gnu.org/faq/faq.wml doc/www.gnu.org/include/layout.wml
	doc/www.gnu.org/include/macros.wml
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 05 Apr 2004 21:14:27 -0000

2004-04-05  Patrik Reali  <reali@acm.org>

	* doc/www.gnu.org/README: some custom tags documented
	* doc/www.gnu.org/newsitems.txt: planet classpath added
	* doc/www.gnu.org/faq/faq.wml doc/www.gnu.org/include/layout.wml 
        doc/www.gnu.org/include/macros.wml: faq entry on installing classpath
	and mauve, custom tags for commented code

Index: doc/www.gnu.org/README
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/README,v
retrieving revision 1.4
diff -u -r1.4 README
--- doc/www.gnu.org/README	27 Nov 2003 14:49:57 -0000	1.4
+++ doc/www.gnu.org/README	5 Apr 2004 21:03:15 -0000
@@ -45,3 +45,41 @@
 
 Some pages define their own tags (e.g. faq.wml, tools.wml, downloads.wml)
 to organize their content.
+
+
+Guide to the custom-defined tags
+--------------------------------
+
+Links
+  <createlink name="name" url="url>
+  <createlink url="url>
+
+  creates a <a href="url">name</a> entry; if name is missing, uses the url 
+  as name
+
+
+Commented code
+
+  <commented-code>
+    <code-line code="1st code-line">comment to 1st line of code</code-line>
+    <code-line code="2nd code-line">comment to 2nd line of code</code-line>
+    <code-line code="3rd code-line" />
+  </commented-code>
+
+
+FAQ-Lists
+
+  <faq-section name="section name">
+    <faq question="1st question">
+      1st answer
+    </faq>
+    <faq question="2nd question">
+      2nd answer
+    </faq>
+  </faq-section>
+  <faq-section name="section name">
+    <faq question="1st question">
+      1st answer
+    </faq>
+  </faq-section>
+
Index: doc/www.gnu.org/newsitems.txt
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/newsitems.txt,v
retrieving revision 1.2
diff -u -r1.2 newsitems.txt
--- doc/www.gnu.org/newsitems.txt	15 Mar 2004 21:54:14 -0000	1.2
+++ doc/www.gnu.org/newsitems.txt	5 Apr 2004 21:03:15 -0000
@@ -1,3 +1,7 @@
+<newsitem date="26 Mar. 2004">
+<createlink name="Planet Classpath" url="http://classpath.wildebeest.org/planet/"> launched; it aggregates the blogs of most Classpath's developers
+</nextitem>
+
 <newsitem date="13 Mar. 2004">
 <createlink name="GNU Classpath 0.08 released" url="announce/20040313.html">
 </nextitem>
Index: doc/www.gnu.org/faq/faq.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/faq/faq.wml,v
retrieving revision 1.6
diff -u -r1.6 faq.wml
--- doc/www.gnu.org/faq/faq.wml	15 Mar 2004 21:54:14 -0000	1.6
+++ doc/www.gnu.org/faq/faq.wml	5 Apr 2004 21:03:15 -0000
@@ -230,6 +230,62 @@
 maintainer of GNU Classpath, Mark Wielaard <mark@klomp.org>.
 </p>
 </faq>
+
+<faq question="How do I install GNU Classpath?">
+<p>Follow these steps to install GNU Classpath. Please note that you need this only if you want to work directly with it; usually JVMs contain a pre-packaged version of GNU Classpath.
+
+<commented-code>
+<code-line code="<createlink url="ftp://ftp.gnu.org/gnu/classpath/">">
+  Download the current release
+</code-line>
+<code-line code="tar zxf classpath-<i>version</i>.tar.gz">
+  unpack
+</code-line>
+<code-line code="cd classpath-<i>version</i>" />
+<code-line code="more INSTALL">
+  make sure you have all pre-requirements
+</code-line>
+<code-line code="./configure">
+  configure the distribution; use <code>--help</code> to get the list of options: you will usually need <code>--prefix=<i>dest/dir/for/classpath</i>; use <code>--disable-gtk-peer</code> if you don't use gtk+/gnome.
+</code-line>
+
+<code-line code="make; make install" />
+</commented-code>
+
+
+</faq>
+
+<faq question="How do I install Mauve?">
+
+<commented-code>
+<code-line code="export CVSROOT=:pserver:anoncvs@bogus.example.com:/cvs/mauve" />
+<code-line code="cvs login">password is anoncvs</code-line>
+<code-line code="cvs checkout mauve" />
+<code-line code="cd mauve" />
+<code-line code="./configure">
+The main thing this does is creating the gnu/testlet/config.java. You could also do this by hand from the config.java.in file
+</code-line>
+<code-line code="vi batch_runner">
+Edit the script 'batch_runner' to set the variable COMPILER correctly
+  (there are a couple of example settings)
+</code-line>
+<code-line code="vi runner">
+Edit script 'runner' to set the variable RUNTIME correctly
+  (there are a couple of example settings)
+</code-line>
+<code-line code="./batch_run">
+run ./batch_run and look at the results. You can also run individual tests with<br>
+<code>- echo gnu.testlet.java.lang.String.getBytes | jamvm 
+gnu.testlet.SimpleTestHarness</code><br>
+(Option flags are -verbose and -debug)
+
+</code-line>
+
+</commented-code>
+
+
+</faq>
+
 </faq-section>
 
 <faq-section name="Classpath Implementation">
Index: doc/www.gnu.org/include/layout.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/include/layout.wml,v
retrieving revision 1.3
diff -u -r1.3 layout.wml
--- doc/www.gnu.org/include/layout.wml	1 Mar 2004 19:41:46 -0000	1.3
+++ doc/www.gnu.org/include/layout.wml	5 Apr 2004 21:03:15 -0000
@@ -36,11 +36,27 @@
 <preserve name>
 <preserve url>
 <set-var %attributes>
+<ifeq <get-var name> "" <set-var name="<get-var url>">>
 <a href="<get-var url>"><get-var name></a>
 <restore url>
 <restore name>
 </define-tag>
 
+<define-tag commented-code endtag=required>
+  <ul>
+  <table cellspacing="0" cellpadding="4">
+  %body
+  </table>
+  </ul>
+</define-tag>
+
+<define-tag code-line endtag=required>
+  <preserve code>
+  <set-var %attributes>
+  <tr><td valign="top"><code><get-var code></code></td><td style="padding-left: 20px;">%body</td></tr>
+  <tr bgcolor="#999999"><td colspan="2"></td></tr>
+  <restore code>
+</define-tag>
 
 ##
 #
Index: doc/www.gnu.org/include/macros.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/include/macros.wml,v
retrieving revision 1.7
diff -u -r1.7 macros.wml
--- doc/www.gnu.org/include/macros.wml	27 Nov 2003 14:49:58 -0000	1.7
+++ doc/www.gnu.org/include/macros.wml	5 Apr 2004 21:03:15 -0000
@@ -25,10 +25,13 @@
 permitted in any medium, provided this notice is preserved.<P>
 Updated:
 </en>
+$Date:$ $Author:$
+<!--
 <preserve info>
 <set-var info=<get-file-properties <__file__>>>
 <date <get-var info[2]>> <get-var last-modified-author>
 <restore info>
+-->
 <HR>
 </define-tag>
 



From MAILER-DAEMON Mon Apr 05 18:51:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAcw9-0002bV-VD
	for mharc-commit-classpath@gnu.org; Mon, 05 Apr 2004 18:51:25 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAcuS-0001gG-Rk
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 18:49:40 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BActW-0000KF-VG
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 18:49:16 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAcsP-0007bj-AA
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 18:47:33 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id DA968621CB
	for <commit-classpath@gnu.org>; Mon,  5 Apr 2004 22:47:26 +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 84363-09 for <commit-classpath@gnu.org>;
	Mon,  5 Apr 2004 22:47:26 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-79-89.adsl.solnet.ch [212.41.79.89])
	by mail01.solnet.ch (Postfix) with ESMTP id 6DE7160C67
	for <commit-classpath@gnu.org>; Mon,  5 Apr 2004 22:47:20 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id 87DB0B5C7C; Tue,  6 Apr 2004 00:45:35 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040405224535.87DB0B5C7C@reali.dnsalias.net>
Date: Tue,  6 Apr 2004 00:45:35 +0200 (CEST)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: doc/www.gnu.org/downloads/downloads.wml
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 05 Apr 2004 22:51:23 -0000

2004-04-06  Patrik Reali  <reali@acm.org>

	* doc/www.gnu.org/downloads/downloads.wml: link to 0.08 corrected


Index: doc/www.gnu.org/downloads/downloads.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/downloads/downloads.wml,v
retrieving revision 1.2
diff -u -r1.2 downloads.wml
--- doc/www.gnu.org/downloads/downloads.wml	15 Mar 2004 22:44:32 -0000	1.2
+++ doc/www.gnu.org/downloads/downloads.wml	5 Apr 2004 22:42:59 -0000
@@ -79,7 +79,7 @@
 <download
 	date="13 Mar. 2004"
 	version="0.08"
-	url="ftp://alpha.gnu.org/gnu/classpath/classpath-0.08.tar.gz"
+	url="ftp://ftp.gnu.org/gnu/classpath/classpath-0.08.tar.gz"
 >
 
 <!-- download
@@ -101,7 +101,7 @@
 <download
 	date="05 Dec. 2003"
 	version="0.07"
-	url="ftp://alpha.gnu.org/gnu/classpath/classpath-0.067tar.gz"
+	url="ftp://alpha.gnu.org/gnu/classpath/classpath-0.07tar.gz"
 >
 
 <download



From MAILER-DAEMON Mon Apr 05 23:47:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAhYR-0003wH-Md
	for mharc-commit-classpath@gnu.org; Mon, 05 Apr 2004 23:47:15 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAhYP-0003vj-Dj
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 23:47:13 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAhXr-0003A0-Ol
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 23:47:12 -0400
Received: from [209.225.28.214] (helo=mxsf14.cluster1.charter.net)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAhXr-00038t-9Z
	for commit-classpath@gnu.org; Mon, 05 Apr 2004 23:46:39 -0400
Received: from InterJet.dellroad.org (E6V6Q8.cpe.mvllo.al.charter.com
	[24.196.29.251])
	by mxsf14.cluster1.charter.net (8.12.11/8.12.11) with ESMTP id
	i363j5tt056041
	for <commit-classpath@gnu.org>; Mon, 5 Apr 2004 23:45:07 -0400 (EDT)
Received: from arch20m.dellroad.org (arch20m.dellroad.org [10.2.2.20])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id WAA22339
	for <commit-classpath@gnu.org>; Mon, 5 Apr 2004 22:30:34 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.6) with ESMTP id i363UYQO018068
	for <commit-classpath@gnu.org>; Mon, 5 Apr 2004 22:30:34 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i363UY1B018067
	for commit-classpath@gnu.org; Mon, 5 Apr 2004 22:30:34 -0500 (CDT)
	(envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404060330.i363UY1B018067@arch20m.dellroad.org>
To: commit-classpath@gnu.org
Date: Mon, 5 Apr 2004 22:30:34 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Subject: Mauve patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 03:47:14 -0000

Hi,

Is this the right place to send Mauve patches? If not please point me
(or the patch) in the right direction.

In JC, phantom references are enqueued on the next finalizer run
after the one that finalizes the object, and finalizer runs only
happen after a GC cycle, therefore the patch below is required to
make JC pass the test; ie, the test is being too strict.

Thanks,
-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com

Index: gnu/testlet/java/lang/ref/PhantomReference/phantom.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/lang/ref/PhantomReference/phantom.java,v
retrieving revision 1.1
diff -u -r1.1 phantom.java
--- gnu/testlet/java/lang/ref/PhantomReference/phantom.java	27 Sep 2001 15:44:09 -0000	1.1
+++ gnu/testlet/java/lang/ref/PhantomReference/phantom.java	6 Apr 2004 03:28:19 -0000
@@ -70,6 +70,8 @@
 
     PhantomReference wr = try1 (q, harness);
     System.gc ();
+    Thread.yield();
+    System.gc ();
 
     Reference r = null;
     try



From MAILER-DAEMON Tue Apr 06 00:01:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAhmL-0007mb-0s
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 00:01:37 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAhmH-0007gh-7q
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 00:01:33 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAhlf-00078T-Kk
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 00:01:26 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAhlf-00078M-9a
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 00:00:55 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 81E0962252
	for <commit-classpath@gnu.org>; Tue,  6 Apr 2004 04:00:54 +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 90584-08 for <commit-classpath@gnu.org>;
	Tue,  6 Apr 2004 04:00:53 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-70-142.adsl.solnet.ch
	[212.41.70.142])
	by mail01.solnet.ch (Postfix) with ESMTP id 6CD0262240
	for <commit-classpath@gnu.org>; Tue,  6 Apr 2004 04:00:53 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 985F5B703E; Tue,  6 Apr 2004 05:59:07 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040406035907.985F5B703E@reali.dnsalias.net>
Date: Tue,  6 Apr 2004 05:59:07 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040406 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 04:01:34 -0000




From MAILER-DAEMON Tue Apr 06 04:11:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAlfi-00071D-LQ
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 04:11:02 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAle8-0006Qj-Rq
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 04:09:24 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAld8-0005iN-4l
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 04:08:53 -0400
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAlcy-0005M1-Gd
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 04:08:12 -0400
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Tue, 6 Apr 2004 10:08:05 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADD0D@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Patch for discussion: The big NIO merge
Thread-Index: AcQbSAhh8UmP+3qER0u4gsvjgG4l/gAYh+Mg
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "Michael Koch" <konqueror@gmx.de>,
	"commit-classpath" <commit-classpath@gnu.org>
Cc: 
Subject: RE: Patch for discussion: The big NIO merge
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 08:11:00 -0000

Michael Koch wrote:
> Here is a little NIO patch for classpath. Its mainly to merge with=20
> current libgcj to get differences smaller. It uses java.nio now=20
> internally in java.io to access files. This surely needs a NEWS item=20
> for the next release.
>=20
> Any comments ? Okay to commit ?

Looks great! I a few small comments/requests.

Would you consider renaming gnu.java.nio.channels.FileChannelImpl to
gnu.java.nio.channels.VMFileChannel? I'm almost certainly going to need
to replace it (unless we introduce another layer VMFileChannelImpl, but
that seems pointless).

Why are some of the fields (e.g. owner in DirectByteBufferImpl)
protected in a final class?

This looks a bit odd:

+    if (channel instanceof FileChannel)
+      {
+       try
+         {
+           ((FileChannel) channel).force(true);
+         }
+       catch (IOException ex)
+         {
+           if (ex instanceof SyncFailedException)
+             throw (SyncFailedException) ex;
+           else
+             throw new SyncFailedException(ex.getMessage());
+         }
+      }

Why not simply do:

+       catch (SyncFailedException ex)
+         {
+             throw ex;
+         }
+       catch (IOException ex)
+         {
+             throw (SyncFailedException)new
SyncFailedException().initCause(ex);
+         }

Would you please consider moving newInputStream/newOutputStream from
java.nio.channels.Channels to java.nio.channels.VMChannels?

Thanks!

Regards,
Jeroen



From MAILER-DAEMON Tue Apr 06 04:54:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAmKf-0007KK-6T
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 04:53:21 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAmJo-0006iJ-VF
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 04:52:28 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAmJ8-0006Do-6P
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 04:52:17 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAmJ7-0006Bq-Bz
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 04:51:45 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-170.ewetel.net
	[80.228.95.170])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i368pcNj019754;
	Tue, 6 Apr 2004 10:51:39 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BAlN8-0000NG-00; Tue, 06 Apr 2004 09:51:50 +0200
From: Michael Koch <konqueror@gmx.de>
To: "Jeroen Frijters" <jeroen@sumatra.nl>,
	"commit-classpath" <commit-classpath@gnu.org>
Date: Tue, 6 Apr 2004 10:51:23 +0200
User-Agent: KMail/1.5.4
References: <788B535AB1F9CB49BB9C229372B50ACC0ADD0D@LEMBU.sumatrasoftware.com>
In-Reply-To: <788B535AB1F9CB49BB9C229372B50ACC0ADD0D@LEMBU.sumatrasoftware.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404061051.23264.konqueror@gmx.de>
X-CheckCompat: OK
Cc: 
Subject: Re: Patch for discussion: The big NIO merge
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 08:53:19 -0000

Am Dienstag, 6. April 2004 10:08 schrieb Jeroen Frijters:
> Michael Koch wrote:
> > Here is a little NIO patch for classpath. Its mainly to merge with
> > current libgcj to get differences smaller. It uses java.nio now
> > internally in java.io to access files. This surely needs a NEWS
> > item for the next release.
> >
> > Any comments ? Okay to commit ?
>
> Looks great! I a few small comments/requests.
>
> Would you consider renaming gnu.java.nio.channels.FileChannelImpl to
> gnu.java.nio.channels.VMFileChannel? I'm almost certainly going to
> need to replace it (unless we introduce another layer
> VMFileChannelImpl, but that seems pointless).
>
> Why are some of the fields (e.g. owner in DirectByteBufferImpl)
> protected in a final class?
>
> This looks a bit odd:
>
> +    if (channel instanceof FileChannel)
> +      {
> +       try
> +         {
> +           ((FileChannel) channel).force(true);
> +         }
> +       catch (IOException ex)
> +         {
> +           if (ex instanceof SyncFailedException)
> +             throw (SyncFailedException) ex;
> +           else
> +             throw new SyncFailedException(ex.getMessage());
> +         }
> +      }
>
> Why not simply do:
>
> +       catch (SyncFailedException ex)
> +         {
> +             throw ex;
> +         }
> +       catch (IOException ex)
> +         {
> +             throw (SyncFailedException)new
> SyncFailedException().initCause(ex);
> +         }

Yeah, looks reasonable. I will do this later (see later).

> Would you please consider moving newInputStream/newOutputStream from
> java.nio.channels.Channels to java.nio.channels.VMChannels?

I know why I always wanted to use VM* names. I havent written the code 
you wanna change. I have this change in my mind but I would like to 
commit this first to get this big patch out of my disk.


Michael




From MAILER-DAEMON Tue Apr 06 08:01:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BApFp-0006WQ-Fb
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 08:00:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BApFV-0006LC-4W
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 08:00:13 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAp7q-0004Mc-Te
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 07:52:50 -0400
Received: from [217.8.192.20] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAp7q-0004M0-0a
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 07:52:18 -0400
Received: from [217.8.218.79] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 1613381; Tue, 06 Apr 2004 13:52:16 +0200
From: Sascha Brawer <brawer@dandelis.ch>
To: <mauve-discuss@sources.redhat.com>, Archie Cobbs <archie@dellroad.org>
Date: Tue, 6 Apr 2004 13:52:05 +0200
Message-Id: <20040406115205.3060@smtp.mail.ch.easynet.net>
In-Reply-To: <200404060330.i363UY1B018067@arch20m.dellroad.org>
References: <200404060330.i363UY1B018067@arch20m.dellroad.org>
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: commit-classpath@gnu.org
Subject: Re: Mauve patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 12:00:17 -0000

Archie Cobbs <archie@dellroad.org> wrote on Mon, 5 Apr 2004 22:30:34 -0500:

>Is this the right place to send Mauve patches? If not please point me
>(or the patch) in the right direction.

There's a list mauve-discuss@sources.redhat.com  (presumably with mostly
the same subscribers as commit-classpath@gnu.org, although there seem to
be also a few non-Classpath people there).

>In JC, phantom references are enqueued on the next finalizer run
>after the one that finalizes the object, and finalizer runs only
>happen after a GC cycle, therefore the patch below is required to
>make JC pass the test; ie, the test is being too strict.


>Index: gnu/testlet/java/lang/ref/PhantomReference/phantom.java
>===================================================================
>RCS file: /cvs/mauve/mauve/gnu/testlet/java/lang/ref/PhantomReference/
>phantom.java,v
>retrieving revision 1.1
>diff -u -r1.1 phantom.java
>--- gnu/testlet/java/lang/ref/PhantomReference/phantom.java	27 Sep
>2001 15:44:09 -0000	1.1
>+++ gnu/testlet/java/lang/ref/PhantomReference/phantom.java	6 Apr
>2004 03:28:19 -0000
>@@ -70,6 +70,8 @@
> 
>     PhantomReference wr = try1 (q, harness);
>     System.gc ();
>+    Thread.yield();
>+    System.gc ();
> 
>     Reference r = null;
>     try

Does this really guarantee that the finalizer has run? Couldn't this also
lead to any other thread, such as some VM-internal thread, without
running the finalizer? If so, you might want to call Object.notify in the
finalizer and Object.wait at the above code location.

-- Sascha

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





From MAILER-DAEMON Tue Apr 06 08:18:56 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BApXc-00054C-1o
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 08:18:56 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BApWM-0004fd-UA
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 08:17:38 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BApV6-0004Kj-Ed
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 08:16:51 -0400
Received: from [212.227.126.189] (helo=moutng.kundenserver.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BApUI-000498-0U
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 08:15:30 -0400
Received: from [212.227.126.155] (helo=mrelayng.kundenserver.de)
	by moutng.kundenserver.de with esmtp (Exim 3.35 #1)
	id 1BApUF-0005xD-00; Tue, 06 Apr 2004 14:15:27 +0200
Received: from [212.126.196.45] (helo=aicas.com)
	by mrelayng.kundenserver.de with asmtp (TLSv1:RC4-MD5:128)
	(Exim 3.35 #1) id 1BApUF-0007Hp-00; Tue, 06 Apr 2004 14:15:27 +0200
Message-ID: <40729F67.9030309@aicas.com>
Date: Tue, 06 Apr 2004 14:15:35 +0200
From: =?ISO-8859-1?Q?Ingo_Pr=F6tel?= <proetel@aicas.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.6) Gecko/20040113
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: mauve-discuss@sources.redhat.com,  commit-classpath@gnu.org
References: <200404060330.i363UY1B018067@arch20m.dellroad.org>
	<20040406115205.3060@smtp.mail.ch.easynet.net>
In-Reply-To: <20040406115205.3060@smtp.mail.ch.easynet.net>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
X-Provags-ID: kundenserver.de abuse@kundenserver.de
	auth:ebd3e0372cc3ac236a2e2611be1a8528
Cc: 
Subject: Re: Mauve patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 12:18:53 -0000



Sascha Brawer wrote:
> Archie Cobbs <archie@dellroad.org> wrote on Mon, 5 Apr 2004 22:30:34 -0500:
> 
> 
>>Is this the right place to send Mauve patches? If not please point me
>>(or the patch) in the right direction.
> 
> 
> There's a list mauve-discuss@sources.redhat.com  (presumably with mostly
> the same subscribers as commit-classpath@gnu.org, although there seem to
> be also a few non-Classpath people there).
> 
> 
>>In JC, phantom references are enqueued on the next finalizer run
>>after the one that finalizes the object, and finalizer runs only
>>happen after a GC cycle, therefore the patch below is required to
>>make JC pass the test; ie, the test is being too strict.
> 
> 
> 
>>Index: gnu/testlet/java/lang/ref/PhantomReference/phantom.java
>>===================================================================
>>RCS file: /cvs/mauve/mauve/gnu/testlet/java/lang/ref/PhantomReference/
>>phantom.java,v
>>retrieving revision 1.1
>>diff -u -r1.1 phantom.java
>>--- gnu/testlet/java/lang/ref/PhantomReference/phantom.java	27 Sep
>>2001 15:44:09 -0000	1.1
>>+++ gnu/testlet/java/lang/ref/PhantomReference/phantom.java	6 Apr
>>2004 03:28:19 -0000
>>@@ -70,6 +70,8 @@
>>
>>    PhantomReference wr = try1 (q, harness);
>>    System.gc ();
>>+    Thread.yield();
>>+    System.gc ();
>>
>>    Reference r = null;
>>    try
> 
> 
> Does this really guarantee that the finalizer has run? Couldn't this also
> lead to any other thread, such as some VM-internal thread, without
> running the finalizer? If so, you might want to call Object.notify in the
> finalizer and Object.wait at the above code location.
> 
I'm not sure a wait/notify will help. It might also just hang the VM since no garbage collection 
might occur. Probably the only real solution would be to force an OutOfMemoryError. Before the VM 
may throw such an error it has to try to clean up memory. But probably not all VMs survive such a 
test ;-)

ingo


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

-- 
Ingo Prötel                                          proetel@aicas.com
aicas GmbH                                        http://www.aicas.com
Haid-und-Neu-Str. 18                        phone   +49 721 663 968-32
76131 Karlsruhe                             fax     +49 721 663 968-93
Germany



From MAILER-DAEMON Tue Apr 06 10:16:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BArNn-0000y0-Cb
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 10:16:55 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BArMs-0000eG-Is
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 10:15:58 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BArL5-0008PN-EA
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 10:14:38 -0400
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 1BArHV-0007FC-Ue
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 10:10:26 -0400
Received: from [209.225.28.214] (helo=mxsf14.cluster1.charter.net)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BArFf-0005AE-0L
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 10:08:31 -0400
Received: from InterJet.dellroad.org (E6V6Q8.cpe.mvllo.al.charter.com
	[24.196.29.251])
	by mxsf14.cluster1.charter.net (8.12.11/8.12.11) with ESMTP id
	i36E036O089352; Tue, 6 Apr 2004 10:00:06 -0400 (EDT)
Received: from arch20m.dellroad.org (arch20m.dellroad.org [10.2.2.20])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id IAA27856;
	Tue, 6 Apr 2004 08:46:28 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.6) with ESMTP id i36DkRQO019921; 
	Tue, 6 Apr 2004 08:46:27 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i36DkRdh019920;
	Tue, 6 Apr 2004 08:46:27 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404061346.i36DkRdh019920@arch20m.dellroad.org>
In-Reply-To: <20040406115205.3060@smtp.mail.ch.easynet.net>
To: Sascha Brawer <brawer@dandelis.ch>
Date: Tue, 6 Apr 2004 08:46:27 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: commit-classpath@gnu.org, mauve-discuss@sources.redhat.com
Subject: Re: Mauve patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 14:16:53 -0000

Sascha Brawer wrote:
> >     PhantomReference wr = try1 (q, harness);
> >     System.gc ();
> >+    Thread.yield();
> >+    System.gc ();
> > 
> >     Reference r = null;
> >     try
> 
> Does this really guarantee that the finalizer has run? Couldn't this also
> lead to any other thread, such as some VM-internal thread, without
> running the finalizer? If so, you might want to call Object.notify in the
> finalizer and Object.wait at the above code location.

This patch doesn't guarantee anything, and in general it's impossible
to make this test "correct" because the spec allows finalization and
reference enqueuing to happen after arbitrarily long delays.

For example, a JVM that *never* finalizes is still within the spec
(it would probably throw OutOfMemoryError's more readily though).

This patch simply makes the test "correct" for JC (and possibly
some other VM(s) out there). Since there's no way to *ensure* the
finalizer and reference enqueing thread(s) have run, we just try
to give them every opportunity to do so before declaring that their
work should be done.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Tue Apr 06 15:19:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAw6V-0003p8-Jl
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 15:19:23 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAw6R-0003k9-OA
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 15:19:19 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAw5t-0003H3-9z
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 15:19:17 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BAw5s-0003GL-Me
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 15:18:44 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 2535C62234
	for <commit-classpath@gnu.org>; Tue,  6 Apr 2004 19:18:44 +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 77125-08 for <commit-classpath@gnu.org>;
	Tue,  6 Apr 2004 19:18:43 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-70-142.adsl.solnet.ch
	[212.41.70.142])
	by mail01.solnet.ch (Postfix) with ESMTP id C106A62210
	for <commit-classpath@gnu.org>; Tue,  6 Apr 2004 19:18:42 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id 4D35B62003; Tue,  6 Apr 2004 21:16:57 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040406191657.4D35B62003@reali.dnsalias.net>
Date: Tue,  6 Apr 2004 21:16:57 +0200 (CEST)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: doc/www.gnu.org/downloads/downloads.wml
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 19:19:21 -0000

2004-04-06  Patrik Reali  <reali@acm.org>

	* doc/www.gnu.org/downloads/downloads.wml: removed download links
	0.00 to 0.05 because they do not exist; link to 0.07 fixed


Index: doc/www.gnu.org/downloads/downloads.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/downloads/downloads.wml,v
retrieving revision 1.3
diff -u -r1.3 downloads.wml
--- doc/www.gnu.org/downloads/downloads.wml	5 Apr 2004 22:47:15 -0000	1.3
+++ doc/www.gnu.org/downloads/downloads.wml	6 Apr 2004 19:13:14 -0000
@@ -101,7 +101,7 @@
 <download
 	date="05 Dec. 2003"
 	version="0.07"
-	url="ftp://alpha.gnu.org/gnu/classpath/classpath-0.07tar.gz"
+	url="ftp://alpha.gnu.org/gnu/classpath/classpath-0.07.tar.gz"
 >
 
 <download
@@ -114,42 +114,36 @@
 <download
 	date="16 Feb. 2003"
 	version="0.05"
-	url="ftp://alpha.gnu.org/pub/gnu/classpath/classpath-0.05.tar.gz"
 	notes="http://mail.gnu.org/archive/html/classpath/2003-02/msg00043.html"
 >
 
 <download
 	date="06 May. 2002"
 	version="0.04"
-	url="ftp://alpha.gnu.org/pub/gnu/classpath/classpath-0.04.tar.gz"
 	notes="http://mail.gnu.org/archive/html/classpath/2002-05/msg00061.html"
 >
 
 <download
 	date="08 Feb. 2002"
 	version="0.03"
-	url="ftp://alpha.gnu.org/pub/gnu/classpath/classpath-0.03.tar.gz"
 	notes="downloads/20020208.html"
 >
 
 <download
 	date="06 Jan. 2001"
 	version="0.02"
-	url="ftp://alpha.gnu.org/pub/gnu/classpath/classpath-0.02.tar.gz"
 	notes="downloads/20010106.html"
 >
 
 <download
 	date="20 Nov. 2000"
 	version="0.01"
-	url="ftp://alpha.gnu.org/pub/gnu/classpath/classpath-0.01.tar.gz"
 	notes="downloads/20001120.html"
 >
 
 <download
 	date="06 Feb. 1999"
 	version="0.00"
-	url="ftp://alpha.gnu.org/pub/gnu/classpath/classpath-0.00.tar.gz"
 	notes="downloads/19990206.html"
 >
 



From MAILER-DAEMON Tue Apr 06 17:15:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAxvB-00014e-UM
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 17:15:49 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAxv8-00012a-TS
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 17:15:46 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAxuc-0000qW-Dc
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 17:15:45 -0400
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 1BAxu0-0000gn-Uy
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 17:14:36 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BAxpb-0000D6-NS
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 17:10:03 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-170.ewetel.net
	[80.228.95.170])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i36L9dNj021194;
	Tue, 6 Apr 2004 23:09:42 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BAwtL-00026s-00; Tue, 06 Apr 2004 22:09:51 +0200
From: Michael Koch <konqueror@gmx.de>
To: "David Lichteblau" <dave@lichteblau.com>
Date: Tue, 6 Apr 2004 23:09:23 +0200
User-Agent: KMail/1.5.4
References: <200404051942.41173.konqueror@gmx.de> <40731058.2060208@uqam.ca>
	<20040406205743.GA21097@lichteblau.com>
In-Reply-To: <20040406205743.GA21097@lichteblau.com>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404062309.23654.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath <commit-classpath@gnu.org>
Subject: Re: Classpath build process and VM-specific issues
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 21:15:47 -0000

Am Dienstag, 6. April 2004 22:57 schrieb David Lichteblau:
> Quoting Etienne Gagnon (gagnon.etienne_m@uqam.ca):
> > I would really like to see the native counterpart of your opaque
> > types and compare the "theoretical" performance of it relative to
> > the byte array proposal.
>
> Sorry if I lost track of the discussion, but when the proposal of an
> abstract class for virtual machine data came up, I thought that one
> of the reasons for this boxing was the portability to virtual
> machines of any kind.  A byte array approach would have performance
> and design implications not for JNI-based implementations, but for
> more exotic VMs which do not have any native pointers at all (IKVM?).
>
> Also, is this still about the Class.vmData slot?  I note that the
> proposed java.nio patch already uses a RawData class.

It uses RawData because it did for a long time. When things calm down 
here and we have a decision on it I will change it accordingly. RawData 
was used because I developed NIO for libgcj first due to several 
reasons and RawData is somehow a natural choice for me when using CNI.


Michael




From MAILER-DAEMON Tue Apr 06 18:11:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BAyn0-0000sG-8v
	for mharc-commit-classpath@gnu.org; Tue, 06 Apr 2004 18:11:26 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BAymu-0000od-Mj
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 18:11:20 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BAylz-0008T3-V2
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 18:10:55 -0400
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 1BAylN-0007lf-Vh
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 18:09:46 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BAyie-0004ce-Lo
	for commit-classpath@gnu.org; Tue, 06 Apr 2004 18:06:56 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 08783621EC
	for <commit-classpath@gnu.org>; Tue,  6 Apr 2004 22:06:54 +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 89323-05 for <commit-classpath@gnu.org>;
	Tue,  6 Apr 2004 22:06:53 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-70-142.adsl.solnet.ch
	[212.41.70.142])
	by mail01.solnet.ch (Postfix) with ESMTP id 93A276215D
	for <commit-classpath@gnu.org>; Tue,  6 Apr 2004 22:06:52 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id 96FDD61FDA; Wed,  7 Apr 2004 00:05:04 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040406220504.96FDD61FDA@reali.dnsalias.net>
Date: Wed,  7 Apr 2004 00:05:04 +0200 (CEST)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: doc/www.gnu.org/newsitems.txt
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 06 Apr 2004 22:11:22 -0000

2004-04-07  Patrik Reali  <reali@acm.org>

	* doc/www.gnu.org/newsitems.txt: JamVM release; ServiceFactory release

Index: doc/www.gnu.org/newsitems.txt
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/newsitems.txt,v
retrieving revision 1.3
diff -u -r1.3 newsitems.txt
--- doc/www.gnu.org/newsitems.txt	5 Apr 2004 21:13:14 -0000	1.3
+++ doc/www.gnu.org/newsitems.txt	6 Apr 2004 22:03:58 -0000
@@ -1,5 +1,13 @@
+<newsitem date="29 Mar 2004">
+JamVM-1.1.2 released (<createlink name="announcement" url="http://mail.gnu.org/archive/html/classpath/2004-03/msg00267.html">) 
+</newsitem>
+
 <newsitem date="26 Mar. 2004">
 <createlink name="Planet Classpath" url="http://classpath.wildebeest.org/planet/"> launched; it aggregates the blogs of most Classpath's developers
+</nextitem>
+
+<newsitem date="19 Mar. 2004">
+Sascha has released <createlink name="ServiceFactory" url="http://mail.gnu.org/archive/html/classpath/2004-03/msg00153.html">
 </nextitem>
 
 <newsitem date="13 Mar. 2004">



From MAILER-DAEMON Wed Apr 07 00:02:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BB4Gf-0007aj-Pm
	for mharc-commit-classpath@gnu.org; Wed, 07 Apr 2004 00:02:25 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BB4Gd-0007ac-TD
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 00:02:23 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BB4G7-0007Xb-8L
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 00:02:22 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BB4G6-0007XW-W5
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 00:01:51 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 3085F62230
	for <commit-classpath@gnu.org>; Wed,  7 Apr 2004 04:01: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 01433-02 for <commit-classpath@gnu.org>;
	Wed,  7 Apr 2004 04:01:49 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-77-247.adsl.solnet.ch
	[212.41.77.247])
	by mail01.solnet.ch (Postfix) with ESMTP id 1B68A62226
	for <commit-classpath@gnu.org>; Wed,  7 Apr 2004 04:01:49 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 6933EB79B7; Wed,  7 Apr 2004 06:00:01 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040407040001.6933EB79B7@reali.dnsalias.net>
Date: Wed,  7 Apr 2004 06:00:01 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040407 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 07 Apr 2004 04:02:24 -0000




From MAILER-DAEMON Wed Apr 07 01:55:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BB62L-0006p8-Kf
	for mharc-commit-classpath@gnu.org; Wed, 07 Apr 2004 01:55:45 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BB62J-0006oI-8R
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 01:55:43 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BB61n-0006Yc-FV
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 01:55:42 -0400
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 1BB61n-0006W3-6C
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 01:55:11 -0400
Received: from [207.174.178.92] (helo=email2.peakpeak.com)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BB5sM-0003xq-9y
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 01:45:26 -0400
Received: (qmail 7083 invoked from network); 7 Apr 2004 05:47:02 -0000
Received: from tf0229.peakpeak.com (HELO fleche.redhat.com) ([204.144.239.229])
	(envelope-sender <tromey@redhat.com>)
	by email2.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <brawer@dandelis.ch>; 7 Apr 2004 05:47:02 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id BE2B54F82D4; Tue,  6 Apr 2004 23:31:38 -0600 (MDT)
To: Archie Cobbs <archie@dellroad.org>
References: <200404061346.i36DkRdh019920@arch20m.dellroad.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Look DEEP into the OPENINGS!!  Do you see any ELVES or EDSELS...
	or a HIGHBALL??...
Date: 06 Apr 2004 23:31:38 -0600
In-Reply-To: <200404061346.i36DkRdh019920@arch20m.dellroad.org>
Message-ID: <87vfkc4amd.fsf@fleche.redhat.com>
Lines: 23
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: commit-classpath@gnu.org, mauve-discuss@sources.redhat.com
Subject: Re: Mauve patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 07 Apr 2004 05:55:43 -0000

>>>>> "Archie" == Archie Cobbs <archie@dellroad.org> writes:

Archie> This patch doesn't guarantee anything, and in general it's impossible
Archie> to make this test "correct" because the spec allows finalization and
Archie> reference enqueuing to happen after arbitrarily long delays.

Yeah, these tests are basically bogus.  I thought I had removed them,
but I guess I forgot.

Archie> This patch simply makes the test "correct" for JC (and possibly
Archie> some other VM(s) out there). Since there's no way to *ensure* the
Archie> finalizer and reference enqueing thread(s) have run, we just try
Archie> to give them every opportunity to do so before declaring that their
Archie> work should be done.

I think the patch is fine to go in.  It certainly doesn't make the
situation any worse.

Perhaps it is better to just remove the test.  Or make a new
"unportable" section of Mauve, since some things seemingly can't be
tested.

Tom



From MAILER-DAEMON Wed Apr 07 10:56:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBETQ-0000gQ-Ub
	for mharc-commit-classpath@gnu.org; Wed, 07 Apr 2004 10:56:16 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBETJ-0000d5-0x
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 10:56:09 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBESm-0000RL-II
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 10:56:07 -0400
Received: from [209.225.28.218] (helo=mxsf18.cluster1.charter.net)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBEQA-0008Ee-Ij
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 10:52:54 -0400
Received: from InterJet.dellroad.org (E6V6Q8.cpe.mvllo.al.charter.com
	[24.196.29.251])
	by mxsf18.cluster1.charter.net (8.12.11/8.12.11) with ESMTP id
	i37Ej4FK075240; Wed, 7 Apr 2004 10:45:13 -0400 (EDT)
Received: from arch20m.dellroad.org (arch20m.dellroad.org [10.2.2.20])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id JAA41401;
	Wed, 7 Apr 2004 09:26:40 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.6) with ESMTP id i37EQdD2077631; 
	Wed, 7 Apr 2004 09:26:40 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i37EQY4N077630;
	Wed, 7 Apr 2004 09:26:34 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404071426.i37EQY4N077630@arch20m.dellroad.org>
In-Reply-To: <200404070600.i3760YmT005287@piglet.dstc.edu.au>
To: Stephen Crawley <crawley@dstc.edu.au>
Date: Wed, 7 Apr 2004 09:26:34 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: mauve-discuss@sources.redhat.com, commit-classpath@gnu.org
Subject: Re: Mauve patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 07 Apr 2004 14:56:09 -0000

Stephen Crawley wrote:
> > Or make a new "unportable" section of Mauve, since some things 
> > seemingly can't be tested.

That's a reasonable idea.. i.e., a "don't panic if these tests fail"
section.

> I think it would be better for each JVM projects to manage its own
> non-portable testcases.   In Kissme for example, there is a small

Would these be kept in the Mauve source or the JVM source? If the
latter, it would be nice for us to define a standard way to tell
Mauve, "oh yeah, also run these JVM-specific tests and by the way
they're in this other directory..." or whatever.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Wed Apr 07 11:11:56 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBEiZ-00066r-Tv
	for mharc-commit-classpath@gnu.org; Wed, 07 Apr 2004 11:11:55 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBEiO-00063A-Bz
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 11:11:44 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBEhr-0005sC-4G
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 11:11:42 -0400
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 1BBEhq-0005rj-O9
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 11:11:10 -0400
Received: from [212.227.126.183] (helo=moutng.kundenserver.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BBEV4-0001OS-Hl
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 10:57:58 -0400
Received: from [212.227.126.155] (helo=mrelayng.kundenserver.de)
	by moutng.kundenserver.de with esmtp (Exim 3.35 #1)
	id 1BBEV3-0002pQ-00
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 16:57:57 +0200
Received: from [212.126.196.45] (helo=aicas.com)
	by mrelayng.kundenserver.de with asmtp (TLSv1:RC4-MD5:128)
	(Exim 3.35 #1) id 1BBEV2-0004XQ-00
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 16:57:56 +0200
Message-ID: <407416F3.1010704@aicas.com>
Date: Wed, 07 Apr 2004 16:57:55 +0200
From: =?ISO-8859-1?Q?Ingo_Pr=F6tel?= <proetel@aicas.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.6) Gecko/20040113
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath@gnu.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
X-Provags-ID: kundenserver.de abuse@kundenserver.de
	auth:ebd3e0372cc3ac236a2e2611be1a8528
Subject: FYI: commited patches
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 07 Apr 2004 15:11:50 -0000

Hi,
I commited the following patches:
2004-04-07  Ingo Proetel  <proetel@aicas.com>

	* java/awt/image/SampleModel.java (<init>): Added error cause information to
	thrown exception.

2004-04-07  Ingo Proetel  <proetel@aicas.com>

	* java/awt/image/SinglePixelPackedSampleModel.java (getDataElements): New method.
	(setDataElements): New method.
	(setPixels): New method.
	(toString): New method.

2004-04-07  Ingo Proetel  <proetel@aicas.com>

	* java/awt/Polygon.java (getBoundingBox): Use correct y-coordinate
	in Rectangle constructor.

2004-04-07  Ingo Proetel  <proetel@aicas.com>

	* java/awt/image/Raster.java (toString): Added method.

ingo

-- 
Ingo Prötel                                          proetel@aicas.com
aicas GmbH                                        http://www.aicas.com
Haid-und-Neu-Str. 18                        phone   +49 721 663 968-32
76131 Karlsruhe                             fax     +49 721 663 968-93
Germany



From MAILER-DAEMON Wed Apr 07 16:30:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBJgQ-0006bF-91
	for mharc-commit-classpath@gnu.org; Wed, 07 Apr 2004 16:30:02 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBJeo-0005La-08
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 16:28:22 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBJe5-0004eF-5X
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 16:27:40 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBJcN-0003jG-UR
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 16:25:52 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BBJc6-0003sd-00; Wed, 07 Apr 2004 22:25:34 +0200
From: Mark Wielaard <mark@klomp.org>
To: tromey@redhat.com
In-Reply-To: <87ekr28gnj.fsf@fleche.redhat.com>
References: <1080236148.18716.161.camel@elsschot.wildebeest.org>
	<87wu58qpmw.fsf@fleche.redhat.com>
	<1080295746.18716.463.camel@elsschot.wildebeest.org>
	<200403261128.55981.konqueror@gmx.de>
	<1080301292.18716.480.camel@elsschot.wildebeest.org>
	<871xn8h9mt.fsf@fleche.redhat.com>
	<1081118952.7548.253.camel@elsschot.wildebeest.org>
	<87ekr28gnj.fsf@fleche.redhat.com>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-rzmnYpLi6O6/QlblmjlB"
Message-Id: <1081369536.13170.38.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Wed, 07 Apr 2004 22:25:37 +0200
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 07 Apr 2004 20:30:00 -0000


--=-rzmnYpLi6O6/QlblmjlB
Content-Type: multipart/mixed; boundary="=-JtK/CHccOA+4Vd8FgOip"


--=-JtK/CHccOA+4Vd8FgOip
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Mon, 2004-04-05 at 19:43, Tom Tromey wrote:
> >>>>> "Mark" =3D=3D Mark Wielaard <mark@klomp.org> writes:
>=20
> Mark> The attached patch does that and enables -Wall for GNU Classpath.
>=20
> Nice.  I skimmed it and it generally looks fine to me.
>=20
> Mark> It fixes all issues found when compiling with -std=3Dc89. Lots in t=
he gtk
> Mark> peers I am afraid. So please yell and scream if this is to intrusiv=
e. It
> Mark> would be good if the gtk-peer stuff in libgcj was also compiled wit=
h
> Mark> this flag.
>=20
> I think it is a requirement, not just nice to have.  Otherwise we're
> going to end up reintroducing code that isn't C89.
>=20
> Here's an untested patch for the GUI branch.
>=20
> from  Tom Tromey  <tromey@redhat.com>
>=20
> 	* Makefile.am (WARNINGS): Added -std=3Dc89.

Thanks for that.

Here is the gtk+ peer part of my patch.
I'll commit this to classpath now.
Could someone commit it to libgcj mainline and/or gui?
(I only have a 3.4 branch checkout on my development machine at the
moment.)

I want to test the other part of my patch first more carefully before
committing to classpath and enabling -std=3Dc89

2004-04-07  Mark Wielaard  <mark@klomp.org>
                                                                           =
    =20
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c:
        Changed C++ comments into C comments. Removed commented out code.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:
        Likewise.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c:
        Likewise.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c:
        Likewise.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c:
        Likewise.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c:
        Likewise.
        * native/jni/gtk-peer/gthread-jni.c:
        Likewise.

Cheers,

Mark

--=-JtK/CHccOA+4Vd8FgOip
Content-Disposition: inline; filename=gtk-peer-cleanup.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=gtk-peer-cleanup.patch; charset=ISO-8859-1

SW5kZXg6IG5hdGl2ZS9qbmkvZ3RrLXBlZXIvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a0NoZWNr
Ym94UGVlci5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNz
cGF0aC9uYXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtDaGVja2Jv
eFBlZXIuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTANCmRpZmYgLXUgLXIxLjEwIGdudV9q
YXZhX2F3dF9wZWVyX2d0a19HdGtDaGVja2JveFBlZXIuYw0KLS0tIG5hdGl2ZS9qbmkvZ3RrLXBl
ZXIvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a0NoZWNrYm94UGVlci5jCTI5IE1hciAyMDA0IDA3
OjA3OjI2IC0wMDAwCTEuMTANCisrKyBuYXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZhX2F3dF9w
ZWVyX2d0a19HdGtDaGVja2JveFBlZXIuYwk3IEFwciAyMDA0IDIwOjIxOjU1IC0wMDAwDQpAQCAt
MSw1ICsxLDUgQEANCiAvKiBndGtjaGVja2JveHBlZXIuYyAtLSBOYXRpdmUgaW1wbGVtZW50YXRp
b24gb2YgR3RrQ2hlY2tib3hQZWVyDQotICAgQ29weXJpZ2h0IChDKSAxOTk4LCAxOTk5LCAyMDAy
LCAyMDAzIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykg
MTk5OCwgMTk5OSwgMjAwMiwgMjAwMywgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIElu
Yy4NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTIzMCw3
ICsyMzAsNiBAQA0KIHN0YXRpYyB2b2lkDQogaXRlbV90b2dnbGVkIChHdGtUb2dnbGVCdXR0b24g
Kml0ZW0sIGpvYmplY3QgcGVlcikNCiB7DQotICAvL2dfcHJpbnQgKCJ0b2dnbGVkXG4iKTsNCiAg
ICgqZ2RrX2VudiktPkNhbGxWb2lkTWV0aG9kIChnZGtfZW52LCBwZWVyLA0KIAkJCSAgICAgIHBv
c3RJdGVtRXZlbnRJRCwNCiAJCQkgICAgICBwZWVyLA0KSW5kZXg6IG5hdGl2ZS9qbmkvZ3RrLXBl
ZXIvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a0NvbXBvbmVudFBlZXIuYw0KPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K
UkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvbmF0aXZlL2puaS9ndGstcGVl
ci9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrQ29tcG9uZW50UGVlci5jLHYNCnJldHJpZXZpbmcg
cmV2aXNpb24gMS4yMw0KZGlmZiAtdSAtcjEuMjMgZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a0Nv
bXBvbmVudFBlZXIuYw0KLS0tIG5hdGl2ZS9qbmkvZ3RrLXBlZXIvZ251X2phdmFfYXd0X3BlZXJf
Z3RrX0d0a0NvbXBvbmVudFBlZXIuYwkyOSBNYXIgMjAwNCAwNzowNzoyNiAtMDAwMAkxLjIzDQor
KysgbmF0aXZlL2puaS9ndGstcGVlci9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrQ29tcG9uZW50
UGVlci5jCTcgQXByIDIwMDQgMjA6MjE6NTUgLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0KIC8qIGd0
a2NvbXBvbmVudHBlZXIuYyAtLSBOYXRpdmUgaW1wbGVtZW50YXRpb24gb2YgR3RrQ29tcG9uZW50
UGVlcg0KLSAgIENvcHlyaWdodCAoQykgMTk5OCwgMTk5OSwgMjAwMiBGcmVlIFNvZnR3YXJlIEZv
dW5kYXRpb24sIEluYy4NCisgICBDb3B5cmlnaHQgKEMpIDE5OTgsIDE5OTksIDIwMDIsIDIwMDQg
RnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2Yg
R05VIENsYXNzcGF0aC4NCiANCkBAIC02MTAsMTAgKzYxMCwxMiBAQA0KIGdib29sZWFuDQogZmls
dGVyX2V4cG9zZV9ldmVudF9oYW5kbGVyIChHdGtXaWRnZXQgKndpZGdldCwgR2RrRXZlbnQgKmV2
ZW50LCBqb2JqZWN0IHBlZXIpDQogew0KLSAgLy8gUHJldmVudCB0aGUgZGVmYXVsdCBldmVudCBo
YW5kbGVyIGZyb20gZ2V0dGluZyB0aGlzIHNpZ25hbCBpZiBhcHBsaWNhYmxlDQotICAvLyBGSVhN
RTogSSBjYW1lIHVwIHdpdGggdGhlc2UgZmlsdGVycyBieSBsb29raW5nIGZvciBwYXR0ZXJucyBp
biB0aGUgdW53YW50ZWQNCi0gIC8vICAgICAgICBleHBvc2UgZXZlbnRzIHRoYXQgYXJlIGZlZCBi
YWNrIHRvIHVzIGZyb20gZ3RrL1guIFBlcmhhcHMgdGhlcmUgaXMNCi0gIC8vICAgICAgICBhIHdh
eSB0byBwcmV2ZW50IHRoZW0gZnJvbSBvY2N1cmluZyBpbiB0aGUgZmlyc3QgcGxhY2UuDQorICAv
Kg0KKyAgICogUHJldmVudCB0aGUgZGVmYXVsdCBldmVudCBoYW5kbGVyIGZyb20gZ2V0dGluZyB0
aGlzIHNpZ25hbCBpZiBhcHBsaWNhYmxlDQorICAgKiBGSVhNRTogSSBjYW1lIHVwIHdpdGggdGhl
c2UgZmlsdGVycyBieSBsb29raW5nIGZvciBwYXR0ZXJucyBpbiB0aGUgdW53YW50ZWQNCisgICAq
ICAgICAgICBleHBvc2UgZXZlbnRzIHRoYXQgYXJlIGZlZCBiYWNrIHRvIHVzIGZyb20gZ3RrL1gu
IFBlcmhhcHMgdGhlcmUgaXMNCisgICAqICAgICAgICBhIHdheSB0byBwcmV2ZW50IHRoZW0gZnJv
bSBvY2N1cmluZyBpbiB0aGUgZmlyc3QgcGxhY2UuDQorICAgKi8NCiAgIGlmIChldmVudC0+dHlw
ZSA9PSBHREtfRVhQT1NFICYmICghR1RLX0lTX0xBWU9VVCh3aWRnZXQpDQogICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgfHwgZXZlbnQtPmFueS53aW5kb3cgIT0gd2lkZ2V0LT53
aW5kb3cpKQ0KICAgICB7DQpAQCAtNjIyLDggKzYyNCw4IEBADQogICAgIH0NCiAgIGVsc2UNCiAg
ICAgew0KLSAgICAgIC8vIFRoZXJlIG1heSBiZSBub24tZXhwb3NlIGV2ZW50cyB0aGF0IGFyZSB0
cmlnZ2VyZWQgd2hpbGUgd2UncmUNCi0gICAgICAvLyBwYWludGluZyBhIGhlYXZ5d2VpZ2h0IHBl
ZXIuDQorICAgICAgLyogVGhlcmUgbWF5IGJlIG5vbi1leHBvc2UgZXZlbnRzIHRoYXQgYXJlIHRy
aWdnZXJlZCB3aGlsZSB3ZSdyZQ0KKyAgICAgICAgcGFpbnRpbmcgYSBoZWF2eXdlaWdodCBwZWVy
LiAqLw0KICAgICAgIHJldHVybiBwcmVfZXZlbnRfaGFuZGxlcih3aWRnZXQsIGV2ZW50LCBwZWVy
KTsNCiAgICAgfQ0KIH0NCkBAIC02NDEsOCArNjQzLDggQEANCiANCiAgIGdka190aHJlYWRzX2Vu
dGVyICgpOw0KIA0KLSAgLy8gR3RrRnJhbWVQZWVyIGlzIGJ1aWx0IGFzIGEgR3RrTGF5b3V0IGlu
c2lkZSBhIEd0a1ZCb3ggaW5zaWRlIGEgR3RrV2luZG93Lg0KLSAgLy8gRXZlbnRzIGdvIHRvIHRo
ZSBHdGtMYXlvdXQgbGF5ZXIsIHNvIHdlIGZpbHRlciB0aGVtIHRoZXJlLg0KKyAgLyogR3RrRnJh
bWVQZWVyIGlzIGJ1aWx0IGFzIGEgR3RrTGF5b3V0IGluc2lkZSBhIEd0a1ZCb3ggaW5zaWRlIGEg
R3RrV2luZG93Lg0KKyAgICAgRXZlbnRzIGdvIHRvIHRoZSBHdGtMYXlvdXQgbGF5ZXIsIHNvIHdl
IGZpbHRlciB0aGVtIHRoZXJlLiAqLw0KICAgaWYgKEdUS19JU19XSU5ET1cocHRyKSkNCiAgICAg
ew0KICAgICAgIGNoaWxkcmVuID0gZ3RrX2NvbnRhaW5lcl9nZXRfY2hpbGRyZW4oR1RLX0NPTlRB
SU5FUihwdHIpKTsNCkBAIC02ODUsOCArNjg3LDggQEANCiANCiAgIGdka190aHJlYWRzX2VudGVy
ICgpOw0KIA0KLSAgLy8gR3RrRnJhbWVQZWVyIGlzIGJ1aWx0IGFzIGEgR3RrTGF5b3V0IGluc2lk
ZSBhIEd0a1ZCb3ggaW5zaWRlIGEgR3RrV2luZG93Lg0KLSAgLy8gRXZlbnRzIGdvIHRvIHRoZSBH
dGtMYXlvdXQgbGF5ZXIsIHNvIHdlIGZpbHRlciB0aGVtIHRoZXJlLg0KKyAgLyogR3RrRnJhbWVQ
ZWVyIGlzIGJ1aWx0IGFzIGEgR3RrTGF5b3V0IGluc2lkZSBhIEd0a1ZCb3ggaW5zaWRlIGEgR3Rr
V2luZG93Lg0KKyAgICAgRXZlbnRzIGdvIHRvIHRoZSBHdGtMYXlvdXQgbGF5ZXIsIHNvIHdlIGZp
bHRlciB0aGVtIHRoZXJlLiAqLw0KICAgaWYgKEdUS19JU19XSU5ET1cocHRyKSkNCiAgICAgew0K
ICAgICAgIGNoaWxkcmVuID0gZ3RrX2NvbnRhaW5lcl9nZXRfY2hpbGRyZW4oR1RLX0NPTlRBSU5F
UihwdHIpKTsNCkluZGV4OiBuYXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZhX2F3dF9wZWVyX2d0
a19HdGtFdmVudHMuYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9j
bGFzc3BhdGgvbmF0aXZlL2puaS9ndGstcGVlci9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrRXZl
bnRzLmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjI0DQpkaWZmIC11IC1yMS4yNCBnbnVfamF2
YV9hd3RfcGVlcl9ndGtfR3RrRXZlbnRzLmMNCi0tLSBuYXRpdmUvam5pL2d0ay1wZWVyL2dudV9q
YXZhX2F3dF9wZWVyX2d0a19HdGtFdmVudHMuYwkyOSBNYXIgMjAwNCAwNzowNzoyNiAtMDAwMAkx
LjI0DQorKysgbmF0aXZlL2puaS9ndGstcGVlci9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrRXZl
bnRzLmMJNyBBcHIgMjAwNCAyMDoyMTo1NSAtMDAwMA0KQEAgLTEsNSArMSw1IEBADQogLyogZ3Rr
ZXZlbnRzLmMgLS0gR0RLL0dUSyBldmVudCBoYW5kbGVycw0KLSAgIENvcHlyaWdodCAoQykgMTk5
OCwgMTk5OSwgMjAwMiBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCisgICBDb3B5cmln
aHQgKEMpIDE5OTgsIDE5OTksIDIwMDIsIDIwMDQgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJ
bmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIENsYXNzcGF0aC4NCiANCkBAIC05MzQs
OSArOTM0LDkgQEANCiAJCQkJICAgIGNsaWNrX2NvdW50LA0KIAkJCQkgICAgSk5JX0ZBTFNFKTsN
CiANCi0JLy8gR2VuZXJhdGUgYW4gQVdUIGNsaWNrIGV2ZW50IG9ubHkgaWYgdGhlIHJlbGVhc2Ug
b2NjdXJlZCBpbiB0aGUNCi0JLy8gd2luZG93IGl0IHdhcyBwcmVzc2VkIGluLCBhbmQgdGhlIG1v
dXNlIGhhcyBub3QgYmVlbiBkcmFnZ2VkIHNpbmNlDQotCS8vIHRoZSBsYXN0IHRpbWUgaXQgd2Fz
IHByZXNzZWQuDQorCS8qIEdlbmVyYXRlIGFuIEFXVCBjbGljayBldmVudCBvbmx5IGlmIHRoZSBy
ZWxlYXNlIG9jY3VyZWQgaW4gdGhlDQorCSAgIHdpbmRvdyBpdCB3YXMgcHJlc3NlZCBpbiwgYW5k
IHRoZSBtb3VzZSBoYXMgbm90IGJlZW4gZHJhZ2dlZCBzaW5jZQ0KKwkgICB0aGUgbGFzdCB0aW1l
IGl0IHdhcyBwcmVzc2VkLiAqLw0KIAlnZGtfd2luZG93X2dldF9zaXplIChldmVudC0+YW55Lndp
bmRvdywgJndpZHRoLCAmaGVpZ2h0KTsNCiAJaWYgKCEgaGFzQmVlbkRyYWdnZWQNCiAJICAgICYm
IGV2ZW50LT5idXR0b24ueCA+PSAwDQpAQCAtMTAzOCwxMSArMTAzOCwxMSBAQA0KICAgICAgIGJy
ZWFrOw0KICAgICBjYXNlIEdES19FWFBPU0U6DQogICAgICAgew0KLSAgICAgICAgLy8gVGhpcyBm
aWx0ZXJzIG91dCB1bndhbnRlZCBmZWVkYmFjayBleHBvc2UgZXZlbnRzIGZyb20gZ3RrL1gNCi0g
ICAgICAgIC8vIHdoZW4gd2UgZXhwbGljdGx5IGludmFsaWRhdGUgYW5kIHVwZGF0ZSBoZWF2eXdl
aWdodCBjb21wb25lbnRzLA0KLSAgICAgICAgLy8gdGh1cyBhdm9pZGluZyBhbiBpbmZpbml0ZSBs
b29wLg0KLSAgICAgICAgLy8gRklYTUU6IEknbSBub3QgcXVpdGUgc3VyZSB3aHkgd2UncmUgZ2V0
dGluZyB0aGVzZSBleHBvc2UgZXZlbnRzLiANCi0gICAgICAgIC8vICAgICAgICBNYXliZSB0aGVy
ZSBpcyBhIHdheSB0byBhdm9pZCB0aGVtPw0KKyAgICAgICAgLyogVGhpcyBmaWx0ZXJzIG91dCB1
bndhbnRlZCBmZWVkYmFjayBleHBvc2UgZXZlbnRzIGZyb20gZ3RrL1gNCisgICAgICAgICAgIHdo
ZW4gd2UgZXhwbGljdGx5IGludmFsaWRhdGUgYW5kIHVwZGF0ZSBoZWF2eXdlaWdodCBjb21wb25l
bnRzLA0KKyAgICAgICAgICAgdGh1cyBhdm9pZGluZyBhbiBpbmZpbml0ZSBsb29wLg0KKyAgICAg
ICAgICAgRklYTUU6IEknbSBub3QgcXVpdGUgc3VyZSB3aHkgd2UncmUgZ2V0dGluZyB0aGVzZSBl
eHBvc2UgZXZlbnRzLiANCisgICAgICAgICAgICAgICAgICBNYXliZSB0aGVyZSBpcyBhIHdheSB0
byBhdm9pZCB0aGVtPyAqLw0KICAgICAgICAgaWYoKGV2ZW50LT5hbnkud2luZG93ID09IHdpZGdl
dC0+d2luZG93ICYmIGV2ZW50LT5hbnkuc2VuZF9ldmVudCkNCiAgICAgICAgICAgIHx8IEdUS19J
U19MQVlPVVQod2lkZ2V0KSkNCiAgICAgICAgICAgew0KQEAgLTExODEsNyArMTE4MSw2IEBADQog
CQkJIHwgR0RLX0tFWV9QUkVTU19NQVNLDQogCQkJIHwgR0RLX0ZPQ1VTX0NIQU5HRV9NQVNLKTsN
CiANCi0gIC8vICBnX3ByaW50KCJzdG9yaW5nIG9iaiAlcCBwcm9wZXJ0eSBvbiB3aW5kb3cgJXBc
biIsIG9iaiwgd2luZG93KTsNCiAgIGdka19wcm9wZXJ0eV9jaGFuZ2UgKHdpbmRvdywNCiAJCSAg
ICAgICBhZGRyX2F0b20sDQogCQkgICAgICAgdHlwZV9hdG9tLA0KQEAgLTExOTYsMTAgKzExOTUs
OCBAQA0KIHsNCiAgIHZhX2xpc3QgYXA7DQogICBqb2JqZWN0ICpvYmo7DQotICAvL3ZvaWQgKnB0
ciA9IE5TQV9HRVRfUFRSIChlbnYsIHBlZXJfb2JqKTsNCiANCiAgIG9iaiA9IE5TQV9HRVRfR0xP
QkFMX1JFRiAoZW52LCBwZWVyX29iaik7DQotICAvL2dfcHJpbnQoIkNvbm5lY3Rpb24gb2JqICVz
XG4iLCBndGtfd2lkZ2V0X2dldF9uYW1lIChHVEtfV0lER0VUIChwdHIpKSk7DQogICBnX2Fzc2Vy
dCAob2JqKTsNCiANCiAgIHZhX3N0YXJ0IChhcCwgbndpbmRvd3MpOw0KSW5kZXg6IG5hdGl2ZS9q
bmkvZ3RrLXBlZXIvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a0ZpbGVEaWFsb2dQZWVyLmMNCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL25hdGl2ZS9q
bmkvZ3RrLXBlZXIvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a0ZpbGVEaWFsb2dQZWVyLmMsdg0K
cmV0cmlldmluZyByZXZpc2lvbiAxLjkNCmRpZmYgLXUgLXIxLjkgZ251X2phdmFfYXd0X3BlZXJf
Z3RrX0d0a0ZpbGVEaWFsb2dQZWVyLmMNCi0tLSBuYXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZh
X2F3dF9wZWVyX2d0a19HdGtGaWxlRGlhbG9nUGVlci5jCTI5IE1hciAyMDA0IDA3OjA3OjI3IC0w
MDAwCTEuOQ0KKysrIG5hdGl2ZS9qbmkvZ3RrLXBlZXIvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0
a0ZpbGVEaWFsb2dQZWVyLmMJNyBBcHIgMjAwNCAyMDoyMTo1NSAtMDAwMA0KQEAgLTEsNSArMSw1
IEBADQogLyogZ3RrZmlsZWRpYWxvZ3BlZXIuYyAtLSBOYXRpdmUgaW1wbGVtZW50YXRpb24gb2Yg
R3RrRmlsZURpYWxvZ1BlZXINCi0gICBDb3B5cmlnaHQgKEMpIDE5OTgsIDE5OTksIDIwMDIgRnJl
ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQorICAgQ29weXJpZ2h0IChDKSAxOTk4LCAxOTk5
LCAyMDAyLCAyMDA0IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KIA0KIFRoaXMgZmls
ZSBpcyBwYXJ0IG9mIEdOVSBDbGFzc3BhdGguDQogDQpAQCAtMTU2LDcgKzE1Niw3IEBADQogICBz
dGF0aWMgam1ldGhvZElEIGRpc3Bvc2VJRDsNCiAgIHZvaWQgKnB0cjsNCiANCi0gIC8vIFdlIG9u
bHkgbmVlZCB0aGlzIGZvciB0aGUgY2FzZSB3aGVuIHRoZSB1c2VyIGNsb3NlZCB0aGUgd2luZG93
DQorICAvKiBXZSBvbmx5IG5lZWQgdGhpcyBmb3IgdGhlIGNhc2Ugd2hlbiB0aGUgdXNlciBjbG9z
ZWQgdGhlIHdpbmRvdy4gKi8NCiAgIGlmIChyZXNwb25zZUlkICE9IEdUS19SRVNQT05TRV9ERUxF
VEVfRVZFTlQpDQogICAgIHJldHVybjsNCiANCkluZGV4OiBuYXRpdmUvam5pL2d0ay1wZWVyL2du
dV9qYXZhX2F3dF9wZWVyX2d0a19HdGtMaXN0UGVlci5jDQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTog
L2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9uYXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZh
X2F3dF9wZWVyX2d0a19HdGtMaXN0UGVlci5jLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMA0K
ZGlmZiAtdSAtcjEuMTAgZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a0xpc3RQZWVyLmMNCi0tLSBu
YXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtMaXN0UGVlci5jCTI5
IE1hciAyMDA0IDA3OjA3OjI3IC0wMDAwCTEuMTANCisrKyBuYXRpdmUvam5pL2d0ay1wZWVyL2du
dV9qYXZhX2F3dF9wZWVyX2d0a19HdGtMaXN0UGVlci5jCTcgQXByIDIwMDQgMjA6MjE6NTUgLTAw
MDANCkBAIC0xLDUgKzEsNSBAQA0KIC8qIGd0a2xpc3RwZWVyLmMgLS0gTmF0aXZlIGltcGxlbWVu
dGF0aW9uIG9mIEd0a0xpc3RQZWVyDQotICAgQ29weXJpZ2h0IChDKSAxOTk4LCAxOTk5IEZyZWUg
U29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykgMTk5OCwgMTk5OSwg
MjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFy
dCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTMyNCw3ICszMjQsNiBAQA0KIAkgICAgIEdka0V2
ZW50QnV0dG9uICpldmVudCBfX2F0dHJpYnV0ZV9fKCh1bnVzZWQpKSwgDQogCSAgICAgam9iamVj
dCBwZWVyX29iaikNCiB7DQotICAvL2dfcHJpbnQgKCJzZWxlY3Rfcm93XG4iKTsNCiAgICgqZ2Rr
X2VudiktPkNhbGxWb2lkTWV0aG9kIChnZGtfZW52LCBwZWVyX29iaiwNCiAJCQkgICAgICBwb3N0
TGlzdEl0ZW1FdmVudElELA0KIAkJCSAgICAgIHJvdywNCkBAIC0zMzgsNyArMzM3LDYgQEANCiAJ
ICAgICAgIEdka0V2ZW50QnV0dG9uICpldmVudCBfX2F0dHJpYnV0ZV9fKCh1bnVzZWQpKSwNCiAJ
ICAgICAgIGpvYmplY3QgcGVlcl9vYmopDQogew0KLSAgLy9nX3ByaW50ICgidW5zZWxlY3Rfcm93
XG4iKTsNCiAgICgqZ2RrX2VudiktPkNhbGxWb2lkTWV0aG9kIChnZGtfZW52LCBwZWVyX29iaiwN
CiAJCQkgICAgICBwb3N0TGlzdEl0ZW1FdmVudElELA0KIAkJCSAgICAgIHJvdywNCkluZGV4OiBu
YXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtUZXh0Q29tcG9uZW50
UGVlci5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0
aC9uYXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtUZXh0Q29tcG9u
ZW50UGVlci5jLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMw0KZGlmZiAtdSAtcjEuMTMgZ251
X2phdmFfYXd0X3BlZXJfZ3RrX0d0a1RleHRDb21wb25lbnRQZWVyLmMNCi0tLSBuYXRpdmUvam5p
L2d0ay1wZWVyL2dudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtUZXh0Q29tcG9uZW50UGVlci5jCTI5
IE1hciAyMDA0IDA3OjA3OjI3IC0wMDAwCTEuMTMNCisrKyBuYXRpdmUvam5pL2d0ay1wZWVyL2du
dV9qYXZhX2F3dF9wZWVyX2d0a19HdGtUZXh0Q29tcG9uZW50UGVlci5jCTcgQXByIDIwMDQgMjA6
MjE6NTUgLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0KIC8qIGd0a3RleHRjb21wb25lbnRwZWVyLmMg
LS0gTmF0aXZlIGltcGxlbWVudGF0aW9uIG9mIEd0a1RleHRDb21wb25lbnRQZWVyDQotICAgQ29w
eXJpZ2h0IChDKSAxOTk4LCAxOTk5IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAg
IENvcHlyaWdodCAoQykgMTk5OCwgMTk5OSwgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24s
IEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTEx
Miw4ICsxMTIsOCBAQA0KIHsNCiAgIHZvaWQgKnB0cjsNCiAgIGludCBwb3MgPSAwOw0KLSAgR3Rr
RWRpdGFibGUgKmVkaXRhYmxlOyAgICAvLyB0eXBlIG9mIEd0a0VudHJ5ICAgIChUZXh0RmllbGQp
DQotICBHdGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8vIHR5cGUgb2YgR3RrVGV4dFZpZXcgKFRl
eHRBcmVhKQ0KKyAgR3RrRWRpdGFibGUgKmVkaXRhYmxlOyAgICAvKiB0eXBlIG9mIEd0a0VudHJ5
ICAgIChUZXh0RmllbGQpICovDQorICBHdGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8qIHR5cGUg
b2YgR3RrVGV4dFZpZXcgKFRleHRBcmVhKSAqLw0KICAgR3RrVGV4dEJ1ZmZlciAqYnVmOw0KICAg
R3RrVGV4dE1hcmsgKm1hcms7DQogICBHdGtUZXh0SXRlciBpdGVyOw0KQEAgLTE1Nyw4ICsxNTcs
OCBAQA0KICAgKEpOSUVudiAqZW52LCBqb2JqZWN0IG9iaiwgamludCBwb3MpDQogew0KICAgdm9p
ZCAqcHRyOw0KLSAgR3RrRWRpdGFibGUgKmVkaXRhYmxlOyAgICAvLyB0eXBlIG9mIEd0a0VudHJ5
ICAgIChUZXh0RmllbGQpDQotICBHdGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8vIHR5cGUgb2Yg
R3RrVGV4dFZpZXcgKFRleHRBcmVhKQ0KKyAgR3RrRWRpdGFibGUgKmVkaXRhYmxlOyAgICAvKiB0
eXBlIG9mIEd0a0VudHJ5ICAgIChUZXh0RmllbGQpICovDQorICBHdGtXaWRnZXQgKnRleHQgPSBO
VUxMOyAgIC8qIHR5cGUgb2YgR3RrVGV4dFZpZXcgKFRleHRBcmVhKSAqLw0KICAgR3RrVGV4dEJ1
ZmZlciAqYnVmOw0KICAgR3RrVGV4dEl0ZXIgaXRlcjsNCiANCkBAIC0xOTgsOCArMTk4LDggQEAN
CiB7DQogICB2b2lkICpwdHI7DQogICBpbnQgcG9zID0gMDsNCi0gIEd0a0VkaXRhYmxlICplZGl0
YWJsZTsgICAgLy8gdHlwZSBvZiBHdGtFbnRyeSAgICAoVGV4dEZpZWxkKQ0KLSAgR3RrV2lkZ2V0
ICp0ZXh0ID0gTlVMTDsgICAvLyB0eXBlIG9mIEd0a1RleHRWaWV3IChUZXh0QXJlYSkNCisgIEd0
a0VkaXRhYmxlICplZGl0YWJsZTsgICAgLyogdHlwZSBvZiBHdGtFbnRyeSAgICAoVGV4dEZpZWxk
KSAqLw0KKyAgR3RrV2lkZ2V0ICp0ZXh0ID0gTlVMTDsgICAvKiB0eXBlIG9mIEd0a1RleHRWaWV3
IChUZXh0QXJlYSkgKi8NCiAgIEd0a1RleHRCdWZmZXIgKmJ1ZjsNCiAgIEd0a1RleHRJdGVyIHN0
YXJ0Ow0KICAgR3RrVGV4dEl0ZXIgZW5kOw0KQEAgLTI1NSw4ICsyNTUsOCBAQA0KIHsNCiAgIHZv
aWQgKnB0cjsNCiAgIGludCBwb3MgPSAwOw0KLSAgR3RrRWRpdGFibGUgKmVkaXRhYmxlOyAgICAv
LyB0eXBlIG9mIEd0a0VudHJ5ICAgIChUZXh0RmllbGQpDQotICBHdGtXaWRnZXQgKnRleHQgPSBO
VUxMOyAgIC8vIHR5cGUgb2YgR3RrVGV4dFZpZXcgKFRleHRBcmVhKQ0KKyAgR3RrRWRpdGFibGUg
KmVkaXRhYmxlOyAgICAvKiB0eXBlIG9mIEd0a0VudHJ5ICAgIChUZXh0RmllbGQpICovDQorICBH
dGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8qIHR5cGUgb2YgR3RrVGV4dFZpZXcgKFRleHRBcmVh
KSAqLw0KICAgR3RrVGV4dEJ1ZmZlciAqYnVmOw0KICAgR3RrVGV4dEl0ZXIgc3RhcnQ7DQogICBH
dGtUZXh0SXRlciBlbmQ7DQpAQCAtMzExLDggKzMxMSw4IEBADQogICAoSk5JRW52ICplbnYsIGpv
YmplY3Qgb2JqLCBqaW50IHN0YXJ0LCBqaW50IGVuZCkNCiB7DQogICB2b2lkICpwdHI7DQotICBH
dGtFZGl0YWJsZSAqZWRpdGFibGU7ICAgIC8vIHR5cGUgb2YgR3RrRW50cnkgICAgKFRleHRGaWVs
ZCkNCi0gIEd0a1dpZGdldCAqdGV4dCA9IE5VTEw7ICAgLy8gdHlwZSBvZiBHdGtUZXh0VmlldyAo
VGV4dEFyZWEpDQorICBHdGtFZGl0YWJsZSAqZWRpdGFibGU7ICAgIC8qIHR5cGUgb2YgR3RrRW50
cnkgICAgKFRleHRGaWVsZCkgKi8NCisgIEd0a1dpZGdldCAqdGV4dCA9IE5VTEw7ICAgLyogdHlw
ZSBvZiBHdGtUZXh0VmlldyAoVGV4dEFyZWEpICovDQogICBHdGtUZXh0QnVmZmVyICpidWY7DQog
ICBHdGtUZXh0SXRlciBpdGVyOw0KIA0KQEAgLTM1Nyw4ICszNTcsOCBAQA0KICAgKEpOSUVudiAq
ZW52LCBqb2JqZWN0IG9iaiwgamJvb2xlYW4gc3RhdGUpDQogew0KICAgdm9pZCAqcHRyOw0KLSAg
R3RrRWRpdGFibGUgKmVkaXRhYmxlOyAgICAvLyB0eXBlIG9mIEd0a0VudHJ5ICAgIChUZXh0Rmll
bGQpDQotICBHdGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8vIHR5cGUgb2YgR3RrVGV4dFZpZXcg
KFRleHRBcmVhKQ0KKyAgR3RrRWRpdGFibGUgKmVkaXRhYmxlOyAgICAvKiB0eXBlIG9mIEd0a0Vu
dHJ5ICAgIChUZXh0RmllbGQpICovDQorICBHdGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8qIHR5
cGUgb2YgR3RrVGV4dFZpZXcgKFRleHRBcmVhKSAqLw0KIA0KICAgcHRyID0gTlNBX0dFVF9QVFIg
KGVudiwgb2JqKTsNCiANCkBAIC0zOTYsOCArMzk2LDggQEANCiAgIHZvaWQgKnB0cjsNCiAgIGNo
YXIgKmNvbnRlbnRzID0gTlVMTDsNCiAgIGpzdHJpbmcgamNvbnRlbnRzOw0KLSAgR3RrRWRpdGFi
bGUgKmVkaXRhYmxlOyAgICAvLyB0eXBlIG9mIEd0a0VudHJ5ICAgIChUZXh0RmllbGQpDQotICBH
dGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8vIHR5cGUgb2YgR3RrVGV4dFZpZXcgKFRleHRBcmVh
KQ0KKyAgR3RrRWRpdGFibGUgKmVkaXRhYmxlOyAgICAvKiB0eXBlIG9mIEd0a0VudHJ5ICAgIChU
ZXh0RmllbGQpICovDQorICBHdGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8qIHR5cGUgb2YgR3Rr
VGV4dFZpZXcgKFRleHRBcmVhKSAqLw0KICAgR3RrVGV4dEJ1ZmZlciAqYnVmOw0KICAgR3RrVGV4
dEl0ZXIgc3RhcnQsIGVuZDsNCiANCkBAIC00NDQsNyArNDQ0LDcgQEANCiB7DQogICB2b2lkICpw
dHI7DQogICBjb25zdCBjaGFyICpzdHI7DQotICBHdGtXaWRnZXQgKnRleHQgPSBOVUxMOyAgIC8v
IHR5cGUgb2YgR3RrVGV4dFZpZXcgKFRleHRBcmVhKQ0KKyAgR3RrV2lkZ2V0ICp0ZXh0ID0gTlVM
TDsgICAvKiB0eXBlIG9mIEd0a1RleHRWaWV3IChUZXh0QXJlYSkgKi8NCiAgIEd0a1RleHRCdWZm
ZXIgKmJ1ZjsNCiANCiAgIHB0ciA9IE5TQV9HRVRfUFRSIChlbnYsIG9iaik7DQpJbmRleDogbmF0
aXZlL2puaS9ndGstcGVlci9ndGhyZWFkLWpuaS5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2
c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9uYXRpdmUvam5pL2d0ay1wZWVyL2d0aHJlYWQtam5p
LmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjgNCmRpZmYgLXUgLXIxLjggZ3RocmVhZC1qbmku
Yw0KLS0tIG5hdGl2ZS9qbmkvZ3RrLXBlZXIvZ3RocmVhZC1qbmkuYwkyOSBNYXIgMjAwNCAwNzow
NzoyNyAtMDAwMAkxLjgNCisrKyBuYXRpdmUvam5pL2d0ay1wZWVyL2d0aHJlYWQtam5pLmMJNyBB
cHIgMjAwNCAyMDoyMTo1NSAtMDAwMA0KQEAgLTEsNSArMSw1IEBADQogLyogZ3RocmVhZC1qbmku
YyAtLSBKTkkgdGhyZWFkaW5nIHJvdXRpbmVzIGZvciBHTElCDQotICAgQ29weXJpZ2h0IChDKSAx
OTk4IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykgMTk5
OCwgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZpbGUgaXMg
cGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTIwNCw3ICsyMDQsNyBAQA0KIHN0YXRpYyBn
Ym9vbGVhbiBnX211dGV4X3RyeWxvY2tfam5pX2ltcGwNCiAgIChHTXV0ZXggKm11dGV4IF9fYXR0
cmlidXRlX18oKHVudXNlZCkpKQ0KIHsNCi0gIC8vIFNoYWxsIHdlIGltcGxlbWVudCB0aGlzIGlu
IGEgSmlrZXNSVk0tc3BlY2lmaWMgd2F5IHVuZGVyIGEgZmxhZz8NCisgIC8qIFhYWCBTaGFsbCB3
ZSBpbXBsZW1lbnQgdGhpcyBpbiBhIFZNLXNwZWNpZmljIHdheSB1bmRlciBhIGZsYWc/ICovDQog
ICByZXR1cm4gRkFMU0U7DQogfQ0KIA0K

--=-JtK/CHccOA+4Vd8FgOip--

--=-rzmnYpLi6O6/QlblmjlB
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)

iD8DBQBAdGPAxVhZCJWr9QwRAgI3AJ4jGrayBQSsM1mSHM7VIHuQFXL5ygCfcLfS
QUUoB9agwF1cciXXPMUtvIc=
=HkvH
-----END PGP SIGNATURE-----

--=-rzmnYpLi6O6/QlblmjlB--




From MAILER-DAEMON Wed Apr 07 17:02:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBKC9-0002c8-Bf
	for mharc-commit-classpath@gnu.org; Wed, 07 Apr 2004 17:02:49 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBKC5-0002a8-TR
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 17:02:45 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBKBR-00026T-MI
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 17:02:36 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBK9F-000181-J3
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 16:59:49 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id BA35160C1B
	for <commit-classpath@gnu.org>; Wed,  7 Apr 2004 20:59:45 +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 94136-01 for <commit-classpath@gnu.org>;
	Wed,  7 Apr 2004 20:59:45 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-77-247.adsl.solnet.ch
	[212.41.77.247])
	by mail01.solnet.ch (Postfix) with ESMTP id 46B3462264
	for <commit-classpath@gnu.org>; Wed,  7 Apr 2004 20:59:39 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id 17B64A643E; Wed,  7 Apr 2004 22:57:51 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040407205751.17B64A643E@reali.dnsalias.net>
Date: Wed,  7 Apr 2004 22:57:51 +0200 (CEST)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: doc/www.gnu.org/events/fosdem04.wml
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 07 Apr 2004 21:02:47 -0000

2004-04-07  Patrik Reali  <reali@acm.org>

	* doc/www.gnu.org/events/fosdem04.wml: link to group picture added


Index: doc/www.gnu.org/events/fosdem04.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/events/fosdem04.wml,v
retrieving revision 1.2
diff -u -r1.2 fosdem04.wml
--- doc/www.gnu.org/events/fosdem04.wml	15 Mar 2004 21:54:14 -0000	1.2
+++ doc/www.gnu.org/events/fosdem04.wml	7 Apr 2004 20:55:58 -0000
@@ -88,6 +88,7 @@
 Additional Resources:
 <ul>
 <li><createlink name="GNU Classpath's Flyer" url="http://www.klomp.org/mark/classpath/fosdem/"> (Kudos to Mark Wielaard)
+<li><createlink name="Group Picture" url="http://adorphuye.com/gallery/FOSDEM2004/IMGP0234"> (thanks to Stephane Meslin-Weber)
 </ul>
 
 Official links:



From MAILER-DAEMON Thu Apr 08 00:08:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBQpc-0000xm-Ry
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 00:08:00 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBQpZ-0000tz-QT
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 00:07:57 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBQm2-0007rf-Ln
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 00:05:03 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBQm2-0007rW-5F
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 00:04:18 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 9FFF762213
	for <commit-classpath@gnu.org>; Thu,  8 Apr 2004 04:04: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 04573-05 for <commit-classpath@gnu.org>;
	Thu,  8 Apr 2004 04:04:17 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-80-190.adsl.solnet.ch
	[212.41.80.190])
	by mail01.solnet.ch (Postfix) with ESMTP id 89E9D6221F
	for <commit-classpath@gnu.org>; Thu,  8 Apr 2004 04:04:16 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id B085891E2C; Thu,  8 Apr 2004 06:02:27 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040408040227.B085891E2C@reali.dnsalias.net>
Date: Thu,  8 Apr 2004 06:02:27 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040408 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 04:07:58 -0000




From MAILER-DAEMON Thu Apr 08 10:45:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBam8-0004mZ-2v
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 10:45:04 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBalw-0004j7-Sl
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 10:44:52 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBalN-0004WO-UA
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 10:44:50 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBalN-0004WE-E9
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 10:44:17 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i38EiDpH020718;
	Thu, 8 Apr 2004 16:44:13 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBZpT-0001OP-00; Thu, 08 Apr 2004 15:44:27 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 16:43:59 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_vUWdA26KyH3ZaMQ"
Message-Id: <200404081643.59869.konqueror@gmx.de>
X-CheckCompat: OK
Cc: Mark Wielaard <mark@klomp.org>
Subject: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 14:44:59 -0000


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

Hi list,


I write the attached little patch to add another generation of 
autogen.sh to classpath cvs.

Ok to commit ?


Michael


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

	* autogen.sh: New script to generate configure and friends.


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

Index: autogen.sh
===================================================================
RCS file: autogen.sh
diff -N autogen.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ autogen.sh	8 Apr 2004 14:42:57 -0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+libtoolize --version | head -1
+echo "libtoolize: minimum version required: 1.4.2"
+autoconf --version | head -1
+echo "autoconf: minimum version required: 2.59"
+automake --version | head -1
+echo "automake: minimum version required: 1.7.0"
+
+echo "libtoolize ..."
+libtoolize --force --copy
+
+echo "aclocal ..."
+aclocal
+
+echo "autoheader ..."
+autoheader
+
+echo "automake ..."
+automake --add-missing --copy
+
+echo "autoconf ..."
+autoconf
+
+echo "Finished"

--Boundary-00=_vUWdA26KyH3ZaMQ--




From MAILER-DAEMON Thu Apr 08 11:11:12 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBbAb-0006nI-3p
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 11:10:21 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBb9t-00065o-Ab
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 11:09:37 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBb8R-0004uJ-CY
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 11:08:40 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBb5n-0002sY-GI
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 11:05:23 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i38F5HpH007489
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 17:05:18 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBa9r-0001VO-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 16:05:31 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 17:05:04 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_goWdATfwC+avejG"
Message-Id: <200404081705.04126.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.io
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 15:10:11 -0000


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

Hi list,


I just commited the attached patch to fix some javadocs and coding style 
in java.io.


Michael


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

	* java/io/ByteArrayInputStream.java,
	java/io/DataInput.java,
	java/io/DataInputStream.java,
	java/io/InputStream.java,
	java/io/InputStreamReader.java,
	java/io/ObjectStreamClass.java,
	java/io/ObjectStreamField.java,
	java/io/PushbackReader.java,
	java/io/StringWriter.java,
	java/io/Writer.java:
	Fixed javadocs and style all over.


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

Index: java/io/ByteArrayInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ByteArrayInputStream.java,v
retrieving revision 1.8
diff -u -r1.8 ByteArrayInputStream.java
--- java/io/ByteArrayInputStream.java	22 Jan 2002 22:26:59 -0000	1.8
+++ java/io/ByteArrayInputStream.java	8 Apr 2004 15:03:37 -0000
@@ -83,7 +83,7 @@
    * bytes supplied to the reader.  Please use caution in changing the 
    * contents of the buffer while this stream is open.
    *
-   * @param buf The byte array buffer this stream will read from.
+   * @param buffer The byte array buffer this stream will read from.
    */
   public ByteArrayInputStream(byte[] buffer)
   {
@@ -105,7 +105,7 @@
    * bytes supplied to the reader.  Please use caution in changing the 
    * contents of the buffer while this stream is open.
    *
-   * @param buf The byte array buffer this stream will read from.
+   * @param buffer The byte array buffer this stream will read from.
    * @param offset The index into the buffer to start reading bytes from
    * @param length The number of bytes to read from the buffer
    */
@@ -146,12 +146,12 @@
    * position 0 in the stream.  This is in constrast to some other
    * stream types where there is no default mark position.
    *
-   * @param readlimit The number of bytes this stream must remember.
+   * @param readLimit The number of bytes this stream must remember.
    * This parameter is ignored.
    */
-  public synchronized void mark(int readAheadLimit)
+  public synchronized void mark(int readLimit)
   {
-    // readAheadLimit is ignored per Java Class Lib. book, p.220.
+    // readLimit is ignored per Java Class Lib. book, p.220.
     mark = pos;
   }
 
@@ -197,19 +197,19 @@
    * <p>
    * This method does not block.
    *
-   * @param buf The array into which the bytes read should be stored.
+   * @param buffer The array into which the bytes read should be stored.
    * @param offset The offset into the array to start storing bytes
-   * @param len The requested number of bytes to read
+   * @param length The requested number of bytes to read
    *
    * @return The actual number of bytes read, or -1 if end of stream.
    */
-  public synchronized int read(byte[] b, int off, int len)
+  public synchronized int read(byte[] buffer, int offset, int length)
   {
     if (pos >= count)
       return -1;
 
-    int numBytes = Math.min(count - pos, len);
-    System.arraycopy(buf, pos, b, off, numBytes);
+    int numBytes = Math.min(count - pos, length);
+    System.arraycopy(buf, pos, buffer, offset, numBytes);
     pos += numBytes;
     return numBytes;
   }
@@ -234,17 +234,17 @@
    * position the stream at the end of the buffer.  The actual number
    * of bytes skipped is returned.
    *
-   * @param num_bytes The requested number of bytes to skip
+   * @param num The requested number of bytes to skip
    *
    * @return The actual number of bytes skipped.
    */
-  public synchronized long skip(long n)
+  public synchronized long skip(long num)
   {
     // Even though the var numBytes is a long, in reality it can never
     // be larger than an int since the result of subtracting 2 positive
     // ints will always fit in an int.  Since we have to return a long
     // anyway, numBytes might as well just be a long.
-    long numBytes = Math.min((long) (count - pos), n < 0 ? 0L : n);
+    long numBytes = Math.min((long) (count - pos), num < 0 ? 0L : num);
     pos += numBytes;
     return numBytes;
   }
Index: java/io/DataInput.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/DataInput.java,v
retrieving revision 1.12
diff -u -r1.12 DataInput.java
--- java/io/DataInput.java	7 Apr 2003 19:45:21 -0000	1.12
+++ java/io/DataInput.java	8 Apr 2004 15:03:37 -0000
@@ -360,7 +360,7 @@
    * patterns which indicate a two byte character encoding, then they would be
    * converted to a Java <code>char</code> like so:
    * <p>
-   * <code>(char)(((byte1 & 0x1F) << 6) + (byte2 & 0x3F))</code>
+   * <code>(char)(((byte1 &amp; 0x1F) &lt;&lt; 6) + (byte2 &amp; 0x3F))</code>
    * <p>
    * If the first byte has a 1110 as its high order bits, then the
    * character consists of three bytes.  The bits that make up the character
@@ -375,7 +375,7 @@
    * then they would be converted to a Java <code>char</code> like so:
    *
    * <code>
-   * (char)(((byte1 & 0x0F) << 12) + ((byte2 & 0x3F) + (byte3 & 0x3F))
+   * (char)(((byte1 &amp; 0x0F) &lt;&lt; 12) + ((byte2 &amp; 0x3F) + (byte3 &amp; 0x3F))
    * </code>
    *
    * Note that all characters are encoded in the method that requires the
@@ -387,7 +387,7 @@
    * This method can read data that was written by an object implementing the
    * <code>writeUTF()</code> method in <code>DataOutput</code>.
    * 
-   * @returns The <code>String</code> read
+   * @return The <code>String</code> read
    *
    * @exception EOFException If end of file is reached before reading the 
    * String
Index: java/io/DataInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/DataInputStream.java,v
retrieving revision 1.23
diff -u -r1.23 DataInputStream.java
--- java/io/DataInputStream.java	20 May 2003 11:25:01 -0000	1.23
+++ java/io/DataInputStream.java	8 Apr 2004 15:03:37 -0000
@@ -277,16 +277,16 @@
    * buffer
    * @exception IOException If any other error occurs
    */
-  public final void readFully (byte[] b, int off, int len) throws IOException
+  public final void readFully (byte[] buf, int offset, int len) throws IOException
   {
     while (len > 0)
       {
 	// in.read will block until some data is available.
-	int numread = in.read (b, off, len);
+	int numread = in.read (buf, offset, len);
 	if (numread < 0)
 	  throw new EOFException ();
 	len -= numread;
-	off += numread;
+	offset += numread;
       }
   }
 
Index: java/io/InputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/InputStream.java,v
retrieving revision 1.6
diff -u -r1.6 InputStream.java
--- java/io/InputStream.java	22 Jan 2002 22:26:59 -0000	1.6
+++ java/io/InputStream.java	8 Apr 2004 15:03:37 -0000
@@ -105,7 +105,7 @@
    * @param readLimit The number of bytes that can be read before the
    *                  mark becomes invalid
    */
-  public void mark(int readlimit)
+  public void mark(int readLimit)
   {
     // Do nothing
   }
Index: java/io/InputStreamReader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/InputStreamReader.java,v
retrieving revision 1.14
diff -u -r1.14 InputStreamReader.java
--- java/io/InputStreamReader.java	21 Nov 2003 12:52:14 -0000	1.14
+++ java/io/InputStreamReader.java	8 Apr 2004 15:03:37 -0000
@@ -150,7 +150,7 @@
    * by this object.  If the stream has been closed, this method is allowed
    * to return <code>null</code>.
    *
-   * @param The current encoding name
+   * @return The current encoding name
    */
   public String getEncoding()
   {
@@ -217,7 +217,7 @@
     * returns the actual number of chars skipped, which may be less than the
     * requested amount.
     *
-    * @param num_chars The requested number of chars to skip
+    * @param count The requested number of chars to skip
     *
     * @return The actual number of chars skipped.
     *
@@ -230,6 +230,4 @@
      
      return super.skip(count);
   }
-
-} // class InputStreamReader
-
+}
Index: java/io/ObjectStreamClass.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectStreamClass.java,v
retrieving revision 1.31
diff -u -r1.31 ObjectStreamClass.java
--- java/io/ObjectStreamClass.java	26 Feb 2004 07:53:15 -0000	1.31
+++ java/io/ObjectStreamClass.java	8 Apr 2004 15:03:37 -0000
@@ -104,17 +104,17 @@
       }
   }
 
-
   /**
    * Returns the name of the class that this
    * <code>ObjectStreamClass</code> represents.
+   *
+   * @return the name of the class.
    */
   public String getName()
   {
     return name;
   }
 
-
   /**
    * Returns the class that this <code>ObjectStreamClass</code>
    * represents.  Null could be returned if this
@@ -129,24 +129,27 @@
     return clazz;
   }
 
-
   /**
    * Returns the serial version stream-unique identifier for the class
    * represented by this <code>ObjectStreamClass</code>.  This SUID is
    * either defined by the class as <code>static final long
    * serialVersionUID</code> or is calculated as specified in
    * Javasoft's "Object Serialization Specification" XXX: add reference
+   *
+   * @return the serial version UID.
    */
   public long getSerialVersionUID()
   {
     return uid;
   }
 
-
-  // Returns the serializable (non-static and non-transient) Fields
-  // of the class represented by this ObjectStreamClass.  The Fields
-  // are sorted by name.
-  // XXX doc
+  /**
+   * Returns the serializable (non-static and non-transient) Fields
+   * of the class represented by this ObjectStreamClass.  The Fields
+   * are sorted by name.
+   *
+   * @return the fields.
+   */
   public ObjectStreamField[] getFields()
   {
     ObjectStreamField[] copy = new ObjectStreamField[ fields.length ];
@@ -154,7 +157,6 @@
     return copy;
   }
 
-
   // XXX doc
   // Can't do binary search since fields is sorted by name and
   // primitiveness.
@@ -166,7 +168,6 @@
     return null;
   }
 
-
   /**
    * Returns a textual representation of this
    * <code>ObjectStreamClass</code> object including the name of the
@@ -180,7 +181,6 @@
   {
     return "java.io.ObjectStreamClass< " + name + ", " + uid + " >";
   }
-
 
   // Returns true iff the class that this ObjectStreamClass represents
   // has the following method:
Index: java/io/ObjectStreamField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectStreamField.java,v
retrieving revision 1.15
diff -u -r1.15 ObjectStreamField.java
--- java/io/ObjectStreamField.java	8 Apr 2004 06:47:53 -0000	1.15
+++ java/io/ObjectStreamField.java	8 Apr 2004 15:03:37 -0000
@@ -86,6 +86,7 @@
    *
    * @param name Name of the field to export.
    * @param type Type of the field in the concerned class.
+   * @param unshared true if field will be unshared, false otherwise.
    */
   public ObjectStreamField (String name, Class type, boolean unshared)
   {
@@ -237,9 +238,16 @@
     return typename.length() == 1;
   }
 
-  public int compareTo (Object o)
+  /**
+   * Compares this object to the given object.
+   *
+   * @param obj the object to compare to.
+   *
+   * @return -1, 0 or 1.
+   */
+  public int compareTo (Object obj)
   {
-    ObjectStreamField f = (ObjectStreamField)o;
+    ObjectStreamField f = (ObjectStreamField) obj;
     boolean this_is_primitive = isPrimitive ();
     boolean f_is_primitive = f.isPrimitive ();
 
@@ -347,6 +355,11 @@
 	 " in class " + field.getDeclaringClass());
   }
 
+  /**
+   * Returns a string representing this object.
+   *
+   * @return the string.
+   */
   public String toString ()
   {
     return "ObjectStreamField< " + type + " " + name + " >";
Index: java/io/PushbackReader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/PushbackReader.java,v
retrieving revision 1.11
diff -u -r1.11 PushbackReader.java
--- java/io/PushbackReader.java	23 Mar 2003 10:39:02 -0000	1.11
+++ java/io/PushbackReader.java	8 Apr 2004 15:03:37 -0000
@@ -266,33 +266,34 @@
    * of the chars requested, the remaining chars are read from the 
    * underlying stream.
    *
-   * @param buf The array into which the chars read should be stored
+   * @param buffer The array into which the chars read should be stored
    * @param offset The offset into the array to start storing chars
-   * @param len The requested number of chars to read
+   * @param length The requested number of chars to read
    *
    * @return The actual number of chars read, or -1 if end of stream.
    *
    * @exception IOException If an error occurs.
    */
-  public synchronized int read(char[] b, int offset, int len) throws IOException
+  public synchronized int read(char[] buffer, int offset, int length)
+    throws IOException
   {
     synchronized (lock)
       {
 	if (buf == null)
           throw new IOException("stream closed");
 
-	if (offset < 0 || len < 0 || offset + len > b.length)
+	if (offset < 0 || length < 0 || offset + length > buffer.length)
           throw new ArrayIndexOutOfBoundsException();
 
-	int numBytes = Math.min(buf.length - pos, len);
+	int numBytes = Math.min(buf.length - pos, length);
 	if (numBytes > 0)
 	  {
-	    System.arraycopy (buf, pos, b, offset, numBytes);
+	    System.arraycopy (buf, pos, buffer, offset, numBytes);
 	    pos += numBytes;
 	    return numBytes;
 	  }
 
-	return super.read(b, offset, len);
+	return super.read(buffer, offset, length);
       }
   }
 
@@ -353,30 +354,30 @@
    * If the pushback buffer cannot hold all of the requested chars, an
    * exception is thrown.
    *
-   * @param buf The char array to be pushed back
+   * @param buffer The char array to be pushed back
    * @param offset The index into the array where the chars to be push start
-   * @param len The number of chars to be pushed.
+   * @param length The number of chars to be pushed.
    *
    * @exception IOException If the pushback buffer is full
    */
-  public synchronized void unread(char[] b, int offset, int len)
+  public synchronized void unread(char[] buffer, int offset, int length)
     throws IOException
   {
     synchronized (lock)
       {
 	if (buf == null)
           throw new IOException("stream closed");
-	if (pos < len)
+	if (pos < length)
 	  throw new IOException("Pushback buffer is full");
 
 	// Note the order that these chars are being added is the opposite
 	// of what would be done if they were added to the buffer one at a time.
 	// See the Java Class Libraries book p. 1397.
-	System.arraycopy(b, offset, buf, pos - len, len);
+	System.arraycopy(buffer, offset, buf, pos - length, length);
 
 	// Don't put this into the arraycopy above, an exception might be thrown
 	// and in that case we don't want to modify pos.
-	pos -= len;
+	pos -= length;
       }
   }
 }
Index: java/io/StringWriter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/StringWriter.java,v
retrieving revision 1.5
diff -u -r1.5 StringWriter.java
--- java/io/StringWriter.java	4 Feb 2003 21:08:16 -0000	1.5
+++ java/io/StringWriter.java	8 Apr 2004 15:03:37 -0000
@@ -60,6 +60,8 @@
   /**
    * This method closes the stream.  The contents of the internal buffer
    * can still be retrieved, but future writes are not guaranteed to work.
+   *
+   * @excepttion IOException If an error orrurs.
    */
   public void close () throws IOException
   {
Index: java/io/Writer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/Writer.java,v
retrieving revision 1.10
diff -u -r1.10 Writer.java
--- java/io/Writer.java	23 Mar 2003 11:15:29 -0000	1.10
+++ java/io/Writer.java	8 Apr 2004 15:03:37 -0000
@@ -75,8 +75,8 @@
    * This method initializes a <code>Writer</code> that will synchronize
    * on the specified <code>Object</code>.
    *
-   * @param obj The <code>Object</code> to use for synchronizing critical
-   *            sections
+   * @param lock The <code>Object</code> to use for synchronizing critical
+   *             sections
    */
   protected Writer(Object lock)
   {
@@ -157,7 +157,7 @@
    *
    * @param str The <code>String</code> whose chars are to be written.
    *
-   * @param IOException If an error occurs
+   * @exception IOException If an error occurs
    */
   public void write(String str) throws IOException
   {

--Boundary-00=_goWdATfwC+avejG--




From MAILER-DAEMON Thu Apr 08 12:28:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBcOY-0002gT-3W
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 12:28:50 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBcNH-0001yM-JN
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 12:27:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBcMd-0001Yh-1g
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 12:27:24 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBcMX-0001W7-Ro
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 12:26:46 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i38GQWNj016325
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 18:26:33 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBbQU-0002PC-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 17:26:46 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 18:26:18 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_q0XdAweoGslqluF"
Message-Id: <200404081826.18757.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.net
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 16:28:40 -0000


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

Hi list,


I just commited the attached patch to fix javadoc and coding style in 
most of java.net.


Michael


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

	* java/net/Authenticator.java,
	java/net/BindException.java,
	java/net/ConnectException.java,
	java/net/DatagramPacket.java,
	java/net/DatagramSocket.java,
	java/net/DatagramSocketImpl.java,
	java/net/DatagramSocketImplFactory.java,
	java/net/FileNameMap.java,
	java/net/HttpURLConnection.java,
	java/net/InetSocketAddress.java,
	java/net/MalformedURLException.java,
	java/net/MulticastSocket.java,
	java/net/NetPermission.java,
	java/net/NetworkInterface.java,
	java/net/NoRouteToHostException.java,
	java/net/PasswordAuthentication.java,
	java/net/PortUnreachableException.java,
	java/net/ProtocolException.java,
	java/net/ServerSocket.java,
	java/net/Socket.java,
	java/net/SocketAddress.java,
	java/net/SocketException.java,
	java/net/SocketImpl.java,
	java/net/SocketImplFactory.java,
	java/net/SocketOptions.java,
	java/net/SocketTimeoutException.java,
	java/net/URISyntaxException.java,
	java/net/URLDecoder.java,
	java/net/URLEncoder.java,
	java/net/URLStreamHandlerFactory.java,
	java/net/UnknownHostException.java,
	java/net/UnknownServiceException.java:
	Reworked javadoc and coding style all over.


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

Index: java/net/Authenticator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Authenticator.java,v
retrieving revision 1.11
diff -u -r1.11 Authenticator.java
--- java/net/Authenticator.java	24 May 2003 04:37:18 -0000	1.11
+++ java/net/Authenticator.java	8 Apr 2004 16:24:06 -0000
@@ -7,7 +7,7 @@
 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
@@ -37,18 +37,19 @@
 
 package java.net;
 
+
 /**
   * This abstract class provides a model for obtaining authentication
   * information (in the form of a username and password) required by
   * some network operations (such as hitting a password protected
   * web site).
   * <p>
-  * To make use of this feature, a programmer must create a subclass 
+  * To make use of this feature, a programmer must create a subclass
   * that knows how to obtain the necessary info.  An example
-  * would be a class that popped up a dialog box to prompt the user.  
-  * After creating an instance of that subclass, the static 
-  * <code>setDefault</code> method of this class is called to set up 
-  * that instance as the object to use on subsequent calls to obtain 
+  * would be a class that popped up a dialog box to prompt the user.
+  * After creating an instance of that subclass, the static
+  * <code>setDefault</code> method of this class is called to set up
+  * that instance as the object to use on subsequent calls to obtain
   * authorization.
   *
   * @since 1.2
@@ -106,8 +107,8 @@
    */
 
   /**
-    * This method sets the default <code>Authenticator</code> object (an 
-    * instance of a subclass of <code>Authenticator</code>) to use when 
+    * This method sets the default <code>Authenticator</code> object (an
+    * instance of a subclass of <code>Authenticator</code>) to use when
     * prompting the user for
     * information.  Note that this method checks to see if the caller is
     * allowed to set this value (the "setDefaultAuthenticator" permission)
@@ -115,9 +116,9 @@
     *
     * @param defAuth The new default <code>Authenticator</code> object to use
     *
-    * @exception SecurityException If the caller does not have permission 
+    * @exception SecurityException If the caller does not have permission
     * to perform this operation
-    */ 
+    */
   public static void setDefault(Authenticator defAuth)
   {
     SecurityManager sm = System.getSecurityManager();
@@ -125,38 +126,40 @@
       sm.checkPermission(new NetPermission("setDefaultAuthenticator"));
 
     defaultAuthenticator = defAuth;
-  } 
+  }
 
   /**
     * This method is called whenever a username and password for a given
     * network operation is required.  First, a security check is made to see
     * if the caller has the "requestPasswordAuthentication"
     * permission.  If not, the method thows an exception.  If there is no
-    * default <code>Authenticator</code> object, the method then returns 
-    * <code>null</code>.  Otherwise, the default authenticators's instance 
+    * default <code>Authenticator</code> object, the method then returns
+    * <code>null</code>.  Otherwise, the default authenticators's instance
     * variables are initialized and it's <code>getPasswordAuthentication</code>
     * method is called to get the actual authentication information to return.
     *
     * @param addr The address requesting authentication
     * @param port The port requesting authentication
     * @param protocol The protocol requesting authentication
-    * @param prompt The prompt to display to the user when requesting 
+    * @param prompt The prompt to display to the user when requesting
     *        authentication info
     * @param scheme The authentication scheme in use
-    * 
-    * @return A <code>PasswordAuthentication</code> object with the user's 
+    *
+    * @return A <code>PasswordAuthentication</code> object with the user's
     *         authentication info.
     *
-    * @exception SecurityException If the caller does not have permission to 
+    * @exception SecurityException If the caller does not have permission to
     *         perform this operation
-    */ 
-  public static PasswordAuthentication 
-    requestPasswordAuthentication(InetAddress addr, int port, String protocol,
-      String prompt, String scheme) 
+    */
+  public static PasswordAuthentication requestPasswordAuthentication(InetAddress addr,
+                                                                     int port,
+                                                                     String protocol,
+                                                                     String prompt,
+                                                                     String scheme)
     throws SecurityException
   {
-    return(requestPasswordAuthentication (null, addr, port, protocol,
-  					prompt, scheme));
+    return requestPasswordAuthentication(null, addr, port, protocol, prompt,
+                                         scheme);
   }
 
   /**
@@ -175,21 +178,24 @@
     * @param addr The address requesting authentication
     * @param port The port requesting authentication
     * @param protocol The protocol requesting authentication
-    * @param prompt The prompt to display to the user when requesting 
+    * @param prompt The prompt to display to the user when requesting
     *        authentication info
     * @param scheme The authentication scheme in use
     *
-    * @return A <code>PasswordAuthentication</code> object with the user's 
+    * @return A <code>PasswordAuthentication</code> object with the user's
     *         authentication info.
     *
-    * @exception SecurityException If the caller does not have permission to 
+    * @exception SecurityException If the caller does not have permission to
     *         perform this operation
     *
     * @since 1.4
     */
-  public static PasswordAuthentication
-    requestPasswordAuthentication(String host, InetAddress addr, int port,
-        String protocol, String prompt, String scheme)
+  public static PasswordAuthentication requestPasswordAuthentication(String host,
+                                                                     InetAddress addr,
+                                                                     int port,
+                                                                     String protocol,
+                                                                     String prompt,
+                                                                     String scheme)
     throws SecurityException
   {
     SecurityManager sm = System.getSecurityManager();
@@ -197,7 +203,7 @@
       sm.checkPermission(new NetPermission("requestPasswordAuthentication"));
 
     if (defaultAuthenticator == null)
-      return(null);
+      return null;
 
     defaultAuthenticator.host = host;
     defaultAuthenticator.addr = addr;
@@ -206,7 +212,7 @@
     defaultAuthenticator.prompt = prompt;
     defaultAuthenticator.scheme = scheme;
 
-    return(defaultAuthenticator.getPasswordAuthentication());
+    return defaultAuthenticator.getPasswordAuthentication();
   }
 
   /*
@@ -232,7 +238,7 @@
     */
   protected final InetAddress getRequestingSite()
   {
-    return(addr);
+    return addr;
   }
 
   /**
@@ -240,24 +246,24 @@
    * or <code>null</code> if not available.
    *
    * @return The name of the host requesting authentication, or
-   * </code>null</code> if it is not available.
+   * <code>null</code> if it is not available.
    *
    * @since 1.4
    */
   protected final String getRequestingHost()
   {
-    return(host);
+    return host;
   }
 
   /**
-    * This method returns the port of the site that is requesting 
+    * This method returns the port of the site that is requesting
     * authentication.
     *
     * @return The requesting port
     */
   protected final int getRequestingPort()
   {
-    return(port);
+    return port;
   }
 
   /**
@@ -268,18 +274,18 @@
     */
   protected final String getRequestingProtocol()
   {
-    return(protocol);
+    return protocol;
   }
 
   /**
-    * Returns the prompt that should be used when requesting authentication 
+    * Returns the prompt that should be used when requesting authentication
     * information from the user
-    * 
+    *
     * @return The user prompt
     */
   protected final String getRequestingPrompt()
   {
-    return(prompt);
+    return prompt;
   }
 
   /**
@@ -289,7 +295,7 @@
     */
   protected final String getRequestingScheme()
   {
-    return(scheme);
+    return scheme;
   }
 
   /**
@@ -302,8 +308,6 @@
     */
   protected PasswordAuthentication getPasswordAuthentication()
   {
-    return(null);
+    return null;
   }
-
 } // class Authenticator
-
Index: java/net/BindException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/BindException.java,v
retrieving revision 1.9
diff -u -r1.9 BindException.java
--- java/net/BindException.java	27 Aug 2002 17:48:05 -0000	1.9
+++ java/net/BindException.java	8 Apr 2004 16:24:06 -0000
@@ -37,6 +37,7 @@
 
 package java.net;
 
+
 /**
  * This exception indicates that an error occurred while attempting to bind
  * socket to a particular port.
Index: java/net/ConnectException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ConnectException.java,v
retrieving revision 1.8
diff -u -r1.8 ConnectException.java
--- java/net/ConnectException.java	24 Feb 2002 04:25:16 -0000	1.8
+++ java/net/ConnectException.java	8 Apr 2004 16:24:06 -0000
@@ -35,8 +35,8 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
+
 
 /**
  * This exception indicates that an error occurred while attempting to
Index: java/net/DatagramPacket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/DatagramPacket.java,v
retrieving revision 1.13
diff -u -r1.13 DatagramPacket.java
--- java/net/DatagramPacket.java	26 Dec 2003 22:27:03 -0000	1.13
+++ java/net/DatagramPacket.java	8 Apr 2004 16:24:06 -0000
@@ -7,7 +7,7 @@
 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
@@ -37,6 +37,7 @@
 
 package java.net;
 
+
 /*
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
@@ -86,7 +87,7 @@
    * The maximal length of the buffer.
    */
   int maxlen;
-  
+
   /**
    * The address to which the packet should be sent or from which it
    * was received.
@@ -134,14 +135,14 @@
    *
    * @param buf A buffer containing the data to send
    * @param offset The offset into the buffer to start writing from.
-   * @param len The length of the buffer (must be &lt;= buf.length)
-   * @param addr The address to send to
+   * @param length The length of the buffer (must be &lt;= buf.length)
+   * @param address The address to send to
    * @param port The port to send to
    *
    * @since 1.2
    */
   public DatagramPacket(byte[] buf, int offset, int length,
-	InetAddress address, int port)
+                        InetAddress address, int port)
   {
     setData(buf, offset, length);
     setAddress(address);
@@ -177,8 +178,7 @@
    * @since 1.4
    */
   public DatagramPacket(byte[] buf, int offset, int length,
-		        SocketAddress address)
-     throws SocketException
+                        SocketAddress address) throws SocketException
   {
     if (! (address instanceof InetSocketAddress))
       throw new IllegalArgumentException("unsupported address type");
@@ -272,16 +272,16 @@
   /**
    * This sets the address to which the data packet will be transmitted.
    *
-   * @param addr The destination address
+   * @param address The destination address
    *
    * @since 1.1
    */
-  public synchronized void setAddress(InetAddress iaddr)
+  public synchronized void setAddress(InetAddress address)
   {
-    if (iaddr == null)
+    if (address == null)
       throw new NullPointerException("Null address");
 
-    address = iaddr;
+    this.address = address;
   }
 
   /**
@@ -291,12 +291,12 @@
    *
    * @since 1.1
    */
-  public synchronized void setPort(int iport)
+  public synchronized void setPort(int port)
   {
-    if (iport < 0 || iport > 65535)
-      throw new IllegalArgumentException("Invalid port: " + iport);
+    if (port < 0 || port > 65535)
+      throw new IllegalArgumentException("Invalid port: " + port);
 
-    port = iport;
+    this.port = port;
   }
 
   /**
@@ -324,12 +324,12 @@
    * will be sent to/is coming from
    *
    * @return The socket address of the remote host
-   * 
+   *
    * @since 1.4
    */
   public SocketAddress getSocketAddress()
   {
-    return new InetSocketAddress (address, port);
+    return new InetSocketAddress(address, port);
   }
 
   /**
@@ -360,7 +360,6 @@
   public synchronized void setData(byte[] buf, int offset, int length)
   {
     // This form of setData must be used if offset is to be changed.
-
     if (buf == null)
       throw new NullPointerException("Null buffer");
     if (offset < 0)
@@ -372,7 +371,7 @@
   }
 
   /**
-   * Sets the length of the data in the buffer. 
+   * Sets the length of the data in the buffer.
    *
    * @param length The new length.  (Where len &lt;= buf.length)
    *
@@ -387,7 +386,7 @@
       throw new IllegalArgumentException("Invalid length: " + length);
     if (offset + length > buffer.length)
       throw new IllegalArgumentException("Potential buffer overflow - offset: "
-			+ offset + " length: " + length);
+                                         + offset + " length: " + length);
 
     this.length = length;
     this.maxlen = length;
Index: java/net/DatagramSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/DatagramSocket.java,v
retrieving revision 1.39
diff -u -r1.39 DatagramSocket.java
--- java/net/DatagramSocket.java	12 Feb 2004 16:38:11 -0000	1.39
+++ java/net/DatagramSocket.java	8 Apr 2004 16:24:06 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,7 +35,6 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import gnu.java.net.PlainDatagramSocketImpl;
@@ -44,24 +43,23 @@
 import java.nio.channels.DatagramChannel;
 import java.nio.channels.IllegalBlockingModeException;
 
+
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  Believed complete and correct.
  */
-
 /**
- * This class models a connectionless datagram socket that sends 
+ * This class models a connectionless datagram socket that sends
  * individual packets of data across the network.  In the TCP/IP world,
  * this means UDP.  Datagram packets do not have guaranteed delivery,
  * or any guarantee about the order the data will be received on the
  * remote host.
- * 
+ *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @author Warren Levy (warrenl@cygnus.com)
  * @date May 3, 1999.
  */
-
 public class DatagramSocket
 {
   /**
@@ -69,7 +67,7 @@
    * variable is null, a default factory is used.
    */
   private static DatagramSocketImplFactory factory;
-	  
+
   /**
    * This is the implementation object used by this socket.
    */
@@ -96,15 +94,15 @@
   private boolean bound;
 
   /**
-   * Creates a <code>DatagramSocket</code> from a specified 
+   * Creates a <code>DatagramSocket</code> from a specified
    * <code>DatagramSocketImpl</code> instance
    *
-   * @param impl The <code>DatagramSocketImpl</code> the socket will be 
+   * @param impl The <code>DatagramSocketImpl</code> the socket will be
    * created from
-   * 
+   *
    * @since 1.4
    */
-  protected DatagramSocket (DatagramSocketImpl impl)
+  protected DatagramSocket(DatagramSocketImpl impl)
   {
     if (impl == null)
       throw new NullPointerException("impl may not be null");
@@ -115,7 +113,7 @@
   }
 
   /**
-   * Initializes a new instance of <code>DatagramSocket</code> that binds to 
+   * Initializes a new instance of <code>DatagramSocket</code> that binds to
    * a random port and every address on the local machine.
    *
    * @exception SocketException If an error occurs.
@@ -128,7 +126,7 @@
   }
 
   /**
-   * Initializes a new instance of <code>DatagramSocket</code> that binds to 
+   * Initializes a new instance of <code>DatagramSocket</code> that binds to
    * the specified port and every address on the local machine.
    *
    * @param port The local port number to bind to.
@@ -143,7 +141,7 @@
   }
 
   /**
-   * Initializes a new instance of <code>DatagramSocket</code> that binds to 
+   * Initializes a new instance of <code>DatagramSocket</code> that binds to
    * the specified local port and address.
    *
    * @param port The local port number to bind to.
@@ -159,7 +157,7 @@
   }
 
   /**
-   * Initializes a new instance of <code>DatagramSocket</code> that binds to 
+   * Initializes a new instance of <code>DatagramSocket</code> that binds to
    * the specified local port and address.
    *
    * @param address The local address and port number to bind to.
@@ -170,35 +168,36 @@
    *
    * @since 1.4
    */
-  public DatagramSocket (SocketAddress address) throws SocketException
+  public DatagramSocket(SocketAddress address) throws SocketException
   {
     String propVal = System.getProperty("impl.prefix");
     if (propVal == null || propVal.equals(""))
       impl = new PlainDatagramSocketImpl();
     else
       try
-	{
-          impl = (DatagramSocketImpl) Class.forName
-            ("java.net." + propVal + "DatagramSocketImpl").newInstance();
-	}
+        {
+	  impl =
+	    (DatagramSocketImpl) Class.forName("java.net." + propVal
+	                                       + "DatagramSocketImpl")
+	                              .newInstance();
+        }
       catch (Exception e)
-	{
-	  System.err.println("Could not instantiate class: java.net." +
-	    propVal + "DatagramSocketImpl");
+        {
+	  System.err.println("Could not instantiate class: java.net."
+	                     + propVal + "DatagramSocketImpl");
 	  impl = new PlainDatagramSocketImpl();
-	}
+        }
 
     if (address != null)
       bind(address);
   }
-  
+
   // This needs to be accessible from java.net.MulticastSocket
-  DatagramSocketImpl getImpl()
-    throws SocketException
+  DatagramSocketImpl getImpl() throws SocketException
   {
     try
       {
-	if (!implCreated)
+	if (! implCreated)
 	  {
 	    impl.create();
 	    implCreated = true;
@@ -211,7 +210,7 @@
 	throw new SocketException(e.getMessage());
       }
   }
-  
+
   /**
    * Closes this datagram socket.
    */
@@ -219,7 +218,7 @@
   {
     if (isClosed())
       return;
-    
+
     try
       {
 	getImpl().close();
@@ -247,10 +246,10 @@
   }
 
   /**
-   * This method returns the remote address to which this socket is 
+   * This method returns the remote address to which this socket is
    * connected.  If this socket is not connected, then this method will
    * return <code>null</code>.
-   * 
+   *
    * @return The remote address.
    *
    * @since 1.2
@@ -264,7 +263,7 @@
    * This method returns the remote port to which this socket is
    * connected.  If this socket is not connected, then this method will
    * return -1.
-   * 
+   *
    * @return The remote port.
    *
    * @since 1.2
@@ -276,7 +275,7 @@
 
   /**
    * Returns the local address this datagram socket is bound to.
-   * 
+   *
    * @return The local address is the socket is bound or null
    *
    * @since 1.1
@@ -285,16 +284,17 @@
   {
     if (isClosed())
       return null;
-    
+
     InetAddress localAddr;
-    
+
     try
       {
-	localAddr = (InetAddress) getImpl().getOption(SocketOptions.SO_BINDADDR);
+	localAddr =
+	  (InetAddress) getImpl().getOption(SocketOptions.SO_BINDADDR);
 
 	SecurityManager s = System.getSecurityManager();
 	if (s != null)
-	  s.checkConnect (localAddr.getHostName(), -1);
+	  s.checkConnect(localAddr.getHostName(), -1);
       }
     catch (SecurityException e)
       {
@@ -303,7 +303,7 @@
     catch (SocketException e)
       {
 	// This cannot happen as we are bound.
-        return null;
+	return null;
       }
 
     return localAddr;
@@ -318,7 +318,7 @@
   {
     if (isClosed())
       return -1;
-	      
+
     try
       {
 	return getImpl().getLocalPort();
@@ -337,7 +337,7 @@
    * @return The current timeout in milliseconds.
    *
    * @exception SocketException If an error occurs.
-   * 
+   *
    * @since 1.1
    */
   public synchronized int getSoTimeout() throws SocketException
@@ -347,7 +347,7 @@
 
     Object buf = getImpl().getOption(SocketOptions.SO_TIMEOUT);
 
-    if (buf instanceof Integer) 
+    if (buf instanceof Integer)
       return ((Integer) buf).intValue();
 
     throw new SocketException("unexpected type");
@@ -368,7 +368,7 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     if (timeout < 0)
       throw new IllegalArgumentException("Invalid timeout: " + timeout);
 
@@ -390,7 +390,7 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object buf = getImpl().getOption(SocketOptions.SO_SNDBUF);
 
     if (buf instanceof Integer)
@@ -415,10 +415,10 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     if (size < 0)
       throw new IllegalArgumentException("Buffer size is less than 0");
-  
+
     getImpl().setOption(SocketOptions.SO_SNDBUF, new Integer(size));
   }
 
@@ -439,7 +439,7 @@
       throw new SocketException("socket is closed");
 
     Object buf = getImpl().getOption(SocketOptions.SO_RCVBUF);
-  
+
     if (buf instanceof Integer)
       return ((Integer) buf).intValue();
 
@@ -455,7 +455,7 @@
    *
    * @exception SocketException If an error occurs.
    * @exception IllegalArgumentException If size is 0 or negative.
-   * 
+   *
    * @since 1.2
    */
   public void setReceiveBufferSize(int size) throws SocketException
@@ -474,7 +474,7 @@
    * When a datagram socket is connected, it will only send or receive
    * packets to and from the host to which it is connected. A multicast
    * socket that is connected may only send and not receive packets.
-   * 
+   *
    * @param address The address to connect this socket to.
    * @param port The port to connect this socket to.
    *
@@ -488,10 +488,10 @@
   public void connect(InetAddress address, int port)
   {
     if (address == null)
-      throw new IllegalArgumentException ("Connect address may not be null");
+      throw new IllegalArgumentException("Connect address may not be null");
 
     if ((port < 1) || (port > 65535))
-      throw new IllegalArgumentException ("Port number is illegal: " + port);
+      throw new IllegalArgumentException("Port number is illegal: " + port);
 
     SecurityManager sm = System.getSecurityManager();
     if (sm != null)
@@ -499,13 +499,13 @@
 
     try
       {
-        getImpl().connect (address, port);
-        remoteAddress = address;
-        remotePort = port;
+	getImpl().connect(address, port);
+	remoteAddress = address;
+	remotePort = port;
       }
     catch (SocketException e)
       {
-        // This means simply not connected or connect not implemented.
+	// This means simply not connected or connect not implemented.
       }
   }
 
@@ -513,12 +513,12 @@
    * This method disconnects this socket from the address/port it was
    * connected to.  If the socket was not connected in the first place,
    * this method does nothing.
-   * 
+   *
    * @since 1.2
    */
   public void disconnect()
   {
-    if (!isConnected())
+    if (! isConnected())
       return;
 
     try
@@ -559,22 +559,20 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
-    if (remoteAddress != null
-        && remoteAddress.isMulticastAddress())
+
+    if (remoteAddress != null && remoteAddress.isMulticastAddress())
       throw new IOException
-        ("Socket connected to a multicast address my not receive");
+	("Socket connected to a multicast address my not receive");
 
-    if (getChannel() != null
-        && !getChannel().isBlocking ()
-        && !((DatagramChannelImpl) getChannel()).isInChannelOperation())
-      throw new IllegalBlockingModeException ();
+    if (getChannel() != null && ! getChannel().isBlocking()
+        && ! ((DatagramChannelImpl) getChannel()).isInChannelOperation())
+      throw new IllegalBlockingModeException();
 
     getImpl().receive(p);
 
     SecurityManager s = System.getSecurityManager();
-    if (s != null && isConnected ())
-      s.checkAccept (p.getAddress().getHostName (), p.getPort ());
+    if (s != null && isConnected())
+      s.checkAccept(p.getAddress().getHostName(), p.getPort());
   }
 
   /**
@@ -596,33 +594,31 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     // JDK1.2: Don't do security checks if socket is connected; see jdk1.2 api.
     SecurityManager s = System.getSecurityManager();
-    if (s != null && !isConnected ())
+    if (s != null && ! isConnected())
       {
-        InetAddress addr = p.getAddress();
-        if (addr.isMulticastAddress())
-          s.checkMulticast(addr);
-        else
-          s.checkConnect(addr.getHostAddress(), p.getPort());
+	InetAddress addr = p.getAddress();
+	if (addr.isMulticastAddress())
+	  s.checkMulticast(addr);
+	else
+	  s.checkConnect(addr.getHostAddress(), p.getPort());
       }
 
-    if (isConnected ())
+    if (isConnected())
       {
-        if (p.getAddress () != null && (remoteAddress != p.getAddress () ||
-                                        remotePort != p.getPort ()))
-          throw new IllegalArgumentException (
-            "DatagramPacket address does not match remote address" );
+	if (p.getAddress() != null
+	    && (remoteAddress != p.getAddress() || remotePort != p.getPort()))
+	  throw new IllegalArgumentException
+	    ("DatagramPacket address does not match remote address");
       }
-	    
+
     // FIXME: if this is a subclass of MulticastSocket,
     // use getTimeToLive for TTL val.
-
-    if (getChannel() != null
-        && !getChannel().isBlocking ()
-        && !((DatagramChannelImpl) getChannel()).isInChannelOperation())
-      throw new IllegalBlockingModeException ();
+    if (getChannel() != null && ! getChannel().isBlocking()
+        && ! ((DatagramChannelImpl) getChannel()).isInChannelOperation())
+      throw new IllegalBlockingModeException();
 
     getImpl().send(p);
   }
@@ -639,12 +635,11 @@
    *
    * @since 1.4
    */
-  public void bind (SocketAddress address)
-    throws SocketException
+  public void bind(SocketAddress address) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     if (! (address instanceof InetSocketAddress))
       throw new IllegalArgumentException("unsupported address type");
 
@@ -654,32 +649,32 @@
     if (port < 0 || port > 65535)
       throw new IllegalArgumentException("Invalid port: " + port);
 
-    SecurityManager s = System.getSecurityManager ();
+    SecurityManager s = System.getSecurityManager();
     if (s != null)
       s.checkListen(port);
 
     if (addr == null)
       addr = InetAddress.ANY_IF;
-    
+
     try
       {
-        getImpl().bind(port, addr);
+	getImpl().bind(port, addr);
 	bound = true;
       }
     catch (SocketException exception)
       {
-        getImpl().close();
-        throw exception;
+	getImpl().close();
+	throw exception;
       }
     catch (RuntimeException exception)
       {
-        getImpl().close();
-        throw exception;
+	getImpl().close();
+	throw exception;
       }
     catch (Error error)
       {
-        getImpl().close();
-        throw error;
+	getImpl().close();
+	throw error;
       }
   }
 
@@ -687,7 +682,7 @@
    * Checks if the datagram socket is closed.
    *
    * @return True if socket is closed, false otherwise.
-   * 
+   *
    * @since 1.4
    */
   public boolean isClosed()
@@ -697,9 +692,9 @@
 
   /**
    * Returns the datagram channel assoziated with this datagram socket.
-   * 
+   *
    * @return The associated <code>DatagramChannel</code> object or null
-   * 
+   *
    * @since 1.4
    */
   public DatagramChannel getChannel()
@@ -717,23 +712,23 @@
    *
    * @since 1.4
    */
-  public void connect (SocketAddress address) throws SocketException
+  public void connect(SocketAddress address) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
-    if ( !(address instanceof InetSocketAddress) )
+
+    if (! (address instanceof InetSocketAddress))
       throw new IllegalArgumentException("unsupported address type");
 
     InetSocketAddress tmp = (InetSocketAddress) address;
     connect(tmp.getAddress(), tmp.getPort());
   }
-  
+
   /**
    * Returns the binding state of the socket.
-   * 
+   *
    * @return True if socket bound, false otherwise.
-   * 
+   *
    * @since 1.4
    */
   public boolean isBound()
@@ -743,9 +738,9 @@
 
   /**
    * Returns the connection state of the socket.
-   * 
+   *
    * @return True if socket is connected, false otherwise.
-   * 
+   *
    * @since 1.4
    */
   public boolean isConnected()
@@ -756,32 +751,32 @@
   /**
    * Returns the SocketAddress of the host this socket is conneted to
    * or null if this socket is not connected.
-   * 
+   *
    * @return The socket address of the remote host if connected or null
-   * 
+   *
    * @since 1.4
    */
   public SocketAddress getRemoteSocketAddress()
   {
-    if (!isConnected ())
+    if (! isConnected())
       return null;
 
-    return new InetSocketAddress (remoteAddress, remotePort);
+    return new InetSocketAddress(remoteAddress, remotePort);
   }
 
   /**
    * Returns the local SocketAddress this socket is bound to.
    *
    * @return The local SocketAddress or null if the socket is not bound.
-   * 
+   *
    * @since 1.4
    */
   public SocketAddress getLocalSocketAddress()
   {
-    if (!isBound())
+    if (! isBound())
       return null;
-    
-    return new InetSocketAddress (getLocalAddress(), getLocalPort());
+
+    return new InetSocketAddress(getLocalAddress(), getLocalPort());
   }
 
   /**
@@ -798,7 +793,7 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
+    getImpl().setOption(SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
@@ -807,7 +802,7 @@
    * @return True if SO_REUSEADDR is set on the socket, false otherwise.
    *
    * @exception SocketException If an error occurs.
-   * 
+   *
    * @since 1.4
    */
   public boolean getReuseAddress() throws SocketException
@@ -815,8 +810,8 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    Object buf = getImpl().getOption (SocketOptions.SO_REUSEADDR);
-  
+    Object buf = getImpl().getOption(SocketOptions.SO_REUSEADDR);
+
     if (buf instanceof Boolean)
       return ((Boolean) buf).booleanValue();
 
@@ -825,7 +820,7 @@
 
   /**
    * Enables/Disables SO_BROADCAST
-   * 
+   *
    * @param enable True if SO_BROADCAST should be enabled, false otherwise.
    *
    * @exception SocketException If an error occurs
@@ -842,11 +837,11 @@
 
   /**
    * Checks if SO_BROADCAST is enabled
-   * 
+   *
    * @return Whether SO_BROADCAST is set
    *
    * @exception SocketException If an error occurs
-   * 
+   *
    * @since 1.4
    */
   public boolean getBroadcast() throws SocketException
@@ -855,7 +850,7 @@
       throw new SocketException("socket is closed");
 
     Object buf = getImpl().getOption(SocketOptions.SO_BROADCAST);
-  
+
     if (buf instanceof Boolean)
       return ((Boolean) buf).booleanValue();
 
@@ -871,11 +866,10 @@
    * @exception IllegalArgumentException If tc value is illegal
    *
    * @see DatagramSocket#getTrafficClass()
-   * 
+   *
    * @since 1.4
    */
-  public void setTrafficClass(int tc)
-    throws SocketException
+  public void setTrafficClass(int tc) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
@@ -883,25 +877,25 @@
     if (tc < 0 || tc > 255)
       throw new IllegalArgumentException();
 
-    getImpl().setOption (SocketOptions.IP_TOS, new Integer (tc));
+    getImpl().setOption(SocketOptions.IP_TOS, new Integer(tc));
   }
-  
+
   /**
    * Returns the current traffic class
-   * 
+   *
    * @return The current traffic class.
    *
    * @see DatagramSocket#setTrafficClass(int tc)
    *
    * @exception SocketException If an error occurs
-   * 
+   *
    * @since 1.4
    */
   public int getTrafficClass() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object buf = getImpl().getOption(SocketOptions.IP_TOS);
 
     if (buf instanceof Integer)
@@ -909,7 +903,7 @@
 
     throw new SocketException("unexpected type");
   }
-  
+
   /**
    * Sets the datagram socket implementation factory for the application
    *
@@ -920,11 +914,11 @@
    * @exception SecurityException If a security manager exists and its
    * checkSetFactory method doesn't allow the operation
    */
-  public static void setDatagramSocketImplFactory
-    (DatagramSocketImplFactory fac) throws IOException
+  public static void setDatagramSocketImplFactory(DatagramSocketImplFactory fac)
+    throws IOException
   {
     if (factory != null)
-      throw new SocketException ("DatagramSocketImplFactory already defined");
+      throw new SocketException("DatagramSocketImplFactory already defined");
 
     SecurityManager sm = System.getSecurityManager();
     if (sm != null)
Index: java/net/DatagramSocketImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/DatagramSocketImpl.java,v
retrieving revision 1.20
diff -u -r1.20 DatagramSocketImpl.java
--- java/net/DatagramSocketImpl.java	7 Jun 2003 21:19:02 -0000	1.20
+++ java/net/DatagramSocketImpl.java	8 Apr 2004 16:24:06 -0000
@@ -1,5 +1,5 @@
 /* DatagramSocketImpl.java -- Abstract class for UDP socket implementations
-   Copyright (C) 1998, 1999 2000, 2001, 
+   Copyright (C) 1998, 1999 2000, 2001,
                  2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,11 +36,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
-import java.io.IOException;
 import java.io.FileDescriptor;
+import java.io.IOException;
+
 
 /**
  * This abstract class models a datagram socket implementation.  An
@@ -58,7 +58,6 @@
  */
 public abstract class DatagramSocketImpl implements SocketOptions
 {
-
   /**
    * The local port to which this socket is bound
    */
@@ -103,7 +102,7 @@
    * Takes a peek at the next packet received in order to retrieve the
    * address of the sender
    *
-   * @param i The <code>InetAddress</code> to fill in with the information 
+   * @param i The <code>InetAddress</code> to fill in with the information
    *          about the sender if the next packet
    *
    * @return The port number of the sender of the packet
@@ -118,19 +117,19 @@
   /**
    * Takes a peek at the next packet received.  This packet is not consumed.
    * With the next peekData/receive operation this packet will be read again.
-   * 
+   *
    * @param p The <code>DatagramPacket</code> to fill in with the data sent.
    *
    * @return The port number of the sender of the packet.
-   * 
+   *
    * @exception IOException If an error occurs
    * @exception PortUnreachableException May be thrown if the socket is
    * connected to a currently unreachable destination. Note, there is no
    * guarantee that the exception will be thrown.
-   * 
+   *
    * @since 1.4
    */
-  protected abstract int peekData (DatagramPacket p) throws IOException;
+  protected abstract int peekData(DatagramPacket p) throws IOException;
 
   /**
    * Transmits the specified packet of data to the network.  The destination
@@ -169,17 +168,18 @@
    *
    * @since 1.4
    */
-  protected void connect (InetAddress address, int port) throws SocketException
+  protected void connect(InetAddress address, int port)
+    throws SocketException
   {
     // This method has to be overwritten by real implementations
   }
 
   /**
    * Disconnects the socket.
-   * 
+   *
    * @since 1.4
    */
-  protected void disconnect ()
+  protected void disconnect()
   {
     // This method has to be overwritten by real implementations
   }
@@ -199,8 +199,11 @@
    * This method returns the current Time to Live (TTL) setting on this
    * socket.  <b>Use <code>getTimeToLive()</code></b> instead.
    *
+   * @return the current time-to-live
+   * 
    * @exception IOException If an error occurs
-   * @deprecated
+   * 
+   * @deprecated // FIXME: when ?
    */
   protected abstract byte getTTL() throws IOException;
 
@@ -218,6 +221,8 @@
    * This method returns the current Time to Live (TTL) setting on this
    * socket.
    *
+   * @return the current time-to-live
+   * 
    * @exception IOException If an error occurs
    */
   protected abstract int getTimeToLive() throws IOException;
@@ -242,35 +247,37 @@
 
   /**
    * Causes this socket to join the specified multicast group on a specified
-   * device 
-   * 
+   * device
+   *
    * @param mcastaddr The address to leave
    * @param netIf The specified network interface to join the group at
    *
    * @exception IOException If an error occurs
-   * 
+   *
    * @since 1.4
    */
-  protected abstract void joinGroup (SocketAddress mcastaddr,
-		                     NetworkInterface netIf)
+  protected abstract void joinGroup(SocketAddress mcastaddr,
+                                    NetworkInterface netIf)
     throws IOException;
 
   /**
    * Leaves a multicast group
-   * 
+   *
    * @param mcastaddr The address to join
    * @param netIf The specified network interface to leave the group at
    *
    * @exception IOException If an error occurs
-   * 
+   *
    * @since 1.4
    */
-  protected abstract void leaveGroup (SocketAddress mcastaddr,
-		                      NetworkInterface netIf)
+  protected abstract void leaveGroup(SocketAddress mcastaddr,
+                                     NetworkInterface netIf)
     throws IOException;
-  
+
   /**
    * Returns the FileDescriptor for this socket
+   * 
+   * @return the file descriptor associated with this socket
    */
   protected FileDescriptor getFileDescriptor()
   {
@@ -279,6 +286,8 @@
 
   /**
    * Returns the local port this socket is bound to
+   *
+   * @return the local port
    */
   protected int getLocalPort()
   {
Index: java/net/DatagramSocketImplFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/DatagramSocketImplFactory.java,v
retrieving revision 1.3
diff -u -r1.3 DatagramSocketImplFactory.java
--- java/net/DatagramSocketImplFactory.java	12 Oct 2003 15:35:01 -0000	1.3
+++ java/net/DatagramSocketImplFactory.java	8 Apr 2004 16:24:06 -0000
@@ -7,7 +7,7 @@
 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
@@ -37,12 +37,12 @@
 
 package java.net;
 
+
 /** Written using on-line Java Platform 1.4 API Specification.
   * Status: Believed complete and correct.
   */
-
 /**
-  * This interface defines one method which returns a 
+  * This interface defines one method which returns a
   * <code>DatagramSocketImpl</code> object.
   * This should not be needed by ordinary applications.
   *
@@ -57,5 +57,4 @@
    * @return A DatagramSocketImpl object
    */
   DatagramSocketImpl createDatagramSocketImpl();
-
 } // interface DatagramSocketImplFactory
Index: java/net/FileNameMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/FileNameMap.java,v
retrieving revision 1.11
diff -u -r1.11 FileNameMap.java
--- java/net/FileNameMap.java	12 Oct 2003 15:35:01 -0000	1.11
+++ java/net/FileNameMap.java	8 Apr 2004 16:24:06 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,15 +35,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
+
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  Believed complete and correct.
  */
-
 /**
   * This interface has one method which, when passed a filename, returns
   * the MIME type associated with that filename.
@@ -63,6 +62,4 @@
     * @return The MIME type for the filename passed in.
     */
   String getContentTypeFor(String filename);
-
 } // interface FileNameMap
-
Index: java/net/HttpURLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/HttpURLConnection.java,v
retrieving revision 1.17
diff -u -r1.17 HttpURLConnection.java
--- java/net/HttpURLConnection.java	19 Mar 2004 21:54:27 -0000	1.17
+++ java/net/HttpURLConnection.java	8 Apr 2004 16:24:07 -0000
@@ -8,7 +8,7 @@
 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
@@ -17,7 +17,7 @@
 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. 
+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
@@ -36,14 +36,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.PushbackInputStream;
 import java.security.Permission;
 
+
 /*
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
@@ -51,12 +51,12 @@
  */
 
 /**
- * This class provides a common abstract implementation for those 
+ * This class provides a common abstract implementation for those
  * URL connection classes that will connect using the HTTP protocol.
  * In addition to the functionality provided by the URLConnection
  * class, it defines constants for HTTP return code values and
  * methods for setting the HTTP request method and determining whether
- * or not to follow redirects. 
+ * or not to follow redirects.
  *
  * @since 1.1
  *
@@ -73,27 +73,27 @@
    * beware of using this value
    */
   static final int HTTP_CONTINUE = 100;
-  
+
   /**
    * Indicates the request succeeded.
    */
-  public static final int HTTP_OK		= 200;
+  public static final int HTTP_OK = 200;
 
   /**
    * The requested resource has been created.
    */
-  public static final int HTTP_CREATED		= 201;
+  public static final int HTTP_CREATED = 201;
 
   /**
    * The request has been accepted for processing but has not completed.
    * There is no guarantee that the requested action will actually ever
    * be completed succesfully, but everything is ok so far.
    */
-  public static final int HTTP_ACCEPTED 	= 202;
+  public static final int HTTP_ACCEPTED = 202;
 
   /**
    * The meta-information returned in the header is not the actual data
-   * from the original server, but may be from a local or other copy. 
+   * from the original server, but may be from a local or other copy.
    * Normally this still indicates a successful completion.
    */
   public static final int HTTP_NOT_AUTHORITATIVE = 203;
@@ -102,20 +102,19 @@
    * The server performed the request, but there is no data to send
    * back.  This indicates that the user's display should not be changed.
    */
-  public static final int HTTP_NO_CONTENT	= 204;
+  public static final int HTTP_NO_CONTENT = 204;
 
   /**
    * The server performed the request, but there is no data to sent back,
    * however, the user's display should be "reset" to clear out any form
    * fields entered.
    */
-  public static final int HTTP_RESET		= 205;
+  public static final int HTTP_RESET = 205;
 
   /**
    * The server completed the partial GET request for the resource.
    */
-  public static final int HTTP_PARTIAL		= 206;
-
+  public static final int HTTP_PARTIAL = 206;
 
   /* HTTP Redirection Response Codes */
 
@@ -123,22 +122,22 @@
    * There is a list of choices available for the requested resource.
    */
   public static final int HTTP_MULT_CHOICE = 300;
-  
+
   /**
    * The resource has been permanently moved to a new location.
    */
   public static final int HTTP_MOVED_PERM = 301;
-  
+
   /**
    * The resource requested has been temporarily moved to a new location.
    */
   public static final int HTTP_MOVED_TEMP = 302;
-  
+
   /**
    * The response to the request issued is available at another location.
    */
   public static final int HTTP_SEE_OTHER = 303;
-  
+
   /**
    * The document has not been modified since the criteria specified in
    * a conditional GET.
@@ -149,64 +148,63 @@
    * The requested resource needs to be accessed through a proxy.
    */
   public static final int HTTP_USE_PROXY = 305;
-  
-  
+
   /* HTTP Client Error Response Codes */
 
   /**
    * The request was misformed or could not be understood.
    */
   public static final int HTTP_BAD_REQUEST = 400;
-  
+
   /**
    * The request made requires user authorization.  Try again with
    * a correct authentication header.
    */
   public static final int HTTP_UNAUTHORIZED = 401;
-  
+
   /**
    * Code reserved for future use - I hope way in the future.
    */
   public static final int HTTP_PAYMENT_REQUIRED = 402;
-  
+
   /**
    * There is no permission to access the requested resource.
    */
   public static final int HTTP_FORBIDDEN = 403;
-  
+
   /**
    * The requested resource was not found.
    */
   public static final int HTTP_NOT_FOUND = 404;
-  
+
   /**
    * The specified request method is not allowed for this resource.
    */
   public static final int HTTP_BAD_METHOD = 405;
-  
+
   /**
    * Based on the input headers sent, the resource returned in response
    * to the request would not be acceptable to the client.
    */
   public static final int HTTP_NOT_ACCEPTABLE = 406;
-  
+
   /**
    * The client must authenticate with a proxy prior to attempting this
    * request.
    */
   public static final int HTTP_PROXY_AUTH = 407;
-  
+
   /**
    * The request timed out.
    */
   public static final int HTTP_CLIENT_TIMEOUT = 408;
-  
+
   /**
    * There is a conflict between the current state of the resource and the
    * requested action.
    */
   public static final int HTTP_CONFLICT = 409;
-  
+
   /**
    * The requested resource is no longer available.  This ususally indicates
    * a permanent condition.
@@ -218,28 +216,27 @@
    * supplied.
    */
   public static final int HTTP_LENGTH_REQUIRED = 411;
-  
+
   /**
    * A client specified pre-condition was not met on the server.
    */
   public static final int HTTP_PRECON_FAILED = 412;
-  
+
   /**
    * The request sent was too large for the server to handle.
    */
   public static final int HTTP_ENTITY_TOO_LARGE = 413;
-  
+
   /**
    * The name of the resource specified was too long.
    */
   public static final int HTTP_REQ_TOO_LONG = 414;
-  
+
   /**
    * The request is in a format not supported by the requested resource.
    */
   public static final int HTTP_UNSUPPORTED_TYPE = 415;
 
-
   /* HTTP Server Error Response Codes */
 
   /**
@@ -247,16 +244,16 @@
    *
    * @deprecated
    */
-  public static final int HTTP_SERVER_ERROR    = 500;
+  public static final int HTTP_SERVER_ERROR = 500;
 
   /**
    * The server encountered an unexpected error (such as a CGI script crash)
    * that prevents the request from being fulfilled.
    */
-  public static final int HTTP_INTERNAL_ERROR   = 500;
+  public static final int HTTP_INTERNAL_ERROR = 500;
 
   /**
-   * The server does not support the requested functionality.  
+   * The server does not support the requested functionality.
    * @since 1.3
    */
   public static final int HTTP_NOT_IMPLEMENTED = 501;
@@ -294,8 +291,8 @@
   /**
    * This is a list of valid request methods, separated by "|" characters.
    */
-  private static String valid_methods
-      = "|GET|POST|HEAD|OPTIONS|PUT|DELETE|TRACE|";
+  private static String valid_methods =
+    "|GET|POST|HEAD|OPTIONS|PUT|DELETE|TRACE|";
 
   // Instance Variables
 
@@ -312,7 +309,7 @@
   /**
    * The response message string received from the server.
    */
-  protected String responseMessage = null;
+  protected String responseMessage;
 
   /**
    * If this instance should follow redirect requests.
@@ -324,7 +321,7 @@
    * Used by <code>getResponseCode()</code> and
    * <code>getResponseMessage()</code>.
    */
-  private boolean gotResponseVals = false;
+  private boolean gotResponseVals;
 
   /**
    * Create an HttpURLConnection for the specified URL
@@ -335,16 +332,16 @@
   {
     super(url);
   }
-  
-  /**   
+
+  /**
    * Closes the connection to the server.
    */
   public abstract void disconnect();
 
-  /** 
+  /**
    * Returns a boolean indicating whether or not this connection is going
    * through a proxy
-   * 
+   *
    * @return true if through a proxy, false otherwise
    */
   public abstract boolean usingProxy();
@@ -370,7 +367,7 @@
   }
 
   /**
-   * Returns a boolean indicating whether or not HTTP redirects will 
+   * Returns a boolean indicating whether or not HTTP redirects will
    * automatically be followed or not.
    *
    * @return true if redirects will be followed, false otherwise
@@ -383,16 +380,20 @@
   /**
    * Returns the value of this HttpURLConnection's instanceFollowRedirects
    * field
+   * 
+   * @return true if following redirects is enabled, false otherwise
    */
-  public boolean getInstanceFollowRedirects ()
+  public boolean getInstanceFollowRedirects()
   {
     return instanceFollowRedirects;
   }
 
   /**
    * Sets the value of this HttpURLConnection's instanceFollowRedirects field
+   *
+   * @param follow true to enable following redirects, false otherwise
    */
-  public void setInstanceFollowRedirects (boolean follow)
+  public void setInstanceFollowRedirects(boolean follow)
   {
     instanceFollowRedirects = follow;
   }
@@ -401,6 +402,8 @@
    * Set the method for the URL request, one of:
    * GET POST HEAD OPTIONS PUT DELETE TRACE are legal
    *
+   * @param method the method to use
+   *
    * @exception ProtocolException If the method cannot be reset or if the
    * requested method isn't valid for HTTP
    */
@@ -414,7 +417,6 @@
       this.method = method;
     else
       throw new ProtocolException("Invalid HTTP request method: " + method);
-
   }
 
   /**
@@ -439,7 +441,7 @@
    */
   public int getResponseCode() throws IOException
   {
-    if (!gotResponseVals)
+    if (! gotResponseVals)
       getResponseVals();
     return responseCode;
   }
@@ -455,7 +457,7 @@
    */
   public String getResponseMessage() throws IOException
   {
-    if (!gotResponseVals)
+    if (! gotResponseVals)
       getResponseVals();
     return responseMessage;
   }
@@ -464,9 +466,9 @@
   {
     // getHeaderField() will connect for us, but do it here first in
     // order to pick up IOExceptions.
-    if (!connected)
+    if (! connected)
       connect();
-      
+
     gotResponseVals = true;
 
     // If responseCode not yet explicitly set by subclass
@@ -474,7 +476,7 @@
       {
 	// Response is the first header received from the connection.
 	String respField = getHeaderField(0);
-	
+
 	if (respField == null || ! respField.startsWith("HTTP/"))
 	  {
 	    // Set to default values on failure.
@@ -483,7 +485,8 @@
 	    return;
 	  }
 
-	int firstSpc, nextSpc;
+	int firstSpc;
+	int nextSpc;
 	firstSpc = respField.indexOf(' ');
 	nextSpc = respField.indexOf(' ', firstSpc + 1);
 	responseMessage = respField.substring(nextSpc + 1);
@@ -505,6 +508,8 @@
    * Returns a permission object representing the permission necessary to make
    * the connection represented by this object
    *
+   * @return the permission necessary for this connection
+   *
    * @exception IOException If an error occurs
    */
   public Permission getPermission() throws IOException
@@ -514,9 +519,9 @@
     int port = url.getPort();
     if (port == -1)
       port = 80;
-    
+
     host = host + ":" + port;
-    
+
     return new SocketPermission(host, "connect");
   }
 
@@ -529,52 +534,56 @@
    *
    * @return An <code>InputStream</code> for reading error data.
    */
-  public InputStream getErrorStream ()
+  public InputStream getErrorStream()
   {
-    if (!connected)
-      return(null);
-    
+    if (! connected)
+      return (null);
+
     int code;
-    try 
+    try
       {
 	code = getResponseCode();
       }
-    catch(IOException e)
+    catch (IOException e)
       {
 	code = -1;
       }
-    
+
     if (code == -1)
-      return(null);
-    
-    if (((code/100) != 4) || ((code/100) != 5))
-      return(null); 
-    
+      return (null);
+
+    if (((code / 100) != 4) || ((code / 100) != 5))
+      return (null);
+
     try
       {
 	PushbackInputStream pbis = new PushbackInputStream(getInputStream());
-	
+
 	int i = pbis.read();
 	if (i == -1)
-	  return(null);
-	
+	  return (null);
+
 	pbis.unread(i);
-	return(pbis);
+	return (pbis);
       }
-    catch(IOException e)
+    catch (IOException e)
       {
-	return(null);
+	return (null);
       }
   }
 
   /**
    * Returns the value of the named field parsed as date
+   *
+   * @param key the key of the header field
+   * @param value the default value if the header field is not present
+   *
+   * @return the value of the header field
    */
-  public long getHeaderFieldDate (String key, long value)
+  public long getHeaderFieldDate(String key, long value)
   {
     // FIXME: implement this correctly
     // http://www.w3.org/Protocols/HTTP-NG/ng-notes.txt
-    
-    return super.getHeaderFieldDate (key, value);
+    return super.getHeaderFieldDate(key, value);
   }
 }
Index: java/net/InetSocketAddress.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/InetSocketAddress.java,v
retrieving revision 1.9
diff -u -r1.9 InetSocketAddress.java
--- java/net/InetSocketAddress.java	26 Nov 2003 15:55:00 -0000	1.9
+++ java/net/InetSocketAddress.java	8 Apr 2004 16:24:07 -0000
@@ -1,4 +1,4 @@
-/* InetSocketAddress.java -- 
+/* InetSocketAddress.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,21 +37,21 @@
 
 package java.net;
 
-/** 
+
+/**
  * InetSocketAddress instances represent socket addresses
  * in the java.nio package. They encapsulate a InetAddress and
  * a port number.
  *
  * @since 1.4
  */
-
 public class InetSocketAddress extends SocketAddress
 {
   /**
    * Compatible with JDK 1.4+
    */
   private static final long serialVersionUID = 5076001401234631237L;
-  
+
   /**
    * Name of host.
    */
@@ -66,10 +66,10 @@
    * Port of host.
    */
   private int port;
-    
+
   /**
    * Constructs an InetSocketAddress instance.
-   * 
+   *
    * @param addr Address of the socket
    * @param port Port if the socket
    *
@@ -79,34 +79,33 @@
     throws IllegalArgumentException
   {
     if (port < 0 || port > 65535)
-      throw new IllegalArgumentException ("Bad port number: " + port);
+      throw new IllegalArgumentException("Bad port number: " + port);
 
     if (addr == null)
       addr = InetAddress.ANY_IF;
-  
+
     this.addr = addr;
     this.port = port;
-    this.hostname = addr.getHostName ();
+    this.hostname = addr.getHostName();
   }
 
   /**
    * Constructs an InetSocketAddress instance.
-   * 
+   *
    * @param port Port if the socket
    *
    * @exception IllegalArgumentException If the port number is illegal
    */
-  public InetSocketAddress(int port)
-    throws IllegalArgumentException
+  public InetSocketAddress(int port) throws IllegalArgumentException
   {
-    this ((InetAddress) null, port);
+    this((InetAddress) null, port);
   }
 
   /**
    * Constructs an InetSocketAddress instance.
    *
-   * @param addr Address of the socket
-   * @param port Port if the socket
+   * @param hostname The hostname for the socket address
+   * @param port The port for the socket address
    *
    * @exception IllegalArgumentException If the port number is illegal
    */
@@ -114,49 +113,48 @@
     throws IllegalArgumentException
   {
     if (hostname == null)
-      throw new IllegalArgumentException ("Null host name value");
-    
+      throw new IllegalArgumentException("Null host name value");
+
     if (port < 0 || port > 65535)
-      throw new IllegalArgumentException ("Bad port number: " + port);
+      throw new IllegalArgumentException("Bad port number: " + port);
 
     this.port = port;
     this.hostname = hostname;
 
     try
       {
-        this.addr = InetAddress.getByName(hostname);
+	this.addr = InetAddress.getByName(hostname);
       }
     catch (Exception e) // UnknownHostException, SecurityException
       {
-        this.addr = null;
+	this.addr = null;
       }
   }
- 
-  /** 
+
+  /**
    * Test if obj is a <code>InetSocketAddress</code> and
    * has the same address and port
    *
    * @param obj The obj to compare this address with.
    *
-   * @return True if obj is equal.   
+   * @return True if obj is equal.
    */
-  public final boolean equals (Object obj)
+  public final boolean equals(Object obj)
   {
     // InetSocketAddress objects are equal when addr and port are equal.
     // The hostname may differ.
-
     if (obj instanceof InetSocketAddress)
       {
-        InetSocketAddress sa = (InetSocketAddress) obj;
-	
-        if (addr == null && sa.addr != null)
-          return false;
-        else if (addr == null && sa.addr == null)
-          return hostname.equals (sa.hostname) && sa.port == port;
-        else
-          return addr.equals (sa.addr) && sa.port == port;
+	InetSocketAddress sa = (InetSocketAddress) obj;
+
+	if (addr == null && sa.addr != null)
+	  return false;
+	else if (addr == null && sa.addr == null)
+	  return hostname.equals(sa.hostname) && sa.port == port;
+	else
+	  return addr.equals(sa.addr) && sa.port == port;
       }
-    
+
     return false;
   }
 
@@ -190,7 +188,7 @@
   {
     return port;
   }
-    
+
   /**
    * Returns the hashcode of the <code>InetSocketAddress</code>
    *
@@ -210,7 +208,7 @@
   {
     return addr == null;
   }
-    
+
   /**
    * Returns the <code>InetSocketAddress</code> as string
    *
Index: java/net/MalformedURLException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/MalformedURLException.java,v
retrieving revision 1.7
diff -u -r1.7 MalformedURLException.java
--- java/net/MalformedURLException.java	24 Feb 2002 04:25:16 -0000	1.7
+++ java/net/MalformedURLException.java	8 Apr 2004 16:24:07 -0000
@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 
+
 /**
  * This exception indicates that a URL passed to an object was not in a
  * valid format.
Index: java/net/MulticastSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/MulticastSocket.java,v
retrieving revision 1.23
diff -u -r1.23 MulticastSocket.java
--- java/net/MulticastSocket.java	12 Feb 2004 16:38:11 -0000	1.23
+++ java/net/MulticastSocket.java	8 Apr 2004 16:24:07 -0000
@@ -8,7 +8,7 @@
 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
@@ -41,21 +41,21 @@
 import java.io.IOException;
 import java.util.Enumeration;
 
+
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  Believed complete and correct.
  */
-
 /**
  * This class models a multicast UDP socket.  A multicast address is a
- * class D internet address (one whose most significant bits are 1110).  
+ * class D internet address (one whose most significant bits are 1110).
  * A multicast group consists of a multicast address and a well known
  * port number.  All members of the group listening on that address and
  * port will receive all the broadcasts to the group.
  * <p>
- * Please note that applets are not allowed to use multicast sockets 
- * 
+ * Please note that applets are not allowed to use multicast sockets
+ *
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  Believed complete and correct.
@@ -111,10 +111,10 @@
     if (address != null)
       bind(address);
   }
-  
+
   /**
    * Returns the interface being used for multicast packets
-   * 
+   *
    * @return The multicast interface
    *
    * @exception SocketException If an error occurs
@@ -131,7 +131,7 @@
    * Returns the current value of the "Time to Live" option.  This is the
    * number of hops a packet can make before it "expires".   This method id
    * deprecated.  Use <code>getTimeToLive</code> instead.
-   * 
+   *
    * @return The TTL value
    *
    * @exception IOException If an error occurs
@@ -153,8 +153,8 @@
 
   /**
    * Returns the current value of the "Time to Live" option.  This is the
-   * number of hops a packet can make before it "expires". 
-   * 
+   * number of hops a packet can make before it "expires".
+   *
    * @return The TTL value
    *
    * @exception IOException If an error occurs
@@ -189,12 +189,12 @@
   /**
    * Sets the local network interface used to send multicast messages
    *
-   * @param netIF The local network interface used to send multicast messages
-   * 
+   * @param netIf The local network interface used to send multicast messages
+   *
    * @exception SocketException If an error occurs
-   * 
+   *
    * @see MulticastSocket#getNetworkInterface()
-   * 
+   *
    * @since 1.4
    */
   public void setNetworkInterface(NetworkInterface netIf)
@@ -203,13 +203,13 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    Enumeration e = netIf.getInetAddresses ();
+    Enumeration e = netIf.getInetAddresses();
 
-    if (!e.hasMoreElements ())
+    if (! e.hasMoreElements())
       throw new SocketException("no network devices found");
 
-    InetAddress address = (InetAddress) e.nextElement ();
-    getImpl().setOption (SocketOptions.IP_MULTICAST_IF, address);
+    InetAddress address = (InetAddress) e.nextElement();
+    getImpl().setOption(SocketOptions.IP_MULTICAST_IF, address);
   }
 
   /**
@@ -220,18 +220,17 @@
    * @exception SocketException If an error occurs
    *
    * @see MulticastSocket#setNetworkInterface(NetworkInterface netIf)
-   * 
+   *
    * @since 1.4
    */
-  public NetworkInterface getNetworkInterface()
-    throws SocketException
+  public NetworkInterface getNetworkInterface() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
 
     InetAddress address =
-      (InetAddress) getImpl().getOption (SocketOptions.IP_MULTICAST_IF);
-    NetworkInterface netIf = NetworkInterface.getByInetAddress (address);
+      (InetAddress) getImpl().getOption(SocketOptions.IP_MULTICAST_IF);
+    NetworkInterface netIf = NetworkInterface.getByInetAddress(address);
 
     return netIf;
   }
@@ -239,7 +238,7 @@
   /**
    * Disable/Enable local loopback of multicast packets.  The option is used by
    * the platform's networking code as a hint for setting whether multicast
-   * data will be looped back to the local socket. 
+   * data will be looped back to the local socket.
    *
    * Because this option is a hint, applications that want to verify what
    * loopback mode is set to should call #getLoopbackMode
@@ -255,12 +254,15 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    getImpl().setOption (SocketOptions.IP_MULTICAST_LOOP, Boolean.valueOf(disable));
+    getImpl().setOption(SocketOptions.IP_MULTICAST_LOOP,
+                        Boolean.valueOf(disable));
   }
 
   /**
-   * Checks if local loopback mode is enabled or not
+   * Checks if local loopback mode is enabled
    *
+   * @return true if loopback mode is enabled, false otherwise
+   * 
    * @exception SocketException If an error occurs
    *
    * @since 1.4
@@ -270,11 +272,11 @@
     if (isClosed())
       throw new SocketException("socket is closed");
 
-    Object buf = getImpl().getOption (SocketOptions.IP_MULTICAST_LOOP);
+    Object buf = getImpl().getOption(SocketOptions.IP_MULTICAST_LOOP);
 
     if (buf instanceof Boolean)
       return ((Boolean) buf).booleanValue();
-    
+
     throw new SocketException("unexpected type");
   }
 
@@ -303,12 +305,12 @@
 
   /**
    * Sets the "Time to Live" value for a socket.  The value must be between
-   * 1 and 255.  
+   * 1 and 255.
    *
    * @param ttl The new TTL value
    *
    * @exception IOException If an error occurs
-   * 
+   *
    * @since 1.2
    */
   public void setTimeToLive(int ttl) throws IOException
@@ -323,10 +325,10 @@
   }
 
   /**
-   * Joins the specified mulitcast group.
+   * Joins the specified multicast group.
+   *
+   * @param mcastaddr The address of the group to join
    *
-   * @param addr The address of the group to join
-   * 
    * @exception IOException If an error occurs
    * @exception SecurityException If a security manager exists and its
    * checkMulticast method doesn't allow the operation
@@ -349,7 +351,7 @@
   /**
    * Leaves the specified multicast group
    *
-   * @param addr The address of the group to leave
+   * @param mcastaddr The address of the group to leave
    *
    * @exception IOException If an error occurs
    * @exception SecurityException If a security manager exists and its
@@ -377,7 +379,7 @@
    * @param netIf The local network interface to receive the multicast
    * messages on or null to defer the interface set by #setInterface or
    * #setNetworkInterface
-   * 
+   *
    * @exception IOException If an error occurs
    * @exception IllegalArgumentException If address type is not supported
    * @exception SecurityException If a security manager exists and its
@@ -395,26 +397,26 @@
       throw new SocketException("socket is closed");
 
     if (! (mcastaddr instanceof InetSocketAddress))
-      throw new IllegalArgumentException ("SocketAddress type not supported");
+      throw new IllegalArgumentException("SocketAddress type not supported");
 
     InetSocketAddress tmp = (InetSocketAddress) mcastaddr;
-    
-    if (! tmp.getAddress ().isMulticastAddress ())
-      throw new IOException ("Not a Multicast address");
 
-    SecurityManager s = System.getSecurityManager ();
+    if (! tmp.getAddress().isMulticastAddress())
+      throw new IOException("Not a Multicast address");
+
+    SecurityManager s = System.getSecurityManager();
     if (s != null)
-      s.checkMulticast (tmp.getAddress ());
+      s.checkMulticast(tmp.getAddress());
 
-    getImpl().joinGroup (mcastaddr, netIf);
+    getImpl().joinGroup(mcastaddr, netIf);
   }
-  
+
   /**
    * Leaves the specified mulitcast group on a specified interface.
    *
    * @param mcastaddr The multicast address to leave
    * @param netIf The local networki interface or null to defer to the
-   * interface set by setInterface or setNetworkInterface 
+   * interface set by setInterface or setNetworkInterface
    *
    * @exception IOException If an error occurs
    * @exception IllegalArgumentException If address type is not supported
@@ -433,17 +435,17 @@
       throw new SocketException("socket is closed");
 
     InetSocketAddress tmp = (InetSocketAddress) mcastaddr;
-    
-    if (! tmp.getAddress ().isMulticastAddress ())
-      throw new IOException ("Not a Multicast address");
 
-    SecurityManager s = System.getSecurityManager ();
+    if (! tmp.getAddress().isMulticastAddress())
+      throw new IOException("Not a Multicast address");
+
+    SecurityManager s = System.getSecurityManager();
     if (s != null)
-      s.checkMulticast (tmp.getAddress ());
+      s.checkMulticast(tmp.getAddress());
 
-    getImpl().leaveGroup (mcastaddr, netIf);
+    getImpl().leaveGroup(mcastaddr, netIf);
   }
-  
+
   /**
    * Sends a packet of data to a multicast address with a TTL that is
    * different from the default TTL on this socket.  The default TTL for
@@ -458,7 +460,8 @@
    *
    * @deprecated
    */
-  public synchronized void send(DatagramPacket p, byte ttl) throws IOException
+  public synchronized void send(DatagramPacket packet, byte ttl)
+    throws IOException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
@@ -466,18 +469,18 @@
     SecurityManager s = System.getSecurityManager();
     if (s != null)
       {
-        InetAddress addr = p.getAddress();
-        if (addr.isMulticastAddress())
-          s.checkPermission (new SocketPermission
-                             (addr.getHostName () + p.getPort (),
-                              "accept,connect"));
-        else
-          s.checkConnect(addr.getHostAddress(), p.getPort());
+	InetAddress addr = packet.getAddress();
+	if (addr.isMulticastAddress())
+	  s.checkPermission(new SocketPermission(addr.getHostName()
+	                                         + packet.getPort(),
+	                                         "accept,connect"));
+	else
+	  s.checkConnect(addr.getHostAddress(), packet.getPort());
       }
 
     int oldttl = getImpl().getTimeToLive();
     getImpl().setTimeToLive(((int) ttl) & 0xFF);
-    getImpl().send(p);
+    getImpl().send(packet);
     getImpl().setTimeToLive(oldttl);
   }
-} // class MulticastSocket
+}
Index: java/net/NetPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/NetPermission.java,v
retrieving revision 1.9
diff -u -r1.9 NetPermission.java
--- java/net/NetPermission.java	25 May 2003 18:03:51 -0000	1.9
+++ java/net/NetPermission.java	8 Apr 2004 16:24:07 -0000
@@ -39,21 +39,22 @@
 
 import java.security.BasicPermission;
 
+
 /**
  * This class is used to model miscellaneous network permissions.  It is
- * a subclass of <code>BasicPermission</code>.  This means that it models a 
- * "boolean" permission.  One that you either have or do not have.  Thus 
- * there is no permitted action list associated with this object. 
+ * a subclass of <code>BasicPermission</code>.  This means that it models a
+ * "boolean" permission.  One that you either have or do not have.  Thus
+ * there is no permitted action list associated with this object.
  *
  * The following permission names are defined for this class:
- * 
+ *
  * <ul>
  * <li>setDefaultAuthenticator - Grants the ability to install a facility
- * to collect username and password information when requested by a 
+ * to collect username and password information when requested by a
  * web site or proxy server.
  * <li>requestPasswordAuthentication - Grants the ability to ask the
  * authentication facility for the user's password.
- * <li>specifyStreamHandler - Grants the permission to specify the 
+ * <li>specifyStreamHandler - Grants the permission to specify the
  * stream handler class used when loading from a URL.
  * </ul>
  *
@@ -75,8 +76,8 @@
   }
 
   /**
-   * Initializes a new instance of <code>NetPermission</code> with the 
-   * specified name and perms.  Note that the perms field is irrelevant and is 
+   * Initializes a new instance of <code>NetPermission</code> with the
+   * specified name and perms.  Note that the perms field is irrelevant and is
    * ignored.  This constructor should never need to be used.
    *
    * @param name The name of this permission
Index: java/net/NetworkInterface.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/NetworkInterface.java,v
retrieving revision 1.6
diff -u -r1.6 NetworkInterface.java
--- java/net/NetworkInterface.java	2 Oct 2003 18:49:59 -0000	1.6
+++ java/net/NetworkInterface.java	8 Apr 2004 16:24:07 -0000
@@ -7,7 +7,7 @@
 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
@@ -41,6 +41,7 @@
 import java.util.Enumeration;
 import java.util.Vector;
 
+
 /**
  * This class models a network interface on the host computer.  A network
  * interface contains a name (typically associated with a specific
@@ -54,25 +55,22 @@
 public final class NetworkInterface
 {
   static
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-	System.loadLibrary ("javanet");
-      }
-  }
+    {
+      if (Configuration.INIT_LOAD_LIBRARY)
+	System.loadLibrary("javanet");
+    }
 
   private String name;
-  
   private Vector inetAddresses;
 
-  private NetworkInterface (String name, InetAddress address)
+  private NetworkInterface(String name, InetAddress address)
   {
     this.name = name;
-    this.inetAddresses = new Vector (1, 1);
-    this.inetAddresses.add (address);
+    this.inetAddresses = new Vector(1, 1);
+    this.inetAddresses.add(address);
   }
 
-  private native static Vector getRealNetworkInterfaces ()
+  private static native Vector getRealNetworkInterfaces()
     throws SocketException;
 
   /**
@@ -80,45 +78,45 @@
    *
    * @return The name of the interface.
    */
-  public String getName ()
+  public String getName()
   {
     return name;
   }
 
   /**
    *  Returns all available addresses of the network interface
-   *  
+   *
    *  If a @see SecurityManager is available all addresses are checked
    *  with @see SecurityManager::checkConnect() if they are available.
-   *  Only <code>InetAddresses</code> are returned where the security manager 
+   *  Only <code>InetAddresses</code> are returned where the security manager
    *  doesn't throw an exception.
-   *  
+   *
    *  @return An enumeration of all addresses.
    */
-  public Enumeration getInetAddresses ()
+  public Enumeration getInetAddresses()
   {
-    SecurityManager s = System.getSecurityManager ();
+    SecurityManager s = System.getSecurityManager();
 
     if (s == null)
-      return inetAddresses.elements ();
+      return inetAddresses.elements();
 
-    Vector tmpInetAddresses = new Vector (1, 1);
+    Vector tmpInetAddresses = new Vector(1, 1);
 
-    for (Enumeration addresses = inetAddresses.elements ();
-	 addresses.hasMoreElements (); )
+    for (Enumeration addresses = inetAddresses.elements();
+         addresses.hasMoreElements();)
       {
-	InetAddress addr = (InetAddress) addresses.nextElement ();
+	InetAddress addr = (InetAddress) addresses.nextElement();
 	try
 	  {
-	    s.checkConnect (addr.getHostAddress (), 58000);
-	    tmpInetAddresses.add (addr);
+	    s.checkConnect(addr.getHostAddress(), 58000);
+	    tmpInetAddresses.add(addr);
 	  }
 	catch (SecurityException e)
 	  {
 	  }
-    }
+      }
 
-    return tmpInetAddresses.elements ();
+    return tmpInetAddresses.elements();
   }
 
   /**
@@ -126,7 +124,7 @@
    *
    *  @return The display name of the interface
    */
-  public String getDisplayName ()
+  public String getDisplayName()
   {
     return name;
   }
@@ -139,21 +137,20 @@
    *  @exception SocketException If an error occurs
    *  @exception NullPointerException If the specified name is null
    */
-  public static NetworkInterface getByName (String name)
+  public static NetworkInterface getByName(String name)
     throws SocketException
   {
-    Vector networkInterfaces = getRealNetworkInterfaces ();
+    Vector networkInterfaces = getRealNetworkInterfaces();
 
-    for (Enumeration e = networkInterfaces.elements ();
-         e.hasMoreElements (); )
+    for (Enumeration e = networkInterfaces.elements(); e.hasMoreElements();)
       {
-        NetworkInterface tmp = (NetworkInterface) e.nextElement ();
-      
-        if (name.equals (tmp.getName ()))
-          return tmp;
+	NetworkInterface tmp = (NetworkInterface) e.nextElement();
+
+	if (name.equals(tmp.getName()))
+	  return tmp;
       }
 
-    throw new SocketException ("no network interface with this name exists");
+    throw new SocketException("no network interface with this name exists");
   }
 
   /**
@@ -164,26 +161,25 @@
    *  @exception SocketException If an error occurs
    *  @exception NullPointerException If the specified addess is null
    */
-  public static NetworkInterface getByInetAddress (InetAddress addr)
+  public static NetworkInterface getByInetAddress(InetAddress addr)
     throws SocketException
   {
-    Vector networkInterfaces = getRealNetworkInterfaces ();
-    
-    for (Enumeration interfaces = networkInterfaces.elements ();
-         interfaces.hasMoreElements (); )
+    Vector networkInterfaces = getRealNetworkInterfaces();
+
+    for (Enumeration interfaces = networkInterfaces.elements();
+         interfaces.hasMoreElements();)
       {
-        NetworkInterface tmp = (NetworkInterface) interfaces.nextElement ();
-      
-        for (Enumeration addresses = tmp.inetAddresses.elements ();
-             addresses.hasMoreElements (); )
-          {
-            if (addr.equals ((InetAddress) addresses.nextElement ()))
-              return tmp;
-          }
+	NetworkInterface tmp = (NetworkInterface) interfaces.nextElement();
+
+	for (Enumeration addresses = tmp.inetAddresses.elements();
+	     addresses.hasMoreElements();)
+	  {
+	    if (addr.equals((InetAddress) addresses.nextElement()))
+	      return tmp;
+	  }
       }
 
-    throw new SocketException (
-      "no network interface is bound to such an IP address");
+    throw new SocketException("no network interface is bound to such an IP address");
   }
 
   /**
@@ -191,8 +187,7 @@
    *
    *  @exception SocketException If an error occurs
    */
-  public static Enumeration getNetworkInterfaces ()
-    throws SocketException
+  public static Enumeration getNetworkInterfaces() throws SocketException
   {
     Vector networkInterfaces = getRealNetworkInterfaces();
 
@@ -206,44 +201,43 @@
    *  Checks if the current instance is equal to obj
    *
    *  @param obj The object to compare with
-   */ 
-  public boolean equals (Object obj)
+   */
+  public boolean equals(Object obj)
   {
-    if (!(obj instanceof NetworkInterface))
+    if (! (obj instanceof NetworkInterface))
       return false;
-   
+
     NetworkInterface tmp = (NetworkInterface) obj;
 
-    return (name.equals (tmp.name)
-            && inetAddresses.equals (tmp.inetAddresses));
+    return (name.equals(tmp.name) && inetAddresses.equals(tmp.inetAddresses));
   }
 
   /**
    *  Returns the hashcode of the current instance
    */
-  public int hashCode ()
+  public int hashCode()
   {
     // FIXME: hash correctly
-    return name.hashCode () + inetAddresses.hashCode ();
+    return name.hashCode() + inetAddresses.hashCode();
   }
 
   /**
    *  Returns a string representation of the interface
    */
-  public String toString ()
+  public String toString()
   {
     // FIXME: check if this is correct
     String result;
-    String separator = System.getProperty ("line.separator");
+    String separator = System.getProperty("line.separator");
 
-    result = "name: " + getDisplayName () + " (" + getName () +
-	     ") addresses:" + separator;
+    result =
+      "name: " + getDisplayName() + " (" + getName() + ") addresses:"
+      + separator;
 
-    for (Enumeration e = inetAddresses.elements ();
-         e.hasMoreElements (); )
+    for (Enumeration e = inetAddresses.elements(); e.hasMoreElements();)
       {
-        InetAddress address = (InetAddress) e.nextElement ();
-        result += address.toString () + ";" + separator;
+	InetAddress address = (InetAddress) e.nextElement();
+	result += address.toString() + ";" + separator;
       }
 
     return result;
Index: java/net/NoRouteToHostException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/NoRouteToHostException.java,v
retrieving revision 1.7
diff -u -r1.7 NoRouteToHostException.java
--- java/net/NoRouteToHostException.java	24 Feb 2002 04:25:16 -0000	1.7
+++ java/net/NoRouteToHostException.java	8 Apr 2004 16:24:07 -0000
@@ -35,8 +35,8 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
+
 
 /**
   * This exception indicates that there is no TCP/IP route to the requested
Index: java/net/PasswordAuthentication.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/PasswordAuthentication.java,v
retrieving revision 1.8
diff -u -r1.8 PasswordAuthentication.java
--- java/net/PasswordAuthentication.java	25 May 2003 18:03:51 -0000	1.8
+++ java/net/PasswordAuthentication.java	8 Apr 2004 16:24:07 -0000
@@ -7,7 +7,7 @@
 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
@@ -37,6 +37,7 @@
 
 package java.net;
 
+
 /**
   * This class serves a container for username/password pairs.
   *
@@ -50,7 +51,7 @@
    */
 
   /**
-    * The username 
+    * The username
     */
   private String username;
 
@@ -66,7 +67,7 @@
    */
 
   /**
-    * Creates a new <code>PasswordAuthentication</code> object from the 
+    * Creates a new <code>PasswordAuthentication</code> object from the
     * specified username and password.
     *
     * @param username The username for this object
@@ -91,9 +92,9 @@
     */
   public String getUserName()
   {
-    return(username);
+    return (username);
   }
-   
+
   /**
     * Returns the password associated with this object
     *
@@ -101,8 +102,6 @@
     */
   public char[] getPassword()
   {
-    return(password);
+    return (password);
   }
-
 } // class PasswordAuthentication
-
Index: java/net/PortUnreachableException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/PortUnreachableException.java,v
retrieving revision 1.1
diff -u -r1.1 PortUnreachableException.java
--- java/net/PortUnreachableException.java	24 Feb 2002 04:25:16 -0000	1.1
+++ java/net/PortUnreachableException.java	8 Apr 2004 16:24:07 -0000
@@ -37,6 +37,7 @@
 
 package java.net;
 
+
 /**
  * This exception signals that an ICMP port unreachable datagram has been
  * received.
@@ -69,4 +70,3 @@
     super(message);
   }
 } // class PortUnreachableException
-
Index: java/net/ProtocolException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ProtocolException.java,v
retrieving revision 1.8
diff -u -r1.8 ProtocolException.java
--- java/net/ProtocolException.java	24 Feb 2002 04:25:16 -0000	1.8
+++ java/net/ProtocolException.java	8 Apr 2004 16:24:07 -0000
@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 
+
 /**
  * This exception indicates that some sort of low level protocol
  * exception occurred.  Look in the descriptive message (if any) for
Index: java/net/ServerSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ServerSocket.java,v
retrieving revision 1.35
diff -u -r1.35 ServerSocket.java
--- java/net/ServerSocket.java	21 Mar 2004 10:42:27 -0000	1.35
+++ java/net/ServerSocket.java	8 Apr 2004 16:24:07 -0000
@@ -8,7 +8,7 @@
 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
@@ -36,7 +36,6 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import gnu.java.net.PlainSocketImpl;
@@ -44,6 +43,7 @@
 import java.nio.channels.IllegalBlockingModeException;
 import java.nio.channels.ServerSocketChannel;
 
+
 /* Written using on-line Java Platform 1.2 API Specification.
  * Status:  I believe all methods are implemented.
  */
@@ -55,7 +55,7 @@
  * server sockets are ready to communicate with one another utilizing
  * whatever application layer protocol they desire.
  *
- * As with the <code>Socket</code> class, most instance methods of this class 
+ * As with the <code>Socket</code> class, most instance methods of this class
  * simply redirect their calls to an implementation class.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -78,34 +78,36 @@
    * True if socket is bound.
    */
   private boolean bound;
-  
+
   /*
    * This constructor is only used by java.nio.
    */
+
   // FIXME: Workaround a bug in gcj.
   //ServerSocket (PlainSocketImpl impl) throws IOException
-  ServerSocket (SocketImpl impl) throws IOException
+  ServerSocket(SocketImpl impl) throws IOException
   {
     if (impl == null)
       throw new NullPointerException("impl may not be null");
 
     this.impl = impl;
-    this.impl.create (true);
+    this.impl.create(true);
   }
 
   /*
    * This method is only used by java.nio.
    */
+
   // FIXME: Workaround a bug in gcj.
   //PlainSocketImpl getImpl()
   SocketImpl getImpl()
   {
     return impl;
   }
-  
+
   /**
    * Constructor that simply sets the implementation.
-   * 
+   *
    * @exception IOException If an error occurs
    *
    * @specnote This constructor is public since JDK 1.4
@@ -126,13 +128,12 @@
    * connection queue on this socket will be set to 50.
    *
    * @param port The port number to bind to
-   * 
+   *
    * @exception IOException If an error occurs
    * @exception SecurityException If a security manager exists and its
    * checkListen method doesn't allow the operation
    */
-  public ServerSocket (int port)
-    throws IOException
+  public ServerSocket(int port) throws IOException
   {
     this(port, 50);
   }
@@ -150,8 +151,7 @@
    * @exception SecurityException If a security manager exists and its
    * checkListen method doesn't allow the operation
    */
-  public ServerSocket (int port, int backlog)
-    throws IOException
+  public ServerSocket(int port, int backlog) throws IOException
   {
     this(port, backlog, null);
   }
@@ -173,13 +173,13 @@
    *
    * @since 1.1
    */
-  public ServerSocket (int port, int backlog, InetAddress bindAddr)
+  public ServerSocket(int port, int backlog, InetAddress bindAddr)
     throws IOException
   {
     this();
 
     // bind/listen socket
-    bind (new InetSocketAddress (bindAddr, port), backlog);
+    bind(new InetSocketAddress(bindAddr, port), backlog);
   }
 
   /**
@@ -191,21 +191,20 @@
    * @exception IllegalArgumentException If address type is not supported
    * @exception SecurityException If a security manager exists and its
    * checkListen method doesn't allow the operation
-   * 
+   *
    * @since 1.4
    */
-  public void bind (SocketAddress endpoint)
-    throws IOException
+  public void bind(SocketAddress endpoint) throws IOException
   {
-    bind (endpoint, 50);
+    bind(endpoint, 50);
   }
- 
+
   /**
    * Binds the server socket to a specified socket address
    *
    * @param endpoint The socket address to bind to
    * @param backlog The length of the pending connection queue
-   * 
+   *
    * @exception IOException If an error occurs
    * @exception IllegalArgumentException If address type is not supported
    * @exception SecurityException If a security manager exists and its
@@ -213,26 +212,27 @@
    *
    * @since 1.4
    */
-  public void bind (SocketAddress endpoint, int backlog) throws IOException
+  public void bind(SocketAddress endpoint, int backlog)
+    throws IOException
   {
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
-    
+
     if (! (endpoint instanceof InetSocketAddress))
-      throw new IllegalArgumentException ("Address type not supported");
+      throw new IllegalArgumentException("Address type not supported");
 
     InetSocketAddress tmp = (InetSocketAddress) endpoint;
 
-    SecurityManager s = System.getSecurityManager ();
+    SecurityManager s = System.getSecurityManager();
     if (s != null)
-      s.checkListen (tmp.getPort ());
+      s.checkListen(tmp.getPort());
 
     InetAddress addr = tmp.getAddress();
-    
+
     // Initialize addr with 0.0.0.0.
     if (addr == null)
       addr = InetAddress.ANY_IF;
-    
+
     try
       {
 	impl.bind(addr, tmp.getPort());
@@ -241,21 +241,21 @@
       }
     catch (IOException exception)
       {
-        close();
-        throw exception;
+	close();
+	throw exception;
       }
     catch (RuntimeException exception)
       {
-        close();
-        throw exception;
+	close();
+	throw exception;
       }
     catch (Error error)
       {
-        close();
-        throw error;
+	close();
+	throw error;
       }
   }
-  
+
   /**
    * This method returns the local address to which this socket is bound
    *
@@ -263,17 +263,17 @@
    */
   public InetAddress getInetAddress()
   {
-    if (!isBound())
+    if (! isBound())
       return null;
-    
+
     try
       {
-        return (InetAddress) impl.getOption (SocketOptions.SO_BINDADDR);
+	return (InetAddress) impl.getOption(SocketOptions.SO_BINDADDR);
       }
     catch (SocketException e)
       {
-        // This never happens as we are bound.
-        return null;
+	// This never happens as we are bound.
+	return null;
       }
   }
 
@@ -284,30 +284,34 @@
    */
   public int getLocalPort()
   {
-    if (!isBound())
+    if (! isBound())
       return -1;
-    
+
     return impl.getLocalPort();
   }
 
   /**
    * Returns the local socket address
    *
+   * @return the local socket address, null if not bound
+   * 
    * @since 1.4
    */
   public SocketAddress getLocalSocketAddress()
   {
-    if (!isBound())
+    if (! isBound())
       return null;
-    
+
     return new InetSocketAddress(getInetAddress(), getLocalPort());
   }
 
   /**
-   * Accepts a new connection and returns a connected <code>Socket</code> 
-   * instance representing that connection.  This method will block until a 
+   * Accepts a new connection and returns a connected <code>Socket</code>
+   * instance representing that connection.  This method will block until a
    * connection is available.
    *
+   * @return socket object for the just accepted connection
+   *
    * @exception IOException If an error occurs
    * @exception SecurityException If a security manager exists and its
    * checkListen method doesn't allow the operation
@@ -316,17 +320,17 @@
    * @exception SocketTimeoutException If a timeout was previously set with
    * setSoTimeout and the timeout has been reached
    */
-  public Socket accept () throws IOException
+  public Socket accept() throws IOException
   {
-    SecurityManager sm = System.getSecurityManager ();
+    SecurityManager sm = System.getSecurityManager();
     if (sm != null)
-      sm.checkListen (impl.getLocalPort ());
+      sm.checkListen(impl.getLocalPort());
 
     Socket socket = new Socket();
-    
+
     try
       {
-        implAccept(socket);
+	implAccept(socket);
       }
     catch (IOException e)
       {
@@ -337,15 +341,15 @@
 	catch (IOException e2)
 	  {
 	  }
-	
+
 	throw e;
       }
-    
+
     return socket;
   }
 
   /**
-   * This protected method is used to help subclasses override 
+   * This protected method is used to help subclasses override
    * <code>ServerSocket.accept()</code>.  The passed in socket will be
    * connected when this method returns.
    *
@@ -357,21 +361,19 @@
    *
    * @since 1.1
    */
-  protected final void implAccept (Socket socket)
-    throws IOException
+  protected final void implAccept(Socket socket) throws IOException
   {
     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 ()
-        && !((PlainSocketImpl) getImpl()).isInChannelOperation())
-      throw new IllegalBlockingModeException ();
-	    
+    if (getChannel() != null && ! getChannel().isBlocking()
+        && ! ((PlainSocketImpl) getImpl()).isInChannelOperation())
+      throw new IllegalBlockingModeException();
+
     impl.accept(socket.getImpl());
   }
 
@@ -380,11 +382,11 @@
    *
    * @exception IOException If an error occurs
    */
-  public void close () throws IOException
+  public void close() throws IOException
   {
     if (isClosed())
       return;
-    
+
     impl.close();
     impl = null;
     bound = false;
@@ -399,6 +401,8 @@
    *
    * The socket only has a ServerSocketChannel if its created
    * by ServerSocketChannel.open.
+   *
+   * @return the associated socket channel, null if none exists
    * 
    * @since 1.4
    */
@@ -409,6 +413,8 @@
 
   /**
    * Returns true when the socket is bound, otherwise false
+   *
+   * @return true if socket is bound, false otherwise
    * 
    * @since 1.4
    */
@@ -419,6 +425,8 @@
 
   /**
    * Returns true if the socket is closed, otherwise false
+   *
+   * @return true if socket is closed, false otherwise
    * 
    * @since 1.4
    */
@@ -429,7 +437,7 @@
 
   /**
    * Sets the value of SO_TIMEOUT.  A value of 0 implies that SO_TIMEOUT is
-   * disabled (ie, operations never time out).  This is the number of 
+   * disabled (ie, operations never time out).  This is the number of
    * milliseconds a socket operation can block before an
    * InterruptedIOException is thrown.
    *
@@ -439,11 +447,11 @@
    *
    * @since 1.1
    */
-  public void setSoTimeout (int timeout) throws SocketException
+  public void setSoTimeout(int timeout) throws SocketException
   {
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
-    
+
     if (timeout < 0)
       throw new IllegalArgumentException("SO_TIMEOUT value must be >= 0");
 
@@ -462,135 +470,135 @@
    *
    * @since 1.1
    */
-  public int getSoTimeout () throws IOException
+  public int getSoTimeout() throws IOException
   {
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
-    
+
     Object timeout = impl.getOption(SocketOptions.SO_TIMEOUT);
 
-    if (!(timeout instanceof Integer))
+    if (! (timeout instanceof Integer))
       throw new IOException("Internal Error");
 
-    return ((Integer)timeout).intValue();
+    return ((Integer) timeout).intValue();
   }
 
   /**
    * Enables/Disables the SO_REUSEADDR option
+   *
+   * @param on true if SO_REUSEADDR should be enabled, false otherwise
    * 
    * @exception SocketException If an error occurs
-   * 
+   *
    * @since 1.4
    */
-  public void setReuseAddress (boolean on)
-    throws SocketException
+  public void setReuseAddress(boolean on) throws SocketException
   {
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
-    
-    impl.setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
+
+    impl.setOption(SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
   }
 
   /**
    * Checks if the SO_REUSEADDR option is enabled
-   * 
+   *
+   * @return true if SO_REUSEADDR is set, false otherwise
+   *
    * @exception SocketException If an error occurs
-   * 
+   *
    * @since 1.4
    */
-  public boolean getReuseAddress()
-    throws SocketException
+  public boolean getReuseAddress() throws SocketException
   {
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
-    
-    Object reuseaddr = impl.getOption (SocketOptions.SO_REUSEADDR);
 
-    if (!(reuseaddr instanceof Boolean))
-      throw new SocketException ("Internal Error");
-    
-    return ((Boolean) reuseaddr).booleanValue ();
+    Object reuseaddr = impl.getOption(SocketOptions.SO_REUSEADDR);
+
+    if (! (reuseaddr instanceof Boolean))
+      throw new SocketException("Internal Error");
+
+    return ((Boolean) reuseaddr).booleanValue();
   }
 
   /**
    * This method sets the value for the system level socket option
    * SO_RCVBUF to the specified value.  Note that valid values for this
    * option are specific to a given operating system.
-   * 
+   *
    * @param size The new receive buffer size.
-   * 
+   *
    * @exception SocketException If an error occurs or Socket is not connected
    * @exception IllegalArgumentException If size is 0 or negative
    *
    * @since 1.4
    */
-  public void setReceiveBufferSize (int size)
-    throws SocketException
+  public void setReceiveBufferSize(int size) throws SocketException
   {
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
-    
+
     if (size <= 0)
-      throw new IllegalArgumentException ("SO_RCVBUF value must be > 0");
+      throw new IllegalArgumentException("SO_RCVBUF value must be > 0");
 
-    impl.setOption (SocketOptions.SO_RCVBUF, new Integer (size));
+    impl.setOption(SocketOptions.SO_RCVBUF, new Integer(size));
   }
 
   /**
    * This method returns the value of the system level socket option
    * SO_RCVBUF, which is used by the operating system to tune buffer
    * sizes for data transfers.
-   * 
+   *
    * @return The receive buffer size.
-   *             
+   *
    * @exception SocketException If an error occurs or Socket is not connected
-   * 
+   *
    * @since 1.4
    */
-  public int getReceiveBufferSize ()
-    throws SocketException
+  public int getReceiveBufferSize() throws SocketException
   {
     if (isClosed())
       throw new SocketException("ServerSocket is closed");
-    
-    Object buf = impl.getOption (SocketOptions.SO_RCVBUF);
 
-    if (!(buf instanceof Integer))
-      throw new SocketException ("Internal Error: Unexpected type");
-    
-    return ((Integer) buf).intValue ();
+    Object buf = impl.getOption(SocketOptions.SO_RCVBUF);
+
+    if (! (buf instanceof Integer))
+      throw new SocketException("Internal Error: Unexpected type");
+
+    return ((Integer) buf).intValue();
   }
 
   /**
-   * Returns the value of this socket as a <code>String</code>. 
+   * Returns the value of this socket as a <code>String</code>.
    *
    * @return This socket represented as a <code>String</code>.
    */
-  public String toString ()
+  public String toString()
   {
-    if (!isBound())
+    if (! isBound())
       return "ServerSocket[unbound]";
-    
-    return ("ServerSocket[addr=" + getInetAddress()
-	    + ",port=" + impl.getPort()
-	    + ",localport=" + impl.getLocalPort()
-	    + "]");
+
+    return ("ServerSocket[addr=" + getInetAddress() + ",port="
+           + impl.getPort() + ",localport=" + impl.getLocalPort() + "]");
   }
 
   /**
-   * Sets the <code>SocketImplFactory</code> for all 
+   * Sets the <code>SocketImplFactory</code> for all
    * <code>ServerSocket</code>'s.  This may only be done
    * once per virtual machine.  Subsequent attempts will generate an
    * exception.  Note that a <code>SecurityManager</code> check is made prior
    * to setting the factory.  If insufficient privileges exist to set the
    * factory, an exception will be thrown
    *
+   * @param fac the factory to set
+   *
    * @exception SecurityException If this operation is not allowed by the
    * <code>SecurityManager</code>.
    * @exception SocketException If the factory object is already defined
    * @exception IOException If any other error occurs
    */
-  public static synchronized void setSocketFactory (SocketImplFactory fac)
+  public static synchronized void setSocketFactory(SocketImplFactory fac)
     throws IOException
   {
     factory = fac;
Index: java/net/Socket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Socket.java,v
retrieving revision 1.42
diff -u -r1.42 Socket.java
--- java/net/Socket.java	12 Feb 2004 16:38:11 -0000	1.42
+++ java/net/Socket.java	8 Apr 2004 16:24:07 -0000
@@ -8,7 +8,7 @@
 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
@@ -36,15 +36,15 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import gnu.java.net.PlainSocketImpl;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
-import java.nio.channels.SocketChannel;
 import java.nio.channels.IllegalBlockingModeException;
+import java.nio.channels.SocketChannel;
+
 
 /* Written using on-line Java Platform 1.2 API Specification.
  * Status:  I believe all methods are implemented.
@@ -56,11 +56,11 @@
  * <p>
  * This class does not actually do any work.  Instead, it redirects all of
  * its calls to a socket implementation object which implements the
- * <code>SocketImpl</code> interface.  The implementation class is 
- * instantiated by factory class that implements the 
+ * <code>SocketImpl</code> interface.  The implementation class is
+ * instantiated by factory class that implements the
  * <code>SocketImplFactory interface</code>.  A default
  * factory is provided, however the factory may be set by a call to
- * the <code>setSocketImplFactory</code> method.  Note that this may only be 
+ * the <code>setSocketImplFactory</code> method.  Note that this may only be
  * done once per virtual machine.  If a subsequent attempt is made to set the
  * factory, a <code>SocketException</code> will be thrown.
  *
@@ -81,7 +81,8 @@
   private SocketImpl impl;
 
   /**
-   * True if socket implementation was created by calling their create() method.
+   * True if socket implementation was created by calling their
+   * create() method.
    */
   private boolean implCreated;
 
@@ -101,14 +102,14 @@
   private boolean outputShutdown;
 
   /**
-   * Initializes a new instance of <code>Socket</code> object without 
-   * connecting to a remote host.  This useful for subclasses of socket that 
+   * Initializes a new instance of <code>Socket</code> object without
+   * connecting to a remote host.  This useful for subclasses of socket that
    * might want this behavior.
    *
    * @specnote This constructor is public since JDK 1.4
    * @since 1.1
    */
-  public Socket ()
+  public Socket()
   {
     if (factory != null)
       impl = factory.createSocketImpl();
@@ -119,7 +120,7 @@
   /**
    * Initializes a new instance of <code>Socket</code> object without
    * connecting to a remote host.  This is useful for subclasses of socket
-   * that might want this behavior.  
+   * that might want this behavior.
    * <p>
    * Additionally, this socket will be created using the supplied
    * implementation class instead the default class or one returned by a
@@ -133,7 +134,7 @@
    *
    * @since 1.1
    */
-  protected Socket (SocketImpl impl) throws SocketException
+  protected Socket(SocketImpl impl) throws SocketException
   {
     if (impl == null)
       this.impl = new PlainSocketImpl();
@@ -142,7 +143,7 @@
   }
 
   /**
-   * Initializes a new instance of <code>Socket</code> and connects to the 
+   * Initializes a new instance of <code>Socket</code> and connects to the
    * hostname and port specified as arguments.
    *
    * @param host The name of the host to connect to
@@ -154,14 +155,14 @@
    * @exception SecurityException If a security manager exists and its
    * checkConnect method doesn't allow the operation
    */
-  public Socket (String host, int port)
+  public Socket(String host, int port)
     throws UnknownHostException, IOException
   {
     this(InetAddress.getByName(host), port, null, 0, true);
   }
 
   /**
-   * Initializes a new instance of <code>Socket</code> and connects to the 
+   * Initializes a new instance of <code>Socket</code> and connects to the
    * address and port number specified as arguments.
    *
    * @param address The address to connect to
@@ -171,15 +172,14 @@
    * @exception SecurityException If a security manager exists and its
    * checkConnect method doesn't allow the operation
    */
-  public Socket (InetAddress address, int port)
-    throws IOException 
+  public Socket(InetAddress address, int port) throws IOException
   {
     this(address, port, null, 0, true);
   }
 
   /**
-   * Initializes a new instance of <code>Socket</code> that connects to the 
-   * named host on the specified port and binds to the specified local address 
+   * Initializes a new instance of <code>Socket</code> that connects to the
+   * named host on the specified port and binds to the specified local address
    * and port.
    *
    * @param host The name of the remote host to connect to.
@@ -194,15 +194,15 @@
    *
    * @since 1.1
    */
-  public Socket (String host, int port,
-		 InetAddress localAddr, int localPort) throws IOException
+  public Socket(String host, int port, InetAddress localAddr, int localPort)
+    throws IOException
   {
     this(InetAddress.getByName(host), port, localAddr, localPort, true);
   }
 
   /**
-   * Initializes a new instance of <code>Socket</code> and connects to the 
-   * address and port number specified as arguments, plus binds to the 
+   * Initializes a new instance of <code>Socket</code> and connects to the
+   * address and port number specified as arguments, plus binds to the
    * specified local address and port.
    *
    * @param address The remote address to connect to
@@ -216,16 +216,16 @@
    *
    * @since 1.1
    */
-  public Socket (InetAddress address, int port,
-		 InetAddress localAddr, int localPort) throws IOException
+  public Socket(InetAddress address, int port, InetAddress localAddr,
+                int localPort) throws IOException
   {
     this(address, port, localAddr, localPort, true);
   }
 
   /**
-   * Initializes a new instance of <code>Socket</code> and connects to the 
-   * hostname and port specified as arguments.  If the stream argument is set 
-   * to <code>true</code>, then a stream socket is created.  If it is 
+   * Initializes a new instance of <code>Socket</code> and connects to the
+   * hostname and port specified as arguments.  If the stream argument is set
+   * to <code>true</code>, then a stream socket is created.  If it is
    * <code>false</code>, a datagram socket is created.
    *
    * @param host The name of the host to connect to
@@ -240,20 +240,21 @@
    * @deprecated Use the <code>DatagramSocket</code> class to create
    * datagram oriented sockets.
    */
-  public Socket (String host, int port, boolean stream) throws IOException
+  public Socket(String host, int port, boolean stream)
+    throws IOException
   {
     this(InetAddress.getByName(host), port, null, 0, stream);
   }
 
   /**
-   * Initializes a new instance of <code>Socket</code> and connects to the 
-   * address and port number specified as arguments.  If the stream param is 
-   * <code>true</code>, a stream socket will be created, otherwise a datagram 
+   * Initializes a new instance of <code>Socket</code> and connects to the
+   * address and port number specified as arguments.  If the stream param is
+   * <code>true</code>, a stream socket will be created, otherwise a datagram
    * socket is created.
    *
    * @param host The address to connect to
    * @param port The port number to connect to
-   * @param stream <code>true</code> to create a stream socket, 
+   * @param stream <code>true</code> to create a stream socket,
    * <code>false</code> to create a datagram socket.
    *
    * @exception IOException If an error occurs
@@ -263,7 +264,8 @@
    * @deprecated Use the <code>DatagramSocket</code> class to create
    * datagram oriented sockets.
    */
-  public Socket (InetAddress host, int port, boolean stream) throws IOException
+  public Socket(InetAddress host, int port, boolean stream)
+    throws IOException
   {
     this(host, port, null, 0, stream);
   }
@@ -296,11 +298,11 @@
 
     // bind socket
     SocketAddress bindaddr =
-      laddr == null ? null : new InetSocketAddress (laddr, lport);
-    bind (bindaddr);
-    
+      laddr == null ? null : new InetSocketAddress(laddr, lport);
+    bind(bindaddr);
+
     // connect socket
-    connect (new InetSocketAddress (raddr, rport));
+    connect(new InetSocketAddress(raddr, rport));
 
     // FIXME: JCL p. 1586 says if localPort is unspecified, bind to any port,
     // i.e. '0' and if localAddr is unspecified, use getLocalAddress() as
@@ -308,12 +310,11 @@
   }
 
   // This has to be accessible from java.net.ServerSocket.
-  SocketImpl getImpl()
-    throws SocketException
+  SocketImpl getImpl() throws SocketException
   {
     try
       {
-	if (!implCreated)
+	if (! implCreated)
 	  {
 	    impl.create(true);
 	    implCreated = true;
@@ -336,10 +337,10 @@
    * @exception SecurityException If a security manager exists and its
    * checkConnect method doesn't allow the operation
    * @exception IllegalArgumentException If the address type is not supported
-   * 
+   *
    * @since 1.4
    */
-  public void bind (SocketAddress bindpoint) throws IOException
+  public void bind(SocketAddress bindpoint) throws IOException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
@@ -347,36 +348,36 @@
     // XXX: JDK 1.4.1 API documentation says that if bindpoint is null the
     // socket will be bound to an ephemeral port and a valid local address.
     if (bindpoint == null)
-      bindpoint = new InetSocketAddress (InetAddress.ANY_IF, 0);
-    
-    if ( !(bindpoint instanceof InetSocketAddress))
-      throw new IllegalArgumentException ();
+      bindpoint = new InetSocketAddress(InetAddress.ANY_IF, 0);
+
+    if (! (bindpoint instanceof InetSocketAddress))
+      throw new IllegalArgumentException();
 
     InetSocketAddress tmp = (InetSocketAddress) bindpoint;
-    
+
     // bind to address/port
     try
       {
-        getImpl().bind (tmp.getAddress(), tmp.getPort());
+	getImpl().bind(tmp.getAddress(), tmp.getPort());
 	bound = true;
       }
     catch (IOException exception)
       {
-        close ();
-        throw exception;
+	close();
+	throw exception;
       }
     catch (RuntimeException exception)
       {
-        close ();
-        throw exception;
+	close();
+	throw exception;
       }
     catch (Error error)
       {
-        close ();
-        throw error;
+	close();
+	throw error;
       }
   }
-  
+
   /**
    * Connects the socket with a remote address.
    *
@@ -386,13 +387,12 @@
    * @exception IllegalArgumentException If the addess type is not supported
    * @exception IllegalBlockingModeException If this socket has an associated
    * channel, and the channel is in non-blocking mode
-   * 
+   *
    * @since 1.4
    */
-  public void connect (SocketAddress endpoint)
-    throws IOException
+  public void connect(SocketAddress endpoint) throws IOException
   {
-    connect (endpoint, 0);
+    connect(endpoint, 0);
   }
 
   /**
@@ -401,7 +401,7 @@
    * until established or an error occurs.
    *
    * @param endpoint The address to connect to
-   * @param timeout The length of the timeout in milliseconds, or 
+   * @param timeout The length of the timeout in milliseconds, or
    * 0 to indicate no timeout.
    *
    * @exception IOException If an error occurs
@@ -409,15 +409,15 @@
    * @exception IllegalBlockingModeException If this socket has an associated
    * channel, and the channel is in non-blocking mode
    * @exception SocketTimeoutException If the timeout is reached
-   * 
+   *
    * @since 1.4
    */
-  public void connect (SocketAddress endpoint, int timeout)
+  public void connect(SocketAddress endpoint, int timeout)
     throws IOException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     if (! (endpoint instanceof InetSocketAddress))
       throw new IllegalArgumentException("unsupported address type");
 
@@ -425,32 +425,31 @@
     // 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 ()
-        && !((PlainSocketImpl) getImpl()).isInChannelOperation())
-      throw new IllegalBlockingModeException ();
-  
-    if (!isBound ())
-      bind (null);
+    if (getChannel() != null && ! getChannel().isBlocking()
+        && ! ((PlainSocketImpl) getImpl()).isInChannelOperation())
+      throw new IllegalBlockingModeException();
+
+    if (! isBound())
+      bind(null);
 
     try
       {
-        getImpl().connect (endpoint, timeout);
+	getImpl().connect(endpoint, timeout);
       }
     catch (IOException exception)
       {
-        close ();
-        throw exception;
+	close();
+	throw exception;
       }
     catch (RuntimeException exception)
       {
-        close ();
-        throw exception;
+	close();
+	throw exception;
       }
     catch (Error error)
       {
-        close ();
-        throw error;
+	close();
+	throw error;
       }
   }
 
@@ -460,9 +459,9 @@
    *
    * @return The remote address this socket is connected to
    */
-  public InetAddress getInetAddress ()
+  public InetAddress getInetAddress()
   {
-    if (!isConnected())
+    if (! isConnected())
       return null;
 
     try
@@ -485,20 +484,20 @@
    *
    * @since 1.1
    */
-  public InetAddress getLocalAddress ()
+  public InetAddress getLocalAddress()
   {
     InetAddress addr = null;
-    
+
     try
       {
-        addr = (InetAddress) getImpl().getOption(SocketOptions.SO_BINDADDR);
+	addr = (InetAddress) getImpl().getOption(SocketOptions.SO_BINDADDR);
       }
-    catch(SocketException e)
+    catch (SocketException e)
       {
-        // (hopefully) shouldn't happen
-        // throw new java.lang.InternalError
-        //      ("Error in PlainSocketImpl.getOption");
-        return null;
+	// (hopefully) shouldn't happen
+	// throw new java.lang.InternalError
+	//      ("Error in PlainSocketImpl.getOption");
+	return null;
       }
 
     // FIXME: According to libgcj, checkConnect() is supposed to be called
@@ -519,9 +518,9 @@
    *
    * @return The remote port this socket is connected to
    */
-  public int getPort ()
+  public int getPort()
   {
-    if (!isConnected())
+    if (! isConnected())
       return 0;
 
     try
@@ -543,11 +542,11 @@
    *
    * @return The local port
    */
-  public int getLocalPort ()
+  public int getLocalPort()
   {
-    if (!isBound())
+    if (! isBound())
       return -1;
-    
+
     try
       {
 	if (getImpl() != null)
@@ -562,21 +561,22 @@
   }
 
   /**
-   * If the socket is already bound this returns the local SocketAddress,
-   * otherwise null
+   * Returns local socket address.
+   *
+   * @return the local socket address, null if not bound
    *
    * @since 1.4
    */
   public SocketAddress getLocalSocketAddress()
   {
-    if (!isBound())
+    if (! isBound())
       return null;
-    
-    InetAddress addr = getLocalAddress ();
+
+    InetAddress addr = getLocalAddress();
 
     try
       {
-	return new InetSocketAddress (addr, getImpl().getLocalPort());
+	return new InetSocketAddress(addr, getImpl().getLocalPort());
       }
     catch (SocketException e)
       {
@@ -586,19 +586,21 @@
   }
 
   /**
-   * If the socket is already connected this returns the remote SocketAddress,
-   * otherwise null
+   * Returns the remote socket address.
+   *
+   * @return the remote socket address, null of not connected
    *
    * @since 1.4
    */
   public SocketAddress getRemoteSocketAddress()
   {
-    if (!isConnected ())
+    if (! isConnected())
       return null;
 
     try
       {
-	return new InetSocketAddress (getImpl().getInetAddress (), getImpl().getPort ());
+	return new InetSocketAddress(getImpl().getInetAddress(),
+	                             getImpl().getPort());
       }
     catch (SocketException e)
       {
@@ -614,14 +616,14 @@
    *
    * @exception IOException If an error occurs or Socket is not connected
    */
-  public InputStream getInputStream () throws IOException
+  public InputStream getInputStream() throws IOException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
-    if (!isConnected())
+
+    if (! isConnected())
       throw new IOException("not connected");
-	    
+
     return getImpl().getInputStream();
   }
 
@@ -632,42 +634,42 @@
    *
    * @exception IOException If an error occurs or Socket is not connected
    */
-  public OutputStream getOutputStream () throws IOException
+  public OutputStream getOutputStream() throws IOException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
-    if (!isConnected())
+
+    if (! isConnected())
       throw new IOException("not connected");
-    
+
     return getImpl().getOutputStream();
   }
 
   /**
-   * Sets the TCP_NODELAY option on the socket. 
+   * Sets the TCP_NODELAY option on the socket.
    *
    * @param on true to enable, false to disable
-   * 
+   *
    * @exception SocketException If an error occurs or Socket is not connected
    *
    * @since 1.1
    */
-  public void setTcpNoDelay (boolean on)  throws SocketException
+  public void setTcpNoDelay(boolean on) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     getImpl().setOption(SocketOptions.TCP_NODELAY, Boolean.valueOf(on));
   }
 
   /**
-   * Tests whether or not the TCP_NODELAY option is set on the socket. 
+   * Tests whether or not the TCP_NODELAY option is set on the socket.
    * Returns true if enabled, false if disabled. When on it disables the
    * Nagle algorithm which means that packets are always send immediatly and
    * never merged together to reduce network trafic.
    *
    * @return Whether or not TCP_NODELAY is set
-   * 
+   *
    * @exception SocketException If an error occurs or Socket not connected
    *
    * @since 1.1
@@ -676,17 +678,17 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object on = getImpl().getOption(SocketOptions.TCP_NODELAY);
-  
+
     if (on instanceof Boolean)
-      return(((Boolean)on).booleanValue());
+      return (((Boolean) on).booleanValue());
     else
       throw new SocketException("Internal Error");
   }
 
   /**
-   * Sets the value of the SO_LINGER option on the socket.  If the 
+   * Sets the value of the SO_LINGER option on the socket.  If the
    * SO_LINGER option is set on a socket and there is still data waiting to
    * be sent when the socket is closed, then the close operation will block
    * until either that data is delivered or until the timeout period
@@ -694,7 +696,7 @@
    * (platform specific?)
    *
    * @param on true to enable SO_LINGER, false to disable
-   * @param linger The SO_LINGER timeout in hundreths of a second or -1 if 
+   * @param linger The SO_LINGER timeout in hundreths of a second or -1 if
    * SO_LINGER not set.
    *
    * @exception SocketException If an error occurs or Socket not connected
@@ -706,25 +708,23 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
-    if (on == true)
+
+    if (on)
       {
-        if (linger < 0)
-          throw new IllegalArgumentException("SO_LINGER must be >= 0");
+	if (linger < 0)
+	  throw new IllegalArgumentException("SO_LINGER must be >= 0");
 
-        if (linger > 65535)
-          linger = 65535;
+	if (linger > 65535)
+	  linger = 65535;
 
-        getImpl().setOption(SocketOptions.SO_LINGER, new Integer(linger));
+	getImpl().setOption(SocketOptions.SO_LINGER, new Integer(linger));
       }
     else
-      {
-        getImpl().setOption(SocketOptions.SO_LINGER, Boolean.valueOf(false));
-      }
+      getImpl().setOption(SocketOptions.SO_LINGER, Boolean.valueOf(false));
   }
 
   /**
-   * Returns the value of the SO_LINGER option on the socket.  If the 
+   * Returns the value of the SO_LINGER option on the socket.  If the
    * SO_LINGER option is set on a socket and there is still data waiting to
    * be sent when the socket is closed, then the close operation will block
    * until either that data is delivered or until the timeout period
@@ -732,7 +732,7 @@
    * of a second (platform specific?)) if SO_LINGER is set, or -1 if
    * SO_LINGER is not set.
    *
-   * @return The SO_LINGER timeout in hundreths of a second or -1 
+   * @return The SO_LINGER timeout in hundreths of a second or -1
    * if SO_LINGER not set
    *
    * @exception SocketException If an error occurs or Socket is not connected
@@ -743,11 +743,11 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object linger = getImpl().getOption(SocketOptions.SO_LINGER);
 
     if (linger instanceof Integer)
-      return(((Integer)linger).intValue());
+      return (((Integer) linger).intValue());
     else
       return -1;
   }
@@ -762,78 +762,78 @@
    *
    * @since 1.4
    */
-  public void sendUrgentData (int data) throws IOException
+  public void sendUrgentData(int data) throws IOException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
-    getImpl().sendUrgentData (data);
+
+    getImpl().sendUrgentData(data);
   }
 
   /**
    * Enables/disables the SO_OOBINLINE option
-   * 
-   * @param on True if SO_OOBLINE should be enabled 
-   * 
+   *
+   * @param on True if SO_OOBLINE should be enabled
+   *
    * @exception SocketException If an error occurs
-   * 
+   *
    * @since 1.4
    */
-  public void setOOBInline (boolean on) throws SocketException
+  public void setOOBInline(boolean on) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     getImpl().setOption(SocketOptions.SO_OOBINLINE, Boolean.valueOf(on));
   }
 
   /**
    * Returns the current setting of the SO_OOBINLINE option for this socket
-   * 
+   *
    * @return True if SO_OOBINLINE is set, false otherwise.
    *
    * @exception SocketException If an error occurs
-   * 
+   *
    * @since 1.4
    */
-  public boolean getOOBInline () throws SocketException
+  public boolean getOOBInline() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object buf = getImpl().getOption(SocketOptions.SO_OOBINLINE);
 
     if (buf instanceof Boolean)
-      return(((Boolean)buf).booleanValue());
+      return (((Boolean) buf).booleanValue());
     else
       throw new SocketException("Internal Error: Unexpected type");
   }
-  
+
   /**
    * Sets the value of the SO_TIMEOUT option on the socket.  If this value
    * is set, and an read/write is performed that does not complete within
    * the timeout period, a short count is returned (or an EWOULDBLOCK signal
    * would be sent in Unix if no data had been read).  A value of 0 for
-   * this option implies that there is no timeout (ie, operations will 
+   * this option implies that there is no timeout (ie, operations will
    * block forever).  On systems that have separate read and write timeout
    * values, this method returns the read timeout.  This
    * value is in milliseconds.
    *
-   * @param timeout The length of the timeout in milliseconds, or 
+   * @param timeout The length of the timeout in milliseconds, or
    * 0 to indicate no timeout.
    *
    * @exception SocketException If an error occurs or Socket not connected
    *
    * @since 1.1
    */
-  public synchronized void setSoTimeout (int timeout) throws SocketException
+  public synchronized void setSoTimeout(int timeout) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     if (timeout < 0)
       throw new IllegalArgumentException("SO_TIMEOUT value must be >= 0");
-      
+
     getImpl().setOption(SocketOptions.SO_TIMEOUT, new Integer(timeout));
   }
 
@@ -842,26 +842,26 @@
    * is set, and an read/write is performed that does not complete within
    * the timeout period, a short count is returned (or an EWOULDBLOCK signal
    * would be sent in Unix if no data had been read).  A value of 0 for
-   * this option implies that there is no timeout (ie, operations will 
+   * this option implies that there is no timeout (ie, operations will
    * block forever).  On systems that have separate read and write timeout
    * values, this method returns the read timeout.  This
    * value is in thousandths of a second (implementation specific?).
    *
-   * @return The length of the timeout in thousandth's of a second or 0 
+   * @return The length of the timeout in thousandth's of a second or 0
    * if not set
    *
    * @exception SocketException If an error occurs or Socket not connected
    *
    * @since 1.1
    */
-  public synchronized int getSoTimeout () throws SocketException
+  public synchronized int getSoTimeout() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object timeout = getImpl().getOption(SocketOptions.SO_TIMEOUT);
     if (timeout instanceof Integer)
-      return(((Integer)timeout).intValue());
+      return (((Integer) timeout).intValue());
     else
       return 0;
   }
@@ -878,14 +878,14 @@
    *
    * @since 1.2
    */
-  public void setSendBufferSize (int size) throws SocketException
+  public void setSendBufferSize(int size) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     if (size <= 0)
       throw new IllegalArgumentException("SO_SNDBUF value must be > 0");
-    
+
     getImpl().setOption(SocketOptions.SO_SNDBUF, new Integer(size));
   }
 
@@ -900,15 +900,15 @@
    *
    * @since 1.2
    */
-  public int getSendBufferSize () throws SocketException
+  public int getSendBufferSize() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object buf = getImpl().getOption(SocketOptions.SO_SNDBUF);
 
     if (buf instanceof Integer)
-      return(((Integer)buf).intValue());
+      return (((Integer) buf).intValue());
     else
       throw new SocketException("Internal Error: Unexpected type");
   }
@@ -925,14 +925,14 @@
    *
    * @since 1.2
    */
-  public void setReceiveBufferSize (int size) throws SocketException
+  public void setReceiveBufferSize(int size) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     if (size <= 0)
       throw new IllegalArgumentException("SO_RCVBUF value must be > 0");
-      
+
     getImpl().setOption(SocketOptions.SO_RCVBUF, new Integer(size));
   }
 
@@ -947,15 +947,15 @@
    *
    * @since 1.2
    */
-  public int getReceiveBufferSize () throws SocketException
+  public int getReceiveBufferSize() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object buf = getImpl().getOption(SocketOptions.SO_RCVBUF);
 
     if (buf instanceof Integer)
-      return(((Integer)buf).intValue());
+      return (((Integer) buf).intValue());
     else
       throw new SocketException("Internal Error: Unexpected type");
   }
@@ -970,11 +970,11 @@
    *
    * @since 1.3
    */
-  public void setKeepAlive (boolean on) throws SocketException
+  public void setKeepAlive(boolean on) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     getImpl().setOption(SocketOptions.SO_KEEPALIVE, Boolean.valueOf(on));
   }
 
@@ -988,15 +988,15 @@
    *
    * @since 1.3
    */
-  public boolean getKeepAlive () throws SocketException
+  public boolean getKeepAlive() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object buf = getImpl().getOption(SocketOptions.SO_KEEPALIVE);
 
     if (buf instanceof Boolean)
-      return(((Boolean)buf).booleanValue());
+      return (((Boolean) buf).booleanValue());
     else
       throw new SocketException("Internal Error: Unexpected type");
   }
@@ -1006,11 +1006,11 @@
    *
    * @exception IOException If an error occurs
    */
-  public synchronized void close ()  throws IOException
+  public synchronized void close() throws IOException
   {
     if (isClosed())
       return;
-    
+
     getImpl().close();
     impl = null;
     bound = false;
@@ -1024,15 +1024,14 @@
    *
    * @return The <code>String</code> representation of this <code>Socket</code>
    */
-  public String toString ()
+  public String toString()
   {
     try
       {
 	if (isConnected())
-	  return ("Socket[addr=" + getImpl().getInetAddress()
-		  + ",port=" + getImpl().getPort()
-		  + ",localport=" + getImpl().getLocalPort()
-		  + "]");
+	  return ("Socket[addr=" + getImpl().getInetAddress() + ",port="
+	         + getImpl().getPort() + ",localport="
+	         + getImpl().getLocalPort() + "]");
       }
     catch (SocketException e)
       {
@@ -1043,19 +1042,21 @@
   }
 
   /**
-   * Sets the <code>SocketImplFactory</code>.  This may be done only once per 
-   * virtual machine.  Subsequent attempts will generate a 
+   * Sets the <code>SocketImplFactory</code>.  This may be done only once per
+   * virtual machine.  Subsequent attempts will generate a
    * <code>SocketException</code>.  Note that a <code>SecurityManager</code>
-   * check is made prior to setting the factory.  If 
-   * insufficient privileges exist to set the factory, then an 
+   * check is made prior to setting the factory.  If
+   * insufficient privileges exist to set the factory, then an
    * <code>IOException</code> will be thrown.
    *
+   * @param fac the factory to set
+   *
    * @exception SecurityException If the <code>SecurityManager</code> does
    * not allow this operation.
    * @exception SocketException If the SocketImplFactory is already defined
    * @exception IOException If any other error occurs
    */
-  public static synchronized void setSocketImplFactory (SocketImplFactory fac)
+  public static synchronized void setSocketImplFactory(SocketImplFactory fac)
     throws IOException
   {
     // See if already set
@@ -1084,7 +1085,7 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     getImpl().shutdownInput();
     inputShutdown = true;
   }
@@ -1100,7 +1101,7 @@
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     getImpl().shutdownOutput();
     outputShutdown = true;
   }
@@ -1108,7 +1109,8 @@
   /**
    * Returns the socket channel associated with this socket.
    *
-   * It returns null if no associated socket exists.
+   * @return the associated socket channel,
+   * null if no associated channel exists
    *
    * @since 1.4
    */
@@ -1126,55 +1128,57 @@
    *
    * @since 1.4
    */
-  public boolean getReuseAddress () throws SocketException
+  public boolean getReuseAddress() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
-    Object reuseaddr = getImpl().getOption (SocketOptions.SO_REUSEADDR);
 
-    if (!(reuseaddr instanceof Boolean))
-      throw new SocketException ("Internal Error");
+    Object reuseaddr = getImpl().getOption(SocketOptions.SO_REUSEADDR);
 
-    return ((Boolean) reuseaddr).booleanValue ();
+    if (! (reuseaddr instanceof Boolean))
+      throw new SocketException("Internal Error");
+
+    return ((Boolean) reuseaddr).booleanValue();
   }
 
   /**
    * Enables/Disables the SO_REUSEADDR option
    *
-   * @param reuseAddress True if SO_REUSEADDR should be set.
-   * 
+   * @param reuseAddress true if SO_REUSEADDR should be enabled,
+   * false otherwise
+   *
    * @exception SocketException If an error occurs
    *
    * @since 1.4
    */
-  public void setReuseAddress (boolean on) throws SocketException
+  public void setReuseAddress(boolean reuseAddress) throws SocketException
   {
-    getImpl().setOption (SocketOptions.SO_REUSEADDR, Boolean.valueOf(on));
+    getImpl().setOption(SocketOptions.SO_REUSEADDR,
+                        Boolean.valueOf(reuseAddress));
   }
 
   /**
    * Returns the current traffic class
    *
    * @return The current traffic class.
-   * 
+   *
    * @exception SocketException If an error occurs
    *
    * @see Socket#setTrafficClass(int tc)
    *
    * @since 1.4
    */
-  public int getTrafficClass () throws SocketException
+  public int getTrafficClass() throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     Object obj = getImpl().getOption(SocketOptions.IP_TOS);
 
     if (obj instanceof Integer)
-      return ((Integer) obj).intValue ();
+      return ((Integer) obj).intValue();
     else
-      throw new SocketException ("Unexpected type");
+      throw new SocketException("Unexpected type");
   }
 
   /**
@@ -1189,15 +1193,15 @@
    *
    * @since 1.4
    */
-  public void setTrafficClass (int tc) throws SocketException
+  public void setTrafficClass(int tc) throws SocketException
   {
     if (isClosed())
       throw new SocketException("socket is closed");
-    
+
     if (tc < 0 || tc > 255)
       throw new IllegalArgumentException();
 
-    getImpl().setOption (SocketOptions.IP_TOS, new Integer (tc));
+    getImpl().setOption(SocketOptions.IP_TOS, new Integer(tc));
   }
 
   /**
@@ -1207,11 +1211,11 @@
    *
    * @since 1.4
    */
-  public boolean isConnected ()
+  public boolean isConnected()
   {
     try
       {
-	return getImpl().getInetAddress () != null;
+	return getImpl().getInetAddress() != null;
       }
     catch (SocketException e)
       {
@@ -1226,19 +1230,19 @@
    *
    * @since 1.4
    */
-  public boolean isBound ()
+  public boolean isBound()
   {
     return bound;
   }
 
   /**
    * Checks if the socket is closed.
-   * 
+   *
    * @return True if socket is closed, false otherwise.
    *
    * @since 1.4
    */
-  public boolean isClosed ()
+  public boolean isClosed()
   {
     return impl == null;
   }
@@ -1247,10 +1251,10 @@
    * Checks if the socket's input stream is shutdown
    *
    * @return True if input is shut down.
-   * 
+   *
    * @since 1.4
    */
-  public boolean isInputShutdown ()
+  public boolean isInputShutdown()
   {
     return inputShutdown;
   }
@@ -1259,10 +1263,10 @@
    * Checks if the socket's output stream is shutdown
    *
    * @return True if output is shut down.
-   * 
+   *
    * @since 1.4
    */
-  public boolean isOutputShutdown ()
+  public boolean isOutputShutdown()
   {
     return outputShutdown;
   }
Index: java/net/SocketAddress.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/SocketAddress.java,v
retrieving revision 1.6
diff -u -r1.6 SocketAddress.java
--- java/net/SocketAddress.java	14 Jan 2003 21:46:20 -0000	1.6
+++ java/net/SocketAddress.java	8 Apr 2004 16:24:08 -0000
@@ -1,4 +1,4 @@
-/* SocketAddress.java -- 
+/* SocketAddress.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,7 +39,8 @@
 
 import java.io.Serializable;
 
-/** 
+
+/**
  * Abstract base class for InetSocketAddress.
  * InetSocketAddress is to my knowledge the only derived
  * class. [Ronald]
Index: java/net/SocketException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/SocketException.java,v
retrieving revision 1.8
diff -u -r1.8 SocketException.java
--- java/net/SocketException.java	24 Feb 2002 04:25:16 -0000	1.8
+++ java/net/SocketException.java	8 Apr 2004 16:24:08 -0000
@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 
+
 /**
  * This exception indicates that a generic error occurred related to an
  * operation on a socket.  Check the descriptive message (if any) for
Index: java/net/SocketImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/SocketImpl.java,v
retrieving revision 1.18
diff -u -r1.18 SocketImpl.java
--- java/net/SocketImpl.java	29 Jul 2003 15:50:20 -0000	1.18
+++ java/net/SocketImpl.java	8 Apr 2004 16:24:08 -0000
@@ -36,14 +36,14 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import java.io.FileDescriptor;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 
+
 /* Written using on-line Java Platform 1.2 API Specification.
  * Believed complete and correct.
  */
@@ -113,7 +113,8 @@
    *
    * @exception IOException If an error occurs
    */
-  protected abstract void connect(String host, int port) throws IOException;
+  protected abstract void connect(String host, int port)
+    throws IOException;
 
   /**
    * Connects to the remote address and port specified as arguments.
@@ -153,7 +154,8 @@
    *
    * @exception IOException If an error occurs
    */
-  protected abstract void bind(InetAddress host, int port) throws IOException;
+  protected abstract void bind(InetAddress host, int port)
+    throws IOException;
 
   /**
    * Starts listening for connections on a socket. The backlog parameter
@@ -220,26 +222,38 @@
    *
    * @return A FileDescriptor for this socket.
    */
-  protected FileDescriptor getFileDescriptor() { return fd; }
+  protected FileDescriptor getFileDescriptor()
+  {
+    return fd;
+  }
 
   /**
    * Returns the remote address this socket is connected to
    *
    * @return The remote address
    */
-  protected InetAddress getInetAddress() { return address; }
+  protected InetAddress getInetAddress()
+  {
+    return address;
+  }
 
   /**
    * Returns the remote port this socket is connected to
    *
    * @return The remote port
    */
-  protected int getPort() { return port; }
+  protected int getPort()
+  {
+    return port;
+  }
 
   /**
    * Returns true or false when this socket supports sending urgent data
    * or not.
    *
+   * @return true if the socket implementation supports sending urgent data,
+   * false otherwise
+   *
    * @since 1.4
    */
   protected boolean supportsUrgentData()
@@ -248,7 +262,7 @@
     // sending urgend data.
     return false;
   }
-  
+
   /**
    * Sends one byte of urgent data to the socket.
    *
@@ -258,15 +272,17 @@
    *
    * @since 1.4
    */
-  protected abstract void sendUrgentData(int data)
-    throws IOException;
-  
+  protected abstract void sendUrgentData(int data) throws IOException;
+
   /**
    * Returns the local port this socket is bound to
    *
    * @return The local port
    */
-  protected int getLocalPort() { return localport; }
+  protected int getLocalPort()
+  {
+    return localport;
+  }
 
   /**
    * Returns a <code>String</code> representing the remote host and port of
@@ -276,10 +292,9 @@
    */
   public String toString()
   {
-    return "[addr=" + ((address == null) ? "0.0.0.0/0.0.0.0" :
- 		       address.toString())
-	    + ",port=" + port
-	    + ",localport=" + localport + "]";
+    return "[addr="
+           + ((address == null) ? "0.0.0.0/0.0.0.0" : address.toString())
+           + ",port=" + port + ",localport=" + localport + "]";
   }
 
   /**
@@ -288,9 +303,9 @@
    *
    * @exception IOException if an error occurs
    */
-  protected void shutdownInput () throws IOException
+  protected void shutdownInput() throws IOException
   {
-    throw new IOException ("Not implemented in this socket class");
+    throw new IOException("Not implemented in this socket class");
   }
 
   /**
@@ -299,8 +314,8 @@
    *
    * @exception IOException if an error occurs
    */
-  protected void shutdownOutput () throws IOException
+  protected void shutdownOutput() throws IOException
   {
-    throw new IOException ("Not implemented in this socket class");
+    throw new IOException("Not implemented in this socket class");
   }
 }
Index: java/net/SocketImplFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/SocketImplFactory.java,v
retrieving revision 1.10
diff -u -r1.10 SocketImplFactory.java
--- java/net/SocketImplFactory.java	12 Oct 2003 15:35:01 -0000	1.10
+++ java/net/SocketImplFactory.java	8 Apr 2004 16:24:08 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,13 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
+
 /** Written using on-line Java Platform 1.2 API Specification.
   * Status:  Believed complete and correct.
   */
-
 /**
   * This interface defines one method which returns a <code>SocketImpl</code>
   * object.  This should not be needed by ordinary applications.
@@ -57,6 +56,4 @@
     * @return A <code>SocketImpl</code> object
     */
   SocketImpl createSocketImpl();
-
 } // interface SocketImplFactory
-
Index: java/net/SocketOptions.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/SocketOptions.java,v
retrieving revision 1.12
diff -u -r1.12 SocketOptions.java
--- java/net/SocketOptions.java	12 Oct 2003 15:35:01 -0000	1.12
+++ java/net/SocketOptions.java	8 Apr 2004 16:24:08 -0000
@@ -1,5 +1,5 @@
 /* SocketOptions.java -- Implements options for sockets (duh!)
-   Copyright (C) 1998, 1999, 2000, 2001, 
+   Copyright (C) 1998, 1999, 2000, 2001,
                  2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -8,7 +8,7 @@
 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
@@ -38,15 +38,15 @@
 
 package java.net;
 
+
 /**
  * Written using on-line Java Platform 1.2 API Specification.
  * Status:  Believed complete and correct.
  */
-
 /**
- * This interface is used by <code>SocketImpl</code> and 
+ * This interface is used by <code>SocketImpl</code> and
  * <code>DatagramSocketImpl</code> to implement options
- * on sockets.  
+ * on sockets.
  *
  * @since 1.2
  *
@@ -163,6 +163,4 @@
    * @exception SocketException If an error occurs
    */
   Object getOption(int optionId) throws SocketException;
-
 } // interface SocketOptions
-
Index: java/net/SocketTimeoutException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/SocketTimeoutException.java,v
retrieving revision 1.1
diff -u -r1.1 SocketTimeoutException.java
--- java/net/SocketTimeoutException.java	24 Feb 2002 04:25:16 -0000	1.1
+++ java/net/SocketTimeoutException.java	8 Apr 2004 16:24:08 -0000
@@ -39,6 +39,7 @@
 
 import java.io.InterruptedIOException;
 
+
 /**
  * This exception signals that a socket read or accept timed out.
  *
Index: java/net/URISyntaxException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URISyntaxException.java,v
retrieving revision 1.1
diff -u -r1.1 URISyntaxException.java
--- java/net/URISyntaxException.java	24 Feb 2002 04:25:16 -0000	1.1
+++ java/net/URISyntaxException.java	8 Apr 2004 16:24:08 -0000
@@ -37,6 +37,7 @@
 
 package java.net;
 
+
 /**
  * This exception is thrown when a String cannot be parsed as a URI.
  *
@@ -137,7 +138,7 @@
    */
   public String getMessage()
   {
-    return super.getMessage() + (index >= 0 ? " at index " + index : "")
-      + ": " + input;
+    return (super.getMessage() + (index >= 0 ? " at index " + index : "")
+           + ": " + input);
   }
 }
Index: java/net/URLDecoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLDecoder.java,v
retrieving revision 1.12
diff -u -r1.12 URLDecoder.java
--- java/net/URLDecoder.java	2 Mar 2003 20:31:56 -0000	1.12
+++ java/net/URLDecoder.java	8 Apr 2004 16:24:08 -0000
@@ -7,7 +7,7 @@
 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
@@ -39,8 +39,9 @@
 
 import java.io.UnsupportedEncodingException;
 
+
 /**
- * This utility class contains static methods that converts a 
+ * This utility class contains static methods that converts a
  * string encoded in the x-www-form-urlencoded format to the original
  * text.  The x-www-form-urlencoded format replaces certain disallowed
  * characters with encoded equivalents.  All upper case and lower case
@@ -65,7 +66,7 @@
   /**
    * Public contructor. Note that this class has only static methods.
    */
-  public URLDecoder ()
+  public URLDecoder()
   {
   }
 
@@ -84,12 +85,12 @@
   {
     try
       {
-        return decode(s, "UTF-8");
+	return decode(s, "UTF-8");
       }
     catch (UnsupportedEncodingException uee)
       {
-        // Should never happen since UTF-8 encoding should always be supported
-        return s;
+	// Should never happen since UTF-8 encoding should always be supported
+	return s;
       }
   }
 
@@ -120,7 +121,7 @@
   {
     // First convert all '+' characters to spaces.
     String str = s.replace('+', ' ');
-    
+
     // Then go through the whole string looking for byte encoded characters
     int i;
     int start = 0;
@@ -134,12 +135,12 @@
 	start = i;
 
 	// Get all consecutive encoded bytes
-	while ((i+2 < length) && (str.charAt(i) == '%'))
+	while ((i + 2 < length) && (str.charAt(i) == '%'))
 	  i += 3;
 
 	// Decode all these bytes
-	if ((bytes == null) || (bytes.length < ((i-start)/3)))
-	  bytes = new byte[((i-start)/3)];
+	if ((bytes == null) || (bytes.length < ((i - start) / 3)))
+	  bytes = new byte[((i - start) / 3)];
 
 	int index = 0;
 	try
@@ -147,7 +148,7 @@
 	    while (start < i)
 	      {
 		String sub = str.substring(start + 1, start + 3);
-		bytes[index] = (byte)Integer.parseInt(sub, 16);
+		bytes[index] = (byte) Integer.parseInt(sub, 16);
 		index++;
 		start += 3;
 	      }
@@ -176,5 +177,4 @@
 
     return result.toString();
   }
-
 } // class URLDecoder
Index: java/net/URLEncoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLEncoder.java,v
retrieving revision 1.11
diff -u -r1.11 URLEncoder.java
--- java/net/URLEncoder.java	22 Jul 2003 16:36:02 -0000	1.11
+++ java/net/URLEncoder.java	8 Apr 2004 16:24:08 -0000
@@ -7,7 +7,7 @@
 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
@@ -39,29 +39,30 @@
 
 import java.io.UnsupportedEncodingException;
 
+
 /*
  * Written using on-line Java Platform 1.2/1.4 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  Believed complete and correct.
  */
 
- /**
-  * This utility class contains static methods that converts a 
-  * string into a fully encoded URL string in x-www-form-urlencoded
-  * format.  This format replaces certain disallowed characters with
-  * encoded equivalents.  All upper case and lower case letters in the
-  * US alphabet remain as is, the space character (' ') is replaced with
-  * '+' sign, and all other characters are converted to a "%XX" format
-  * where XX is the hexadecimal representation of that character in a
-  * certain encoding (by default, the platform encoding, though the
-  * standard is "UTF-8").
-  * <p>
-  * This method is very useful for encoding strings to be sent to CGI scripts
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  * @author Warren Levy <warrenl@cygnus.com>
-  * @author Mark Wielaard (mark@klomp.org)
-  */
+/**
+ * This utility class contains static methods that converts a
+ * string into a fully encoded URL string in x-www-form-urlencoded
+ * format.  This format replaces certain disallowed characters with
+ * encoded equivalents.  All upper case and lower case letters in the
+ * US alphabet remain as is, the space character (' ') is replaced with
+ * '+' sign, and all other characters are converted to a "%XX" format
+ * where XX is the hexadecimal representation of that character in a
+ * certain encoding (by default, the platform encoding, though the
+ * standard is "UTF-8").
+ * <p>
+ * This method is very useful for encoding strings to be sent to CGI scripts
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @author Mark Wielaard (mark@klomp.org)
+ */
 public class URLEncoder
 {
   /**
@@ -82,11 +83,11 @@
       {
 	// We default to 8859_1 for compatibility with the same
 	// default elsewhere in the library.
-        return encode(s, System.getProperty("file.encoding", "8859_1"));
+	return encode(s, System.getProperty("file.encoding", "8859_1"));
       }
     catch (UnsupportedEncodingException uee)
       {
-        // Should never happen since default should always be supported
+	// Should never happen since default should always be supported
 	return s;
       }
   }
@@ -114,42 +115,42 @@
 
     StringBuffer result = new StringBuffer(length);
     while (true)
-    {
-      while ( i < length && isSafe(s.charAt(i)) )
-	i++;
-
-      // Safe character can just be added
-      result.append(s.substring(start, i));
-
-      // Are we done?
-      if (i >= length)
-	return result.toString();
-      else if (s.charAt(i) == ' ')
-        {
-	  result.append('+');  // Replace space char with plus symbol.
+      {
+	while (i < length && isSafe(s.charAt(i)))
 	  i++;
-	}
-      else
-	{
-	  // Get all unsafe characters
-	  start = i;
-	  char c;
-	  while ( i < length && (c = s.charAt(i)) != ' ' && !isSafe(c) )
-	    i++;
 
-	  // Convert them to %XY encoded strings
-	  String unsafe = s.substring(start,i);
-	  byte bytes[] = unsafe.getBytes(encoding);
-	  for (int j = 0; j < bytes.length; j++)
-	    {
-	      result.append('%');
-	      int val = bytes[j];
-	      result.append(hex.charAt((val & 0xf0) >> 4));
-	      result.append(hex.charAt(val & 0x0f));
-	    }
-	}
-      start = i;
-    }
+	// Safe character can just be added
+	result.append(s.substring(start, i));
+
+	// Are we done?
+	if (i >= length)
+	  return result.toString();
+	else if (s.charAt(i) == ' ')
+	  {
+	    result.append('+'); // Replace space char with plus symbol.
+	    i++;
+	  }
+	else
+	  {
+	    // Get all unsafe characters
+	    start = i;
+	    char c;
+	    while (i < length && (c = s.charAt(i)) != ' ' && ! isSafe(c))
+	      i++;
+
+	    // Convert them to %XY encoded strings
+	    String unsafe = s.substring(start, i);
+	    byte[] bytes = unsafe.getBytes(encoding);
+	    for (int j = 0; j < bytes.length; j++)
+	      {
+		result.append('%');
+		int val = bytes[j];
+		result.append(hex.charAt((val & 0xf0) >> 4));
+		result.append(hex.charAt(val & 0x0f));
+	      }
+	  }
+	start = i;
+      }
   }
 
   /**
@@ -160,17 +161,18 @@
    */
   private static boolean isSafe(char c)
   {
-    return  ((c >= 'a' && c <= 'z') ||
-	     (c >= 'A' && c <= 'Z') ||
-	     (c >= '0' && c <= '9') ||
-	     c == '-' || c == '_' || c == '.' || c == '*');
+    return ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
+           || (c >= '0' && c <= '9') || c == '-' || c == '_' || c == '.'
+           || c == '*');
   }
 
   /**
    * Private constructor that does nothing. Included to avoid a default
    * public constructor being created by the compiler.
    */
-  private URLEncoder() { }
+  private URLEncoder()
+  {
+  }
 
   /**
    * Used to convert to hex.  We don't use Integer.toHexString, since
@@ -179,4 +181,4 @@
    * leading 0.
    */
   private static final String hex = "0123456789ABCDEF";
-} // class URLEncoder
+}
Index: java/net/URLStreamHandlerFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLStreamHandlerFactory.java,v
retrieving revision 1.10
diff -u -r1.10 URLStreamHandlerFactory.java
--- java/net/URLStreamHandlerFactory.java	13 Oct 2003 06:29:48 -0000	1.10
+++ java/net/URLStreamHandlerFactory.java	8 Apr 2004 16:24:08 -0000
@@ -7,7 +7,7 @@
 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
@@ -37,15 +37,15 @@
 
 package java.net;
 
+
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  Believed complete and correct.
  */
-
 /**
  * This interface contains one method which maps the protocol portion of
- * a URL (eg, "http" in "http://www.urbanophile.com/arenn/") to a 
+ * a URL (eg, "http" in "http://www.urbanophile.com/arenn/") to a
  * <code>URLStreamHandler</code> object.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -54,14 +54,12 @@
 public interface URLStreamHandlerFactory
 {
   /**
-    * This method maps the protocol portion of a URL to a 
+    * This method maps the protocol portion of a URL to a
     * <code>URLStreamHandler</code> object.
     *
     * @param protocol The protocol name to map ("http", "ftp", etc).
     *
     * @return The <code>URLStreamHandler</code> for the specified protocol
     */
-  URLStreamHandler createURLStreamHandler (String protocol);
-
+  URLStreamHandler createURLStreamHandler(String protocol);
 } // interface URLStreamHandlerFactory
-
Index: java/net/UnknownHostException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/UnknownHostException.java,v
retrieving revision 1.7
diff -u -r1.7 UnknownHostException.java
--- java/net/UnknownHostException.java	24 Feb 2002 04:25:16 -0000	1.7
+++ java/net/UnknownHostException.java	8 Apr 2004 16:24:08 -0000
@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 
+
 /**
  * This exception indicates that an attempt was made to reference a hostname
  * or IP address that is not valid.  This could possibly indicate that a
Index: java/net/UnknownServiceException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/UnknownServiceException.java,v
retrieving revision 1.8
diff -u -r1.8 UnknownServiceException.java
--- java/net/UnknownServiceException.java	24 Feb 2002 04:25:16 -0000	1.8
+++ java/net/UnknownServiceException.java	8 Apr 2004 16:24:08 -0000
@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 
+
 /**
  * Contrary to what you might think, this does not indicate that the
  * TCP/IP service name specified was invalid.  Instead it indicates that

--Boundary-00=_q0XdAweoGslqluF--




From MAILER-DAEMON Thu Apr 08 13:29:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBdLG-00030Z-Lm
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 13:29:30 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBdLD-00030E-0o
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 13:29:27 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBdKg-0002qt-Bs
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 13:29:25 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBdKe-0002q8-76
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 13:28:52 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i38HScre013138
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 19:28:39 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBcOa-0002Xa-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 18:28:52 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 19:28:24 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_4uYdAZtRoT5xDaI"
Message-Id: <200404081928.24580.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.net
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 17:29:27 -0000


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

Hi list,


I just commited the attached patch to rework more javadocs and coding 
style issues in java.net.


Michael


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

	* java/net/ContentHandler.java,
	java/net/ContentHandlerFactory.java,
	java/net/Inet4Address.java,
	java/net/Inet6Address.java,
	java/net/JarURLConnection.java,
	java/net/MimeTypeMapper.java,
	java/net/URI.java,
	java/net/URL.java,
	java/net/URLClassLoader.java,
	java/net/URLConnection.java,
	java/net/URLStreamHandler.java:
	Reworked javadocs and coding style.


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

Index: java/net/ContentHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ContentHandler.java,v
retrieving revision 1.9
diff -u -r1.9 ContentHandler.java
--- java/net/ContentHandler.java	24 May 2003 04:37:18 -0000	1.9
+++ java/net/ContentHandler.java	8 Apr 2004 16:53:13 -0000
@@ -7,7 +7,7 @@
 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
@@ -47,11 +47,11 @@
 
 /**
   * This is an abstract class that is the superclass for classes that read
-  * objects from URL's.  Calling the <code>getContent()</code> method in the 
-  * <code>URL</code> class or the <code>URLConnection</code> class will cause 
-  * an instance of a subclass of <code>ContentHandler</code> to be created for 
-  * the MIME type of the object being downloaded from the URL.  Thus, this 
-  * class is seldom needed by applications/applets directly, but only 
+  * objects from URL's.  Calling the <code>getContent()</code> method in the
+  * <code>URL</code> class or the <code>URLConnection</code> class will cause
+  * an instance of a subclass of <code>ContentHandler</code> to be created for
+  * the MIME type of the object being downloaded from the URL.  Thus, this
+  * class is seldom needed by applications/applets directly, but only
   * indirectly through methods in other classes.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -66,8 +66,8 @@
   /**
     * Default, no-argument constructor.
     */
-  public ContentHandler() 
-  { 
+  public ContentHandler()
+  {
   }
 
   /*
@@ -75,10 +75,10 @@
    */
 
   /**
-    * This method reads from the <code>InputStream</code> of the passed in URL 
-    * connection and uses the data downloaded to create an <code>Object</code> 
-    * represening the content.  For example, if the URL is pointing to a GIF 
-    * file, this method might return an <code>Image</code> object.  This method 
+    * This method reads from the <code>InputStream</code> of the passed in URL
+    * connection and uses the data downloaded to create an <code>Object</code>
+    * represening the content.  For example, if the URL is pointing to a GIF
+    * file, this method might return an <code>Image</code> object.  This method
     * must be implemented by subclasses.
     *
     * @param urlc A <code>URLConnection</code> object to read data from.
@@ -87,16 +87,16 @@
     *
     * @exception IOException If an error occurs
     */
-  public abstract Object getContent(URLConnection urlc) 
+  public abstract Object getContent(URLConnection urlc)
     throws IOException;
 
   /**
     * This method reads from the <code>InputStream</code> of the passed in URL
     * connection and uses the data downloaded to create an <code>Object</code>
-    * represening the content.  For example, if the URL is pointing to a GIF 
-    * file, this method might return an <code>Image</code> object.  This method 
+    * represening the content.  For example, if the URL is pointing to a GIF
+    * file, this method might return an <code>Image</code> object.  This method
     * must be implemented by subclasses.  This method uses the list of
-    * supplied classes as candidate types.  If the data read doesn't match 
+    * supplied classes as candidate types.  If the data read doesn't match
     * any of the supplied type, <code>null</code> is returned.
     *
     * @param urlc A <code>URLConnection</code> object to read data from.
@@ -113,15 +113,14 @@
   public Object getContent(URLConnection urlc, Class[] classes)
     throws IOException
   {
-    Object obj = getContent (urlc);
+    Object obj = getContent(urlc);
 
     for (int i = 0; i < classes.length; i++)
       {
-        if (classes [i].isInstance (obj))
-          return obj;
+	if (classes[i].isInstance(obj))
+	  return obj;
       }
 
     return null;
   }
-
 } // class ContentHandler
Index: java/net/ContentHandlerFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ContentHandlerFactory.java,v
retrieving revision 1.10
diff -u -r1.10 ContentHandlerFactory.java
--- java/net/ContentHandlerFactory.java	12 Oct 2003 15:35:01 -0000	1.10
+++ java/net/ContentHandlerFactory.java	8 Apr 2004 16:53:13 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,18 +35,17 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
+
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  Believed complete and correct.
  */
-
 /**
-  * This interface maps MIME types to <code>ContentHandler</code> objects.  
-  * It consists of one method that, when passed a MIME type, returns a 
+  * This interface maps MIME types to <code>ContentHandler</code> objects.
+  * It consists of one method that, when passed a MIME type, returns a
   * handler for that type.
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
@@ -63,6 +62,4 @@
     * @return The <code>ContentHandler</code> for the passed in MIME type
     */
   ContentHandler createContentHandler(String mimeType);
-
 } // interface ContentHandlerFactory
-
Index: java/net/Inet4Address.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Inet4Address.java,v
retrieving revision 1.8
diff -u -r1.8 Inet4Address.java
--- java/net/Inet4Address.java	15 Nov 2003 22:41:54 -0000	1.8
+++ java/net/Inet4Address.java	8 Apr 2004 16:53:13 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,12 +35,12 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import java.io.ObjectStreamException;
 import java.util.Arrays;
 
+
 /**
  * @author Michael Koch
  * @date August 3, 2002.
@@ -53,7 +53,6 @@
  * RFC 2365 (http://www.ietf.org/rfc/rfc2365.txt)
  * Status: Believed complete and correct.
  */
-
 public final class Inet4Address extends InetAddress
 {
   static final long serialVersionUID = 3286316764910316507L;
@@ -61,20 +60,20 @@
   /**
    * needed for serialization
    */
-  private Object writeReplace () throws ObjectStreamException
+  private Object writeReplace() throws ObjectStreamException
   {
-    return new InetAddress (addr, hostName);
+    return new InetAddress(addr, hostName);
   }
 
   /**
    * Creates a Inet4Address
-   * 
+   *
    * @param addr The IP address
    * @param host The Hostname
    */
   Inet4Address(byte[] addr, String host)
   {
-    super (addr, host);
+    super(addr, host);
   }
 
   /**
@@ -82,37 +81,37 @@
    *
    * @since 1.1
    */
-  public boolean isMulticastAddress ()
+  public boolean isMulticastAddress()
   {
-    return (addr [0] & 0xF0) == 0xE0;
+    return (addr[0] & 0xF0) == 0xE0;
   }
-  
+
   /**
    * Checks if this address is a loopback address
    */
-  public boolean isLoopbackAddress ()
+  public boolean isLoopbackAddress()
   {
-    return addr [0] == 0x7F;
+    return addr[0] == 0x7F;
   }
- 
+
   /**
    * Checks if this address is a wildcard address
    *
    * @since 1.4
    */
-  public boolean isAnyLocalAddress ()
+  public boolean isAnyLocalAddress()
   {
     byte[] anylocal = { 0, 0, 0, 0 };
-    
+
     return Arrays.equals(addr, anylocal);
   }
 
   /**
    * Checks if this address is a link local address
-   * 
+   *
    * @since 1.4
    */
-  public boolean isLinkLocalAddress ()
+  public boolean isLinkLocalAddress()
   {
     // XXX: This seems to not exist with IPv4 addresses
     return false;
@@ -120,36 +119,36 @@
 
   /**
    * Checks if this address is a site local address
-   * 
+   *
    * @since 1.4
    */
-  public boolean isSiteLocalAddress ()
+  public boolean isSiteLocalAddress()
   {
     // 10.0.0.0/8
-    if (addr [0] == 0x0A)
+    if (addr[0] == 0x0A)
       return true;
 
     // XXX: Suns JDK 1.4.1 (on Linux) seems to have a bug here:
     // it says 172.16.0.0 - 172.255.255.255 are site local addresses
     //
     // 172.16.0.0/12
-    if (addr [0] == 0xAC && (addr [1] & 0xF0) == 0x01)
+    if (addr[0] == 0xAC && (addr[1] & 0xF0) == 0x01)
       return true;
 
     // 192.168.0.0/16
-    if (addr [0] == 0xC0 && addr [1] == 0xA8)
+    if (addr[0] == 0xC0 && addr[1] == 0xA8)
       return true;
-   
+
     // XXX: Do we need to check more addresses here ?
     return false;
   }
 
   /**
    * Checks if this multicast address has global scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCGlobal ()
+  public boolean isMCGlobal()
   {
     // XXX: This seems to net exist with IPv4 addresses
     return false;
@@ -157,120 +156,118 @@
 
   /**
    * Checks if this multicast address has node scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCNodeLocal ()
+  public boolean isMCNodeLocal()
   {
     // XXX: This seems to net exist with IPv4 addresses
     return false;
   }
-  
+
   /**
    * Checks if this multicast address has link scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCLinkLocal ()
+  public boolean isMCLinkLocal()
   {
-    if (!isMulticastAddress ())
+    if (! isMulticastAddress())
       return false;
-    
-    return (addr [0] == 0xE0)
-	   && (addr [1] == 0x00)
-	   && (addr [2] == 0x00);
+
+    return (addr[0] == 0xE0) && (addr[1] == 0x00) && (addr[2] == 0x00);
   }
-  
+
   /**
    * Checks if this multicast address has site scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCSiteLocal ()
+  public boolean isMCSiteLocal()
   {
     // XXX: This seems to net exist with IPv4 addresses
     return false;
   }
-  
+
   /**
    * Checks if this multicast address has organization scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCOrgLocal ()
+  public boolean isMCOrgLocal()
   {
     // XXX: This seems to net exist with IPv4 addresses
     return false;
   }
-  
+
   /**
    * Returns the address of the current instance
    */
-  public byte[] getAddress ()
+  public byte[] getAddress()
   {
     return addr;
   }
-  
+
   /**
    * Returns the address as string
-   * 
+   *
    * @since 1.0.2
    */
-  public String getHostAddress ()
+  public String getHostAddress()
   {
-    StringBuffer sbuf = new StringBuffer (40);
+    StringBuffer sbuf = new StringBuffer(40);
     int len = addr.length;
     int i = 0;
-    
-    for ( ;  ; )
+
+    for (;;)
       {
-	sbuf.append (addr [i] & 0xFF);
+	sbuf.append(addr[i] & 0xFF);
 	i++;
-	
+
 	if (i == len)
 	  break;
-	
-	sbuf.append ('.');
+
+	sbuf.append('.');
       }
-    
-    return sbuf.toString ();
+
+    return sbuf.toString();
   }
-  
+
   /**
    * Computes the hashcode of the instance
    */
-  public int hashCode ()
+  public int hashCode()
   {
     int hash = 0;
     int len = addr.length;
     int i = len > 4 ? len - 4 : 0;
-    
-    for ( ; i < len;  i++)
-      hash = (hash << 8) | (addr [i] & 0xFF);
-    
+
+    for (; i < len; i++)
+      hash = (hash << 8) | (addr[i] & 0xFF);
+
     return hash;
   }
- 
+
   /**
    * Compare the current Inet4Address instance with obj
-   * 
+   *
    * @param obj Object to compare with
    */
-  public boolean equals (Object obj)
+  public boolean equals(Object obj)
   {
     if (! (obj instanceof InetAddress))
       return false;
-    
+
     byte[] addr1 = addr;
     byte[] addr2 = ((InetAddress) obj).addr;
-    
+
     if (addr1.length != addr2.length)
       return false;
-    
-    for (int i = addr1.length;  --i >= 0; )
-      if (addr1 [i] != addr2 [i])
-        return false;
-    
+
+    for (int i = addr1.length; --i >= 0;)
+      if (addr1[i] != addr2[i])
+	return false;
+
     return true;
   }
 } // class Inet4Address
Index: java/net/Inet6Address.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Inet6Address.java,v
retrieving revision 1.5
diff -u -r1.5 Inet6Address.java
--- java/net/Inet6Address.java	15 Nov 2003 22:41:54 -0000	1.5
+++ java/net/Inet6Address.java	8 Apr 2004 16:53:14 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,11 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import java.util.Arrays;
 
+
 /**
  * @author Michael Koch
  * @date August 3, 2002.
@@ -50,7 +50,6 @@
  * RFC 1884 (http://www.ietf.org/rfc/rfc1884.txt)
  * Status: Believed complete and correct.
  */
-
 public final class Inet6Address extends InetAddress
 {
   static final long serialVersionUID = 6880410070516793377L;
@@ -59,213 +58,210 @@
    * Needed for serialization
    */
   byte[] ipaddress;
-  
+
   /**
    * Create an Inet6Address object
    *
    * @param addr The IP address
    * @param host The hostname
    */
-  Inet6Address (byte[] addr, String host)
+  Inet6Address(byte[] addr, String host)
   {
-    super (addr, host);
+    super(addr, host);
     this.ipaddress = addr;
   }
 
   /**
    * Utility routine to check if the InetAddress is an IP multicast address
-   * 
+   *
    * @since 1.1
    */
-  public boolean isMulticastAddress ()
+  public boolean isMulticastAddress()
   {
-    return ipaddress [0] == 0xFF;
+    return ipaddress[0] == 0xFF;
   }
- 
+
   /**
    * Utility routine to check if the InetAddress in a wildcard address
-   * 
+   *
    * @since 1.4
    */
-  public boolean isAnyLocalAddress ()
+  public boolean isAnyLocalAddress()
   {
-    byte[] anylocal = { 0, 0, 0, 0, 0, 0, 0, 0,
-	                0, 0, 0, 0, 0, 0, 0, 0 };
-    
+    byte[] anylocal = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
     return Arrays.equals(ipaddress, anylocal);
   }
-	  
+
   /**
    * Utility routine to check if the InetAddress is a loopback address
-   * 
+   *
    * @since 1.4
    */
-  public boolean isLoopbackAddress ()
+  public boolean isLoopbackAddress()
   {
-    byte[] loopback = { 0, 0, 0, 0, 0, 0, 0, 0,
-	                0, 0, 0, 0, 0, 0, 0, 1 };
-    
+    byte[] loopback = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 };
+
     return Arrays.equals(ipaddress, loopback);
   }
 
   /**
    * Utility routine to check if the InetAddress is an link local address
-   * 
+   *
    * @since 1.4
    */
-  public boolean isLinkLocalAddress ()
+  public boolean isLinkLocalAddress()
   {
-    return ipaddress [0] == 0xFA;
+    return ipaddress[0] == 0xFA;
   }
 
   /**
    * Utility routine to check if the InetAddress is a site local address
-   * 
+   *
    * @since 1.4
    */
-  public boolean isSiteLocalAddress ()
+  public boolean isSiteLocalAddress()
   {
-    return ipaddress [0] == 0xFB;
+    return ipaddress[0] == 0xFB;
   }
 
   /**
    * Utility routine to check if the multicast address has global scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCGlobal ()
+  public boolean isMCGlobal()
   {
-    if (!isMulticastAddress ())
+    if (! isMulticastAddress())
       return false;
-    
-    return (ipaddress [1] & 0x0F) == 0xE;
+
+    return (ipaddress[1] & 0x0F) == 0xE;
   }
 
   /**
    * Utility routine to check if the multicast address has node scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCNodeLocal ()
+  public boolean isMCNodeLocal()
   {
-    if (!isMulticastAddress ())
+    if (! isMulticastAddress())
       return false;
-    
-    return (ipaddress [1] & 0x0F) == 0x1;
+
+    return (ipaddress[1] & 0x0F) == 0x1;
   }
 
   /**
    * Utility routine to check if the multicast address has link scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCLinkLocal ()
+  public boolean isMCLinkLocal()
   {
-    if (!isMulticastAddress ())
+    if (! isMulticastAddress())
       return false;
-    
-    return (ipaddress [1] & 0x0F) == 0x2;
+
+    return (ipaddress[1] & 0x0F) == 0x2;
   }
 
   /**
    * Utility routine to check if the multicast address has site scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCSiteLocal ()
+  public boolean isMCSiteLocal()
   {
-    if (!isMulticastAddress ())
+    if (! isMulticastAddress())
       return false;
-    
-    return (ipaddress [1] & 0x0F) == 0x5;
+
+    return (ipaddress[1] & 0x0F) == 0x5;
   }
 
   /**
    * Utility routine to check if the multicast address has organization scope
-   * 
+   *
    * @since 1.4
    */
-  public boolean isMCOrgLocal ()
+  public boolean isMCOrgLocal()
   {
-    if (!isMulticastAddress ())
+    if (! isMulticastAddress())
       return false;
-    
-    return (ipaddress [1] & 0x0F) == 0x8;
+
+    return (ipaddress[1] & 0x0F) == 0x8;
   }
-  
+
   /**
    * Returns the raw IP address of this InetAddress object. The result is in
    * network byte order: the highest order byte of the address is i
    * n getAddress()[0]
    */
-  public byte[] getAddress ()
+  public byte[] getAddress()
   {
     return ipaddress;
   }
-  
+
   /**
    * Returns the IP address string in textual presentation
    */
-  public String getHostAddress ()
+  public String getHostAddress()
   {
-    StringBuffer sbuf = new StringBuffer (40);
+    StringBuffer sbuf = new StringBuffer(40);
 
     for (int i = 0; i < 16; i += 2)
       {
-        int x = ((ipaddress [i] & 0xFF) << 8) | (ipaddress [i + 1] & 0xFF);
-        boolean empty = sbuf.length () == 0;
-	
-        if (empty)
-          {
-            if (i > 0)
-              sbuf.append ("::");
-          }
-        else
-          sbuf.append (':');
+	int x = ((ipaddress[i] & 0xFF) << 8) | (ipaddress[i + 1] & 0xFF);
+	boolean empty = sbuf.length() == 0;
+
+	if (empty)
+	  {
+	    if (i > 0)
+	      sbuf.append("::");
+	  }
+	else
+	  sbuf.append(':');
 
-        if (x != 0 || i >= 14)
-          sbuf.append (Integer.toHexString (x));
+	if (x != 0 || i >= 14)
+	  sbuf.append(Integer.toHexString(x));
       }
-   
-    return sbuf.toString ();
+
+    return sbuf.toString();
   }
 
   /**
    * Returns a hashcode for this IP address
    */
-  public int hashCode ()
+  public int hashCode()
   {
-    return super.hashCode ();
+    return super.hashCode();
   }
- 
+
   /**
    * Compares this object against the specified object
    */
-  public boolean equals (Object obj)
+  public boolean equals(Object obj)
   {
     if (! (obj instanceof Inet6Address))
       return false;
 
     Inet6Address tmp = (Inet6Address) obj;
 
-    return super.equals (tmp)
-           && this.ipaddress == tmp.ipaddress;
+    return super.equals(tmp) && this.ipaddress == tmp.ipaddress;
   }
-  
+
   /**
    * Utility routine to check if the InetAddress is an
    * IPv4 compatible IPv6 address
    *
    * @since 1.4
    */
-  public boolean isIPv4CompatibleAddress ()
+  public boolean isIPv4CompatibleAddress()
   {
-    if (ipaddress [0] != 0x00 || ipaddress [1] != 0x00 ||
-        ipaddress [2] != 0x00 || ipaddress [3] != 0x00 ||
-	ipaddress [4] != 0x00 || ipaddress [5] != 0x00 ||
-	ipaddress [6] != 0x00 || ipaddress [7] != 0x00 ||
-	ipaddress [8] != 0x00 || ipaddress [9] != 0x00 ||
-	ipaddress [10] != 0x00 || ipaddress [11] != 0x00)
+    if (ipaddress[0] != 0x00 || ipaddress[1] != 0x00 || ipaddress[2] != 0x00
+        || ipaddress[3] != 0x00 || ipaddress[4] != 0x00
+        || ipaddress[5] != 0x00 || ipaddress[6] != 0x00
+        || ipaddress[7] != 0x00 || ipaddress[8] != 0x00
+        || ipaddress[9] != 0x00 || ipaddress[10] != 0x00
+        || ipaddress[11] != 0x00)
       return false;
 
     return true;
Index: java/net/JarURLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/JarURLConnection.java,v
retrieving revision 1.18
diff -u -r1.18 JarURLConnection.java
--- java/net/JarURLConnection.java	6 Jan 2004 10:07:59 -0000	1.18
+++ java/net/JarURLConnection.java	8 Apr 2004 16:53:14 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,15 +35,15 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import java.io.IOException;
+import java.security.cert.Certificate;
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
-import java.security.cert.Certificate;
+
 
 /**
  * This abstract class represents a common superclass for implementations
@@ -94,30 +94,29 @@
   /**
    * Creates a JarURLConnection from an URL object
    *
-   * @param URL url The URL object for this connection.
+   * @param url The URL object for this connection.
    *
    * @exception MalformedURLException If url is invalid
    *
    * @specnote This constructor is protected since JDK 1.4
    */
-  protected JarURLConnection (URL url)
-    throws MalformedURLException
+  protected JarURLConnection(URL url) throws MalformedURLException
   {
-    super (url);
+    super(url);
 
-    if (!url.getProtocol().equals ("jar"))
-      throw new MalformedURLException (url + ": Not jar protocol.");
+    if (! url.getProtocol().equals("jar"))
+      throw new MalformedURLException(url + ": Not jar protocol.");
 
     String spec = url.getFile();
-    int bang = spec.indexOf ("!/");
+    int bang = spec.indexOf("!/");
     if (bang == -1)
-      throw new MalformedURLException (url + ": No `!/' in spec.");
+      throw new MalformedURLException(url + ": No `!/' in spec.");
 
     // Extract the url for the jar itself.
-    jarFileURL = new URL (spec.substring (0, bang));
+    jarFileURL = new URL(spec.substring(0, bang));
 
     // Get the name of the entry, if any.
-    entryName = spec.length() == (bang + 2) ? null : spec.substring (bang + 2);
+    entryName = spec.length() == (bang + 2) ? null : spec.substring(bang + 2);
   }
 
   /**
@@ -126,7 +125,7 @@
    *
    * @return The remote URL
    */
-  public URL getJarFileURL ()
+  public URL getJarFileURL()
   {
     return jarFileURL;
   }
@@ -138,23 +137,23 @@
    *
    * @return The entry name.
    */
-  public String getEntryName ()
+  public String getEntryName()
   {
     return entryName;
   }
 
   /**
-   * Returns the entry in this jar file specified by the URL.  
-   * 
+   * Returns the entry in this jar file specified by the URL.
+   *
    * @return The jar entry
    *
    * @exception IOException If an error occurs
    */
-  public JarEntry getJarEntry () throws IOException
+  public JarEntry getJarEntry() throws IOException
   {
     JarFile jarFile = getJarFile();
 
-    return jarFile != null ? jarFile.getJarEntry (entryName) : null;
+    return jarFile != null ? jarFile.getJarEntry(entryName) : null;
   }
 
   /**
@@ -164,7 +163,7 @@
    *
    * @exception IOException If an error occurs
    */
-  public abstract JarFile getJarFile () throws IOException;
+  public abstract JarFile getJarFile() throws IOException;
 
   /**
    * Returns an array of Certificate objects for the jar file entry specified
@@ -174,10 +173,10 @@
    *
    * @exception IOException If an error occurs
    */
-  public Certificate[] getCertificates () throws IOException
+  public Certificate[] getCertificates() throws IOException
   {
     JarEntry entry = getJarEntry();
-    
+
     return entry != null ? entry.getCertificates() : null;
   }
 
@@ -189,10 +188,10 @@
    *
    * @exception IOException If an error occurs
    */
-  public Attributes getMainAttributes () throws IOException
+  public Attributes getMainAttributes() throws IOException
   {
     Manifest manifest = getManifest();
-    
+
     return manifest != null ? manifest.getMainAttributes() : null;
   }
 
@@ -205,7 +204,7 @@
    *
    * @exception IOException If an error occurs
    */
-  public Attributes getAttributes () throws IOException
+  public Attributes getAttributes() throws IOException
   {
     JarEntry entry = getJarEntry();
 
@@ -220,7 +219,7 @@
    *
    * @exception IOException If an error occurs
    */
-  public Manifest getManifest () throws IOException
+  public Manifest getManifest() throws IOException
   {
     JarFile file = getJarFile();
 
Index: java/net/MimeTypeMapper.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/MimeTypeMapper.java,v
retrieving revision 1.4
diff -u -r1.4 MimeTypeMapper.java
--- java/net/MimeTypeMapper.java	22 Jan 2002 22:27:00 -0000	1.4
+++ java/net/MimeTypeMapper.java	8 Apr 2004 16:53:14 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,11 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import java.util.Hashtable;
 
+
 /**
   * This non-public class is used to implement the FileNameMap interface
   * which defines a mechanism for mapping filenames to MIME types.
@@ -50,7 +50,6 @@
   */
 class MimeTypeMapper implements FileNameMap
 {
-
 /*************************************************************************/
 
 /*
@@ -58,128 +57,129 @@
  */
 
 /**
-  * This array of strings is used to identify a MIME type based on a file 
+  * This array of strings is used to identify a MIME type based on a file
   * extension.  This is list is based on the Apache mime.types file.
   */
-protected static final String[][] mime_strings = {
-  { "application/mac-binhex40", "hqx" },
-  { "application/mac-compactpro", "cpt" },
-  { "application/msword", "doc" },
-  { "application/octet-stream", "bin" },
-  { "application/octet-stream", "dms" },
-  { "application/octet-stream", "lha" },
-  { "application/octet-stream", "lzh" },
-  { "application/octet-stream", "exe" },
-  { "application/octet-stream", "class" },
-  { "application/oda", "oda" },
-  { "application/pdf", "pdf" },
-  { "application/postscript", "ai" },
-  { "application/postscript", "eps" },
-  { "application/postscript", "ps" },
-  { "application/powerpoint", "ppt" },
-  { "application/rtf", "rtf" },
-  { "application/x-bcpio", "bcpio" },
-  { "application/x-cdlink", "vcd" },
-  { "application/x-compress", "Z" },
-  { "application/x-cpio", "cpio" },
-  { "application/x-csh", "csh" },
-  { "application/x-director", "dcr" },
-  { "application/x-director", "dir" },
-  { "application/x-director", "dxr" },
-  { "application/x-dvi", "dvi" },
-  { "application/x-gtar", "gtar" },
-  { "application/x-gzip", "gz" },
-  { "application/x-hdf", "hdf" },
-  { "application/x-httpd-cgi", "cgi" },
-  { "application/x-koan", "skp" },
-  { "application/x-koan", "skd" },
-  { "application/x-koan", "skt" },
-  { "application/x-koan", "skm" },
-  { "application/x-latex", "latex" },
-  { "application/x-mif", "mif" },
-  { "application/x-netcdf", "nc" },
-  { "application/x-netcdf", "cdf" },
-  { "application/x-sh", "sh" },
-  { "application/x-shar", "shar" },
-  { "application/x-stuffit", "sit" },
-  { "application/x-sv4cpio", "sv4cpio" },
-  { "application/x-sv4crc", "sv4crc" },
-  { "application/x-tar", "tar" },
-  { "application/x-tcl", "tcl" },
-  { "application/x-tex", "tex" },
-  { "application/x-texinfo", "texinfo" },
-  { "application/x-texinfo", "texi" },
-  { "application/x-troff", "t" },
-  { "application/x-troff", "tr" },
-  { "application/x-troff", "roff" },
-  { "application/x-troff-man", "man" },
-  { "application/x-troff-me", "me" },
-  { "application/x-troff-ms", "ms" },
-  { "application/x-ustar", "ustar" },
-  { "application/x-wais-source", "src" },
-  { "application/zip", "zip" },
-  { "audio/basic", "au" },
-  { "audio/basic", "snd" },
-  { "audio/mpeg", "mpga" },
-  { "audio/mpeg", "mp2" },
-  { "audio/mpeg", "mp3" },
-  { "audio/x-aiff", "aif" },
-  { "audio/x-aiff", "aiff" },
-  { "audio/x-aiff", "aifc" },
-  { "audio/x-pn-realaudio", "ram" },
-  { "audio/x-pn-realaudio-plugin", "rpm" },
-  { "audio/x-realaudio", "ra" },
-  { "audio/x-wav", "wav" },
-  { "chemical/x-pdb", "pdb" },
-  { "chemical/x-pdb", "xyz" },
-  { "image/gif", "gif" },
-  { "image/ief", "ief" },
-  { "image/jpeg", "jpeg" },
-  { "image/jpeg", "jpg" },
-  { "image/jpeg", "jpe" },
-  { "image/png", "png" },
-  { "image/tiff", "tiff" },
-  { "image/tiff", "tif" },
-  { "image/x-cmu-raster", "ras" },
-  { "image/x-portable-anymap", "pnm" },
-  { "image/x-portable-bitmap", "pbm" },
-  { "image/x-portable-graymap", "pgm" },
-  { "image/x-portable-pixmap", "ppm" },
-  { "image/x-rgb", "rgb" },
-  { "image/x-xbitmap", "xbm" },
-  { "image/x-xpixmap", "xpm" },
-  { "image/x-xwindowdump", "xwd" },
-  { "text/html", "html" },
-  { "text/html", "htm" },
-  { "text/plain", "txt" },
-  { "text/richtext", "rtx" },
-  { "text/tab-separated-values", "tsv" },
-  { "text/x-setext", "etx" },
-  { "text/x-sgml", "sgml" },
-  { "text/x-sgml", "sgm" },
-  { "video/mpeg", "mpeg" },
-  { "video/mpeg", "mpg" },
-  { "video/mpeg", "mpe" },
-  { "video/quicktime", "qt" },
-  { "video/quicktime", "mov" },
-  { "video/x-msvideo", "avi" },
-  { "video/x-sgi-movie", "movie" },
-  { "x-conference/x-cooltalk", "ice" },
-  { "x-world/x-vrml", "wrl" },
-  { "x-world/x-vrml", "vrml" }
-  };
+  protected static final String[][] mime_strings =
+    {
+      { "application/mac-binhex40", "hqx" },
+      { "application/mac-compactpro", "cpt" },
+      { "application/msword", "doc" },
+      { "application/octet-stream", "bin" },
+      { "application/octet-stream", "dms" },
+      { "application/octet-stream", "lha" },
+      { "application/octet-stream", "lzh" },
+      { "application/octet-stream", "exe" },
+      { "application/octet-stream", "class" },
+      { "application/oda", "oda" },
+      { "application/pdf", "pdf" },
+      { "application/postscript", "ai" },
+      { "application/postscript", "eps" },
+      { "application/postscript", "ps" },
+      { "application/powerpoint", "ppt" },
+      { "application/rtf", "rtf" },
+      { "application/x-bcpio", "bcpio" },
+      { "application/x-cdlink", "vcd" },
+      { "application/x-compress", "Z" },
+      { "application/x-cpio", "cpio" },
+      { "application/x-csh", "csh" },
+      { "application/x-director", "dcr" },
+      { "application/x-director", "dir" },
+      { "application/x-director", "dxr" },
+      { "application/x-dvi", "dvi" },
+      { "application/x-gtar", "gtar" },
+      { "application/x-gzip", "gz" },
+      { "application/x-hdf", "hdf" },
+      { "application/x-httpd-cgi", "cgi" },
+      { "application/x-koan", "skp" },
+      { "application/x-koan", "skd" },
+      { "application/x-koan", "skt" },
+      { "application/x-koan", "skm" },
+      { "application/x-latex", "latex" },
+      { "application/x-mif", "mif" },
+      { "application/x-netcdf", "nc" },
+      { "application/x-netcdf", "cdf" },
+      { "application/x-sh", "sh" },
+      { "application/x-shar", "shar" },
+      { "application/x-stuffit", "sit" },
+      { "application/x-sv4cpio", "sv4cpio" },
+      { "application/x-sv4crc", "sv4crc" },
+      { "application/x-tar", "tar" },
+      { "application/x-tcl", "tcl" },
+      { "application/x-tex", "tex" },
+      { "application/x-texinfo", "texinfo" },
+      { "application/x-texinfo", "texi" },
+      { "application/x-troff", "t" },
+      { "application/x-troff", "tr" },
+      { "application/x-troff", "roff" },
+      { "application/x-troff-man", "man" },
+      { "application/x-troff-me", "me" },
+      { "application/x-troff-ms", "ms" },
+      { "application/x-ustar", "ustar" },
+      { "application/x-wais-source", "src" },
+      { "application/zip", "zip" },
+      { "audio/basic", "au" },
+      { "audio/basic", "snd" },
+      { "audio/mpeg", "mpga" },
+      { "audio/mpeg", "mp2" },
+      { "audio/mpeg", "mp3" },
+      { "audio/x-aiff", "aif" },
+      { "audio/x-aiff", "aiff" },
+      { "audio/x-aiff", "aifc" },
+      { "audio/x-pn-realaudio", "ram" },
+      { "audio/x-pn-realaudio-plugin", "rpm" },
+      { "audio/x-realaudio", "ra" },
+      { "audio/x-wav", "wav" },
+      { "chemical/x-pdb", "pdb" },
+      { "chemical/x-pdb", "xyz" },
+      { "image/gif", "gif" },
+      { "image/ief", "ief" },
+      { "image/jpeg", "jpeg" },
+      { "image/jpeg", "jpg" },
+      { "image/jpeg", "jpe" },
+      { "image/png", "png" },
+      { "image/tiff", "tiff" },
+      { "image/tiff", "tif" },
+      { "image/x-cmu-raster", "ras" },
+      { "image/x-portable-anymap", "pnm" },
+      { "image/x-portable-bitmap", "pbm" },
+      { "image/x-portable-graymap", "pgm" },
+      { "image/x-portable-pixmap", "ppm" },
+      { "image/x-rgb", "rgb" },
+      { "image/x-xbitmap", "xbm" },
+      { "image/x-xpixmap", "xpm" },
+      { "image/x-xwindowdump", "xwd" },
+      { "text/html", "html" },
+      { "text/html", "htm" },
+      { "text/plain", "txt" },
+      { "text/richtext", "rtx" },
+      { "text/tab-separated-values", "tsv" },
+      { "text/x-setext", "etx" },
+      { "text/x-sgml", "sgml" },
+      { "text/x-sgml", "sgm" },
+      { "video/mpeg", "mpeg" },
+      { "video/mpeg", "mpg" },
+      { "video/mpeg", "mpe" },
+      { "video/quicktime", "qt" },
+      { "video/quicktime", "mov" },
+      { "video/x-msvideo", "avi" },
+      { "video/x-sgi-movie", "movie" },
+      { "x-conference/x-cooltalk", "ice" },
+      { "x-world/x-vrml", "wrl" },
+      { "x-world/x-vrml", "vrml" }
+    };
 
 /**
   * The MIME types above are put into this Hashtable for faster lookup.
   */
-private static Hashtable mime_types = new Hashtable(150);
+  private static Hashtable mime_types = new Hashtable(150);
 
 // Static initializer to load MIME types into Hashtable
-static
-{
-  for (int i = 0; i < mime_strings.length; i++)
-    mime_types.put(mime_strings[i][1], mime_strings[i][0]);
-}
+  static
+    {
+      for (int i = 0; i < mime_strings.length; i++)
+	mime_types.put(mime_strings[i][1], mime_strings[i][0]);
+    }
 
 /*************************************************************************/
 
@@ -190,11 +190,10 @@
 /**
   * A do nothing constructor
   */
-public
-MimeTypeMapper()
-{
-  ;
-}
+  public MimeTypeMapper()
+  {
+    ;
+  }
 
 /*************************************************************************/
 
@@ -204,7 +203,7 @@
 
 /**
   * The method returns the MIME type of the filename passed as an argument.
-  * The value returned is based on the extension of the filename.  The 
+  * The value returned is based on the extension of the filename.  The
   * default content type returned if this method cannot determine the
   * actual content type is "application/octet-stream"
   *
@@ -212,24 +211,21 @@
   *
   * @return The MIME type
   */
-public String 
-getContentTypeFor(String filename)
-{
-  int index = filename.lastIndexOf(".");
-  if (index != -1)
-    {
-      if (index == filename.length())
-        return("application/octet-stream");
-      else
-        filename = filename.substring(index + 1);
-    }
-
-  String type = (String)mime_types.get(filename);
-  if (type == null)
-    return("application/octet-stream");
-  else
-    return(type);
-}
-
+  public String getContentTypeFor(String filename)
+  {
+    int index = filename.lastIndexOf(".");
+    if (index != -1)
+      {
+	if (index == filename.length())
+	  return ("application/octet-stream");
+	else
+	  filename = filename.substring(index + 1);
+      }
+
+    String type = (String) mime_types.get(filename);
+    if (type == null)
+      return ("application/octet-stream");
+    else
+      return (type);
+  }
 } // class MimeTypeMapper
-
Index: java/net/URI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URI.java,v
retrieving revision 1.5
diff -u -r1.5 URI.java
--- java/net/URI.java	20 Mar 2004 14:52:26 -0000	1.5
+++ java/net/URI.java	8 Apr 2004 16:53:14 -0000
@@ -7,7 +7,7 @@
 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
@@ -44,14 +44,14 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+
 /**
  * @author Ito Kazumitsu (ito.kazumitsu@hitachi-cable.co.jp)
  * @author Dalibor Topic (robilad@kaffe.org)
  * @author Michael Koch (konqueror@gmx.de)
  * @since 1.4
  */
-public final class URI
-  implements Comparable, Serializable
+public final class URI implements Comparable, Serializable
 {
   static final long serialVersionUID = -6052424284110960213L;
 
@@ -70,11 +70,14 @@
   private static final String RFC2396_DIGIT = "0123456789";
   private static final String RFC2396_LOWALPHA = "abcdefghijklmnopqrstuvwxyz";
   private static final String RFC2396_UPALPHA = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-  private static final String RFC2396_ALPHA = RFC2396_LOWALPHA + RFC2396_UPALPHA;
+  private static final String RFC2396_ALPHA =
+    RFC2396_LOWALPHA + RFC2396_UPALPHA;
   private static final String RFC2396_ALPHANUM = RFC2396_DIGIT + RFC2396_ALPHA;
   private static final String RFC2396_MARK = "-_.!~*'()";
-  private static final String RFC2396_UNRESERVED = RFC2396_ALPHANUM + RFC2396_MARK;
-  private static final String RFC2396_REG_NAME = RFC2396_UNRESERVED + "$,;:@&=+";
+  private static final String RFC2396_UNRESERVED =
+    RFC2396_ALPHANUM + RFC2396_MARK;
+  private static final String RFC2396_REG_NAME =
+    RFC2396_UNRESERVED + "$,;:@&=+";
   private static final String RFC2396_PCHAR = RFC2396_UNRESERVED + ":@&=+$,";
   private static final String RFC2396_SEGMENT = RFC2396_PCHAR + ";";
   private static final String RFC2396_PATH_SEGMENTS = RFC2396_SEGMENT + "/";
@@ -108,7 +111,6 @@
    * Index of fragment component in parsed URI.
    */
   private static final int FRAGMENT_GROUP = 10;
-
   private String scheme;
   private String rawSchemeSpecificPart;
   private String schemeSpecificPart;
@@ -126,17 +128,17 @@
   private String rawFragment;
   private String fragment;
 
-  private void readObject (ObjectInputStream is)
+  private void readObject(ObjectInputStream is)
     throws ClassNotFoundException, IOException
   {
   }
 
-  private void writeObject (ObjectOutputStream is)
-    throws IOException
+  private void writeObject(ObjectOutputStream is) throws IOException
   {
   }
 
-  private static String getURIGroup (Matcher match, int group) {
+  private static String getURIGroup(Matcher match, int group)
+  {
     String matched = match.group(group);
     return matched.length() == 0 ? null : matched;
   }
@@ -148,23 +150,22 @@
    *
    * @exception URISyntaxException If the given string violates RFC 2396
    */
-  private void parseURI (String str)
-    throws URISyntaxException
+  private void parseURI(String str) throws URISyntaxException
   {
     Pattern pattern = Pattern.compile(URI_REGEXP);
     Matcher matcher = pattern.matcher(str);
     if (matcher.matches())
       {
 	scheme = getURIGroup(matcher, SCHEME_GROUP);
-	rawSchemeSpecificPart = getURIGroup(matcher, SCHEME_SPEC_PART_GROUP); 
+	rawSchemeSpecificPart = getURIGroup(matcher, SCHEME_SPEC_PART_GROUP);
 	rawAuthority = getURIGroup(matcher, AUTHORITY_GROUP);
 	rawPath = getURIGroup(matcher, PATH_GROUP);
 	rawQuery = getURIGroup(matcher, QUERY_GROUP);
 	rawFragment = getURIGroup(matcher, FRAGMENT_GROUP);
       }
     else
-      throw new URISyntaxException(str,
-				   "doesn't match URI regular expression");
+      throw new URISyntaxException(str, "doesn't match URI regular expression");
+
     // We must eagerly unquote the parts, because this is the only time
     // we may throw an exception.
     schemeSpecificPart = unquote(rawSchemeSpecificPart);
@@ -184,35 +185,39 @@
    * @exception URISyntaxException If the given string contains invalid
    * escape sequences.
    */
-  private static String unquote (String str)
-    throws URISyntaxException
+  private static String unquote(String str) throws URISyntaxException
   {
     if (str == null)
       return null;
     byte[] buf = new byte[str.length()];
     int pos = 0;
-    for (int i = 0; i < str.length(); i++) {
-      char c = str.charAt(i);
-      if (c > 127)
+    for (int i = 0; i < str.length(); i++)
+      {
+	char c = str.charAt(i);
+	if (c > 127)
 	  throw new URISyntaxException(str, "Invalid character");
-      if (c == '%') {
-        if (i + 2 >= str.length())
-	  throw new URISyntaxException(str, "Invalid quoted character");
-	String hex = "0123456789ABCDEF";
-        int hi = hex.indexOf(str.charAt(++i));
-        int lo = hex.indexOf(str.charAt(++i));
-        if (lo < 0 || hi < 0)
-	  throw new URISyntaxException(str, "Invalid quoted character");
-	buf[pos++] = (byte)(hi * 16 + lo);
-      } else {
-	buf[pos++] = (byte)c;
+	if (c == '%')
+	  {
+	    if (i + 2 >= str.length())
+	      throw new URISyntaxException(str, "Invalid quoted character");
+	    String hex = "0123456789ABCDEF";
+	    int hi = hex.indexOf(str.charAt(++i));
+	    int lo = hex.indexOf(str.charAt(++i));
+	    if (lo < 0 || hi < 0)
+	      throw new URISyntaxException(str, "Invalid quoted character");
+	    buf[pos++] = (byte) (hi * 16 + lo);
+	  }
+	else
+	  buf[pos++] = (byte) c;
+      }
+    try
+      {
+	return new String(buf, 0, pos, "utf-8");
+      }
+    catch (java.io.UnsupportedEncodingException x2)
+      {
+	throw (Error) new InternalError().initCause(x2);
       }
-    }
-    try {
-      return new String(buf, 0, pos, "utf-8");
-    } catch (java.io.UnsupportedEncodingException x2) {
-      throw (Error)new InternalError().initCause(x2);
-    }
   }
 
   /**
@@ -223,10 +228,11 @@
    * UTF-8 character.
    *
    * @param str The string to quote
-   * 
+   *
    * @return The quoted string.
    */
-  private static String quote (String str) {
+  private static String quote(String str)
+  {
     // FIXME: unimplemented.
     return str;
   }
@@ -239,10 +245,11 @@
    * UTF-8 character.
    *
    * @param str The string to quote
-   * 
+   *
    * @return The quoted string.
    */
-  private static String quoteAuthority (String str) {
+  private static String quoteAuthority(String str)
+  {
     // Technically, we should be using RFC2396_AUTHORITY, but
     // it contains no additional characters.
     return quote(str, RFC2396_REG_NAME);
@@ -257,37 +264,39 @@
    *
    * @param str The string to quote
    * @param legalCharacters The set of legal characters
-   * 
+   *
    * @return The quoted string.
    */
-  private static String quote (String str, String legalCharacters)
+  private static String quote(String str, String legalCharacters)
   {
     StringBuffer sb = new StringBuffer(str.length());
-    for (int i = 0; i < str.length(); i++) {
-      char c = str.charAt(i);
-      if (legalCharacters.indexOf(c) == -1) {
-	String hex = "0123456789ABCDEF";
-	if (c <= 127) {
-	  sb.append('%')
-	    .append(hex.charAt(c / 16))
-	    .append(hex.charAt(c % 16));
-	} else {
-	  try {
-	    // this is far from optimal, but it works
-	    byte[] utf8 = str.substring(i, i + 1).getBytes("utf-8");
-	    for (int j = 0; j < utf8.length; j++) {
-		sb.append('%')
-		.append(hex.charAt((utf8[j] & 0xff) / 16))
-		.append(hex.charAt((utf8[j] & 0xff) % 16));
-	    }
-	  } catch (java.io.UnsupportedEncodingException x) {
-	    throw (Error)new InternalError().initCause(x);
+    for (int i = 0; i < str.length(); i++)
+      {
+	char c = str.charAt(i);
+	if (legalCharacters.indexOf(c) == -1)
+	  {
+	    String hex = "0123456789ABCDEF";
+	    if (c <= 127)
+	      sb.append('%').append(hex.charAt(c / 16)).append(hex.charAt(c % 16));
+	    else
+	      {
+		try
+		  {
+		    // this is far from optimal, but it works
+		    byte[] utf8 = str.substring(i, i + 1).getBytes("utf-8");
+		    for (int j = 0; j < utf8.length; j++)
+		      sb.append('%').append(hex.charAt((utf8[j] & 0xff) / 16))
+		        .append(hex.charAt((utf8[j] & 0xff) % 16));
+		  }
+		catch (java.io.UnsupportedEncodingException x)
+		  {
+		    throw (Error) new InternalError().initCause(x);
+		  }
+	      }
 	  }
-	}
-      } else {
-	sb.append(c);
+	else
+	  sb.append(c);
       }
-    }
     return sb.toString();
   }
 
@@ -299,10 +308,11 @@
    * UTF-8 character.
    *
    * @param str The string to quote
-   * 
+   *
    * @return The quoted string.
    */
-  private static String quoteHost (String str) {
+  private static String quoteHost(String str)
+  {
     // FIXME: unimplemented.
     return str;
   }
@@ -315,10 +325,11 @@
    * UTF-8 character.
    *
    * @param str The string to quote
-   * 
+   *
    * @return The quoted string.
    */
-  private static String quotePath (String str) {
+  private static String quotePath(String str)
+  {
     // Technically, we should be using RFC2396_PATH, but
     // it contains no additional characters.
     return quote(str, RFC2396_PATH_SEGMENTS);
@@ -332,10 +343,11 @@
    * UTF-8 character.
    *
    * @param str The string to quote
-   * 
+   *
    * @return The quoted string.
    */
-  private static String quoteUserInfo (String str) {
+  private static String quoteUserInfo(String str)
+  {
     // FIXME: unimplemented.
     return str;
   }
@@ -348,12 +360,11 @@
    * @exception URISyntaxException If the given string violates RFC 2396
    * @exception NullPointerException If str is null
    */
-  public URI (String str)
-    throws URISyntaxException
+  public URI(String str) throws URISyntaxException
   {
     parseURI(str);
   }
- 
+
   /**
    * Create an URI from the given components
    *
@@ -367,19 +378,19 @@
    *
    * @exception URISyntaxException If the given string violates RFC 2396
    */
-  public URI (String scheme, String userInfo, String host, int port,
-	     String path, String query, String fragment)
+  public URI(String scheme, String userInfo, String host, int port,
+             String path, String query, String fragment)
     throws URISyntaxException
   {
-    this((scheme == null ? "" : scheme + ":" )
-	 + (userInfo == null && host == null && port == -1 ? "" : "//")
-	 + (userInfo == null ? "" : quoteUserInfo(userInfo) + "@")
-	 + (host == null ? "" : quoteHost(host))
-	 + (port == -1 ? "" : ":" + String.valueOf(port))
-	 + (path == null ? "" : quotePath(path))
-	 + (query == null ? "" : "?" + quote(query))
-	 + (fragment == null ? "" : "#" + quote(fragment)));
-    
+    this((scheme == null ? "" : scheme + ":")
+         + (userInfo == null && host == null && port == -1 ? "" : "//")
+         + (userInfo == null ? "" : quoteUserInfo(userInfo) + "@")
+         + (host == null ? "" : quoteHost(host))
+         + (port == -1 ? "" : ":" + String.valueOf(port))
+         + (path == null ? "" : quotePath(path))
+         + (query == null ? "" : "?" + quote(query))
+         + (fragment == null ? "" : "#" + quote(fragment)));
+
     parseServerAuthority();
   }
 
@@ -394,15 +405,14 @@
    *
    * @exception URISyntaxException If the given string violates RFC 2396
    */
-  public URI (String scheme, String authority, String path, String query,
-	     String fragment)
-    throws URISyntaxException
+  public URI(String scheme, String authority, String path, String query,
+             String fragment) throws URISyntaxException
   {
     this((scheme == null ? "" : scheme + ":")
-	 + (authority == null ? "" : "//" + quoteAuthority(authority))
-	 + (path == null ? "" : quotePath(path))
-	 + (query == null ? "" : "?" + quote(query))
-	 + (fragment == null ? "" : "#" + quote(fragment)));
+         + (authority == null ? "" : "//" + quoteAuthority(authority))
+         + (path == null ? "" : quotePath(path))
+         + (query == null ? "" : "?" + quote(query))
+         + (fragment == null ? "" : "#" + quote(fragment)));
   }
 
   /**
@@ -415,7 +425,7 @@
    *
    * @exception URISyntaxException If the given string violates RFC 2396
    */
-  public URI (String scheme, String host, String path, String fragment)
+  public URI(String scheme, String host, String path, String fragment)
     throws URISyntaxException
   {
     this(scheme, null, host, -1, path, null, fragment);
@@ -430,12 +440,12 @@
    *
    * @exception URISyntaxException If the given string violates RFC 2396
    */
-  public URI (String scheme, String ssp, String fragment)
+  public URI(String scheme, String ssp, String fragment)
     throws URISyntaxException
   {
     this((scheme == null ? "" : scheme + ":")
-	 + (ssp == null ? "" : quote(ssp))
-	 + (fragment == null ? "" : "#" + quote(fragment)));
+         + (ssp == null ? "" : quote(ssp))
+         + (fragment == null ? "" : "#" + quote(fragment)));
   }
 
   /**
@@ -446,16 +456,16 @@
    * @exception IllegalArgumentException If the given string violates RFC 2396
    * @exception NullPointerException If str is null
    */
-  public static URI create (String str)
+  public static URI create(String str)
   {
     try
       {
 	return new URI(str);
       }
-    catch(URISyntaxException e)
+    catch (URISyntaxException e)
       {
-	throw (IllegalArgumentException)
-	  new IllegalArgumentException().initCause(e);
+	throw (IllegalArgumentException) new IllegalArgumentException()
+	      .initCause(e);
       }
   }
 
@@ -465,8 +475,7 @@
    *
    * @exception URISyntaxException If the given string violates RFC 2396
    */
-  public URI parseServerAuthority ()
-     throws URISyntaxException
+  public URI parseServerAuthority() throws URISyntaxException
   {
     return null;
   }
@@ -474,7 +483,7 @@
   /**
    * Returns a normalizes versions of the URI
    */
-  public URI normalize ()
+  public URI normalize()
   {
     return null;
   }
@@ -489,8 +498,8 @@
    *
    * @exception NullPointerException If uri is null
    */
-  public URI resolve (URI uri)
-  { 
+  public URI resolve(URI uri)
+  {
     if (uri.isAbsolute())
       return uri;
     if (uri.isOpaque())
@@ -505,35 +514,34 @@
 
     try
       {
-        if (fragment != null &&
-            path != null && path.equals("") &&
-            scheme == null && authority == null && query == null)
+	if (fragment != null && path != null && path.equals("")
+	    && scheme == null && authority == null && query == null)
 	  return new URI(this.scheme, this.schemeSpecificPart, fragment);
 
-        if (authority == null)
+	if (authority == null)
 	  {
-            authority = this.authority;
-            if (path == null)
+	    authority = this.authority;
+	    if (path == null)
 	      path = "";
-            if (!(path.startsWith("/")))
+	    if (! (path.startsWith("/")))
 	      {
-                StringBuffer basepath = new StringBuffer(this.path);
-                int i = this.path.lastIndexOf('/');
+		StringBuffer basepath = new StringBuffer(this.path);
+		int i = this.path.lastIndexOf('/');
 
-                if (i >= 0)
-		  basepath.delete(i+1, basepath.length());
+		if (i >= 0)
+		  basepath.delete(i + 1, basepath.length());
 
-                basepath.append(path);
-                path = basepath.toString();
-                //  FIXME We must normalize the path here.
-                //  Normalization process omitted.
+		basepath.append(path);
+		path = basepath.toString();
+		//  FIXME We must normalize the path here.
+		//  Normalization process omitted.
 	      }
 	  }
-        return new URI(this.scheme, authority, path, query, fragment);
+	return new URI(this.scheme, authority, path, query, fragment);
       }
     catch (URISyntaxException e)
       {
-        return null;
+	return null;
       }
   }
 
@@ -548,8 +556,7 @@
    * violates RFC 2396
    * @exception NullPointerException If uri is null
    */
-  public URI resolve (String str)
-    throws IllegalArgumentException
+  public URI resolve(String str) throws IllegalArgumentException
   {
     return resolve(create(str));
   }
@@ -563,7 +570,7 @@
    *
    * @exception NullPointerException If uri is null
    */
-  public URI relativize (URI uri)
+  public URI relativize(URI uri)
   {
     return null;
   }
@@ -575,8 +582,7 @@
    * not be found, or if some other error occurred while constructing the URL
    * @exception IllegalArgumentException If the URI is not absolute
    */
-  public URL toURL ()
-    throws IllegalArgumentException, MalformedURLException
+  public URL toURL() throws IllegalArgumentException, MalformedURLException
   {
     if (isAbsolute())
       return new URL(this.toString());
@@ -587,7 +593,7 @@
   /**
    * Returns the scheme of the URI
    */
-  public String getScheme ()
+  public String getScheme()
   {
     return scheme;
   }
@@ -595,7 +601,7 @@
   /**
    * Tells whether this URI is absolute or not
    */
-  public boolean isAbsolute ()
+  public boolean isAbsolute()
   {
     return (scheme != null);
   }
@@ -603,16 +609,16 @@
   /**
    * Tell whether this URI is opaque or not
    */
-  public boolean isOpaque ()
+  public boolean isOpaque()
   {
-    return ((scheme != null) && !(schemeSpecificPart.startsWith("/")));
+    return ((scheme != null) && ! (schemeSpecificPart.startsWith("/")));
   }
 
   /**
    * Returns the raw scheme specific part of this URI.
    * The scheme-specific part is never undefined, though it may be empty
    */
-  public String getRawSchemeSpecificPart ()
+  public String getRawSchemeSpecificPart()
   {
     return rawSchemeSpecificPart;
   }
@@ -620,7 +626,7 @@
   /**
    * Returns the decoded scheme specific part of this URI.
    */
-  public String getSchemeSpecificPart ()
+  public String getSchemeSpecificPart()
   {
     return schemeSpecificPart;
   }
@@ -628,7 +634,7 @@
   /**
    * Returns the rae authority part of this URI
    */
-  public String getRawAuthority ()
+  public String getRawAuthority()
   {
     return rawAuthority;
   }
@@ -636,7 +642,7 @@
   /**
    * Returns the decoded authority part of this URI
    */
-  public String getAuthority ()
+  public String getAuthority()
   {
     return authority;
   }
@@ -644,7 +650,7 @@
   /**
    * Returns the raw user info part of this URI
    */
-  public String getRawUserInfo ()
+  public String getRawUserInfo()
   {
     return rawUserInfo;
   }
@@ -652,7 +658,7 @@
   /**
    * Returns the decoded user info part of this URI
    */
-  public String getUserInfo ()
+  public String getUserInfo()
   {
     return userInfo;
   }
@@ -660,7 +666,7 @@
   /**
    * Returns the hostname of the URI
    */
-  public String getHost ()
+  public String getHost()
   {
     return host;
   }
@@ -668,7 +674,7 @@
   /**
    * Returns the port number of the URI
    */
-  public int getPort ()
+  public int getPort()
   {
     return port;
   }
@@ -676,7 +682,7 @@
   /**
    * Returns the raw path part of this URI
    */
-  public String getRawPath ()
+  public String getRawPath()
   {
     return rawPath;
   }
@@ -684,7 +690,7 @@
   /**
    * Returns the path of the URI
    */
-  public String getPath ()
+  public String getPath()
   {
     return path;
   }
@@ -692,7 +698,7 @@
   /**
    * Returns the raw query part of this URI
    */
-  public String getRawQuery ()
+  public String getRawQuery()
   {
     return rawQuery;
   }
@@ -700,7 +706,7 @@
   /**
    * Returns the query of the URI
    */
-  public String getQuery ()
+  public String getQuery()
   {
     return query;
   }
@@ -708,7 +714,7 @@
   /**
    * Return the raw fragment part of this URI
    */
-  public String getRawFragment ()
+  public String getRawFragment()
   {
     return rawFragment;
   }
@@ -716,7 +722,7 @@
   /**
    * Returns the fragment of the URI
    */
-  public String getFragment ()
+  public String getFragment()
   {
     return fragment;
   }
@@ -734,7 +740,7 @@
   /**
    * Computes the hascode of the URI
    */
-  public int hashCode ()
+  public int hashCode()
   {
     return 0;
   }
@@ -746,8 +752,7 @@
    *
    * @exception ClassCastException If given object ist not an URI
    */
-  public int compareTo (Object obj)
-    throws ClassCastException
+  public int compareTo(Object obj) throws ClassCastException
   {
     return 0;
   }
@@ -755,19 +760,19 @@
   /**
    * Returns the URI as string
    */
-  public String toString ()
+  public String toString()
   {
     return (getScheme() == null ? "" : getScheme() + ":")
-      + (getRawAuthority() == null ? "" : "//" + getRawAuthority())
-      + (getRawPath() == null ? "" : getRawPath())
-      + (getRawQuery() == null ? "" : "?" + getRawQuery())
-      + (getRawFragment() == null ? "" : "#" + getRawFragment());
+           + (getRawAuthority() == null ? "" : "//" + getRawAuthority())
+           + (getRawPath() == null ? "" : getRawPath())
+           + (getRawQuery() == null ? "" : "?" + getRawQuery())
+           + (getRawFragment() == null ? "" : "#" + getRawFragment());
   }
 
   /**
    * Returns the URI as US-ASCII string
    */
-  public String toASCIIString ()
+  public String toASCIIString()
   {
     return "";
   }
Index: java/net/URL.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URL.java,v
retrieving revision 1.25
diff -u -r1.25 URL.java
--- java/net/URL.java	31 Dec 2003 08:44:39 -0000	1.25
+++ java/net/URL.java	8 Apr 2004 16:53:14 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,18 +35,18 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import gnu.java.net.URLParseError;
-import java.io.InputStream;
 import java.io.IOException;
-import java.io.Serializable;
+import java.io.InputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
+
 /*
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
@@ -56,7 +56,7 @@
 /**
   * This final class represents an Internet Uniform Resource Locator (URL).
   * For details on the syntax of URL's and what they can be used for,
-  * refer to RFC 1738, available from <a 
+  * refer to RFC 1738, available from <a
   * href="http://ds.internic.net/rfcs/rfc1738.txt">
   * http://ds.internic.net/rfcs/rfc1738.txt</a>
   * <p>
@@ -74,7 +74,7 @@
   * This chaining is done via the system property java.protocol.handler.pkgs
   * If this property is set, it is assumed to be a "|" separated list of
   * package names in which to attempt locating protocol handlers.  The
-  * protocol handler is searched for by appending the string 
+  * protocol handler is searched for by appending the string
   * ".&lt;protocol&gt;.Handler" to each packed in the list until a hander is
   * found. If a protocol handler is not found in this list of packages, or if
   * the property does not exist, then the default protocol handler of
@@ -87,7 +87,7 @@
   * <p>
   * Here is an example of how URL searches for protocol handlers.  Assume
   * the value of java.protocol.handler.pkgs is "com.foo|com.bar" and the
-  * URL is "news://comp.lang.java.programmer".  URL would looking the 
+  * URL is "news://comp.lang.java.programmer".  URL would looking the
   * following places for protocol handlers:
   * <p><pre>
   * com.foo.news.Handler
@@ -122,7 +122,7 @@
 {
   private static final String DEFAULT_SEARCH_PATH =
     "gnu.java.net.protocol|sun.net.www.protocol";
-  
+
   /**
    * The name of the protocol for this URL.
    * The protocol is always stored in lower case.
@@ -144,7 +144,7 @@
    * The port number of this protocol or -1 if the port number used is
    * the default for this protocol.
    */
-  private int port = -1;	// Initialize for constructor using context.
+  private int port = -1; // Initialize for constructor using context.
 
   /**
    * The "file" portion of the URL. It is defined as <code>path[?query]</code>.
@@ -159,7 +159,7 @@
   /**
    * This is the hashCode for this URL
    */
-  private int hashCode = 0;
+  private int hashCode;
 
   /**
    * The protocol handler in use for this URL
@@ -171,7 +171,6 @@
    * where we keep track of it.
    */
   private static URLStreamHandlerFactory factory;
-
   private static final long serialVersionUID = -7627629688361524110L;
 
   /**
@@ -187,18 +186,18 @@
 
   static
     {
-      String s = System.getProperty ("gnu.java.net.nocache_protocol_handlers");
-      
+      String s = System.getProperty("gnu.java.net.nocache_protocol_handlers");
+
       if (s == null)
-        cache_handlers = true;
+	cache_handlers = true;
       else
-        cache_handlers = false;
+	cache_handlers = false;
     }
 
   /**
    * Constructs a URL and loads a protocol handler for the values passed as
    * arguments.
-   * 
+   *
    * @param protocol The protocol for this URL ("http", "ftp", etc)
    * @param host The hostname or IP address to connect to
    * @param port The port number to use, or -1 to use the protocol's
@@ -231,11 +230,10 @@
     this(protocol, host, -1, file, null);
   }
 
-
   /**
    * This method initializes a new instance of <code>URL</code> with the
    * specified protocol, host, port, and file.  Additionally, this method
-   * allows the caller to specify a protocol handler to use instead of 
+   * allows the caller to specify a protocol handler to use instead of
    * the default.  If this handler is specified, the caller must have
    * the "specifyStreamHandler" permission (see <code>NetPermission</code>)
    * or a <code>SecurityException</code> will be thrown.
@@ -254,9 +252,8 @@
    *
    * @since 1.2
    */
-  public URL (String protocol, String host, int port, String file,
-	      URLStreamHandler ph)
-    throws MalformedURLException
+  public URL(String protocol, String host, int port, String file,
+             URLStreamHandler ph) throws MalformedURLException
   {
     if (protocol == null)
       throw new MalformedURLException("null protocol");
@@ -266,16 +263,16 @@
       {
 	SecurityManager s = System.getSecurityManager();
 	if (s != null)
-	  s.checkPermission (new NetPermission ("specifyStreamHandler"));
+	  s.checkPermission(new NetPermission("specifyStreamHandler"));
 
-        this.ph = ph;
+	this.ph = ph;
       }
     else
       this.ph = getURLStreamHandler(protocol);
 
     if (this.ph == null)
-      throw new MalformedURLException (
-		      "Protocol handler not found: " + protocol);
+      throw new MalformedURLException("Protocol handler not found: "
+                                      + protocol);
 
     this.host = host;
     this.port = port;
@@ -292,7 +289,7 @@
 	this.file = file.substring(0, hashAt);
 	this.ref = file.substring(hashAt + 1);
       }
-    hashCode = hashCode();			// Used for serialization.
+    hashCode = hashCode(); // Used for serialization.
   }
 
   /**
@@ -325,7 +322,7 @@
    * @param context The context on which to parse the specification
    * @param spec The string to parse an URL
    *
-   * @exception MalformedURLException If a protocol handler cannot be found 
+   * @exception MalformedURLException If a protocol handler cannot be found
    * for the URL cannot be parsed
    */
   public URL(URL context, String spec) throws MalformedURLException
@@ -340,7 +337,7 @@
    * not present the URL are inheritied from the context URL.  This allows
    * relative URL's to be easily constructed.  If the context argument is
    * null, then a complete URL must be specified in the URL string.
-   * If the protocol parsed out of the URL is different 
+   * If the protocol parsed out of the URL is different
    * from the context URL's protocol, then then URL String is also
    * expected to be a complete URL.
    * <p>
@@ -372,7 +369,7 @@
      * The relative URL need not specify all the components of a URL.
      * If the protocol, host name, or port number is missing, the value
      * is inherited from the context.  A bare file component is appended
-     * to the context's file.  The optional anchor is not inherited. 
+     * to the context's file.  The optional anchor is not inherited.
      */
 
     // If this is an absolute URL, then ignore context completely.
@@ -380,13 +377,13 @@
     // right after the "://".  The second colon is for an optional port value
     // and implies that the host from the context is used if available.
     int colon;
-    if ((colon = spec.indexOf("://", 1)) > 0 &&
-	! spec.regionMatches(colon, "://:", 0, 4))
+    if ((colon = spec.indexOf("://", 1)) > 0
+        && ! spec.regionMatches(colon, "://:", 0, 4))
       context = null;
 
     int slash;
-    if ((colon = spec.indexOf(':')) > 0 &&
-	(colon < (slash = spec.indexOf('/')) || slash < 0))
+    if ((colon = spec.indexOf(':')) > 0
+        && (colon < (slash = spec.indexOf('/')) || slash < 0))
       {
 	// Protocol specified in spec string.
 	protocol = spec.substring(0, colon).toLowerCase();
@@ -412,26 +409,27 @@
 	file = context.file;
 	if (file == null || file.length() == 0)
 	  file = "/";
-        authority = context.authority;
+	authority = context.authority;
       }
-    else	// Protocol NOT specified in spec. and no context available.
-      throw new
-	  MalformedURLException("Absolute URL required with null context");
+    else // Protocol NOT specified in spec. and no context available.
+
+
+      throw new MalformedURLException("Absolute URL required with null context");
 
     if (ph != null)
       {
-	SecurityManager s = System.getSecurityManager ();
+	SecurityManager s = System.getSecurityManager();
 	if (s != null)
-	  s.checkPermission (new NetPermission ("specifyStreamHandler"));
+	  s.checkPermission(new NetPermission("specifyStreamHandler"));
 
-        this.ph = ph;
+	this.ph = ph;
       }
     else
       this.ph = getURLStreamHandler(protocol);
 
     if (this.ph == null)
       throw new MalformedURLException("Protocol handler not found: "
-				      + protocol);
+                                      + protocol);
 
     // JDK 1.2 doc for parseURL specifically states that any '#' ref
     // is to be excluded by passing the 'limit' as the indexOf the '#'
@@ -441,35 +439,35 @@
     try
       {
 	this.ph.parseURL(this, spec, colon + 1,
-			 hashAt < 0 ? spec.length() : hashAt);
+	                 hashAt < 0 ? spec.length() : hashAt);
       }
     catch (URLParseError e)
       {
 	throw new MalformedURLException(e.getMessage());
       }
-    
+
     if (hashAt >= 0)
       ref = spec.substring(hashAt + 1);
 
-    hashCode = hashCode();			// Used for serialization.
+    hashCode = hashCode(); // Used for serialization.
   }
 
   /**
    * Test another URL for equality with this one.  This will be true only if
-   * the argument is non-null and all of the fields in the URL's match 
+   * the argument is non-null and all of the fields in the URL's match
    * exactly (ie, protocol, host, port, file, and ref).  Overrides
    * Object.equals(), implemented by calling the equals method of the handler.
    *
-   * @param url The URL to compare with
+   * @param obj The URL to compare with
    *
    * @return true if the URL is equal, false otherwise
    */
-  public boolean equals (Object obj)
+  public boolean equals(Object obj)
   {
     if (! (obj instanceof URL))
       return false;
 
-    return ph.equals (this, (URL) obj);
+    return ph.equals(this, (URL) obj);
   }
 
   /**
@@ -482,7 +480,7 @@
    *
    * @since 1.3
    */
-  public final Object getContent() throws IOException
+  public Object getContent() throws IOException
   {
     return openConnection().getContent();
   }
@@ -496,7 +494,7 @@
    *
    * @exception IOException If an error occurs
    */
-  public final Object getContent (Class[] classes) throws IOException
+  public Object getContent(Class[] classes) throws IOException
   {
     // FIXME: implement this
     return getContent();
@@ -519,7 +517,7 @@
    * character.
    *
    * @return The path specified in this URL.
-   * 
+   *
    * @since 1.3
    */
   public String getPath()
@@ -532,7 +530,7 @@
    * Returns the authority of the URL
    *
    * @return The authority specified in this URL.
-   * 
+   *
    * @since 1.3
    */
   public String getAuthority()
@@ -602,7 +600,7 @@
    *
    * @return the user at a particular host or null when no user defined.
    */
-  public String getUserInfo ()
+  public String getUserInfo()
   {
     int at = (host == null) ? -1 : host.indexOf('@');
     return at < 0 ? null : host.substring(0, at);
@@ -614,7 +612,7 @@
    *
    * @return the query part of the file, or null when there is no query part.
    */
-  public String getQuery ()
+  public String getQuery()
   {
     int quest = (file == null) ? -1 : file.indexOf('?');
     return quest < 0 ? null : file.substring(quest + 1, file.length());
@@ -628,9 +626,9 @@
   public int hashCode()
   {
     if (hashCode != 0)
-      return hashCode;		// Use cached value if available.
+      return hashCode; // Use cached value if available.
     else
-      return ph.hashCode (this);
+      return ph.hashCode(this);
   }
 
   /**
@@ -652,10 +650,10 @@
    * from that connection
    *
    * @return An <code>InputStream</code> for this URL.
-   * 
+   *
    * @exception IOException If an error occurs
    */
-  public final InputStream openStream() throws IOException
+  public InputStream openStream() throws IOException
   {
     return openConnection().getInputStream();
   }
@@ -670,9 +668,9 @@
    *
    * @return true if URL matches this URL's file, false otherwise
    */
-  public boolean sameFile(URL other)
+  public boolean sameFile(URL url)
   {
-    return ph.sameFile(this, other);
+    return ph.sameFile(this, url);
   }
 
   /**
@@ -688,7 +686,7 @@
    * @param ref The anchor portion of this URL.
    */
   protected void set(String protocol, String host, int port, String file,
-		     String ref)
+                     String ref)
   {
     // TBD: Theoretically, a poorly written StreamHandler could pass an
     // invalid protocol.  It will cause the handler to be set to null
@@ -701,7 +699,7 @@
     this.host = host;
     this.file = file;
     this.ref = ref;
-    hashCode = hashCode();			// Used for serialization.
+    hashCode = hashCode(); // Used for serialization.
   }
 
   /**
@@ -720,9 +718,8 @@
    *
    * @since 1.3
    */
-  protected void set(String protocol, String host, int port,
-		     String authority, String userInfo,
-		     String path, String query, String ref)
+  protected void set(String protocol, String host, int port, String authority,
+                     String userInfo, String path, String query, String ref)
   {
     // TBD: Theoretically, a poorly written StreamHandler could pass an
     // invalid protocol.  It will cause the handler to be set to null
@@ -740,7 +737,7 @@
     else
       this.file = path + "?" + query;
     this.ref = ref;
-    hashCode = hashCode();			// Used for serialization.
+    hashCode = hashCode(); // Used for serialization.
   }
 
   /**
@@ -754,8 +751,7 @@
    * @exception SecurityException If a security manager exists and its
    * checkSetFactory method doesn't allow the operation
    */
-  public static synchronized void
-	setURLStreamHandlerFactory(URLStreamHandlerFactory fac)
+  public static synchronized void setURLStreamHandlerFactory(URLStreamHandlerFactory fac)
   {
     if (factory != null)
       throw new Error("URLStreamHandlerFactory already set");
@@ -782,7 +778,7 @@
 
   /**
    * Returns a String representing this URL.  Identical to toExternalForm().
-   * The value returned is created by the protocol handler's 
+   * The value returned is created by the protocol handler's
    * toExternalForm method.  Overrides Object.toString()
    *
    * @return A string for this URL
@@ -801,23 +797,20 @@
    *
    * @return A URLStreamHandler for this protocol, or null when not found.
    */
-  private static synchronized URLStreamHandler
-    getURLStreamHandler (String protocol)
+  private static synchronized URLStreamHandler getURLStreamHandler(String protocol)
   {
     URLStreamHandler ph = null;
 
     // First, see if a protocol handler is in our cache.
     if (cache_handlers)
       {
-        if ((ph = (URLStreamHandler) ph_cache.get (protocol)) != null)
-          return ph;
+	if ((ph = (URLStreamHandler) ph_cache.get(protocol)) != null)
+	  return ph;
       }
 
     // If a non-default factory has been set, use it to find the protocol.
     if (factory != null)
-      {
-	ph = factory.createURLStreamHandler (protocol);
-      }
+      ph = factory.createURLStreamHandler(protocol);
 
     // Non-default factory may have returned null or a factory wasn't set.
     // Use the default search algorithm to find a handler for this protocol.
@@ -832,42 +825,41 @@
 
 	// Tack our default package on at the ends.
 	if (ph_search_path != null)
-          ph_search_path += "|" + DEFAULT_SEARCH_PATH;
+	  ph_search_path += "|" + DEFAULT_SEARCH_PATH;
 	else
-          ph_search_path = DEFAULT_SEARCH_PATH;
+	  ph_search_path = DEFAULT_SEARCH_PATH;
 
 	// Finally loop through our search path looking for a match.
-	StringTokenizer pkgPrefix = new StringTokenizer (ph_search_path, "|");
-        
+	StringTokenizer pkgPrefix = new StringTokenizer(ph_search_path, "|");
+
 	do
-          {
-            String clsName = (pkgPrefix.nextToken() + "."
-			      + protocol + ".Handler");
-         
-            try
-              {
-                Object obj = Class.forName (clsName).newInstance();
-	    
-                if (!(obj instanceof URLStreamHandler))
-                  continue;
-                else
-                  ph = (URLStreamHandler) obj;
-              }
-            catch (Exception e)
-              {
-                // Can't instantiate; handler still null,
+	  {
+	    String clsName =
+	      (pkgPrefix.nextToken() + "." + protocol + ".Handler");
+
+	    try
+	      {
+		Object obj = Class.forName(clsName).newInstance();
+
+		if (! (obj instanceof URLStreamHandler))
+		  continue;
+		else
+		  ph = (URLStreamHandler) obj;
+	      }
+	    catch (Exception e)
+	      {
+		// Can't instantiate; handler still null,
 		// go on to next element.
-              }
-          }
-	while ((! (ph instanceof URLStreamHandler))
-               && pkgPrefix.hasMoreTokens());
+	      }
+	  }
+	 while ((! (ph instanceof URLStreamHandler))
+	        && pkgPrefix.hasMoreTokens());
       }
 
     // Update the hashtable with the new protocol handler.
-    if (ph != null
-        && cache_handlers)
+    if (ph != null && cache_handlers)
       if (ph instanceof URLStreamHandler)
-	ph_cache.put (protocol, ph);
+	ph_cache.put(protocol, ph);
       else
 	ph = null;
 
Index: java/net/URLClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLClassLoader.java,v
retrieving revision 1.19
diff -u -r1.19 URLClassLoader.java
--- java/net/URLClassLoader.java	19 Sep 2003 06:19:42 -0000	1.19
+++ java/net/URLClassLoader.java	8 Apr 2004 16:53:15 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,7 +35,6 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import java.io.ByteArrayOutputStream;
@@ -43,23 +42,24 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FilePermission;
-import java.io.InputStream;
 import java.io.IOException;
-import java.security.AccessController;
+import java.io.InputStream;
 import java.security.AccessControlContext;
+import java.security.AccessController;
 import java.security.CodeSource;
-import java.security.SecureClassLoader;
-import java.security.PrivilegedAction;
 import java.security.PermissionCollection;
+import java.security.PrivilegedAction;
+import java.security.SecureClassLoader;
 import java.security.cert.Certificate;
 import java.util.Enumeration;
-import java.util.Vector;
 import java.util.HashMap;
+import java.util.Vector;
 import java.util.jar.Attributes;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
+
 /**
  * A secure class loader that can load classes and resources from
  * multiple locations.  Given an array of <code>URL</code>s this class
@@ -117,7 +117,6 @@
  * @author Mark Wielaard (mark@klomp.org)
  * @author Wu Gansha (gansha.wu@intel.com)
  */
- 
 public class URLClassLoader extends SecureClassLoader
 {
   // Class Variables
@@ -129,7 +128,7 @@
    * XXX - Keeps these loaders forever which prevents garbage collection.
    */
   private static HashMap urlloaders = new HashMap();
-    
+
   /**
    * A cache to store mappings between handler factory and its
    * private protocol handler cache (also a HashMap), so we can avoid
@@ -143,12 +142,12 @@
   private final Vector urls = new Vector();
 
   /**
-   * Store pre-parsed information for each url into this vector 
-   * each element is a URL loader, corresponding to the URL of 
+   * Store pre-parsed information for each url into this vector
+   * each element is a URL loader, corresponding to the URL of
    * the same index in "urls"
    */
   private final Vector urlinfos = new Vector();
-    
+
   /** Factory used to get the protocol handlers of the URLs */
   private final URLStreamHandlerFactory factory;
 
@@ -160,12 +159,12 @@
   private final AccessControlContext securityContext;
 
   // Helper classes
- 
-  /** 
+
+  /**
    * A <code>URLLoader</code> contains all logic to load resources from a
    * given base <code>URL</code>.
    */
-  static abstract class URLLoader
+  abstract static class URLLoader
   {
     /**
      * Our classloader to get info from if needed.
@@ -211,14 +210,14 @@
     }
   }
 
-  /** 
+  /**
    * A <code>Resource</code> represents a resource in some
    * <code>URLLoader</code>. It also contains all information (e.g.,
    * <code>URL</code>, <code>CodeSource</code>, <code>Manifest</code> and
    * <code>InputStream</code>) that is necessary for loading resources
    * and creating classes from a <code>URL</code>.
    */
-  static abstract class Resource
+  abstract static class Resource
   {
     final URLLoader loader;
     final String name;
@@ -273,10 +272,10 @@
    * A <code>JarURLLoader</code> is a type of <code>URLLoader</code>
    * only loading from jar url.
    */
-  final static class JarURLLoader extends URLLoader
+  static final class JarURLLoader extends URLLoader
   {
     final JarFile jarfile; // The jar file for this url
-    final URL baseJarURL;  // Base jar: url for all resources loaded from jar
+    final URL baseJarURL; // Base jar: url for all resources loaded from jar
 
     public JarURLLoader(URLClassLoader classloader, URL baseURL)
     {
@@ -293,13 +292,17 @@
       URL baseJarURL = null;
       JarFile jarfile = null;
       try
-	{
-	  baseJarURL
-	    = new URL(null, jarURL, classloader.getURLStreamHandler("jar"));
-	  jarfile
-	    = ((JarURLConnection) baseJarURL.openConnection()).getJarFile();
-	}
-      catch (IOException ioe) { /* ignored */ }
+        {
+	  baseJarURL =
+	    new URL(null, jarURL, classloader.getURLStreamHandler("jar"));
+
+	  jarfile =
+	    ((JarURLConnection) baseJarURL.openConnection()).getJarFile();
+        }
+      catch (IOException ioe)
+        {
+	  /* ignored */
+        }
 
       this.baseJarURL = baseJarURL;
       this.jarfile = jarfile;
@@ -312,10 +315,10 @@
 	return null;
 
       if (name.startsWith("/"))
-        name = name.substring(1);
+	name = name.substring(1);
 
       JarEntry je = jarfile.getJarEntry(name);
-      if(je != null)
+      if (je != null)
 	return new JarURLResource(this, name, je);
       else
 	return null;
@@ -324,17 +327,17 @@
     Manifest getManifest()
     {
       try
-	{
+        {
 	  return (jarfile == null) ? null : jarfile.getManifest();
-	}
+        }
       catch (IOException ioe)
-	{
+        {
 	  return null;
-	}
+        }
     }
   }
 
-  final static class JarURLResource extends Resource
+  static final class JarURLResource extends Resource
   {
     private final JarEntry entry;
 
@@ -346,12 +349,12 @@
 
     InputStream getInputStream() throws IOException
     {
-      return ((JarURLLoader)loader).jarfile.getInputStream(entry);
+      return ((JarURLLoader) loader).jarfile.getInputStream(entry);
     }
 
     int getLength()
     {
-      return (int)entry.getSize();
+      return (int) entry.getSize();
     }
 
     Certificate[] getCertificates()
@@ -362,25 +365,25 @@
     URL getURL()
     {
       try
-	{
-	  return new URL(((JarURLLoader)loader).baseJarURL, name,
-			 loader.classloader.getURLStreamHandler("jar"));
-	}
-      catch(MalformedURLException e)
-	{
+        {
+	  return new URL(((JarURLLoader) loader).baseJarURL, name,
+	                 loader.classloader.getURLStreamHandler("jar"));
+        }
+      catch (MalformedURLException e)
+        {
 	  InternalError ie = new InternalError();
 	  ie.initCause(e);
 	  throw ie;
-	}
+        }
     }
   }
 
   /**
    * Loader for remote directories.
    */
-  final static class RemoteURLLoader extends URLLoader
+  static final class RemoteURLLoader extends URLLoader
   {
-    final private String protocol;
+    private final String protocol;
 
     RemoteURLLoader(URLClassLoader classloader, URL url)
     {
@@ -395,9 +398,9 @@
     Resource getResource(String name)
     {
       try
-	{
-	  URL url = new URL(baseURL, name,
-			    classloader.getURLStreamHandler(protocol));
+        {
+	  URL url =
+	    new URL(baseURL, name, classloader.getURLStreamHandler(protocol));
 	  URLConnection connection = url.openConnection();
 
 	  // Open the connection and check the stream
@@ -408,9 +411,9 @@
 	  // We can do some extra checking if it is a http request
 	  if (connection instanceof HttpURLConnection)
 	    {
-	      int response
-		= ((HttpURLConnection)connection).getResponseCode();
-	      if (response/100 != 2)
+	      int response =
+		((HttpURLConnection) connection).getResponseCode();
+	      if (response / 100 != 2)
 		return null;
 	    }
 
@@ -418,25 +421,25 @@
 	    return new RemoteResource(this, name, url, stream, length);
 	  else
 	    return null;
-	}
+        }
       catch (IOException ioe)
-	{
+        {
 	  return null;
-	}
+        }
     }
   }
 
   /**
    * A resource from some remote location.
    */
-  final static class RemoteResource extends Resource
+  static final class RemoteResource extends Resource
   {
-    final private URL url;
-    final private InputStream stream;
-    final private int length;
+    private final URL url;
+    private final InputStream stream;
+    private final int length;
 
     RemoteResource(RemoteURLLoader loader, String name, URL url,
-		   InputStream stream, int length)
+                   InputStream stream, int length)
     {
       super(loader, name);
       this.url = url;
@@ -464,9 +467,9 @@
    * A <code>FileURLLoader</code> is a type of <code>URLLoader</code>
    * only loading from file url.
    */
-  final static class FileURLLoader extends URLLoader
+  static final class FileURLLoader extends URLLoader
   {
-    File dir;   //the file for this file url
+    File dir; //the file for this file url
 
     FileURLLoader(URLClassLoader classloader, URL url)
     {
@@ -478,13 +481,13 @@
     Resource getResource(String name)
     {
       File file = new File(dir, name);
-      if (file.exists() && !file.isDirectory())
+      if (file.exists() && ! file.isDirectory())
 	return new FileResource(this, name, file);
       return null;
     }
   }
 
-  final static class FileResource extends Resource
+  static final class FileResource extends Resource
   {
     final File file;
 
@@ -498,28 +501,28 @@
     {
       return new FileInputStream(file);
     }
-                        
+
     public int getLength()
     {
-      return (int)file.length();
+      return (int) file.length();
     }
 
     public URL getURL()
     {
       try
-	{
+        {
 	  return new URL(loader.baseURL, name,
-			 loader.classloader.getURLStreamHandler("file"));
-	}
-      catch(MalformedURLException e)
-	{
+	                 loader.classloader.getURLStreamHandler("file"));
+        }
+      catch (MalformedURLException e)
+        {
 	  InternalError ie = new InternalError();
 	  ie.initCause(e);
 	  throw ie;
-	}
+        }
     }
   }
-    
+
   // Constructors
 
   /**
@@ -573,7 +576,7 @@
    * load classes and resources (after using the supplied parent ClassLoader).
    * @exception SecurityException if the SecurityManager disallows the
    * creation of a ClassLoader.
-   * @exception SecurityException 
+   * @exception SecurityException
    * @param urls Locations that should be searched by this ClassLoader when
    * resolving Classes or Resources.
    * @param parent The parent class loader used before trying this class
@@ -603,7 +606,7 @@
    * @param securityContext the security context of the unprivileged code.
    */
   private URLClassLoader(ClassLoader parent,
-			 AccessControlContext securityContext)
+                         AccessControlContext securityContext)
   {
     super(parent);
     this.factory = null;
@@ -621,7 +624,7 @@
    * protocol handlers of the supplied URLs.
    * @exception SecurityException if the SecurityManager disallows the
    * creation of a ClassLoader.
-   * @exception SecurityException 
+   * @exception SecurityException
    * @param urls Locations that should be searched by this ClassLoader when
    * resolving Classes or Resources.
    * @param parent The parent class loader used before trying this class
@@ -629,9 +632,8 @@
    * @param factory Used to get the protocol handler for the URLs.
    * @see SecureClassLoader
    */
-  public URLClassLoader(URL[] urls,
-			ClassLoader parent,
-			URLStreamHandlerFactory factory)
+  public URLClassLoader(URL[] urls, ClassLoader parent,
+                        URLStreamHandlerFactory factory)
     throws SecurityException
   {
     super(parent);
@@ -642,7 +644,7 @@
     // If this factory is still not in factoryCache, add it,
     //   since we only support three protocols so far, 5 is enough 
     //   for cache initial size
-    synchronized(factoryCache)
+    synchronized (factoryCache)
       {
 	if (factory != null && factoryCache.get(factory) == null)
 	  factoryCache.put(factory, new HashMap(5));
@@ -662,17 +664,18 @@
 
   private void addURLImpl(URL newUrl)
   {
-    synchronized(urlloaders)
+    synchronized (urlloaders)
       {
 	if (newUrl == null)
 	  return; // Silently ignore...
-        
+
 	// Check global cache to see if there're already url loader
 	// for this url.
-	URLLoader loader = (URLLoader)urlloaders.get(newUrl);
+	URLLoader loader = (URLLoader) urlloaders.get(newUrl);
 	if (loader == null)
 	  {
 	    String file = newUrl.getFile();
+
 	    // Check that it is not a directory
 	    if (! (file.endsWith("/") || file.endsWith(File.separator)))
 	      loader = new JarURLLoader(this, newUrl);
@@ -697,12 +700,10 @@
   private void addURLs(URL[] newUrls)
   {
     for (int i = 0; i < newUrls.length; i++)
-    {
       addURLImpl(newUrls[i]);
-    }
   }
 
-  /** 
+  /**
    * Defines a Package based on the given name and the supplied manifest
    * information. The manifest indicates the tile, version and
    * vendor information of the specification and implementation and wheter the
@@ -717,22 +718,16 @@
    * @param url the code source url to seal the package
    * @return the defined Package
    */
-  protected Package definePackage(String name, Manifest manifest, URL url) 
+  protected Package definePackage(String name, Manifest manifest, URL url)
     throws IllegalArgumentException
   {
     Attributes attr = manifest.getMainAttributes();
-    String specTitle =
-      attr.getValue(Attributes.Name.SPECIFICATION_TITLE); 
-    String specVersion =
-      attr.getValue(Attributes.Name.SPECIFICATION_VERSION); 
-    String specVendor =
-      attr.getValue(Attributes.Name.SPECIFICATION_VENDOR); 
-    String implTitle =
-      attr.getValue(Attributes.Name.IMPLEMENTATION_TITLE); 
-    String implVersion =
-      attr.getValue(Attributes.Name.IMPLEMENTATION_VERSION); 
-    String implVendor =
-      attr.getValue(Attributes.Name.IMPLEMENTATION_VENDOR);
+    String specTitle = attr.getValue(Attributes.Name.SPECIFICATION_TITLE);
+    String specVersion = attr.getValue(Attributes.Name.SPECIFICATION_VERSION);
+    String specVendor = attr.getValue(Attributes.Name.SPECIFICATION_VENDOR);
+    String implTitle = attr.getValue(Attributes.Name.IMPLEMENTATION_TITLE);
+    String implVersion = attr.getValue(Attributes.Name.IMPLEMENTATION_VERSION);
+    String implVendor = attr.getValue(Attributes.Name.IMPLEMENTATION_VENDOR);
 
     // Look if the Manifest indicates that this package is sealed
     // XXX - most likely not completely correct!
@@ -741,13 +736,11 @@
     // But how do we get that jar manifest here?
     String sealed = attr.getValue(Attributes.Name.SEALED);
     if ("false".equals(sealed))
-    {
       // make sure that the URL is null so the package is not sealed
       url = null;
-    }
 
-    return definePackage(name, specTitle, specVersion, specVendor,
-			 implTitle, implVersion, implVendor, url);
+    return definePackage(name, specTitle, specVersion, specVendor, implTitle,
+                         implVersion, implVendor, url);
   }
 
   /**
@@ -772,87 +765,81 @@
     // construct the class (and watch out for those nasty IOExceptions)
     try
       {
-	byte [] data;
+	byte[] data;
 	InputStream in = resource.getInputStream();
 	try
 	  {
 	    int length = resource.getLength();
 	    if (length != -1)
-	    {
+	      {
 		// We know the length of the data.
 		// Just try to read it in all at once
 		data = new byte[length];
 		int pos = 0;
-		while(length - pos > 0)
-		{
+		while (length - pos > 0)
+		  {
 		    int len = in.read(data, pos, length - pos);
 		    if (len == -1)
-		    throw new EOFException("Not enough data reading from: "
-					    + in);
+		      throw new EOFException("Not enough data reading from: "
+		                             + in);
 		    pos += len;
-		}
-	    }
+		  }
+	      }
 	    else
-	    {
+	      {
 		// We don't know the data length.
 		// Have to read it in chunks.
 		ByteArrayOutputStream out = new ByteArrayOutputStream(4096);
-		byte b[] = new byte[4096];
+		byte[] b = new byte[4096];
 		int l = 0;
 		while (l != -1)
-		{
+		  {
 		    l = in.read(b);
 		    if (l != -1)
-		    out.write(b, 0, l);
-		}
+		      out.write(b, 0, l);
+		  }
 		data = out.toByteArray();
-	    }
+	      }
 	  }
-        finally
-          {
+	finally
+	  {
 	    in.close();
-          }
+	  }
 	final byte[] classData = data;
 
 	// Now get the CodeSource
 	final CodeSource source = resource.getCodeSource();
-	
+
 	// Find out package name
 	String packageName = null;
 	int lastDot = className.lastIndexOf('.');
 	if (lastDot != -1)
 	  packageName = className.substring(0, lastDot);
-	
+
 	if (packageName != null && getPackage(packageName) == null)
 	  {
 	    // define the package
 	    Manifest manifest = resource.loader.getManifest();
 	    if (manifest == null)
-	      definePackage(packageName,
-			    null, null, null, null, null, null, null);
+	      definePackage(packageName, null, null, null, null, null, null,
+	                    null);
 	    else
 	      definePackage(packageName, manifest, resource.loader.baseURL);
 	  }
-	
+
 	// And finally construct the class!
 	SecurityManager sm = System.getSecurityManager();
 	if (sm != null && securityContext != null)
-	  {
-	    return (Class)AccessController.doPrivileged
-	      (new PrivilegedAction()
+	  return (Class) AccessController.doPrivileged(new PrivilegedAction()
+	      {
+		public Object run()
 		{
-		  public Object run()
-		  {
-		    return defineClass(className, classData,
-				       0, classData.length,
-				       source);
-		  }
-		}, securityContext);
-	  }
+		  return defineClass(className, classData, 0,
+		                     classData.length, source);
+		}
+	      }, securityContext);
 	else
-	  return defineClass(className, classData,
-			     0, classData.length,
-			     source);
+	  return defineClass(className, classData, 0, classData.length, source);
       }
     catch (IOException ioe)
       {
@@ -872,10 +859,10 @@
     int max = urls.size();
     for (int i = 0; i < max; i++)
       {
-	URLLoader loader = (URLLoader)urlinfos.elementAt(i);
+	URLLoader loader = (URLLoader) urlinfos.elementAt(i);
 	if (loader == null)
 	  continue;
-	
+
 	Resource resource = loader.getResource(resourceName);
 	if (resource != null)
 	  return resource;
@@ -894,7 +881,7 @@
     Resource resource = findURLResource(resourceName);
     if (resource != null)
       return resource.getURL();
-    
+
     // Resource not found
     return null;
   }
@@ -915,9 +902,9 @@
     synchronized (factoryCache)
       {
 	// Check if there're handler for the same protocol in cache.
-	HashMap cache = (HashMap)factoryCache.get(factory);
-	handler = (URLStreamHandler)cache.get(protocol);
-	if(handler == null)
+	HashMap cache = (HashMap) factoryCache.get(factory);
+	handler = (URLStreamHandler) cache.get(protocol);
+	if (handler == null)
 	  {
 	    // Add it to cache.
 	    handler = factory.createURLStreamHandler(protocol);
@@ -936,13 +923,14 @@
    * @return a (possible empty) enumeration of URLs where the resource can be
    * found
    */
-  public Enumeration findResources(String resourceName) throws IOException
+  public Enumeration findResources(String resourceName)
+    throws IOException
   {
     Vector resources = new Vector();
     int max = urls.size();
     for (int i = 0; i < max; i++)
       {
-	URLLoader loader = (URLLoader)urlinfos.elementAt(i);
+	URLLoader loader = (URLLoader) urlinfos.elementAt(i);
 	Resource resource = loader.getResource(resourceName);
 	if (resource != null)
 	  resources.add(resource.getURL());
@@ -974,29 +962,25 @@
   {
     // XXX - This implementation does exactly as the Javadoc describes.
     // But maybe we should/could use URLConnection.getPermissions()?
-
     // First get the permissions that would normally be granted
     PermissionCollection permissions = super.getPermissions(source);
-        
+
     // Now add any extra permissions depending on the URL location.
     URL url = source.getLocation();
     String protocol = url.getProtocol();
     if (protocol.equals("file"))
       {
 	String file = url.getFile();
+
 	// If the file end in / it must be an directory.
 	if (file.endsWith("/") || file.endsWith(File.separator))
-	  {
-	    // Grant permission to read everything in that directory and
-	    // all subdirectories.
-	    permissions.add(new FilePermission(file + "-", "read"));
-	  }
+	  // Grant permission to read everything in that directory and
+	  // all subdirectories.
+	  permissions.add(new FilePermission(file + "-", "read"));
 	else
-	  {
-	    // It is a 'normal' file.
-	    // Grant permission to access that file.
-	    permissions.add(new FilePermission(file, "read"));
-	  }
+	  // It is a 'normal' file.
+	  // Grant permission to access that file.
+	  permissions.add(new FilePermission(file, "read"));
       }
     else
       {
@@ -1008,7 +992,7 @@
 
     return permissions;
   }
-    
+
   /**
    * Returns all the locations that this class loader currently uses the
    * resolve classes and resource. This includes both the initially supplied
@@ -1031,7 +1015,7 @@
    * @exception SecurityException when the calling code does not have
    * permission to access the given <code>URL</code>s
    */
-  public static URLClassLoader newInstance(URL urls[])
+  public static URLClassLoader newInstance(URL[] urls)
     throws SecurityException
   {
     return newInstance(urls, null);
@@ -1049,8 +1033,7 @@
    * @exception SecurityException when the calling code does not have
    * permission to access the given <code>URL</code>s
    */
-  public static URLClassLoader newInstance(URL urls[],
-					   final ClassLoader parent)
+  public static URLClassLoader newInstance(URL[] urls, final ClassLoader parent)
     throws SecurityException
   {
     SecurityManager sm = System.getSecurityManager();
@@ -1059,21 +1042,21 @@
     else
       {
 	final Object securityContext = sm.getSecurityContext();
+
 	// XXX - What to do with anything else then an AccessControlContext?
-	if (!(securityContext instanceof AccessControlContext))
-	  throw new SecurityException
-	    ("securityContext must be AccessControlContext: "
-	     + securityContext);
-	
+	if (! (securityContext instanceof AccessControlContext))
+	  throw new SecurityException("securityContext must be AccessControlContext: "
+	                              + securityContext);
+
 	URLClassLoader loader =
-	  (URLClassLoader)AccessController.doPrivileged(new PrivilegedAction()
-	    {
-	      public Object run()
+	  (URLClassLoader) AccessController.doPrivileged(new PrivilegedAction()
 	      {
-		return new URLClassLoader
-		  (parent, (AccessControlContext)securityContext);
-	      }
-	    });
+		public Object run()
+		{
+		  return new URLClassLoader(parent,
+		                            (AccessControlContext) securityContext);
+		}
+	      });
 	loader.addURLs(urls);
 	return loader;
       }
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLConnection.java,v
retrieving revision 1.23
diff -u -r1.23 URLConnection.java
--- java/net/URLConnection.java	27 Feb 2004 11:02:55 -0000	1.23
+++ java/net/URLConnection.java	8 Apr 2004 16:53:15 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,11 +35,10 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.security.AllPermission;
 import java.security.Permission;
@@ -51,13 +50,13 @@
 import java.util.Locale;
 import java.util.Map;
 
+
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * Status:  One guessContentTypeFrom... methods not implemented.
  *    getContent method assumes content type from response; see comment there.
  */
-
 /**
  * This class models a connection that retrieves the information pointed
  * to by a URL object.  This is typically a connection to a remote node
@@ -97,18 +96,18 @@
    * instance and store it here.
    */
   private static FileNameMap fileNameMap;
- 
+
   /**
    * This is the ContentHandlerFactory set by the caller, if any
    */
   private static ContentHandlerFactory factory;
-  
+
   /**
    * This is the default value that will be used to determine whether or
    * not user interaction should be allowed.
    */
-  private static boolean defaultAllowUserInteraction = false;
-  
+  private static boolean defaultAllowUserInteraction;
+
   /**
    * This is the default flag indicating whether or not to use caches to
    * store the data returned from a server
@@ -125,18 +124,18 @@
    * Indicates whether or not a connection has been established to the
    * destination specified in the URL
    */
-  protected boolean connected = false;
-  
+  protected boolean connected;
+
   /**
    * Indicates whether or not input can be read from this URL
    */
   protected boolean doInput = true;
-  
+
   /**
    * Indicates whether or not output can be sent to this URL
    */
-  protected boolean doOutput = false;
-  
+  protected boolean doOutput;
+
   /**
    * If this flag is set, the protocol is allowed to cache data whenever
    * it can (caching is not guaranteed). If it is not set, the protocol
@@ -156,15 +155,16 @@
    * modified more recently than the date set in this variable.  That date
    * should be specified as the number of seconds since 1/1/1970 GMT.
    */
-  protected long ifModifiedSince = 0L;
+  protected long ifModifiedSince;
 
   /**
    * This is the URL associated with this connection
    */
   protected URL url;
-
-  private static SimpleDateFormat dateFormat1, dateFormat2, dateFormat3;
-  private static boolean dateformats_initialized = false;
+  private static SimpleDateFormat dateFormat1;
+  private static SimpleDateFormat dateFormat2;
+  private static SimpleDateFormat dateFormat3;
+  private static boolean dateformats_initialized;
 
   /**
    * Creates a URL connection to a given URL. A real connection is not made.
@@ -185,6 +185,8 @@
   /**
    * Establishes the actual connection to the URL associated with this
    * connection object
+   *
+   * @exception IOException if an error occurs
    */
   public abstract void connect() throws IOException;
 
@@ -227,7 +229,7 @@
   /**
    * Returns the value of the content-encoding field or null if it is not
    * known or not present.
-   * 
+   *
    * @return The content-encoding field
    */
   public String getContentEncoding()
@@ -292,7 +294,7 @@
    * Returns a String representing the value of the header field having
    * the named key.  Returns null if the header field does not exist.
    *
-   * @param The key of the header field
+   * @param name The key of the header field
    *
    * @return The value of the header field as a String
    */
@@ -304,7 +306,9 @@
 
   /**
    * Returns a map of all sent header fields
-   * 
+   *
+   * @return all header fields
+   *
    * @since 1.4
    */
   public Map getHeaderFields()
@@ -327,18 +331,18 @@
    */
   public int getHeaderFieldInt(String name, int defaultValue)
   {
-    String value = getHeaderField (name);
-    
+    String value = getHeaderField(name);
+
     if (value == null)
       return defaultValue;
 
     try
       {
-        return Integer.parseInt (value);
+	return Integer.parseInt(value);
       }
-    catch (NumberFormatException e) 
-      { 
-        return defaultValue;
+    catch (NumberFormatException e)
+      {
+	return defaultValue;
       }
   }
 
@@ -354,25 +358,25 @@
    * @return Returns the date value of the header filed or the default value
    * if the field is missing or malformed
    */
-  public long getHeaderFieldDate (String name, long defaultValue)
+  public long getHeaderFieldDate(String name, long defaultValue)
   {
     if (! dateformats_initialized)
-      initializeDateFormats ();
-    
+      initializeDateFormats();
+
     long result = defaultValue;
-    String str = getHeaderField (name);
-    
+    String str = getHeaderField(name);
+
     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 ();
+	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 result;
   }
 
@@ -382,12 +386,12 @@
    * getHeaderField(int) method allows access to the corresponding value for
    * this tag.
    *
-   * @param index The index into the header field list to retrieve the key for. 
+   * @param index The index into the header field list to retrieve the key for.
    *
    * @return The header field key or null if index is past the end
    * of the headers.
    */
-  public String getHeaderFieldKey (int index)
+  public String getHeaderFieldKey(int index)
   {
     // Subclasses for specific protocols override this.
     return null;
@@ -419,7 +423,7 @@
 
     // First try the factory
     ContentHandler ch = null;
-    
+
     if (factory != null)
       ch = factory.createContentHandler(type);
 
@@ -429,16 +433,16 @@
     // Then try our default class
     try
       {
-        Class cls = Class.forName("gnu.java.net.content." + 
-                                  type.replace('/', '.'));
-     
-        Object obj = cls.newInstance();
-        
+	Class cls =
+	  Class.forName("gnu.java.net.content." + type.replace('/', '.'));
+
+	Object obj = cls.newInstance();
+
 	if (! (obj instanceof ContentHandler))
-          throw new UnknownServiceException(type);
+	  throw new UnknownServiceException(type);
 
-        ch = (ContentHandler) obj;
-        return ch.getContent(this);
+	ch = (ContentHandler) obj;
+	return ch.getContent(this);
       }
     catch (ClassNotFoundException e)
       {
@@ -456,6 +460,8 @@
   /**
    * Retrieves the content of this URLConnection
    *
+   * @param classes The allowed classes for the content
+   *
    * @exception IOException If an error occurs
    * @exception UnknownServiceException If the protocol does not support the
    * content type
@@ -463,7 +469,7 @@
   public Object getContent(Class[] classes) throws IOException
   {
     // FIXME: implement this
-    return getContent ();
+    return getContent();
   }
 
   /**
@@ -500,8 +506,8 @@
   public InputStream getInputStream() throws IOException
   {
     // Subclasses for specific protocols override this.
-    throw new UnknownServiceException("Protocol " + url.getProtocol() +
-			" does not support input.");
+    throw new UnknownServiceException("Protocol " + url.getProtocol()
+                                      + " does not support input.");
   }
 
   /**
@@ -516,14 +522,14 @@
   public OutputStream getOutputStream() throws IOException
   {
     // Subclasses for specific protocols override this.
-    throw new UnknownServiceException("Protocol " + url.getProtocol() +
-			" does not support output.");
+    throw new UnknownServiceException("Protocol " + url.getProtocol()
+                                      + " does not support output.");
   }
 
   /**
    * The methods prints the value of this object as a String by calling the
    * toString() method of its associated URL.  Overrides Object.toString()
-   * 
+   *
    * @return A String representation of this object
    */
   public String toString()
@@ -535,7 +541,7 @@
    * Returns the value of a flag indicating whether or not input is going
    * to be done for this connection.  This default to true unless the
    * doOutput flag is set to false, in which case this defaults to false.
-   * 
+   *
    * @param input <code>true</code> if input is to be done,
    * <code>false</code> otherwise
    *
@@ -544,7 +550,7 @@
   public void setDoInput(boolean input)
   {
     if (connected)
-      throw new IllegalStateException ("Already connected");
+      throw new IllegalStateException("Already connected");
 
     doInput = input;
   }
@@ -573,7 +579,7 @@
   public void setDoOutput(boolean output)
   {
     if (connected)
-      throw new IllegalStateException ("Already connected");
+      throw new IllegalStateException("Already connected");
 
     doOutput = output;
   }
@@ -648,7 +654,7 @@
   public void setUseCaches(boolean usecaches)
   {
     if (connected)
-      throw new IllegalStateException ("Already connected");
+      throw new IllegalStateException("Already connected");
 
     useCaches = usecaches;
   }
@@ -679,7 +685,7 @@
   public void setIfModifiedSince(long ifmodifiedsince)
   {
     if (connected)
-      throw new IllegalStateException ("Already connected");
+      throw new IllegalStateException("Already connected");
 
     ifModifiedSince = ifmodifiedsince;
   }
@@ -715,9 +721,9 @@
    *
    * @param use true to use caches if possible by default, false otherwise
    */
-  public void setDefaultUseCaches(boolean defaultusecaches)
+  public void setDefaultUseCaches(boolean use)
   {
-    defaultUseCaches = defaultusecaches;
+    defaultUseCaches = use;
   }
 
   /**
@@ -725,23 +731,23 @@
    *
    * @param key The name of the property
    * @param value The value of the property
-   * 
+   *
    * @exception IllegalStateException If already connected
    * @exception NullPointerException If key is null
    *
    * @see URLConnection#getRequestProperty(String key)
    * @see URLConnection#addRequestProperty(String key, String value)
-   * 
+   *
    * @since 1.4
    */
   public void setRequestProperty(String key, String value)
   {
     if (connected)
-      throw new IllegalStateException ("Already connected");
+      throw new IllegalStateException("Already connected");
 
     if (key == null)
-      throw new NullPointerException ("key is null");
-    
+      throw new NullPointerException("key is null");
+
     // Do nothing unless overridden by subclasses that support setting
     // header fields in the request.
   }
@@ -755,20 +761,20 @@
    *
    * @exception IllegalStateException If already connected
    * @exception NullPointerException If key is null
-   * 
+   *
    * @see URLConnection#getRequestProperty(String key)
    * @see URLConnection#setRequestProperty(String key, String value)
-   * 
+   *
    * @since 1.4
    */
   public void addRequestProperty(String key, String value)
   {
     if (connected)
-      throw new IllegalStateException ("Already connected");
+      throw new IllegalStateException("Already connected");
 
     if (key == null)
-      throw new NullPointerException ("key is null");
-    
+      throw new NullPointerException("key is null");
+
     // Do nothing unless overridden by subclasses that support adding
     // header fields in the request.
   }
@@ -788,7 +794,7 @@
   public String getRequestProperty(String key)
   {
     if (connected)
-      throw new IllegalStateException ("Already connected");
+      throw new IllegalStateException("Already connected");
 
     // Overridden by subclasses that support reading header fields from the
     // request.
@@ -807,7 +813,7 @@
   public Map getRequestProperties()
   {
     if (connected)
-      throw new IllegalStateException ("Already connected");
+      throw new IllegalStateException("Already connected");
 
     // Overridden by subclasses that support reading header fields from the
     // request.
@@ -827,7 +833,7 @@
    *
    * @see URLConnection#setRequestProperty(String key, String value)
    */
-  public static void setDefaultRequestProperty (String key, String value)
+  public static void setDefaultRequestProperty(String key, String value)
   {
     // This method does nothing since JDK 1.3.
   }
@@ -840,7 +846,7 @@
    * @param key The request property to return the default value of
    *
    * @return The value of the default property or null if not available
-   * 
+   *
    * @deprecated 1.3 The method getRequestProperty should be used instead.
    * This method does nothing now.
    *
@@ -864,8 +870,7 @@
    * @exception SecurityException If a security manager exists and its
    * checkSetFactory method doesn't allow the operation
    */
-  public static synchronized void setContentHandlerFactory
-                                    (ContentHandlerFactory fac)
+  public static synchronized void setContentHandlerFactory(ContentHandlerFactory factory)
   {
     if (factory != null)
       throw new Error("ContentHandlerFactory already set");
@@ -876,7 +881,7 @@
     if (s != null)
       s.checkSetFactory();
 
-    factory = fac;
+    URLConnection.factory = factory;
   }
 
   /**
@@ -900,7 +905,7 @@
    * Returns the MIME type of a stream based on the first few characters
    * at the beginning of the stream.  This routine can be used to determine
    * the MIME type if a server is believed to be returning an incorrect
-   * MIME type.  This method returns "application/octet-stream" if it 
+   * MIME type.  This method returns "application/octet-stream" if it
    * cannot determine the MIME type.
    * <p>
    * NOTE: Overriding MIME types sent from the server can be obnoxious
@@ -915,7 +920,7 @@
   public static String guessContentTypeFromStream(InputStream is)
     throws IOException
   {
-    return("application/octet-stream");
+    return ("application/octet-stream");
   }
 
   /**
@@ -930,9 +935,7 @@
   {
     // Delayed initialization.
     if (fileNameMap == null)
-      {
-	fileNameMap = new MimeTypeMapper();
-      }
+      fileNameMap = new MimeTypeMapper();
 
     return fileNameMap;
   }
@@ -945,7 +948,7 @@
    *
    * @exception SecurityException If a security manager exists and its
    * checkSetFactory method doesn't allow the operation
-   * 
+   *
    * @since 1.2
    */
   public static void setFileNameMap(FileNameMap map)
@@ -958,7 +961,7 @@
 
     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).
@@ -968,10 +971,10 @@
       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);
+    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;
   }
Index: java/net/URLStreamHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLStreamHandler.java,v
retrieving revision 1.25
diff -u -r1.25 URLStreamHandler.java
--- java/net/URLStreamHandler.java	12 Feb 2004 16:38:11 -0000	1.25
+++ java/net/URLStreamHandler.java	8 Apr 2004 16:53:15 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,11 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
-import java.io.IOException;
 import java.io.File;
+import java.io.IOException;
+
 
 /*
  * Written using on-line Java Platform 1.2 API Specification, as well
@@ -57,7 +57,7 @@
  * A protocol handler implementation should override the openConnection()
  * method, and optionally override the parseURL() and toExternalForm()
  * methods if necessary. (The default implementations will parse/write all
- * URL's in the same form as http URL's).  A protocol  specific subclass 
+ * URL's in the same form as http URL's).  A protocol  specific subclass
  * of URLConnection will most likely need to be created as well.
  * <p>
  * Note that the instance methods in this class are called as if they
@@ -71,7 +71,7 @@
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  * @author Warren Levy (warrenl@cygnus.com)
- * 
+ *
  * @see URL
  */
 public abstract class URLStreamHandler
@@ -79,7 +79,7 @@
   /**
    * Creates a URLStreamHander
    */
-  public URLStreamHandler ()
+  public URLStreamHandler()
   {
   }
 
@@ -96,7 +96,7 @@
    *
    * @exception IOException If an error occurs
    */
-  protected abstract URLConnection openConnection(URL u)
+  protected abstract URLConnection openConnection(URL url)
     throws IOException;
 
   /**
@@ -109,8 +109,8 @@
    * position of the "#" character, which separates the "file" portion of
    * the URL from the "anchor" portion.
    * <p>
-   * This method assumes URL's are formatted like http protocol URL's, so 
-   * subclasses that implement protocols with URL's the follow a different 
+   * This method assumes URL's are formatted like http protocol URL's, so
+   * subclasses that implement protocols with URL's the follow a different
    * syntax should override this method.  The lone exception is that if
    * the protocol name set in the URL is "file", this method will accept
    * an empty hostname (i.e., "file:///"), which is legal for that protocol
@@ -126,28 +126,29 @@
     int port = url.getPort();
     String file = url.getFile();
     String ref = url.getRef();
-    
-    if (spec.regionMatches (start, "//", 0, 2))
+
+    if (spec.regionMatches(start, "//", 0, 2))
       {
 	String genuineHost;
 	int hostEnd;
-	int colon, at_host;
+	int colon;
+	int at_host;
 
 	start += 2;
-	int slash = spec.indexOf ('/', start);
-	if (slash >= 0) 
+	int slash = spec.indexOf('/', start);
+	if (slash >= 0)
 	  hostEnd = slash;
-        else
+	else
 	  hostEnd = end;
 
-	host = spec.substring (start, hostEnd);
-	
+	host = spec.substring(start, hostEnd);
+
 	// We first need a genuine host name (with userinfo).
 	// So we check for '@': if it's present check the port in the
 	// section after '@' in the other case check it in the full string.
 	// P.S.: We don't care having '@' at the beginning of the string.
-	if ((at_host = host.indexOf ('@')) >= 0)
-	  genuineHost = host.substring (at_host);
+	if ((at_host = host.indexOf('@')) >= 0)
+	  genuineHost = host.substring(at_host);
 	else
 	  genuineHost = host;
 
@@ -157,70 +158,70 @@
 	// this is undocumented and likely an unintended side effect in 1.2
 	// so we'll be simple here and stick with "". Note that
 	// "http://" or "http:///" produce a "" host in JDK 1.2.
-	if ((colon = genuineHost.indexOf (':')) >= 0)
+	if ((colon = genuineHost.indexOf(':')) >= 0)
 	  {
 	    try
 	      {
-		port = Integer.parseInt (genuineHost.substring (colon + 1));
+		port = Integer.parseInt(genuineHost.substring(colon + 1));
 	      }
 	    catch (NumberFormatException e)
 	      {
 		; // Ignore invalid port values; port is already set to u's
 		  // port.
 	      }
+
 	    // Now we must cut the port number in the original string.
 	    if (at_host >= 0)
-	      host = host.substring (0, at_host + colon);
+	      host = host.substring(0, at_host + colon);
 	    else
-	      host = host.substring (0, colon);
+	      host = host.substring(0, colon);
 	  }
 	file = null;
 	start = hostEnd;
-      } 
-    else if (host == null) 
+      }
+    else if (host == null)
       host = "";
 
     if (file == null || file.length() == 0
-	|| (start < end && spec.charAt(start) == '/')) 
+        || (start < end && spec.charAt(start) == '/'))
       {
 	// No file context available; just spec for file.
 	// Or this is an absolute path name; ignore any file context.
 	file = spec.substring(start, end);
 	ref = null;
-      } 
+      }
     else if (start < end)
       {
-        // Context is available, but only override it if there is a new file.
-        char sepChar = '/';
-        int lastSlash = file.lastIndexOf (sepChar);
-        if (lastSlash < 0 && File.separatorChar != sepChar
-            && url.getProtocol ().equals ("file"))
-          {
-            // On Windows, even '\' is allowed in a "file" URL.
-            sepChar = File.separatorChar;
-            lastSlash = file.lastIndexOf (sepChar);
-          }
-        
-        file = file.substring(0, lastSlash)
-                + sepChar + spec.substring (start, end);
-
-        if (url.getProtocol ().equals ("file"))
-          {
-            // For "file" URLs constructed relative to a context, we
-            // need to canonicalise the file path.
-            try
-              {
+	// Context is available, but only override it if there is a new file.
+	char sepChar = '/';
+	int lastSlash = file.lastIndexOf(sepChar);
+	if (lastSlash < 0 && File.separatorChar != sepChar
+	    && url.getProtocol().equals("file"))
+	  {
+	    // On Windows, even '\' is allowed in a "file" URL.
+	    sepChar = File.separatorChar;
+	    lastSlash = file.lastIndexOf(sepChar);
+	  }
+
+	file =
+	  file.substring(0, lastSlash) + sepChar + spec.substring(start, end);
+
+	if (url.getProtocol().equals("file"))
+	  {
+	    // For "file" URLs constructed relative to a context, we
+	    // need to canonicalise the file path.
+	    try
+	      {
 		boolean endsWithSlash = file.charAt(file.length() - 1) == '/';
-                file = new File (file).getCanonicalPath ();
-		if (endsWithSlash
-		    && file.charAt(file.length() - 1) != '/')
+		file = new File(file).getCanonicalPath();
+		if (endsWithSlash && file.charAt(file.length() - 1) != '/')
 		  file += '/';
-              }
-            catch (IOException e)
-              {
+	      }
+	    catch (IOException e)
+	      {
 		// Do nothing.
-              }
-          }
+	      }
+	  }
 
 	ref = null;
       }
@@ -240,10 +241,9 @@
     // XXX - Classpath used to call PlatformHelper.toCanonicalForm() on
     // the file part. It seems like overhead, but supposedly there is some
     // benefit in windows based systems (it also lowercased the string).
-
     setURL(url, url.getProtocol(), host, port, file, ref);
   }
-  
+
   /*
    * Canonicalize a filename.
    */
@@ -251,7 +251,6 @@
   {
     // XXX - GNU Classpath has an implementation that might be more appropriate
     // for Windows based systems (gnu.java.io.PlatformHelper.toCanonicalForm)
-
     int index;
 
     // Replace "/./" with "/".  This probably isn't very efficient in
@@ -270,7 +269,7 @@
 	else
 	  break;
       }
-    return file; 
+    return file;
   }
 
   /**
@@ -278,7 +277,7 @@
    *
    * @param url1 The first url
    * @param url2 The second url to compare with the first
-   * 
+   *
    * @return True if both URLs point to the same file, false otherwise.
    *
    * @specnote Now protected
@@ -287,19 +286,21 @@
   {
     if (url1 == url2)
       return true;
+
     // This comparison is very conservative.  It assumes that any
     // field can be null.
     if (url1 == null || url2 == null)
       return false;
-    int p1 = url1.getPort ();
+    int p1 = url1.getPort();
     if (p1 == -1)
-      p1 = url1.ph.getDefaultPort ();
-    int p2 = url2.getPort ();
+      p1 = url1.ph.getDefaultPort();
+    int p2 = url2.getPort();
     if (p2 == -1)
-      p2 = url2.ph.getDefaultPort ();
+      p2 = url2.ph.getDefaultPort();
     if (p1 != p2)
       return false;
-    String s1, s2;
+    String s1;
+    String s2;
     s1 = url1.getProtocol();
     s2 = url2.getProtocol();
     if (s1 != s2 && (s1 == null || ! s1.equals(s2)))
@@ -333,7 +334,7 @@
    * #setURL(URL,String,String,int,String,String,String,String);
    */
   protected void setURL(URL u, String protocol, String host, int port,
-			String file, String ref)
+                        String file, String ref)
   {
     u.set(protocol, host, port, file, ref);
   }
@@ -355,8 +356,8 @@
    * different from this one
    */
   protected void setURL(URL u, String protocol, String host, int port,
-			String authority, String userInfo, String path,
-			String query, String ref)
+                        String authority, String userInfo, String path,
+                        String query, String ref)
   {
     u.set(protocol, host, port, authority, userInfo, path, query, ref);
   }
@@ -372,32 +373,29 @@
    *
    * @return True if both given URLs are equal, false otherwise.
    */
-  protected boolean equals (URL url1, URL url2)
+  protected boolean equals(URL url1, URL url2)
   {
     // This comparison is very conservative.  It assumes that any
     // field can be null.
-    return (url1.getPort () == url2.getPort ()
-	    && ((url1.getProtocol () == null && url2.getProtocol () == null)
-		|| (url1.getProtocol () != null
-			&& url1.getProtocol ().equals (url2.getProtocol ())))
-	    && ((url1.getUserInfo () == null && url2.getUserInfo () == null)
-                || (url1.getUserInfo () != null
-			&& url1.getUserInfo ().equals(url2.getUserInfo ())))
-	    && ((url1.getAuthority () == null && url2.getAuthority () == null)
-                || (url1.getAuthority () != null
-			&& url1.getAuthority ().equals(url2.getAuthority ())))
-	    && ((url1.getHost () == null && url2.getHost () == null)
-		|| (url1.getHost () != null
-			&& url1.getHost ().equals(url2.getHost ())))
-	    && ((url1.getPath () == null && url2.getPath () == null)
-		|| (url1.getPath () != null
-			&& url1.getPath ().equals (url2.getPath ())))
-	    && ((url1.getQuery () == null && url2.getQuery () == null)
-                || (url1.getQuery () != null
-			&& url1.getQuery ().equals(url2.getQuery ())))
-	    && ((url1.getRef () == null && url2.getRef () == null)
-		|| (url1.getRef () != null
-			&& url1.getRef ().equals(url2.getRef ()))));
+    return (url1.getPort() == url2.getPort()
+           && ((url1.getProtocol() == null && url2.getProtocol() == null)
+           || (url1.getProtocol() != null
+           && url1.getProtocol().equals(url2.getProtocol())))
+           && ((url1.getUserInfo() == null && url2.getUserInfo() == null)
+           || (url1.getUserInfo() != null
+           && url1.getUserInfo().equals(url2.getUserInfo())))
+           && ((url1.getAuthority() == null && url2.getAuthority() == null)
+           || (url1.getAuthority() != null
+           && url1.getAuthority().equals(url2.getAuthority())))
+           && ((url1.getHost() == null && url2.getHost() == null)
+           || (url1.getHost() != null && url1.getHost().equals(url2.getHost())))
+           && ((url1.getPath() == null && url2.getPath() == null)
+           || (url1.getPath() != null && url1.getPath().equals(url2.getPath())))
+           && ((url1.getQuery() == null && url2.getQuery() == null)
+           || (url1.getQuery() != null
+           && url1.getQuery().equals(url2.getQuery())))
+           && ((url1.getRef() == null && url2.getRef() == null)
+           || (url1.getRef() != null && url1.getRef().equals(url2.getRef()))));
   }
 
   /**
@@ -410,19 +408,19 @@
    *
    * @exception UnknownHostException If an unknown host is found
    */
-  protected boolean hostsEqual (URL url1, URL url2)
+  protected boolean hostsEqual(URL url1, URL url2)
   {
-    InetAddress addr1 = getHostAddress (url1);
-    InetAddress addr2 = getHostAddress (url2);
+    InetAddress addr1 = getHostAddress(url1);
+    InetAddress addr2 = getHostAddress(url2);
 
     if (addr1 != null && addr2 != null)
-      return addr1.equals (addr2);
+      return addr1.equals(addr2);
 
     String host1 = url1.getHost();
     String host2 = url2.getHost();
-    
+
     if (host1 != null && host2 != null)
-      return host1.equalsIgnoreCase (host2);
+      return host1.equalsIgnoreCase(host2);
 
     return host1 == null && host2 == null;
   }
@@ -435,16 +433,16 @@
    *
    * @return The address of the hostname in url.
    */
-  protected InetAddress getHostAddress (URL url)
+  protected InetAddress getHostAddress(URL url)
   {
-    String hostname = url.getHost ();
+    String hostname = url.getHost();
 
     if (hostname.equals(""))
       return null;
-    
+
     try
       {
-        return InetAddress.getByName (hostname);
+	return InetAddress.getByName(hostname);
       }
     catch (UnknownHostException e)
       {
@@ -458,7 +456,7 @@
    *
    * @return The default port number.
    */
-  protected int getDefaultPort ()
+  protected int getDefaultPort()
   {
     return -1;
   }
@@ -468,15 +466,14 @@
    * other protocols that have different requirements for hashCode calculation.
    *
    * @param url The URL to calc the hashcode for.
-   * 
+   *
    * @return The hashcode for the given URL.
    */
-  protected int hashCode (URL url)
+  protected int hashCode(URL url)
   {
-    return url.getProtocol ().hashCode () +
-           ((url.getHost () == null) ? 0 : url.getHost ().hashCode ()) +
-	   url.getFile ().hashCode() +
-	   url.getPort ();
+    return url.getProtocol().hashCode()
+           + ((url.getHost() == null) ? 0 : url.getHost().hashCode())
+           + url.getFile().hashCode() + url.getPort();
   }
 
   /**
@@ -488,23 +485,27 @@
    *
    * @return A string representation of the url
    */
-  protected String toExternalForm(URL u)
+  protected String toExternalForm(URL url)
   {
-    String protocol, host, file, ref, user;
+    String protocol;
+    String host;
+    String file;
+    String ref;
+    String user;
     int port;
 
-    protocol = u.getProtocol();
+    protocol = url.getProtocol();
 
     // JDK 1.2 online doc infers that host could be null because it
     // explicitly states that file cannot be null, but is silent on host.
-    host = u.getHost();
+    host = url.getHost();
     if (host == null)
       host = "";
 
-    port = u.getPort();
-    file = u.getFile();
-    ref = u.getRef();
-    user = u.getUserInfo();
+    port = url.getPort();
+    file = url.getFile();
+    ref = url.getRef();
+    user = url.getUserInfo();
 
     // Guess a reasonable size for the string buffer so we have to resize
     // at most once.
@@ -520,13 +521,13 @@
     if (host.length() != 0)
       {
 	sb.append("//");
-	if (user != null && !"".equals(user))
+	if (user != null && ! "".equals(user))
 	  sb.append(user).append('@');
 	sb.append(host);
 
-        // Append port if port was in URL spec.
-        if (port >= 0)
-          sb.append(':').append(port);
+	// Append port if port was in URL spec.
+	if (port >= 0)
+	  sb.append(':').append(port);
       }
 
     sb.append(file);

--Boundary-00=_4uYdAZtRoT5xDaI--




From MAILER-DAEMON Thu Apr 08 16:11:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBfrc-0008An-Bj
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 16:11:04 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBfrY-00084p-KV
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:11:00 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBfqv-00070B-9T
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:10:52 -0400
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BBfqu-0006oD-PC
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:10:20 -0400
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i38KABMC002302;
	Thu, 8 Apr 2004 16:10:11 -0400
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 i38KAAj22825; 
	Thu, 8 Apr 2004 16:10:10 -0400
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
	i38KAAe1019802; Thu, 8 Apr 2004 16:10:10 -0400
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200404081643.59869.konqueror@gmx.de>
References: <200404081643.59869.konqueror@gmx.de>
Content-Type: text/plain
Message-Id: <1081455009.2783.122.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Thu, 08 Apr 2004 16:10:10 -0400
Content-Transfer-Encoding: 7bit
Cc: Mark Wielaard <mark@klomp.org>, commit classpath <commit-classpath@gnu.org>
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 20:11:02 -0000

On Thu, 2004-04-08 at 10:43, Michael Koch wrote:
> Hi list,
> 
> 
> I write the attached little patch to add another generation of 
> autogen.sh to classpath cvs.
> 
> Ok to commit ?
> 

Just tested this, and it works fine for me.

Tom





From MAILER-DAEMON Thu Apr 08 16:23:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBg3m-0000lp-62
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 16:23:38 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBg3h-0000kp-E1
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:23:33 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBg3A-0000fC-4U
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:23:31 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBg37-0000df-EU
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:22:57 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i38KMWpH022896;
	Thu, 8 Apr 2004 22:22:32 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBf6s-0002xT-00; Thu, 08 Apr 2004 21:22:46 +0200
From: Michael Koch <konqueror@gmx.de>
To: Thomas Fitzsimmons <fitzsim@redhat.com>
Date: Thu, 8 Apr 2004 22:22:18 +0200
User-Agent: KMail/1.5.4
References: <200404081643.59869.konqueror@gmx.de>
	<1081455009.2783.122.camel@tortoise.toronto.redhat.com>
In-Reply-To: <1081455009.2783.122.camel@tortoise.toronto.redhat.com>
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_6RbdA/iyjSQCoND"
Message-Id: <200404082222.18202.konqueror@gmx.de>
X-CheckCompat: OK
Cc: Mark Wielaard <mark@klomp.org>, commit classpath <commit-classpath@gnu.org>
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 20:23:34 -0000


--Boundary-00=_6RbdA/iyjSQCoND
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Am Donnerstag, 8. April 2004 22:10 schrieb Thomas Fitzsimmons:
> On Thu, 2004-04-08 at 10:43, Michael Koch wrote:
> > Hi list,
> >
> >
> > I write the attached little patch to add another generation of
> > autogen.sh to classpath cvs.
> >
> > Ok to commit ?
>
> Just tested this, and it works fine for me.

Okay, I commited now a slightly better version which removes ltmain.sh 
too. This file gets into the tree automtically by calling libtoolize.


Michael

--Boundary-00=_6RbdA/iyjSQCoND
Content-Type: text/x-diff;
  charset="iso-8859-15";
  name="autogen.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="autogen.diff"

Index: autogen.sh
===================================================================
RCS file: autogen.sh
diff -N autogen.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ autogen.sh	8 Apr 2004 20:20:10 -0000
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+libtoolize --version | head -1
+echo "libtoolize: minimum version required: 1.4.2"
+autoconf --version | head -1
+echo "autoconf: minimum version required: 2.59"
+automake --version | head -1
+echo "automake: minimum version required: 1.7.0"
+
+echo "libtoolize ..."
+libtoolize --force --copy
+
+echo "aclocal ..."
+aclocal
+
+echo "autoheader ..."
+autoheader --force
+
+echo "automake ..."
+automake --add-missing --copy
+
+echo "autoconf ..."
+autoconf --force
+
+echo "Finished"
Index: ltmain.sh
===================================================================
RCS file: ltmain.sh
diff -N ltmain.sh
--- ltmain.sh	29 Mar 2004 07:07:24 -0000	1.8
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,6330 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program 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 of the License, or
-# (at your option) any later version.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Backwards compatibility hacks for older versions of automake, etc
-if test "X$SED" = X ; then
-  SED=sed
-fi
-if test "X$max_cmd_len" = X ; then
-  max_cmd_len=-1
-fi
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The name of this program.
-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
-modename="$progname"
-
-# Constants.
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.0a
-TIMESTAMP=" (1.1220.2.25 2003/08/01 19:08:35) Debian$Rev: 49 $"
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
-  ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-: ${IFS=" 	
-"}
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit 1
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-win32_libid () {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*) 
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-# End of Shell function definitions
-#####################################
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit 1
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit 0
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
-    done
-    exit 0
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit 0
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit 1
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_output=
-    arg_mode=normal
-    libobj=
-
-    for arg
-    do
-      case "$arg_mode" in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit 1
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static)
-	  build_old_libs=yes
-	  continue
-	  ;;
-
-	-prefer-pic)
-	  pic_mode=yes
-	  continue
-	  ;;
-
-	-prefer-non-pic)
-	  pic_mode=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
-	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit 1
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit 1
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit 1
-      ;;
-    esac
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base compile
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case "$base_compile " in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit 1" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit 1" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$0" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-      $echo $srcfile > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      suppress_output=' >/dev/null 2>&1'
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      else
-	command="$base_compile $srcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit 1
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit 1
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit 0
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      base_compile="$base_compile $arg"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit 1
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit 1
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit 1
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit 1
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit 1
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit 1
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # gcc -m* arguments should be passed to the linker via $compiler_flags
-      # in order to pass architecture information to the linker
-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-      # but this is not reliable with gcc because gcc may use -mfoo to
-      # select a different linker, different libraries, etc, while
-      # -Wl,-mfoo simply passes -mfoo to the linker.
-      -m*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit 1
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit 1
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit 1
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in $compile_command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplcations in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit 1
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit 1
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit 1
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit 1
-	  fi
-	  continue
-	fi # $pass = conv
-
-    
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit 1
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit 1
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-    
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-	
-      # Warn about portability, can't link against -module's on some systems (darwin)
-      if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"    
-      fi	  
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      eval cmds=\"$extract_expsyms_cmds\"
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against it, someone
-		    # is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi 
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit 1
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit 1
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs, but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		   fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		    path=""
-		  fi
-		  ;;
-		*)
-		path="-L$path"
-		;;
-		esac 
-		
-		;;
-		  -l*)
-		case $host in
-		*-*-darwin*)
-		 # Again, we only want to link against shared libraries
-		 eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		 for tmp in $newlib_search_path ; do
-		     if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		       eval depdepl="$tmp/lib$tmp_libs.dylib"
-		       break
-		     fi  
-         done
-         path=""
-		  ;;
-		*) continue ;;
-		esac  		  
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$deplibs $depdepl" ;;
-	      esac	      
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit 1
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-	
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $revision in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	case $age in
-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit 1
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    eval cmds=\"$export_symbols_cmds\"
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*) 
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs" 
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      # We will extract separately just the conflicting names and we will no
-	      # longer touch any unique names. It is faster to leave these extract
-	      # automatically by $AR in one run.
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-		:
-	      else
-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-		do
-		  i=1
-		  while test "$i" -le "$count"
-		  do
-		   # Put our $i before any first dot (extension)
-		   # Never overwrite any file
-		   name_to="$name"
-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	    done
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval cmds=\"$module_expsym_cmds\"
-	  else
-	    eval cmds=\"$module_cmds\"
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval cmds=\"$archive_expsym_cmds\"
-	else
-	  eval cmds=\"$archive_cmds\"
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadale object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval cmds=\"$archive_expsym_cmds\"
-	  else
-	    eval cmds=\"$archive_cmds\"
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit 0
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit 1
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "$mkdir $gentop"
-	  $run $mkdir "$gentop"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
-	  generated="$generated $gentop"
-
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    # We will extract separately just the conflicting names and we will no
-	    # longer touch any unique names. It is faster to leave these extract
-	    # automatically by $AR in one run.
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	      :
-	    else
-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	      do
-		i=1
-		while test "$i" -le "$count"
-		do
-		 # Put our $i before any first dot (extension)
-		 # Never overwrite any file
-		 name_to="$name"
-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      eval cmds=\"$reload_cmds\"
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit 0
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit 0
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	eval cmds=\"$reload_cmds\"
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit 0
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit 1
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit 0
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
-	case $0 in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-   
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2 
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-  
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe"); 
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char * 
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':') 
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char * 
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat) 
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode, 
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit 1" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit 1
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit 1
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit 0
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test "$status" -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  # We will extract separately just the conflicting names and we will no
-	  # longer touch any unique names. It is faster to leave these extract
-	  # automatically by $AR in one run.
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	    do
-	      i=1
-	      while test "$i" -le "$count"
-	      do
-	       # Put our $i before any first dot (extension)
-	       # Never overwrite any file
-	       name_to="$name"
-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-	eval cmds=\"$old_archive_from_new_cmds\"
-      else
-	eval cmds=\"$old_archive_cmds\"
-
-	len=`expr "X$cmds" : ".*"`
-	if test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	  if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done  
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi  
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-        relink_command=
-      fi  
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit 1
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit 1
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in 
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in 
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit 0
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest="$arg"
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*) ;;
-
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest="$arg"
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit 1
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit 1
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  eval cmds=\"$postinstall_cmds\"
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit 0
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit 1
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-	      else
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      eval cmds=\"$old_postinstall_cmds\"
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $0 --finish$current_libdirs'
-    else
-      exit 0
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  eval cmds=\"$finish_cmds\"
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit 0
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit 0
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit 1
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit 1
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit 1
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit 1
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit 0
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit 1
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      eval cmds=\"$postuninstall_cmds\"
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      eval cmds=\"$old_postuninstall_cmds\"
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe) 
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit 1
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit 1
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit 0
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit 1
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit 0
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:

--Boundary-00=_6RbdA/iyjSQCoND--




From MAILER-DAEMON Thu Apr 08 16:55:52 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBgYx-00008M-N4
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 16:55:51 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBgYn-0008WN-IP
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:55:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBgYH-0008K8-4U
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:55:40 -0400
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 1BBgY3-0008BP-SZ
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:54:55 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BBgPz-00087C-8p
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:46:35 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i38Kk9Nj013314
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 22:46:10 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBfTj-0002yP-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 21:46:23 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 22:45:55 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_DobdAiGvX+poRMF"
Message-Id: <200404082245.56256.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.nio
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 20:55:44 -0000


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

Hi list,


I commited more coding style and javadoc work in java.nio.


Michael
 

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

	* java/nio/Buffer.java,
	java/nio/ByteBufferImpl.java,
	java/nio/CharBufferImpl.java,
	java/nio/DoubleBufferImpl.java,
	java/nio/DoubleViewBufferImpl.java,
	java/nio/FloatBufferImpl.java,
	java/nio/FloatViewBufferImpl.java,
	java/nio/IntBufferImpl.java,
	java/nio/IntViewBufferImpl.java,
	java/nio/LongBufferImpl.java,
	java/nio/LongViewBufferImpl.java,
	java/nio/ShortBufferImpl.java,
	java/nio/ShortViewBufferImpl.java,
	java/nio/channels/AlreadyConnectedException.java,
	java/nio/channels/AsynchronousCloseException.java,
	java/nio/channels/ByteChannel.java,
	java/nio/channels/CancelledKeyException.java,
	java/nio/channels/Channel.java,
	java/nio/channels/ClosedByInterruptException.java,
	java/nio/channels/ClosedChannelException.java,
	java/nio/channels/ClosedSelectorException.java,
	java/nio/channels/ConnectionPendingException.java,
	java/nio/channels/FileLockInterruptionException.java,
	java/nio/channels/GatheringByteChannel.java,
	java/nio/channels/IllegalBlockingModeException.java,
	java/nio/channels/IllegalSelectorException.java,
	java/nio/channels/InterruptibleChannel.java,
	java/nio/channels/NoConnectionPendingException.java,
	java/nio/channels/NonReadableChannelException.java,
	java/nio/channels/NonWritableChannelException.java,
	java/nio/channels/NotYetBoundException.java,
	java/nio/channels/NotYetConnectedException.java,
	java/nio/channels/OverlappingFileLockException.java,
	java/nio/channels/ReadableByteChannel.java,
	java/nio/channels/ScatteringByteChannel.java,
	java/nio/channels/SelectableChannel.java,
	java/nio/channels/SelectionKey.java,
	java/nio/channels/Selector.java,
	java/nio/channels/UnresolvedAddressException.java,
	java/nio/channels/UnsupportedAddressTypeException.java,
	java/nio/channels/WritableByteChannel.java,
	java/nio/charset/spi/CharsetProvider.java:
	Reworked coding style and javadocs.


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

Index: java/nio/Buffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/Buffer.java,v
retrieving revision 1.9
diff -u -r1.9 Buffer.java
--- java/nio/Buffer.java	12 Oct 2003 17:51:53 -0000	1.9
+++ java/nio/Buffer.java	8 Apr 2004 20:44:28 -0000
@@ -45,10 +45,11 @@
   int pos = 0;
   int mark = -1;
 
-  // Creates a new Buffer.
-  //
-  // Should be package private.
-  //
+  /**
+   * Creates a new Buffer.
+   *
+   * Should be package private.
+   */
   Buffer (int capacity, int limit, int position, int mark)
   {
     if (capacity < 0)
@@ -69,6 +70,8 @@
   
   /**
    * Retrieves the capacity of the buffer.
+   *
+   * @return the capacity of the buffer
    */
   public final int capacity ()
   {
@@ -77,6 +80,8 @@
 
   /**
    * Clears the buffer.
+   *
+   * @return this buffer
    */
   public final Buffer clear ()
   {
@@ -88,6 +93,8 @@
     
   /**
    * Flips the buffer.
+   *
+   * @return this buffer
    */
   public final Buffer flip ()
   {
@@ -99,6 +106,9 @@
     
   /**
    * Tells whether the buffer has remaining data to read or not.
+   *
+   * @return true if the buffer contains remaining data to read,
+   * false otherwise
    */
   public final boolean hasRemaining ()
   {
@@ -107,11 +117,15 @@
 
   /**
    * Tells whether this buffer is read only or not.
+   *
+   * @return true if the buffer is read only, false otherwise
    */
   public abstract boolean isReadOnly ();
 
   /**
    * Retrieves the current limit of the buffer.
+   *
+   * @return the limit of the buffer
    */
   public final int limit ()
   {
@@ -124,6 +138,8 @@
    * @param newLimit The new limit value; must be non-negative and no larger
    * than this buffer's capacity.
    *
+   * @return this buffer
+   *
    * @exception IllegalArgumentException If the preconditions on newLimit
    * do not hold.
    */
@@ -144,6 +160,8 @@
 
   /**
    * Sets this buffer's mark at its position.
+   *
+   * @return this buffer
    */
   public final Buffer mark ()
   {
@@ -153,6 +171,8 @@
 
   /**
    * Retrieves the current position of this buffer.
+   *
+   * @return the current position of this buffer
    */
   public final int position ()
   {
@@ -165,7 +185,9 @@
    * 
    * @param newPosition The new position value; must be non-negative and no
    * larger than the current limit.
-   * 
+   *
+   * @return this buffer
+   *
    * @exception IllegalArgumentException If the preconditions on newPosition
    * do not hold
    */
@@ -183,6 +205,8 @@
 
   /**
    * Returns the number of elements between the current position and the limit.
+   *
+   * @return the number of remaining elements
    */
   public final int remaining()
   {
@@ -191,7 +215,9 @@
 
   /**
    * Resets this buffer's position to the previously-marked position.
-   * 
+   *
+   * @return this buffer
+   *
    * @exception InvalidMarkException If the mark has not been set.
    */
   public final Buffer reset()
@@ -206,6 +232,8 @@
   /**
    * Rewinds this buffer. The position is set to zero and the mark
    * is discarded.
+   *
+   * @this buffer
    */
   public final Buffer rewind()
   {
Index: java/nio/ByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ByteBufferImpl.java,v
retrieving revision 1.5
diff -u -r1.5 ByteBufferImpl.java
--- java/nio/ByteBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.5
+++ java/nio/ByteBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -131,7 +131,7 @@
   /**
    * Relative get method. Reads the next <code>byte</code> from the buffer.
    */
-  final public byte get ()
+  public byte get ()
   {
     byte result = backing_buffer [position () + array_offset];
     position (position () + 1);
@@ -144,7 +144,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public ByteBuffer put (byte value)
+  public ByteBuffer put (byte value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -162,7 +162,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public byte get (int index)
+  public byte get (int index)
   {
     return backing_buffer [index + array_offset];
   }
@@ -175,7 +175,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public ByteBuffer put (int index, byte value)
+  public ByteBuffer put (int index, byte value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -184,133 +184,133 @@
     return this;
   }
   
-  final public char getChar ()
+  public char getChar ()
   {
     return ByteBufferHelper.getChar(this, order());
   }
   
-  final public ByteBuffer putChar (char value)
+  public ByteBuffer putChar (char value)
   {
     ByteBufferHelper.putChar(this, value, order());
     return this;
   }
   
-  final public char getChar (int index)
+  public char getChar (int index)
   {
     return ByteBufferHelper.getChar(this, index, order());
   }
   
-  final public ByteBuffer putChar (int index, char value)
+  public ByteBuffer putChar (int index, char value)
   {
     ByteBufferHelper.putChar(this, index, value, order());
     return this;
   }
 
-  final public short getShort ()
+  public short getShort ()
   {
     return ByteBufferHelper.getShort(this, order());
   }
   
-  final public ByteBuffer putShort (short value)
+  public ByteBuffer putShort (short value)
   {
     ByteBufferHelper.putShort(this, value, order());
     return this;
   }
   
-  final public short getShort (int index)
+  public short getShort (int index)
   {
     return ByteBufferHelper.getShort(this, index, order());
   }
   
-  final public ByteBuffer putShort (int index, short value)
+  public ByteBuffer putShort (int index, short value)
   {
     ByteBufferHelper.putShort(this, index, value, order());
     return this;
   }
 
-  final public int getInt ()
+  public int getInt ()
   {
     return ByteBufferHelper.getInt(this, order());
   }
   
-  final public ByteBuffer putInt (int value)
+  public ByteBuffer putInt (int value)
   {
     ByteBufferHelper.putInt(this, value, order());
     return this;
   }
   
-  final public int getInt (int index)
+  public int getInt (int index)
   {
     return ByteBufferHelper.getInt(this, index, order());
   }
   
-  final public ByteBuffer putInt (int index, int value)
+  public ByteBuffer putInt (int index, int value)
   {
     ByteBufferHelper.putInt(this, index, value, order());
     return this;
   }
 
-  final public long getLong ()
+  public long getLong ()
   {
     return ByteBufferHelper.getLong(this, order());
   }
   
-  final public ByteBuffer putLong (long value)
+  public ByteBuffer putLong (long value)
   {
     ByteBufferHelper.putLong (this, value, order());
     return this;
   }
   
-  final public long getLong (int index)
+  public long getLong (int index)
   {
     return ByteBufferHelper.getLong (this, index, order());
   }
   
-  final public ByteBuffer putLong (int index, long value)
+  public ByteBuffer putLong (int index, long value)
   {
     ByteBufferHelper.putLong (this, index, value, order());
     return this;
   }
 
-  final public float getFloat ()
+  public float getFloat ()
   {
     return ByteBufferHelper.getFloat (this, order());
   }
   
-  final public ByteBuffer putFloat (float value)
+  public ByteBuffer putFloat (float value)
   {
     ByteBufferHelper.putFloat (this, value, order());
     return this;
   }
   
-  public final float getFloat (int index)
+  public float getFloat (int index)
   {
     return ByteBufferHelper.getFloat (this, index, order());
   }
 
-  final public ByteBuffer putFloat (int index, float value)
+  public ByteBuffer putFloat (int index, float value)
   {
     ByteBufferHelper.putFloat (this, index, value, order());
     return this;
   }
 
-  final public double getDouble ()
+  public double getDouble ()
   {
     return ByteBufferHelper.getDouble (this, order());
   }
 
-  final public ByteBuffer putDouble (double value)
+  public ByteBuffer putDouble (double value)
   {
     ByteBufferHelper.putDouble (this, value, order());
     return this;
   }
   
-  final public double getDouble (int index)
+  public double getDouble (int index)
   {
     return ByteBufferHelper.getDouble (this, index, order());
   }
   
-  final public ByteBuffer putDouble (int index, double value)
+  public ByteBuffer putDouble (int index, double value)
   {
     ByteBufferHelper.putDouble (this, index, value, order());
     return this;
Index: java/nio/CharBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/CharBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 CharBufferImpl.java
--- java/nio/CharBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/CharBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -104,7 +104,7 @@
     return false;
   }
 
-  final public CharSequence subSequence (int start, int end)
+  public CharSequence subSequence (int start, int end)
   {
     if (start < 0
         || start > length ()
@@ -118,7 +118,7 @@
   /**
    * Relative get method. Reads the next <code>char</code> from the buffer.
    */
-  final public char get ()
+  public char get ()
   {
     char result = backing_buffer [position ()];
     position (position () + 1);
@@ -131,7 +131,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public CharBuffer put (char value)
+  public CharBuffer put (char value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -148,7 +148,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public char get (int index)
+  public char get (int index)
   {
     if (index < 0
         || index >= limit ())
@@ -165,7 +165,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public CharBuffer put (int index, char value)
+  public CharBuffer put (int index, char value)
   {
     if (index < 0
         || index >= limit ())
@@ -178,7 +178,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/DoubleBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 DoubleBufferImpl.java
--- java/nio/DoubleBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/DoubleBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>double</code> from the buffer.
    */
-  final public double get ()
+  public double get ()
   {
     double result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public DoubleBuffer put (double value)
+  public DoubleBuffer put (double value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public double get (int index)
+  public double get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public DoubleBuffer put (int index, double value)
+  public DoubleBuffer put (int index, double value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/DoubleViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 DoubleViewBufferImpl.java
--- java/nio/DoubleViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/DoubleViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class DoubleViewBufferImpl extends DoubleBuffer
+final class DoubleViewBufferImpl extends DoubleBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/FloatBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 FloatBufferImpl.java
--- java/nio/FloatBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/FloatBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>float</code> from the buffer.
    */
-  final public float get ()
+  public float get ()
   {
     float result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public FloatBuffer put (float value)
+  public FloatBuffer put (float value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public float get (int index)
+  public float get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public FloatBuffer put (int index, float value)
+  public FloatBuffer put (int index, float value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/FloatViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 FloatViewBufferImpl.java
--- java/nio/FloatViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/FloatViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class FloatViewBufferImpl extends FloatBuffer
+final class FloatViewBufferImpl extends FloatBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/IntBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 IntBufferImpl.java
--- java/nio/IntBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/IntBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>int</code> from the buffer.
    */
-  final public int get ()
+  public int get ()
   {
     int result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public IntBuffer put (int value)
+  public IntBuffer put (int value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public int get (int index)
+  public int get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public IntBuffer put (int index, int value)
+  public IntBuffer put (int index, int value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/IntViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 IntViewBufferImpl.java
--- java/nio/IntViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/IntViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class IntViewBufferImpl extends IntBuffer
+final class IntViewBufferImpl extends IntBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/LongBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 LongBufferImpl.java
--- java/nio/LongBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/LongBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>long</code> from the buffer.
    */
-  final public long get ()
+  public long get ()
   {
     long result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public LongBuffer put (long value)
+  public LongBuffer put (long value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public long get (int index)
+  public long get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public LongBuffer put (int index, long value)
+  public LongBuffer put (int index, long value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/LongViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 LongViewBufferImpl.java
--- java/nio/LongViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/LongViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class LongViewBufferImpl extends LongBuffer
+final class LongViewBufferImpl extends LongBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/ShortBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ShortBufferImpl.java
--- java/nio/ShortBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/ShortBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -100,7 +100,7 @@
   /**
    * Relative get method. Reads the next <code>short</code> from the buffer.
    */
-  final public short get ()
+  public short get ()
   {
     short result = backing_buffer [position ()];
     position (position () + 1);
@@ -113,7 +113,7 @@
    * 
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public ShortBuffer put (short value)
+  public ShortBuffer put (short value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -130,7 +130,7 @@
    * @exception IndexOutOfBoundsException If index is negative or not smaller
    * than the buffer's limit.
    */
-  final public short get (int index)
+  public short get (int index)
   {
     return backing_buffer [index];
   }
@@ -143,7 +143,7 @@
    * than the buffer's limit.
    * @exception ReadOnlyBufferException If this buffer is read-only.
    */
-  final public ShortBuffer put (int index, short value)
+  public ShortBuffer put (int index, short value)
   {
     if (readOnly)
       throw new ReadOnlyBufferException ();
@@ -152,7 +152,7 @@
     return this;
   }
   
-  final public ByteOrder order ()
+  public ByteOrder order ()
   {
     return ByteOrder.nativeOrder ();
   }
Index: java/nio/ShortViewBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortViewBufferImpl.java,v
retrieving revision 1.3
diff -u -r1.3 ShortViewBufferImpl.java
--- java/nio/ShortViewBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.3
+++ java/nio/ShortViewBufferImpl.java	8 Apr 2004 20:44:28 -0000
@@ -38,7 +38,7 @@
 
 package java.nio;
 
-class ShortViewBufferImpl extends ShortBuffer
+final class ShortViewBufferImpl extends ShortBuffer
 {
   /** Position in bb (i.e. a byte offset) where this buffer starts. */
   private int offset;
Index: java/nio/channels/AlreadyConnectedException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/AlreadyConnectedException.java,v
retrieving revision 1.5
diff -u -r1.5 AlreadyConnectedException.java
--- java/nio/channels/AlreadyConnectedException.java	11 Nov 2002 14:25:46 -0000	1.5
+++ java/nio/channels/AlreadyConnectedException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* AlreadyConnectedException.java -- 
+/* AlreadyConnectedException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
Index: java/nio/channels/AsynchronousCloseException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/AsynchronousCloseException.java,v
retrieving revision 1.1
diff -u -r1.1 AsynchronousCloseException.java
--- java/nio/channels/AsynchronousCloseException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/AsynchronousCloseException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* AsynchronousCloseException.java -- 
+/* AsynchronousCloseException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ByteChannel.java,v
retrieving revision 1.3
diff -u -r1.3 ByteChannel.java
--- java/nio/channels/ByteChannel.java	11 Nov 2002 14:25:46 -0000	1.3
+++ java/nio/channels/ByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ByteChannel.java -- 
+/* ByteChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,7 +37,7 @@
 
 package java.nio.channels;
 
-public interface ByteChannel
-  extends ReadableByteChannel, WritableByteChannel
+public interface ByteChannel extends ReadableByteChannel,
+                                     WritableByteChannel
 {
 }
Index: java/nio/channels/CancelledKeyException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/CancelledKeyException.java,v
retrieving revision 1.1
diff -u -r1.1 CancelledKeyException.java
--- java/nio/channels/CancelledKeyException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/CancelledKeyException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* CancelledKeyException.java -- 
+/* CancelledKeyException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/Channel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/Channel.java,v
retrieving revision 1.5
diff -u -r1.5 Channel.java
--- java/nio/channels/Channel.java	12 Oct 2003 15:51:25 -0000	1.5
+++ java/nio/channels/Channel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* Channel.java -- 
+/* Channel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package java.nio.channels;
 
 import java.io.IOException;
+
 
 public interface Channel
 {
Index: java/nio/channels/ClosedByInterruptException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ClosedByInterruptException.java,v
retrieving revision 1.1
diff -u -r1.1 ClosedByInterruptException.java
--- java/nio/channels/ClosedByInterruptException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/ClosedByInterruptException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ClosedByInterruptException.java -- 
+/* ClosedByInterruptException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ClosedChannelException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ClosedChannelException.java,v
retrieving revision 1.5
diff -u -r1.5 ClosedChannelException.java
--- java/nio/channels/ClosedChannelException.java	18 Nov 2002 11:26:03 -0000	1.5
+++ java/nio/channels/ClosedChannelException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ClosedChannelException.java -- 
+/* ClosedChannelException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package java.nio.channels;
 
 import java.io.IOException;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ClosedSelectorException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ClosedSelectorException.java,v
retrieving revision 1.1
diff -u -r1.1 ClosedSelectorException.java
--- java/nio/channels/ClosedSelectorException.java	18 Nov 2002 11:26:03 -0000	1.1
+++ java/nio/channels/ClosedSelectorException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ClosedSelectorException.java -- 
+/* ClosedSelectorException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ConnectionPendingException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ConnectionPendingException.java,v
retrieving revision 1.1
diff -u -r1.1 ConnectionPendingException.java
--- java/nio/channels/ConnectionPendingException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/ConnectionPendingException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ConnectionPendingException.java -- 
+/* ConnectionPendingException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/FileLockInterruptionException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/FileLockInterruptionException.java,v
retrieving revision 1.1
diff -u -r1.1 FileLockInterruptionException.java
--- java/nio/channels/FileLockInterruptionException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/FileLockInterruptionException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* FileLockInterruptionException.java -- 
+/* FileLockInterruptionException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package java.nio.channels;
 
 import java.io.IOException;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/GatheringByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/GatheringByteChannel.java,v
retrieving revision 1.5
diff -u -r1.5 GatheringByteChannel.java
--- java/nio/channels/GatheringByteChannel.java	12 Oct 2003 15:51:25 -0000	1.5
+++ java/nio/channels/GatheringByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* GatheringByteChannel.java -- 
+/* GatheringByteChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,11 +37,11 @@
 
 package java.nio.channels;
 
-import java.nio.ByteBuffer;
 import java.io.IOException;
+import java.nio.ByteBuffer;
 
-public interface GatheringByteChannel
-  extends WritableByteChannel
+
+public interface GatheringByteChannel extends WritableByteChannel
 {
   /**
    * Writes a sequence of bytes to this channel from a subsequence of
@@ -59,9 +59,9 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing
    */
-  long write (ByteBuffer[] srcs, int offset, int length)
+  long write(ByteBuffer[] srcs, int offset, int length)
     throws IOException;
-  
+
   /**
    * Writes a sequence of bytes to this channel from the given buffers
    *
@@ -75,5 +75,5 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing
    */
-  long write (ByteBuffer[] srcs) throws IOException;
+  long write(ByteBuffer[] srcs) throws IOException;
 }
Index: java/nio/channels/IllegalBlockingModeException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/IllegalBlockingModeException.java,v
retrieving revision 1.1
diff -u -r1.1 IllegalBlockingModeException.java
--- java/nio/channels/IllegalBlockingModeException.java	7 Nov 2002 11:20:39 -0000	1.1
+++ java/nio/channels/IllegalBlockingModeException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* IllegalBlockingModeException.java -- 
+/* IllegalBlockingModeException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch <konqueror@gmx.de>
Index: java/nio/channels/IllegalSelectorException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/IllegalSelectorException.java,v
retrieving revision 1.1
diff -u -r1.1 IllegalSelectorException.java
--- java/nio/channels/IllegalSelectorException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/IllegalSelectorException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* IllegalSelectorException.java -- 
+/* IllegalSelectorException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/InterruptibleChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/InterruptibleChannel.java,v
retrieving revision 1.4
diff -u -r1.4 InterruptibleChannel.java
--- java/nio/channels/InterruptibleChannel.java	11 Nov 2002 14:25:46 -0000	1.4
+++ java/nio/channels/InterruptibleChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* InterruptibleChannel.java -- 
+/* InterruptibleChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -38,6 +38,7 @@
 package java.nio.channels;
 
 import java.io.IOException;
+
 
 public interface InterruptibleChannel extends Channel
 {
Index: java/nio/channels/NoConnectionPendingException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NoConnectionPendingException.java,v
retrieving revision 1.1
diff -u -r1.1 NoConnectionPendingException.java
--- java/nio/channels/NoConnectionPendingException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NoConnectionPendingException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NoConnectionPendingException.java -- 
+/* NoConnectionPendingException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/NonReadableChannelException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NonReadableChannelException.java,v
retrieving revision 1.1
diff -u -r1.1 NonReadableChannelException.java
--- java/nio/channels/NonReadableChannelException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NonReadableChannelException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NonReadableChannelException.java -- 
+/* NonReadableChannelException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/NonWritableChannelException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NonWritableChannelException.java,v
retrieving revision 1.1
diff -u -r1.1 NonWritableChannelException.java
--- java/nio/channels/NonWritableChannelException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NonWritableChannelException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NonWritableChannelException.java -- 
+/* NonWritableChannelException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/NotYetBoundException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NotYetBoundException.java,v
retrieving revision 1.1
diff -u -r1.1 NotYetBoundException.java
--- java/nio/channels/NotYetBoundException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NotYetBoundException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NotYetBoundException.java -- 
+/* NotYetBoundException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/NotYetConnectedException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/NotYetConnectedException.java,v
retrieving revision 1.1
diff -u -r1.1 NotYetConnectedException.java
--- java/nio/channels/NotYetConnectedException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/NotYetConnectedException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* NotYetConnectedException.java -- 
+/* NotYetConnectedException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/OverlappingFileLockException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/OverlappingFileLockException.java,v
retrieving revision 1.1
diff -u -r1.1 OverlappingFileLockException.java
--- java/nio/channels/OverlappingFileLockException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/OverlappingFileLockException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* OverlappingFileLockException.java -- 
+/* OverlappingFileLockException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/ReadableByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ReadableByteChannel.java,v
retrieving revision 1.4
diff -u -r1.4 ReadableByteChannel.java
--- java/nio/channels/ReadableByteChannel.java	12 Oct 2003 15:51:25 -0000	1.4
+++ java/nio/channels/ReadableByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,5 +1,5 @@
-/* ReadableByteChannel.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* ReadableByteChannel.java --
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,11 +40,16 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
+
 public interface ReadableByteChannel extends Channel
 {
   /**
    * Reads a sequence of bytes from this channel into the given buffer
    *
+   * @param dst the buffer to put the read data into
+   *
+   * @return the numer of bytes read
+   *
    * @exception AsynchronousCloseException If another thread closes this
    * channel while the read operation is in progress
    * @exception ClosedByInterruptException If another thread interrupts the
@@ -55,5 +60,5 @@
    * @exception NonReadableChannelException If this channel was not opened for
    * reading
    */
-  int read (ByteBuffer dst) throws IOException;
+  int read(ByteBuffer dst) throws IOException;
 }
Index: java/nio/channels/ScatteringByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ScatteringByteChannel.java,v
retrieving revision 1.5
diff -u -r1.5 ScatteringByteChannel.java
--- java/nio/channels/ScatteringByteChannel.java	12 Oct 2003 15:51:25 -0000	1.5
+++ java/nio/channels/ScatteringByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* ScatteringByteChannel.java -- 
+/* ScatteringByteChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,11 +37,11 @@
 
 package java.nio.channels;
 
-import java.nio.ByteBuffer;
 import java.io.IOException;
+import java.nio.ByteBuffer;
+
 
-public interface ScatteringByteChannel
-  extends ReadableByteChannel
+public interface ScatteringByteChannel extends ReadableByteChannel
 {
   /**
    * Reads a sequence of bytes from this channel into a subsequence of the
@@ -59,7 +59,7 @@
    * @exception NonReadableChannelException If this channel was not opened for
    * reading
    */
-  long read (ByteBuffer[] srcs, int offset, int length)
+  long read(ByteBuffer[] srcs, int offset, int length)
     throws IOException;
 
   /**
@@ -75,5 +75,5 @@
    * @exception NonReadableChannelException If this channel was not opened for
    * reading
    */
-  long read (ByteBuffer[] srcs) throws IOException;
+  long read(ByteBuffer[] srcs) throws IOException;
 }
Index: java/nio/channels/SelectableChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/SelectableChannel.java,v
retrieving revision 1.6
diff -u -r1.6 SelectableChannel.java
--- java/nio/channels/SelectableChannel.java	21 Dec 2002 11:42:37 -0000	1.6
+++ java/nio/channels/SelectableChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* SelectableChannel.java -- 
+/* SelectableChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,62 +41,62 @@
 import java.nio.channels.spi.AbstractInterruptibleChannel;
 import java.nio.channels.spi.SelectorProvider;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
  */
-public abstract class SelectableChannel
-  extends AbstractInterruptibleChannel
+public abstract class SelectableChannel extends AbstractInterruptibleChannel
 {
   /**
    * Initializes the channel.
    */
-  protected SelectableChannel ()
+  protected SelectableChannel()
   {
   }
- 
+
   /**
    * Returns the lock of this channel.
    */
-  public abstract Object blockingLock ();
+  public abstract Object blockingLock();
 
   /**
    * Adjusts this channel's blocking mode.
-   * 
+   *
    * @exception ClosedChannelException If this channel is closed.
    * @exception IllegalBlockingModeException If block is true and this channel
    * is registered with one or more selectors.
    * @exception IOException If an error occurs.
    */
-  public abstract SelectableChannel configureBlocking (boolean block)
+  public abstract SelectableChannel configureBlocking(boolean block)
     throws IOException;
-  
+
   /**
    * Tells whether this channel is blocking or not.
    */
-  public abstract boolean isBlocking ();
-  
+  public abstract boolean isBlocking();
+
   /**
    * Tells whether or not this channel is currently registered with
    * any selectors.
    */
-  public abstract boolean isRegistered ();
-  
+  public abstract boolean isRegistered();
+
   /**
    * Retrieves the key representing the channel's registration with
    * the given selector.
    */
-  public abstract SelectionKey keyFor (Selector sel);
-  
+  public abstract SelectionKey keyFor(Selector sel);
+
   /**
    * Returns the provider that created this channel.
    */
-  public abstract SelectorProvider provider ();
-  
+  public abstract SelectorProvider provider();
+
   /**
    * Registers this channel with the given selector,
    * returning a selection key.
-   * 
+   *
    * @exception CancelledKeyException If this channel is currently registered
    * with the given selector but the corresponding key has already been cancelled
    * @exception ClosedChannelException If this channel is closed.
@@ -108,12 +108,12 @@
    * @exception IllegalSelectorException If this channel was not created by
    * the same provider as the given selector.
    */
-  public final SelectionKey register (Selector sel, int ops)
+  public final SelectionKey register(Selector sel, int ops)
     throws ClosedChannelException
   {
-    return register (sel, ops, null);
+    return register(sel, ops, null);
   }
-  
+
   /**
    * Registers this channel with the given selector,
    * returning a selection key.
@@ -130,9 +130,9 @@
    * @exception IllegalSelectorException If this channel was not created by
    * the same provider as the given selector.
    */
-  public abstract SelectionKey register (Selector sel, int ops, Object att)
+  public abstract SelectionKey register(Selector sel, int ops, Object att)
     throws ClosedChannelException;
-  
+
   /**
    * Returns a set of valid operations on this channel.
    */
Index: java/nio/channels/SelectionKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/SelectionKey.java,v
retrieving revision 1.6
diff -u -r1.6 SelectionKey.java
--- java/nio/channels/SelectionKey.java	21 Dec 2002 11:42:37 -0000	1.6
+++ java/nio/channels/SelectionKey.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* SelectionKey.java -- 
+/* SelectionKey.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,128 +37,128 @@
 
 package java.nio.channels;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
  */
 public abstract class SelectionKey
 {
-  public static final int OP_ACCEPT  = 16;
+  public static final int OP_ACCEPT = 16;
   public static final int OP_CONNECT = 8;
-  public static final int OP_READ    = 1;
-  public static final int OP_WRITE   = 4;
-    
+  public static final int OP_READ = 1;
+  public static final int OP_WRITE = 4;
   Object attached;
-   
+
   /**
    * Initializes the selection key.
    */
-  protected SelectionKey ()
+  protected SelectionKey()
   {
   }
 
   /**
    * Attaches obj to the key and returns the old attached object.
    */
-  public final Object attach (Object obj)
+  public final Object attach(Object obj)
   {
     Object old = attached;
     attached = obj;
     return old;
   }
-   
+
   /**
    * Returns the object attached to the key.
    */
-  public final Object attachment ()
+  public final Object attachment()
   {
     return attached;
-  }    
+  }
 
   /**
    * Tests if the channel attached to this key is ready to accept
    * a new socket connection.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public final boolean isAcceptable ()
-  { 
-    return (readyOps () & OP_ACCEPT) != 0;
+  public final boolean isAcceptable()
+  {
+    return (readyOps() & OP_ACCEPT) != 0;
   }
 
   /**
    * Tests whether this key's channel has either finished,
    * or failed to finish, its socket-connection operation.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public final boolean isConnectable ()
+  public final boolean isConnectable()
   {
-    return (readyOps () & OP_CONNECT) != 0;  
-  }        
-  
+    return (readyOps() & OP_CONNECT) != 0;
+  }
+
   /**
    * Tests if the channel attached to the key is readable.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public final boolean isReadable ()
+  public final boolean isReadable()
   {
-    return (readyOps () & OP_READ) != 0; 
+    return (readyOps() & OP_READ) != 0;
   }
-  
+
   /**
    * Tests if the channel attached to the key is writable.
    *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public final boolean isWritable ()
+  public final boolean isWritable()
   {
-    return (readyOps () & OP_WRITE) != 0;
+    return (readyOps() & OP_WRITE) != 0;
   }
 
   /**
    * Requests that the registration of this key's channel with
    * its selector be cancelled.
    */
-  public abstract void cancel (); 
- 
+  public abstract void cancel();
+
   /**
    * return the channel attached to the key.
    */
-  public abstract SelectableChannel channel ();
-  
+  public abstract SelectableChannel channel();
+
   /**
    * Returns the key's interest set.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public abstract int interestOps ();
-  
+  public abstract int interestOps();
+
   /**
    * Sets this key's interest set to the given value.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    * @exception IllegalArgumentException If a bit in the set does not
    * correspond to an operation that is supported by this key's channel,
    * that is, if set &amp; ~(channel().validOps()) != 0
    */
-  public abstract SelectionKey interestOps (int ops);
- 
+  public abstract SelectionKey interestOps(int ops);
+
   /**
    * Tells whether or not this key is valid.
    */
-  public abstract boolean isValid ();
- 
+  public abstract boolean isValid();
+
   /**
    * Retrieves this key's ready-operation set.
-   * 
+   *
    * @exception CancelledKeyException If this key has been cancelled
    */
-  public abstract int readyOps ();
-  
+  public abstract int readyOps();
+
   /**
    * Returns the selector for which this key was created.
    */
-  public abstract Selector selector ();
+  public abstract Selector selector();
 }
Index: java/nio/channels/Selector.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/Selector.java,v
retrieving revision 1.6
diff -u -r1.6 Selector.java
--- java/nio/channels/Selector.java	16 Nov 2002 15:22:16 -0000	1.6
+++ java/nio/channels/Selector.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* Selector.java -- 
+/* Selector.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,6 +41,7 @@
 import java.nio.channels.spi.SelectorProvider;
 import java.util.Set;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
@@ -53,81 +54,81 @@
   protected Selector()
   {
   }
- 
+
   /**
    * Opens a selector.
-   * 
+   *
    * @exception IOException If an error occurs
    */
-  public static Selector open () throws IOException
+  public static Selector open() throws IOException
   {
-    return SelectorProvider.provider ().openSelector ();
+    return SelectorProvider.provider().openSelector();
   }
 
   /**
    * Closes the selector.
-   * 
+   *
    * @exception IOException If an error occurs
    */
-  public abstract void close () throws IOException;
-  
+  public abstract void close() throws IOException;
+
   /**
    * Tells whether the selector is open or not.
    */
-  public abstract boolean isOpen ();
-  
+  public abstract boolean isOpen();
+
   /**
    * Returns this selector's key set.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    */
-  public abstract Set keys ();
- 
+  public abstract Set keys();
+
   /**
    * Returns the SelectorProvider that created the selector.
    */
-  public abstract SelectorProvider provider ();
-  
+  public abstract SelectorProvider provider();
+
   /**
    * Selects a set of keys whose corresponding channels are ready
    * for I/O operations.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    * @exception IOException If an error occurs
    */
-  public abstract int select () throws IOException;
-  
+  public abstract int select() throws IOException;
+
   /**
    * Selects a set of keys whose corresponding channels are ready
    * for I/O operations.
    *
    * @param timeout The timeout to use.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    * @exception IllegalArgumentException If the timeout value is negative.
    * @exception IOException If an error occurs
    */
-  public abstract int select (long timeout) throws IOException;
-  
+  public abstract int select(long timeout) throws IOException;
+
   /**
    * Returns this selector's selected-key set.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    */
-  public abstract Set selectedKeys ();
-  
+  public abstract Set selectedKeys();
+
   /**
    * Selects a set of keys whose corresponding channels are ready
    * for I/O operations.
-   * 
+   *
    * @exception ClosedSelectorException If this selector is closed.
    * @exception IOException If an error occurs
    */
-  public abstract int selectNow () throws IOException;
-  
+  public abstract int selectNow() throws IOException;
+
   /**
    * Causes the first selection operation that has not yet returned to
    * return immediately.
    */
-  public abstract Selector wakeup ();
+  public abstract Selector wakeup();
 }
Index: java/nio/channels/UnresolvedAddressException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/UnresolvedAddressException.java,v
retrieving revision 1.1
diff -u -r1.1 UnresolvedAddressException.java
--- java/nio/channels/UnresolvedAddressException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/UnresolvedAddressException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* UnresolvedAddressException.java -- 
+/* UnresolvedAddressException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/UnsupportedAddressTypeException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/UnsupportedAddressTypeException.java,v
retrieving revision 1.1
diff -u -r1.1 UnsupportedAddressTypeException.java
--- java/nio/channels/UnsupportedAddressTypeException.java	21 Nov 2002 09:12:27 -0000	1.1
+++ java/nio/channels/UnsupportedAddressTypeException.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* UnsupportedAddressTypeException.java -- 
+/* UnsupportedAddressTypeException.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -36,6 +36,7 @@
 exception statement from your version. */
 
 package java.nio.channels;
+
 
 /**
  * @author Michael Koch
Index: java/nio/channels/WritableByteChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/WritableByteChannel.java,v
retrieving revision 1.6
diff -u -r1.6 WritableByteChannel.java
--- java/nio/channels/WritableByteChannel.java	12 Oct 2003 15:51:25 -0000	1.6
+++ java/nio/channels/WritableByteChannel.java	8 Apr 2004 20:44:28 -0000
@@ -1,4 +1,4 @@
-/* WritableByteChannel.java -- 
+/* WritableByteChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -40,8 +40,8 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-public interface WritableByteChannel
-  extends Channel
+
+public interface WritableByteChannel extends Channel
 {
   /**
    * Writes a sequence of bytes to this channel from the given buffer
@@ -56,5 +56,5 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing
    */
-  int write (ByteBuffer src) throws IOException;
+  int write(ByteBuffer src) throws IOException;
 }
Index: java/nio/charset/spi/CharsetProvider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/charset/spi/CharsetProvider.java,v
retrieving revision 1.1
diff -u -r1.1 CharsetProvider.java
--- java/nio/charset/spi/CharsetProvider.java	8 May 2002 07:53:54 -0000	1.1
+++ java/nio/charset/spi/CharsetProvider.java	8 Apr 2004 20:44:28 -0000
@@ -40,6 +40,7 @@
 import java.nio.charset.Charset;
 import java.util.Iterator;
 
+
 /**
  * This class allows an implementor to provide additional character sets. The
  * subclass must have a nullary constructor, and be attached to charset
@@ -81,6 +82,8 @@
 
   /**
    * Returns the named charset, by canonical name or alias.
+   *
+   * @param name the name of the character
    *
    * @return the charset, or null if not supported
    */

--Boundary-00=_DobdAiGvX+poRMF--




From MAILER-DAEMON Thu Apr 08 16:57:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBgaX-0000sl-6O
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 16:57:29 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBgaU-0000qz-7s
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:57:26 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBgZw-0000XV-7t
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:57:23 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBgZv-0000WW-J2
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:56:51 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i38KunpH015155
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 22:56:50 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBfe3-0002ys-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 21:57:03 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 22:56:36 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_EybdAuPDmmGD0GE"
Message-Id: <200404082256.36350.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: ignoring generated files
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 20:57:26 -0000


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

Hi list,


I just commited the attached patch to ignore generated files by CVS.


Michael


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

	* resource/gnu/regexp/.cvsignore: New file.


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

Index: resource/gnu/regexp/.cvsignore
===================================================================
RCS file: resource/gnu/regexp/.cvsignore
diff -N resource/gnu/regexp/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ resource/gnu/regexp/.cvsignore	8 Apr 2004 20:55:24 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

--Boundary-00=_EybdAuPDmmGD0GE--




From MAILER-DAEMON Thu Apr 08 17:04:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBghU-0004Vm-Fs
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 17:04:40 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBghB-0004Pm-Bg
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:04:21 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBgdA-0003E7-FS
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:00:45 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBgcx-00030C-6g
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 16:59:59 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i38Kxsre008493
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 22:59:55 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBfh2-0002zP-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 22:00:08 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 22:59:41 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_90bdAVrqgs6+sbE"
Message-Id: <200404082259.41206.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.nio
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 21:04:37 -0000


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

Hi list,


I just commited another patch for java.nio to make it comply more to our 
coding standard.


Michael


2004-04-08  Michael Koch  <konqueror@gmx.de>
,
	* java/nio/channels/DatagramChannel.java,
	java/nio/channels/FileChannel.java,
	java/nio/channels/FileLock.java,
	java/nio/channels/Pipe.java,
	java/nio/channels/ServerSocketChannel.java,
	java/nio/channels/SocketChannel.java,
	java/nio/channels/spi/AbstractInterruptibleChannel.java,
	java/nio/channels/spi/AbstractSelectableChannel.java,
	java/nio/channels/spi/AbstractSelectionKey.java,
	java/nio/channels/spi/AbstractSelector.java,
	java/nio/channels/spi/SelectorProvider.java:
	Reworked coding style and javadocs.


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

Index: java/nio/channels/DatagramChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/DatagramChannel.java,v
retrieving revision 1.11
diff -u -r1.11 DatagramChannel.java
--- java/nio/channels/DatagramChannel.java	3 Mar 2003 07:09:20 -0000	1.11
+++ java/nio/channels/DatagramChannel.java	8 Apr 2004 20:58:51 -0000
@@ -1,4 +1,4 @@
-/* DatagramChannel.java -- 
+/* DatagramChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -44,19 +44,19 @@
 import java.nio.channels.spi.AbstractSelectableChannel;
 import java.nio.channels.spi.SelectorProvider;
 
+
 /**
  * @since 1.4
  */
-public abstract class DatagramChannel
-  extends AbstractSelectableChannel
+public abstract class DatagramChannel extends AbstractSelectableChannel
   implements ByteChannel, ScatteringByteChannel, GatheringByteChannel
 {
   /**
    * Initializes the channel.
    */
-  protected DatagramChannel (SelectorProvider provider)
+  protected DatagramChannel(SelectorProvider provider)
   {
-    super (provider);
+    super(provider);
   }
 
   /**
@@ -64,40 +64,40 @@
    *
    * @exception IOException If an error occurs
    */
-  public static DatagramChannel open () throws IOException
+  public static DatagramChannel open() throws IOException
   {
-    return SelectorProvider.provider ().openDatagramChannel ();
+    return SelectorProvider.provider().openDatagramChannel();
   }
-  
+
   /**
    * Reads data from this channel.
    */
-  public final long read (ByteBuffer[] dsts) throws IOException
+  public final long read(ByteBuffer[] dsts) throws IOException
   {
     long b = 0;
-    
+
     for (int i = 0; i < dsts.length; i++)
-      b += read (dsts[i]);
-    
+      b += read(dsts[i]);
+
     return b;
   }
-  
+
   /**
    * Writes data to this channel.
    *
    * @exception IOException If an error occurs
    * @exception NotYetConnectedException The channel's socket is not connected.
    */
-  public final long write (ByteBuffer[] srcs) throws IOException
+  public final long write(ByteBuffer[] srcs) throws IOException
   {
     long b = 0;
-    
-    for (int i = 0;i < srcs.length; i++)
-      b += write (srcs[i]);
-    
+
+    for (int i = 0; i < srcs.length; i++)
+      b += write(srcs[i]);
+
     return b;
   }
-    
+
   /**
    * Connects this channel's socket.
    *
@@ -111,7 +111,7 @@
    * @exception SecurityException If a security manager has been installed and
    * it does not permit datagrams to be sent to the given address.
    */
-  public abstract DatagramChannel connect (SocketAddress remote)
+  public abstract DatagramChannel connect(SocketAddress remote)
     throws IOException;
 
   /**
@@ -119,7 +119,7 @@
    *
    * @exception IOException If an error occurs
    */
-  public abstract DatagramChannel disconnect () throws IOException;
+  public abstract DatagramChannel disconnect() throws IOException;
 
   /**
    * Tells whether or not this channel's socket is connected.
@@ -127,22 +127,22 @@
    * @exception IOException If an error occurs.
    * @exception NotYetConnectedException The channel's socket is not connected.
    */
-  public abstract boolean isConnected ();
-  
+  public abstract boolean isConnected();
+
   /**
    * Reads data from this channel.
    */
-  public abstract int read (ByteBuffer dst) throws IOException;
-  
+  public abstract int read(ByteBuffer dst) throws IOException;
+
   /**
    * Reads data from this channel.
    *
    * @exception IOException If an error occurs.
    * @exception NotYetConnectedException The channel's socket is not connected.
    */
-  public abstract long read (ByteBuffer[] dsts, int offset, int length)
+  public abstract long read(ByteBuffer[] dsts, int offset, int length)
     throws IOException;
- 
+
   /**
    * Receives a datagram via this channel.
    *
@@ -156,8 +156,9 @@
    * @exception SecurityException If a security manager has been installed and
    * it does not permit datagrams to be sent to the given address.
    */
-  public abstract SocketAddress receive (ByteBuffer dst) throws IOException;
- 
+  public abstract SocketAddress receive(ByteBuffer dst)
+    throws IOException;
+
   /**
    * Sends a datagram via this channel.
    *
@@ -171,29 +172,29 @@
    * @exception SecurityException If a security manager has been installed and
    * it does not permit datagrams to be sent to the given address.
    */
-  public abstract int send (ByteBuffer src, SocketAddress target)
+  public abstract int send(ByteBuffer src, SocketAddress target)
     throws IOException;
- 
+
   /**
    * Retrieves the channel's socket.
    */
-  public abstract DatagramSocket socket ();
-  
+  public abstract DatagramSocket socket();
+
   /**
    * Writes data to this channel.
    *
    * @exception IOException If an error occurs.
    * @exception NotYetConnectedException The channel's socket is not connected.
    */
-  public abstract int write (ByteBuffer src) throws IOException;
-  
+  public abstract int write(ByteBuffer src) throws IOException;
+
   /**
    * Writes data to this channel.
    *
    * @exception IOException If an error occurs.
    * @exception NotYetConnectedException The channel's socket is not connected.
    */
-  public abstract long write (ByteBuffer[] srcs, int offset, int length)
+  public abstract long write(ByteBuffer[] srcs, int offset, int length)
     throws IOException;
 
   /**
@@ -202,8 +203,8 @@
    * @exception IOException If an error occurs.
    * @exception NotYetConnectedException The channel's socket is not connected.
    */
-  public final int validOps ()
+  public final int validOps()
   {
     return SelectionKey.OP_READ | SelectionKey.OP_WRITE;
-  }    
+  }
 }
Index: java/nio/channels/FileChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/FileChannel.java,v
retrieving revision 1.12
diff -u -r1.12 FileChannel.java
--- java/nio/channels/FileChannel.java	27 Feb 2004 11:19:23 -0000	1.12
+++ java/nio/channels/FileChannel.java	8 Apr 2004 20:58:51 -0000
@@ -1,4 +1,4 @@
-/* FileChannel.java -- 
+/* FileChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,6 +42,7 @@
 import java.nio.MappedByteBuffer;
 import java.nio.channels.spi.AbstractInterruptibleChannel;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
@@ -52,10 +53,9 @@
   public static class MapMode
   {
     int m;
-
-    public static final MapMode READ_ONLY  = new MapMode(0);
+    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);
+    public static final MapMode PRIVATE = new MapMode(2);
 
     /**
      * Initializes the MapMode.
@@ -68,12 +68,12 @@
     /**
      * Returns a string representation of the <code>MapMode</code> object.
      */
-    public String toString() 
+    public String toString()
     {
       if (this == READ_ONLY)
-        return "READ_ONLY";
+	return "READ_ONLY";
       else if (this == READ_WRITE)
-        return "READ_WRITE";
+	return "READ_WRITE";
 
       return "PRIVATE";
     }
@@ -82,7 +82,7 @@
   /**
    * Initializes the channel.
    */
-  protected FileChannel ()
+  protected FileChannel()
   {
   }
 
@@ -102,34 +102,32 @@
 
   /**
    * Return the size of the file thus far
-   * 
+   *
    * @exception ClosedChannelException If this channel is closed.
    */
   public abstract long size() throws IOException;
-  
+
   /**
    * Writes data to the channel.
    *
    * @exception IOException If an I/O error occurs.
    */
-  public final long write (ByteBuffer[] srcs) throws IOException
+  public final long write(ByteBuffer[] srcs) throws IOException
   {
     long result = 0;
-    
+
     for (int i = 0; i < srcs.length; i++)
-      {
-        result += write (srcs[i]);
-      }
-    
+      result += write(srcs[i]);
+
     return result;
   }
-  
+
   /**
    * Writes data to the channel.
    *
    * @exception IOException If an I/O error occurs.
    */
-  public abstract int write (ByteBuffer src) throws IOException;
+  public abstract int write(ByteBuffer src) throws IOException;
 
   /**
    * Writes data to the channel.
@@ -145,7 +143,8 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing.
    */
-  public abstract int write (ByteBuffer srcs, long position) throws IOException;
+  public abstract int write(ByteBuffer srcs, long position)
+    throws IOException;
 
   /**
    * Writes data to the channel.
@@ -154,13 +153,13 @@
    */
   public abstract long write(ByteBuffer[] srcs, int offset, int length)
     throws IOException;
-  
+
   /**
    * Reads data from the channel.
    *
    * @exception IOException If an I/O error occurs.
    */
-  public abstract long read (ByteBuffer[] dsts, int offset, int length)
+  public abstract long read(ByteBuffer[] dsts, int offset, int length)
     throws IOException;
 
   /**
@@ -168,14 +167,12 @@
    *
    * @exception IOException If an I/O error occurs.
    */
-  public final long read (ByteBuffer[] dsts) throws IOException
+  public final long read(ByteBuffer[] dsts) throws IOException
   {
     long result = 0;
-    
+
     for (int i = 0; i < dsts.length; i++)
-      {
-        read (dsts [i]);
-      }
+      read(dsts[i]);
 
     return result;
   }
@@ -186,7 +183,7 @@
    * @exception IOException If an I/O error occurs.
    */
   public abstract int read(ByteBuffer dst) throws IOException;
-  
+
   /**
    * Reads data from the channel.
    *
@@ -201,8 +198,9 @@
    * @exception NonReadableChannelException If this channel was not opened for
    * reading.
    */
-  public abstract int read(ByteBuffer dst, long position) throws IOException;
-  
+  public abstract int read(ByteBuffer dst, long position)
+    throws IOException;
+
   /**
    * Closes the channel.
    *
@@ -238,9 +236,9 @@
    * another thread is already blocked in this method and is attempting to lock
    * an overlapping region.
    */
-  public final FileLock lock () throws IOException
+  public final FileLock lock() throws IOException
   {
-    return lock (0, Long.MAX_VALUE, false);
+    return lock(0, Long.MAX_VALUE, false);
   }
 
   /**
@@ -263,7 +261,7 @@
    * @exception NonWritableChannelException If shared is false and this channel
    * was not opened for writing.
    */
-  public abstract FileLock lock (long position, long size, boolean shared)
+  public abstract FileLock lock(long position, long size, boolean shared)
     throws IOException;
 
   /**
@@ -276,9 +274,9 @@
    * another thread is already blocked in this method and is attempting to lock
    * an overlapping region.
    */
-  public final FileLock tryLock () throws IOException
+  public final FileLock tryLock() throws IOException
   {
-    return tryLock (0, Long.MAX_VALUE, false);
+    return tryLock(0, Long.MAX_VALUE, false);
   }
 
   /**
@@ -293,7 +291,7 @@
    * another thread is already blocked in this method and is attempting to lock
    * an overlapping region.
    */
-  public abstract FileLock tryLock (long position, long size, boolean shared)
+  public abstract FileLock tryLock(long position, long size, boolean shared)
     throws IOException;
 
   /**
@@ -302,7 +300,7 @@
    * @exception ClosedChannelException If this channel is closed.
    * @exception IOException If an I/O error occurs.
    */
-  public abstract long position () throws IOException;
+  public abstract long position() throws IOException;
 
   /**
    * Sets the position of the channel on the assoziated file.
@@ -311,7 +309,8 @@
    * @exception IllegalArgumentException If newPosition is negative.
    * @exception IOException If an I/O error occurs.
    */
-  public abstract FileChannel position (long newPosition) throws IOException;
+  public abstract FileChannel position(long newPosition)
+    throws IOException;
 
   /**
    * Transfers bytes from this channel's file to the given writable byte
@@ -331,8 +330,8 @@
    * @exception NonWritableChannelException If the target channel was not
    * opened for writing.
    */
-  public abstract long transferTo (long position, long count,
-                                   WritableByteChannel target)
+  public abstract long transferTo(long position, long count,
+                                  WritableByteChannel target)
     throws IOException;
 
   /**
@@ -352,8 +351,8 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing.
    */
-  public abstract long transferFrom (ReadableByteChannel src, long position,
-                                     long count) throws IOException;
+  public abstract long transferFrom(ReadableByteChannel src, long position,
+                                    long count) throws IOException;
 
   /**
    * Truncates the channel's file at <code>size</code>.
@@ -364,5 +363,5 @@
    * @exception NonWritableChannelException If this channel was not opened for
    * writing.
    */
-  public abstract FileChannel truncate (long size) throws IOException;
+  public abstract FileChannel truncate(long size) throws IOException;
 }
Index: java/nio/channels/FileLock.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/FileLock.java,v
retrieving revision 1.6
diff -u -r1.6 FileLock.java
--- java/nio/channels/FileLock.java	18 May 2003 06:36:35 -0000	1.6
+++ java/nio/channels/FileLock.java	8 Apr 2004 20:58:51 -0000
@@ -1,4 +1,4 @@
-/* FileLock.java -- 
+/* FileLock.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,6 +39,7 @@
 
 import java.io.IOException;
 
+
 /**
  * @since 1.4
  */
@@ -48,42 +49,41 @@
   long position;
   long size;
   boolean shared;
-  
+
   /**
    * Initializes the file lock.
    *
    * @exception IllegalArgumentException If the preconditions on the parameters do not hold
    */
-  protected FileLock (FileChannel channel, long position, long size,
-                      boolean shared)
+  protected FileLock(FileChannel channel, long position, long size,
+                     boolean shared)
   {
-    if (position < 0 ||
-        size < 0)
-      throw new IllegalArgumentException ();
+    if (position < 0 || size < 0)
+      throw new IllegalArgumentException();
 
     this.channel = channel;
     this.position = position;
     this.size = size;
     this.shared = shared;
   }
- 
+
   /**
    * Tells whether or not this lock is valid.
    */
   public abstract boolean isValid();
- 
+
   /**
    * Releases this lock.
    *
    * @exception IOException If an error occurs
    * @exception ClosedChannelException If the locked channel is no longer open.
    */
-  public abstract void release () throws IOException;
-  
+  public abstract void release() throws IOException;
+
   /**
    * Returns the file channel upon whose file this lock is held.
    */
-  public final FileChannel channel ()
+  public final FileChannel channel()
   {
     return channel;
   }
@@ -91,15 +91,15 @@
   /**
    * Tells whether this lock is shared.
    */
-  public final boolean isShared ()
+  public final boolean isShared()
   {
     return shared;
-  }    
+  }
 
   /**
    * Tells whether or not this lock overlaps the given lock range.
    */
-  public final boolean overlaps (long position, long size)
+  public final boolean overlaps(long position, long size)
   {
     if (position > this.position + this.size)
       return false;
@@ -114,15 +114,15 @@
    * Returns the position within the file of the first byte of the
    * locked region.
    */
-  public final long position ()
+  public final long position()
   {
     return position;
   }
-    
+
   /**
    * Returns the size of the locked region in bytes.
    */
-  public final long size ()
+  public final long size()
   {
     return size;
   }
@@ -130,7 +130,7 @@
   /**
    * Returns a string describing the range, type, and validity of this lock.
    */
-  public final String toString ()
+  public final String toString()
   {
     return "file-lock:pos=" + position + "size=" + size;
   }
Index: java/nio/channels/Pipe.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/Pipe.java,v
retrieving revision 1.6
diff -u -r1.6 Pipe.java
--- java/nio/channels/Pipe.java	21 Dec 2002 11:42:37 -0000	1.6
+++ java/nio/channels/Pipe.java	8 Apr 2004 20:58:51 -0000
@@ -1,4 +1,4 @@
-/* Pipe.java -- 
+/* Pipe.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -41,22 +41,22 @@
 import java.nio.channels.spi.AbstractSelectableChannel;
 import java.nio.channels.spi.SelectorProvider;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
  */
 public abstract class Pipe
 {
-  public abstract static class SinkChannel
-    extends AbstractSelectableChannel
+  public abstract static class SinkChannel extends AbstractSelectableChannel
     implements WritableByteChannel, GatheringByteChannel
   {
     /**
      * Initializes the channel.
      */
-    protected SinkChannel (SelectorProvider provider)
+    protected SinkChannel(SelectorProvider provider)
     {
-      super (provider);
+      super(provider);
     }
 
     /**
@@ -64,22 +64,21 @@
      *
      * The only valid operation on this channel is @see SelectionKey.OP_WRITE.
      */
-    public final int validOps ()
+    public final int validOps()
     {
       return SelectionKey.OP_WRITE;
     }
   }
 
-  public abstract static class SourceChannel
-    extends AbstractSelectableChannel
+  public abstract static class SourceChannel extends AbstractSelectableChannel
     implements ReadableByteChannel, ScatteringByteChannel
   {
     /**
      * Initializes the channel.
      */
-    protected SourceChannel (SelectorProvider provider)
+    protected SourceChannel(SelectorProvider provider)
     {
-      super (provider);
+      super(provider);
     }
 
     /**
@@ -87,7 +86,7 @@
      *
      * The only valid operation on this channel is @see SelectionKey.OP_READ.
      */
-    public final int validOps ()
+    public final int validOps()
     {
       return SelectionKey.OP_READ;
     }
@@ -102,12 +101,12 @@
 
   /**
    * Opens a pipe.
-   * 
+   *
    * @exception IOException If an error occurs
    */
   public static Pipe open() throws IOException
   {
-    return SelectorProvider.provider ().openPipe();
+    return SelectorProvider.provider().openPipe();
   }
 
   /**
@@ -118,5 +117,5 @@
   /**
    * Returns a pipe's source channel
    */
-  public abstract Pipe.SourceChannel source();   
+  public abstract Pipe.SourceChannel source();
 }
Index: java/nio/channels/ServerSocketChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/ServerSocketChannel.java,v
retrieving revision 1.9
diff -u -r1.9 ServerSocketChannel.java
--- java/nio/channels/ServerSocketChannel.java	26 Jun 2003 19:52:43 -0000	1.9
+++ java/nio/channels/ServerSocketChannel.java	8 Apr 2004 20:58:52 -0000
@@ -1,4 +1,4 @@
-/* ServerSocketChannel.java -- 
+/* ServerSocketChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -35,29 +35,28 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.nio.channels;
 
-import java.nio.channels.spi.AbstractSelectableChannel;
-import java.nio.channels.spi.SelectorProvider;
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.nio.channels.spi.AbstractSelectableChannel;
+import java.nio.channels.spi.SelectorProvider;
+
 
 /**
  * @author Michael Koch
  * @since 1.4
  */
-public abstract class ServerSocketChannel
-  extends AbstractSelectableChannel
+public abstract class ServerSocketChannel extends AbstractSelectableChannel
 {
   /**
    * Initializes this channel.
    */
-  protected ServerSocketChannel (SelectorProvider provider)
+  protected ServerSocketChannel(SelectorProvider provider)
   {
-    super (provider);
+    super(provider);
   }
-  
+
   /**
    * Accepts a connection made to this channel's socket.
    *
@@ -72,28 +71,28 @@
    * @exception SecurityException If a security manager has been installed and
    * it does not permit access to the remote endpoint of the new connection.
    */
-  public abstract SocketChannel accept () throws IOException;
-  
+  public abstract SocketChannel accept() throws IOException;
+
   /**
    * Retrieves the channels socket.
    */
-  public abstract ServerSocket socket ();
-    
+  public abstract ServerSocket socket();
+
   /**
    * Opens a server socket channel.
    *
    * @exception IOException If an error occurs
    */
-  public static ServerSocketChannel open () throws IOException
+  public static ServerSocketChannel open() throws IOException
   {
-    return SelectorProvider.provider ().openServerSocketChannel ();
+    return SelectorProvider.provider().openServerSocketChannel();
   }
 
   /**
    * Retrieves the valid operations for this channel.
    */
-  public final int validOps ()
+  public final int validOps()
   {
     return SelectionKey.OP_ACCEPT;
-  } 
+  }
 }
Index: java/nio/channels/SocketChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/SocketChannel.java,v
retrieving revision 1.10
diff -u -r1.10 SocketChannel.java
--- java/nio/channels/SocketChannel.java	27 Feb 2004 11:19:23 -0000	1.10
+++ java/nio/channels/SocketChannel.java	8 Apr 2004 20:58:52 -0000
@@ -1,4 +1,4 @@
-/* SocketChannel.java -- 
+/* SocketChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -37,38 +37,39 @@
 
 package java.nio.channels;
 
-import java.nio.channels.spi.AbstractSelectableChannel;
-import java.nio.channels.spi.SelectorProvider;
-import java.nio.ByteBuffer;
 import java.io.IOException;
 import java.net.Socket;
 import java.net.SocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.spi.AbstractSelectableChannel;
+import java.nio.channels.spi.SelectorProvider;
+
 
 /**
  * @author Michael Koch
  * @since 1.4
  */
-abstract public class SocketChannel extends AbstractSelectableChannel
+public abstract class SocketChannel extends AbstractSelectableChannel
   implements ByteChannel, ScatteringByteChannel, GatheringByteChannel
 {
   /**
    * Initializes this socket.
    */
-  protected SocketChannel (SelectorProvider provider)
+  protected SocketChannel(SelectorProvider provider)
   {
-    super (provider);
+    super(provider);
   }
- 
+
   /**
    * Opens a socket channel.
    *
    * @exception IOException If an error occurs
    */
-  public static SocketChannel open () throws IOException
+  public static SocketChannel open() throws IOException
   {
-    return SelectorProvider.provider ().openSocketChannel ();
+    return SelectorProvider.provider().openSocketChannel();
   }
-  
+
   /**
    * Opens a channel and connects it to a remote address.
    *
@@ -84,55 +85,53 @@
    * @exception UnsupportedAddressTypeException If the type of the given remote
    * address is not supported.
    */
-  public static SocketChannel open (SocketAddress remote) throws IOException
+  public static SocketChannel open(SocketAddress remote)
+    throws IOException
   {
-    SocketChannel ch = open ();
+    SocketChannel ch = open();
     ch.connect(remote);
     return ch;
   }
-    
+
   /**
    * Reads data from the channel.
    *
    * @exception IOException If an error occurs
    * @exception NotYetConnectedException If this channel is not yet connected.
    */
-  public final long read (ByteBuffer[] dsts) throws IOException
+  public final long read(ByteBuffer[] dsts) throws IOException
   {
     long b = 0;
-    
+
     for (int i = 0; i < dsts.length; i++)
-      {
-        b += read (dsts [i]);
-      }
-    
+      b += read(dsts[i]);
+
     return b;
   }
-    
+
   /**
    * Writes data to the channel.
    *
    * @exception IOException If an error occurs
    * @exception NotYetConnectedException If this channel is not yet connected.
    */
-  public final long write (ByteBuffer[] dsts) throws IOException
+  public final long write(ByteBuffer[] dsts) throws IOException
   {
     long b = 0;
 
-    for (int  i= 0; i < dsts.length; i++)
-      {
-        b += write (dsts [i]);
-      }
-    
+    for (int i = 0; i < dsts.length; i++)
+      b += write(dsts[i]);
+
     return b;
-  }    
-   
+  }
+
   /**
    * Retrieves the valid operations for this channel.
    */
-  public final int validOps ()
+  public final int validOps()
   {
-    return SelectionKey.OP_CONNECT | SelectionKey.OP_READ | SelectionKey.OP_WRITE;
+    return SelectionKey.OP_CONNECT | SelectionKey.OP_READ
+           | SelectionKey.OP_WRITE;
   }
 
   /**
@@ -141,7 +140,7 @@
    * @exception IOException If an error occurs
    * @exception NotYetConnectedException If this channel is not yet connected.
    */
-  public abstract int read (ByteBuffer dst) throws IOException;
+  public abstract int read(ByteBuffer dst) throws IOException;
 
   /**
    * Connects the channel's socket to the remote address.
@@ -162,8 +161,9 @@
    * @exception UnsupportedAddressTypeException If the type of the given remote
    * address is not supported.
    */
-  public abstract boolean connect (SocketAddress remote) throws IOException;
-  
+  public abstract boolean connect(SocketAddress remote)
+    throws IOException;
+
   /**
    * Finishes the process of connecting a socket channel.
    *
@@ -176,46 +176,46 @@
    * @exception NoConnectionPendingException If this channel is not connected
    * and a connection operation has not been initiated.
    */
-  public abstract boolean finishConnect () throws IOException;
- 
+  public abstract boolean finishConnect() throws IOException;
+
   /**
    * Tells whether or not the channel's socket is connected.
    */
-  public abstract boolean isConnected ();
-  
+  public abstract boolean isConnected();
+
   /**
    * Tells whether or not a connection operation is in progress on this channel.
    */
-  public abstract boolean isConnectionPending ();
-  
+  public abstract boolean isConnectionPending();
+
   /**
    * Reads data from the channel.
    *
    * @exception IOException If an error occurs
    * @exception NotYetConnectedException If this channel is not yet connected.
    */
-  public abstract long read (ByteBuffer[] dsts, int offset, int length)
+  public abstract long read(ByteBuffer[] dsts, int offset, int length)
     throws IOException;
- 
+
   /**
    * Retrieves the channel's socket.
    */
-  public abstract Socket socket ();
-  
+  public abstract Socket socket();
+
   /**
    * Writes data to the channel.
    *
    * @exception IOException If an error occurs
    * @exception NotYetConnectedException If this channel is not yet connected.
    */
-  public abstract int write (ByteBuffer src) throws IOException;
-  
+  public abstract int write(ByteBuffer src) throws IOException;
+
   /**
    * Writes data to the channel.
    *
    * @exception IOException If an error occurs
    * @exception NotYetConnectedException If this channel is not yet connected.
    */
-  public abstract long write (ByteBuffer[] srcs, int offset, int length)
+  public abstract long write(ByteBuffer[] srcs, int offset, int length)
     throws IOException;
 }
Index: java/nio/channels/spi/AbstractInterruptibleChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java,v
retrieving revision 1.7
diff -u -r1.7 AbstractInterruptibleChannel.java
--- java/nio/channels/spi/AbstractInterruptibleChannel.java	17 Feb 2004 21:16:28 -0000	1.7
+++ java/nio/channels/spi/AbstractInterruptibleChannel.java	8 Apr 2004 20:58:52 -0000
@@ -1,4 +1,4 @@
-/* AbstractInterruptibleChannel.java -- 
+/* AbstractInterruptibleChannel.java --
    Copyright (C) 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -42,6 +42,7 @@
 import java.nio.channels.Channel;
 import java.nio.channels.InterruptibleChannel;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
@@ -54,25 +55,25 @@
   /**
    * Initializes the channel.
    */
-  protected AbstractInterruptibleChannel ()
+  protected AbstractInterruptibleChannel()
   {
   }
 
   /**
    * Marks the beginning of an I/O operation that might block indefinitely.
    */
-  protected final void begin ()
+  protected final void begin()
   {
   }
-    
+
   /**
    * Closes the channel.
-   * 
+   *
    * @exception IOException If an error occurs
    */
-  public final void close () throws IOException
+  public final void close() throws IOException
   {
-    if (!closed)
+    if (! closed)
       {
 	closed = true;
 	implCloseChannel();
@@ -81,29 +82,35 @@
 
   /**
    * Marks the end of an I/O operation that might block indefinitely.
-   * 
+   *
+   * @param completed true if the task completed successfully,
+   * false otherwise
+   *
+   * @exception IOException if an error occurs
    * @exception AsynchronousCloseException If the channel was asynchronously
    * closed.
    * @exception ClosedByInterruptException If the thread blocked in the
    * I/O operation was interrupted.
    */
-  protected final void end (boolean completed)
+  protected final void end(boolean completed)
     throws AsynchronousCloseException
   {
-  }   
+  }
 
   /**
    * Closes the channel.
-   * 
+   *
    * @exception IOException If an error occurs
    */
-  protected abstract void implCloseChannel () throws IOException;
+  protected abstract void implCloseChannel() throws IOException;
 
   /**
    * Tells whether or not this channel is open.
+   * 
+   * @return true if the channel is open, false otherwise 
    */
-  public final boolean isOpen ()
+  public final boolean isOpen()
   {
-    return !closed;
+    return ! closed;
   }
 }
Index: java/nio/channels/spi/AbstractSelectableChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractSelectableChannel.java,v
retrieving revision 1.14
diff -u -r1.14 AbstractSelectableChannel.java
--- java/nio/channels/spi/AbstractSelectableChannel.java	19 Mar 2004 21:22:24 -0000	1.14
+++ java/nio/channels/spi/AbstractSelectableChannel.java	8 Apr 2004 20:58:52 -0000
@@ -43,9 +43,9 @@
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.ListIterator;
 
+
 public abstract class AbstractSelectableChannel extends SelectableChannel
 {
   private boolean blocking = true;
@@ -55,8 +55,10 @@
 
   /**
    * Initializes the channel
+   *
+   * @param provider the provider that created this channel
    */
-  protected AbstractSelectableChannel (SelectorProvider provider)
+  protected AbstractSelectableChannel(SelectorProvider provider)
   {
     this.provider = provider;
   }
@@ -64,27 +66,35 @@
   /**
    * Retrieves the object upon which the configureBlocking and register
    * methods synchronize.
+   *
+   * @return the blocking lock
    */
-  public final Object blockingLock ()
+  public final Object blockingLock()
   {
     return LOCK;
   }
-    
+
   /**
    * Adjusts this channel's blocking mode.
+   *
+   * @param blocking true if blocking should be enabled, false otherwise
+   *
+   * @return this channel
+   *
+   * @exception IOException If an error occurs
    */
-  public final SelectableChannel configureBlocking (boolean blocking)
+  public final SelectableChannel configureBlocking(boolean blocking)
     throws IOException
   {
     synchronized (blockingLock())
       {
-        if (this.blocking != blocking)
-          {
-            implConfigureBlocking(blocking);
-            this.blocking = blocking;
-          }
+	if (this.blocking != blocking)
+	  {
+	    implConfigureBlocking(blocking);
+	    this.blocking = blocking;
+	  }
       }
-    
+
     return this;
   }
 
@@ -93,25 +103,34 @@
    *
    * @exception IOException If an error occurs
    */
-  protected final void implCloseChannel () throws IOException
+  protected final void implCloseChannel() throws IOException
   {
-    implCloseSelectableChannel ();
+    implCloseSelectableChannel();
   }
 
   /**
    * Closes this selectable channel.
+   *
+   * @exception IOException If an error occurs
    */
-  protected abstract void implCloseSelectableChannel () throws IOException;
-  
+  protected abstract void implCloseSelectableChannel()
+    throws IOException;
+
   /**
    * Adjusts this channel's blocking mode.
+   *
+   * @param blocking true if blocking should be enabled, false otherwise
+   *
+   * @exception IOException If an error occurs
    */
-  protected abstract void implConfigureBlocking (boolean block)
+  protected abstract void implConfigureBlocking(boolean blocking)
     throws IOException;
 
   /**
    * Tells whether or not every I/O operation on this channel will block
    * until it completes.
+   *
+   * @return true of this channel is blocking, false otherwise
    */
   public final boolean isBlocking()
   {
@@ -121,66 +140,80 @@
   /**
    * Tells whether or not this channel is currently registered with
    * any selectors.
+   *
+   * @return true if this channel is registered, false otherwise
    */
   public final boolean isRegistered()
   {
-    return !keys.isEmpty();
+    return ! keys.isEmpty();
   }
 
   /**
    * Retrieves the key representing the channel's registration with the
    * given selector.
+   *
+   * @param selector the selector to get a selection key for
+   *
+   * @return the selection key this channel is registered with
    */
   public final SelectionKey keyFor(Selector selector)
   {
     if (! isOpen())
       return null;
-    
+
     try
       {
-        synchronized(blockingLock())
+	synchronized (blockingLock())
 	  {
-	    return locate (selector);
+	    return locate(selector);
 	  }
       }
     catch (Exception e)
       {
-        return null;
+	return null;
       }
   }
 
   /**
    * Returns the provider that created this channel.
+   *
+   * @return the selector provider that created this channel
    */
-  public final SelectorProvider provider ()
+  public final SelectorProvider provider()
   {
     return provider;
   }
 
-  private SelectionKey locate (Selector selector)
+  private SelectionKey locate(Selector selector)
   {
-    ListIterator it = keys.listIterator ();
-    
-    while (it.hasNext ())
+    ListIterator it = keys.listIterator();
+
+    while (it.hasNext())
       {
-        SelectionKey key = (SelectionKey) it.next();
-        
-    	if (key.selector() == selector)
-          return key;
+	SelectionKey key = (SelectionKey) it.next();
+
+	if (key.selector() == selector)
+	  return key;
       }
-    
+
     return null;
   }
 
   /**
    * Registers this channel with the given selector, returning a selection key.
    *
+   * @param selin the seletor to use
+   * @param ops the interested operations
+   * @param att an attachment for the returned selection key
+   *
+   * @return the registered selection key
+   * 
    * @exception ClosedChannelException If the channel is already closed.
    */
-  public final SelectionKey register (Selector selin, int ops, Object att)
+  public final SelectionKey register(Selector selin, int ops, Object att)
     throws ClosedChannelException
   {
-    if (!isOpen ())
+    if (! isOpen())
       throw new ClosedChannelException();
 
     SelectionKey key = null;
@@ -188,20 +221,20 @@
 
     synchronized (blockingLock())
       {
-        key = locate (selector);
+	key = locate(selector);
 
-        if (key != null)
-          {
+	if (key != null)
+	  {
 	    if (att != null)
-	      key.attach (att);
-          }
-        else
-          {
-            key = selector.register (this, ops, att);
-    		
-            if (key != null)
-              addSelectionKey (key);
-          }
+	      key.attach(att);
+	  }
+	else
+	  {
+	    key = selector.register(this, ops, att);
+
+	    if (key != null)
+	      addSelectionKey(key);
+	  }
       }
 
     return key;
Index: java/nio/channels/spi/AbstractSelectionKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractSelectionKey.java,v
retrieving revision 1.7
diff -u -r1.7 AbstractSelectionKey.java
--- java/nio/channels/spi/AbstractSelectionKey.java	19 Mar 2004 21:22:24 -0000	1.7
+++ java/nio/channels/spi/AbstractSelectionKey.java	8 Apr 2004 20:58:52 -0000
@@ -1,4 +1,4 @@
-/* AbstractSelectionKey.java -- 
+/* AbstractSelectionKey.java --
    Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -39,38 +39,40 @@
 
 import java.nio.channels.SelectionKey;
 
+
 /**
  * @since 1.4
  */
-public abstract class AbstractSelectionKey
-  extends SelectionKey
+public abstract class AbstractSelectionKey extends SelectionKey
 {
-  private boolean cancelled = false;
+  private boolean cancelled;
 
   /**
    * Initializes the key.
    */
-  protected AbstractSelectionKey ()
+  protected AbstractSelectionKey()
   {
   }
 
   /**
    * Cancels this key.
    */
-  public final void cancel ()
+  public final void cancel()
   {
     if (isValid())
       {
 	((AbstractSelector) selector()).cancelKey(this);
-        cancelled = true;
+	cancelled = true;
       }
   }
 
   /**
    * Tells whether this key is valid or not.
+   *
+   * @return true if this key is valid, false otherwise
    */
-  public final boolean isValid ()
+  public final boolean isValid()
   {
-    return !cancelled;
+    return ! cancelled;
   }
 }
Index: java/nio/channels/spi/AbstractSelector.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractSelector.java,v
retrieving revision 1.9
diff -u -r1.9 AbstractSelector.java
--- java/nio/channels/spi/AbstractSelector.java	19 Mar 2004 21:22:24 -0000	1.9
+++ java/nio/channels/spi/AbstractSelector.java	8 Apr 2004 20:58:52 -0000
@@ -1,4 +1,4 @@
-/* AbstractSelector.java -- 
+/* AbstractSelector.java --
    Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -35,49 +35,53 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.nio.channels.spi;
 
 import java.io.IOException;
 import java.nio.channels.ClosedSelectorException;
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
-import java.util.Set;
 import java.util.HashSet;
+import java.util.Set;
+
 
 public abstract class AbstractSelector extends Selector
 {
-  private boolean closed = false;
+  private boolean closed;
   private SelectorProvider provider;
   private HashSet cancelledKeys;
 
   /**
    * Initializes the slector.
+   *
+   * @param provider the provider that created this selector
    */
-  protected AbstractSelector (SelectorProvider provider)
+  protected AbstractSelector(SelectorProvider provider)
   {
     this.provider = provider;
     this.cancelledKeys = new HashSet();
   }
- 
+
   /**
    * Closes the channel.
-   * 
+   *
    * @exception IOException If an error occurs
    */
-  public final synchronized void close () throws IOException
+  public final synchronized void close() throws IOException
   {
     if (closed)
       return;
-    
+
     implCloseSelector();
     closed = true;
   }
 
   /**
    * Tells whether this channel is open or not.
+   *
+   * @return true if channel is open, false otherwise.
    */
-  public final boolean isOpen ()
+  public final boolean isOpen()
   {
     return ! closed;
   }
@@ -95,21 +99,25 @@
   protected final void end()
   {
   }
-    
+
   /**
    * Returns the provider for this selector object.
+   *
+   * @return the SelectorProvider object that created this seletor
    */
-  public final SelectorProvider provider ()
+  public final SelectorProvider provider()
   {
     return provider;
   }
 
   /**
    * Returns the cancelled keys set.
+   *
+   * @return the cancelled keys set
    */
   protected final Set cancelledKeys()
   {
-    if (!isOpen())
+    if (! isOpen())
       throw new ClosedSelectorException();
 
     return cancelledKeys;
@@ -118,8 +126,9 @@
   /**
    * Cancels a selection key.
    */
+
   // This method is only called by AbstractSelectionKey.cancel().
-  final void cancelKey (AbstractSelectionKey key)
+  final void cancelKey(AbstractSelectionKey key)
   {
     synchronized (cancelledKeys)
       {
@@ -129,13 +138,29 @@
 
   /**
    * Closes the channel.
+   *
+   * @exception IOException if an error occurs
    */
-  protected abstract void implCloseSelector () throws IOException;
+  protected abstract void implCloseSelector() throws IOException;
 
-  protected abstract SelectionKey register (AbstractSelectableChannel ch,
-                                            int ops, Object att);   
+  /**
+   * Registers a channel for the selection process.
+   *
+   * @param ch the channel register
+   * @param ops the interested operations
+   * @param att an attachement to the selection key
+   *
+   * @return the registered selection key
+   */
+  protected abstract SelectionKey register(AbstractSelectableChannel ch,
+                                           int ops, Object att);
 
-  protected final void deregister (AbstractSelectionKey key)
+  /**
+   * Deregisters the given selection key.
+   *
+   * @param key the key to deregister
+   */
+  protected final void deregister(AbstractSelectionKey key)
   {
     ((AbstractSelectableChannel) key.channel()).removeSelectionKey(key);
   }
Index: java/nio/channels/spi/SelectorProvider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/SelectorProvider.java,v
retrieving revision 1.8
diff -u -r1.8 SelectorProvider.java
--- java/nio/channels/spi/SelectorProvider.java	12 Oct 2003 16:56:00 -0000	1.8
+++ java/nio/channels/spi/SelectorProvider.java	8 Apr 2004 20:58:52 -0000
@@ -44,6 +44,7 @@
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 
+
 /**
  * @author Michael Koch
  * @since 1.4
@@ -51,76 +52,99 @@
 public abstract class SelectorProvider
 {
   private static SelectorProvider systemDefaultProvider;
-    
+
   /**
    * Initializes the selector provider.
    *
    * @exception SecurityException If a security manager has been installed and
    * it denies @see RuntimePermission ("selectorProvider").
    */
-  protected SelectorProvider ()
+  protected SelectorProvider()
   {
-    SecurityManager sm = System.getSecurityManager ();
+    SecurityManager sm = System.getSecurityManager();
     if (sm != null)
-      sm.checkPermission (new RuntimePermission ("selectorProvider"));
+      sm.checkPermission(new RuntimePermission("selectorProvider"));
   }
-  
+
   /**
    * Opens a datagram channel.
+   *
+   * @return a new datagram channel object
+   * 
+   * @exception IOException if an error occurs
    */
-  public abstract DatagramChannel openDatagramChannel () throws IOException;
-  
+  public abstract DatagramChannel openDatagramChannel()
+    throws IOException;
+
   /**
    * Opens a pipe.
+   *
+   * @return a new pipe object
+   * 
+   * @exception IOException if an error occurs
    */
-  public abstract Pipe openPipe () throws IOException;
-  
+  public abstract Pipe openPipe() throws IOException;
+
   /**
    * Opens a selector.
+   *
+   * @return a new selector object
+   * 
+   * @exception IOException if an error occurs
    */
-  public abstract AbstractSelector openSelector () throws IOException;
-  
+  public abstract AbstractSelector openSelector() throws IOException;
+
   /**
    * Opens a server socket channel.
+   *
+   * @return a new server socket channel object
+   * 
+   * @exception IOException if an error occurs
    */
-  public abstract ServerSocketChannel openServerSocketChannel ()
+  public abstract ServerSocketChannel openServerSocketChannel()
     throws IOException;
-  
+
   /**
    * Opens a socket channel.
+   *
+   * @return a new socket channel object
+   * 
+   * @exception IOException if an error occurs
    */
-  public abstract SocketChannel openSocketChannel () throws IOException;
-    
+  public abstract SocketChannel openSocketChannel() throws IOException;
+
   /**
    * Returns the system-wide default selector provider for this invocation
    * of the Java virtual machine.
+   *
+   * @return the default seletor provider
    */
-  public static synchronized SelectorProvider provider ()
+  public static synchronized SelectorProvider provider()
   {
     if (systemDefaultProvider == null)
       {
-        String propertyValue =
-          System.getProperty ("java.nio.channels.spi.SelectorProvider");
+	String propertyValue =
+	  System.getProperty("java.nio.channels.spi.SelectorProvider");
 
-        if (propertyValue == null
-            || propertyValue.equals (""))
-          systemDefaultProvider = new SelectorProviderImpl();
-        else
-          {
-            try
-              {
-                systemDefaultProvider = (SelectorProvider) Class.forName
-                  (propertyValue).newInstance();
-              }
-            catch (Exception e)
-              {
-                System.err.println ("Could not instantiate class: "
-                                    + propertyValue);
-                systemDefaultProvider = new SelectorProviderImpl();
-              }
-          }
+	if (propertyValue == null || propertyValue.equals(""))
+	  systemDefaultProvider = new SelectorProviderImpl();
+	else
+	  {
+	    try
+	      {
+		systemDefaultProvider =
+		  (SelectorProvider) Class.forName(propertyValue)
+		                          .newInstance();
+	      }
+	    catch (Exception e)
+	      {
+		System.err.println("Could not instantiate class: "
+		                   + propertyValue);
+		systemDefaultProvider = new SelectorProviderImpl();
+	      }
+	  }
       }
-    
+
     return systemDefaultProvider;
   }
 }

--Boundary-00=_90bdAVrqgs6+sbE--




From MAILER-DAEMON Thu Apr 08 17:24:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBh0k-00064W-A3
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 17:24:34 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBh0h-00063W-OF
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:24:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBh0B-0005r3-Ku
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:24:30 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBgzY-0005C6-OP
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:23:20 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i38LNIre022678
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 23:23:19 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBg3g-00036K-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 22:23:32 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 23:23:04 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_4KcdAPC8MSQeCND"
Message-Id: <200404082323.04841.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.io
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 21:24:32 -0000


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

Hi list,


more coding style and javadoc cleanups.


Michael


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

	* java/io/BufferedWriter.java,
	java/io/FilterInputStream.java,
	java/io/ObjectInputStream.java:
	More javadoc and coding style work.


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

Index: java/io/BufferedWriter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/BufferedWriter.java,v
retrieving revision 1.12
diff -u -r1.12 BufferedWriter.java
--- java/io/BufferedWriter.java	7 Apr 2003 20:28:01 -0000	1.12
+++ java/io/BufferedWriter.java	8 Apr 2004 21:22:08 -0000
@@ -44,21 +44,44 @@
  */
 
 /**
-  * This class accumulates chars written in a buffer instead of immediately
-  * writing the data to the underlying output sink. The chars are instead
-  * as one large block when the buffer is filled, or when the stream is
-  * closed or explicitly flushed. This mode operation can provide a more
-  * efficient mechanism for writing versus doing numerous small unbuffered
-  * writes.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  * @author Tom Tromey <tromey@cygnus.com>
-  * @date September 25, 1998 
-  */
-
+ * This class accumulates chars written in a buffer instead of immediately
+ * writing the data to the underlying output sink. The chars are instead
+ * as one large block when the buffer is filled, or when the stream is
+ * closed or explicitly flushed. This mode operation can provide a more
+ * efficient mechanism for writing versus doing numerous small unbuffered
+ * writes.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @author Tom Tromey (tromey@cygnus.com)
+ * @date September 25, 1998 
+ */
 public class BufferedWriter extends Writer
 {
   /**
+   * This is the default buffer size
+   */
+  private static final int DEFAULT_BUFFER_SIZE = 8192;
+
+  /**
+   * This is the underlying <code>Writer</code> to which this object
+   * sends its output.
+   */
+  private Writer out;
+
+  /**
+   * This is the internal char array used for buffering output before
+   * writing it.
+   */
+  char[] buffer;
+
+  /**
+   * This is the number of chars that are currently in the buffer and
+   * are waiting to be written to the underlying stream.  It always points to
+   * the index into the buffer where the next char of data will be stored
+   */
+  int count;
+
+  /**
    * This method initializes a new <code>BufferedWriter</code> instance
    * that will write to the specified subordinate <code>Writer</code>
    * and which will use a default buffer size of 8192 chars.
@@ -78,18 +101,20 @@
    * @param out The underlying <code>Writer</code> to write data to
    * @param size The size of the internal buffer
    */
-  public BufferedWriter (Writer ox, int size)
+  public BufferedWriter (Writer out, int size)
   {
-    super (ox);
-    out = ox;
-    buffer = new char[size];
-    count = 0;
+    super(out);
+    this.out = out;
+    this.buffer = new char[size];
+    this.count = 0;
   }
 
   /**
    * This method flushes any remaining buffered chars then closes the 
    * underlying output stream.  Any further attempts to write to this stream
    * may throw an exception
+   *
+   * @exception IOException If an error occurs.
    */
   public void close () throws IOException
   {
@@ -138,7 +163,7 @@
    * is filled as a result of this write request, it will be flushed to the
    * underlying output stream.
    *
-   * @param b The char of data to be written, passed as an int
+   * @param oneChar The char of data to be written, passed as an int
    *
    * @exception IOException If an error occurs
    */
@@ -226,7 +251,7 @@
   }
 
   // This should only be called with the lock held.
-  private final void localFlush () throws IOException
+  private void localFlush () throws IOException
   {
     if (count > 0)
       {
@@ -234,28 +259,4 @@
 	count = 0;
       }
   }
-
-  /**
-   * This is the underlying <code>Writer</code> to which this object
-   * sends its output.
-   */
-  private Writer out;
-
-  /**
-   * This is the internal char array used for buffering output before
-   * writing it.
-   */
-  char[] buffer;
-
-  /**
-   * This is the number of chars that are currently in the buffer and
-   * are waiting to be written to the underlying stream.  It always points to
-   * the index into the buffer where the next char of data will be stored
-   */
-  int count;
-
-  /**
-   * This is the default buffer size
-   */
-  private static final int DEFAULT_BUFFER_SIZE = 8192;
 }
Index: java/io/FilterInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/FilterInputStream.java,v
retrieving revision 1.8
diff -u -r1.8 FilterInputStream.java
--- java/io/FilterInputStream.java	23 Mar 2003 10:53:30 -0000	1.8
+++ java/io/FilterInputStream.java	8 Apr 2004 21:22:08 -0000
@@ -104,7 +104,7 @@
     */
   public boolean markSupported()
   {
-    return(in.markSupported());
+    return in.markSupported() ;
   }
 
   /**
@@ -126,7 +126,7 @@
     */
   public int available() throws IOException
   {
-    return(in.available());
+    return in.available() ;
   }
 
   /**
@@ -138,9 +138,9 @@
     *
     * @exception IOException If an error occurs
     */
-  public long skip(long num_bytes) throws IOException
+  public long skip(long numBytes) throws IOException
   {
-    return(in.skip(num_bytes));
+    return in.skip(numBytes);
   }
 
   /**
@@ -152,7 +152,7 @@
     */
   public int read() throws IOException
   {
-    return(in.read());
+    return in.read();
   }
 
   /**
@@ -170,7 +170,7 @@
     */
   public int read(byte[] buf) throws IOException
   {
-    return(read(buf, 0, buf.length));
+    return read(buf, 0, buf.length);
   }
 
   /**
@@ -186,7 +186,7 @@
     */
   public int read(byte[] buf, int offset, int len) throws IOException
   {
-    return(in.read(buf, offset, len));
+    return in.read(buf, offset, len);
   }
 
   /**
@@ -200,6 +200,4 @@
   {
     in.close();
   }
-
-} // class FilterInputStream
-
+}
Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectInputStream.java,v
retrieving revision 1.39
diff -u -r1.39 ObjectInputStream.java
--- java/io/ObjectInputStream.java	26 Feb 2004 07:53:15 -0000	1.39
+++ java/io/ObjectInputStream.java	8 Apr 2004 21:22:09 -0000
@@ -38,23 +38,19 @@
 
 package java.io;
 
+import gnu.classpath.Configuration;
+import gnu.java.io.ObjectIdentityWrapper;
+
 import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Proxy;
-import java.security.PrivilegedAction;
-import java.security.AccessController;
 import java.util.Arrays;
 import java.util.Hashtable;
 import java.util.Vector;
 
-
-import gnu.java.io.ObjectIdentityWrapper;
-import gnu.java.lang.reflect.TypeSignature;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
-import gnu.classpath.Configuration;
 
 public class ObjectInputStream extends InputStream
   implements ObjectInput, ObjectStreamConstants

--Boundary-00=_4KcdAPC8MSQeCND--




From MAILER-DAEMON Thu Apr 08 17:27:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBh36-0006aX-QX
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 17:27:00 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBh34-0006a7-3o
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:26:58 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBh2X-0006Qz-KM
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:26:56 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBh2W-0006Qm-Kn
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:26:24 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i38LQLNj007470
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 23:26:22 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBg6d-00036Q-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 22:26:35 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 23:26:07 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_vNcdA682kQi84UV"
Message-Id: <200404082326.07705.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.nio
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 21:26:59 -0000


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

Hi list,


and here another part of the big NIO commit.


Michael


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

	* java/nio/DirectByteBufferImpl.java,
	java/nio/MappedByteBuffer.java,
	java/nio/MappedByteBufferImpl.java:
	Forgot to commit this during the big NIO commit.


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

Index: java/nio/DirectByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DirectByteBufferImpl.java,v
retrieving revision 1.7
diff -u -r1.7 DirectByteBufferImpl.java
--- java/nio/DirectByteBufferImpl.java	11 Feb 2004 19:05:14 -0000	1.7
+++ java/nio/DirectByteBufferImpl.java	8 Apr 2004 21:25:27 -0000
@@ -41,7 +41,7 @@
 import gnu.classpath.Configuration;
 import gnu.classpath.RawData;
 
-class DirectByteBufferImpl extends ByteBuffer
+final class DirectByteBufferImpl extends ByteBuffer
 {
   static
   {
@@ -52,23 +52,25 @@
       }
   }
   
+  /** Used by MappedByteBufferImpl to prevent premature GC. */
+  protected Object owner;
+
   RawData address;
-  private int offset;
   private boolean readOnly;
 
   public DirectByteBufferImpl (RawData address, long len)
   {
-    this (address, 0, (int) len, (int) len, 0, -1, false);
+    this (null, address, (int) len, (int) len, 0, false);
   }
   
-  public DirectByteBufferImpl (RawData address, int offset, int capacity,
-                               int limit, int position, int mark,
-                               boolean readOnly)
+  public DirectByteBufferImpl (Object owner, RawData address,
+			       int capacity, int limit,
+			       int position, boolean readOnly)
   {
-    super (capacity, limit, position, mark);
+    super (capacity, limit, position, -1);
     this.address = address;
-    this.offset = offset;
     this.readOnly = readOnly;
+    this.owner = owner;
   }
 
   private static native RawData allocateImpl (int capacity);
@@ -79,41 +81,58 @@
     freeImpl (address);
   }
   
-  public static ByteBuffer allocateDirect (int capacity)
-  {
-    RawData address = allocateImpl (capacity);
-
-    if (address == null)
-      throw new InternalError ("Not enough memory to create direct buffer");
-    
-    return new DirectByteBufferImpl (address, 0, capacity, capacity, 0, -1, false);
-  }
-  
-  private native byte getImpl (int index);
-  private native void putImpl (int index, byte value);
+  static native byte getImpl (RawData address, int index);
+  static native void putImpl (RawData address, int index, byte value);
 
   public byte get ()
   {
-    byte result = getImpl (position () + offset);
-    position (position () + 1);
+    int pos = position();
+    if (pos >= limit())
+      throw new BufferUnderflowException();
+    byte result = getImpl (address, pos);
+    position (pos + 1);
     return result;
   }
 
   public byte get (int index)
   {
-    return getImpl (index);
+    if (index >= limit())
+      throw new BufferUnderflowException();
+    return getImpl (address, index);
+  }
+
+  static native void getImpl (RawData address, int index,
+			      byte[] dst, int offset, int length);
+
+  public ByteBuffer get (byte[] dst, int offset, int length)
+  {
+    if (offset < 0 || length < 0 || offset + length > dst.length)
+      throw new IndexOutOfBoundsException ();
+    if (length > remaining())
+      throw new BufferUnderflowException();
+
+    int index = position();
+    getImpl(address, index, dst, offset, length);
+    position(index+length);
+
+    return this;
   }
 
   public ByteBuffer put (byte value)
   {
-    putImpl (position (), value);
-    position (position () + 1);
+    int pos = position();
+    if (pos >= limit())
+      throw new BufferUnderflowException();
+    putImpl (address, pos, value);
+    position (pos + 1);
     return this;
   }
   
   public ByteBuffer put (int index, byte value)
   {
-    putImpl (index, value);
+    if (index >= limit())
+      throw new BufferUnderflowException();
+    putImpl (address, index, value);
     return this;
   }
   
@@ -132,21 +151,42 @@
     return this;
   }
 
-  public ByteBuffer duplicate ()
+  public static native RawData adjustAddress(RawData address, int offset);
+
+  public ByteBuffer slice ()
   {
-    return new DirectByteBufferImpl (
-      address, offset, capacity (), limit (), position (), -1, isReadOnly ());
+    int rem = remaining();
+    return new DirectByteBufferImpl (owner,
+				     adjustAddress(address, position()),
+				     rem, rem, 0, isReadOnly ());
   }
 
-  public ByteBuffer slice ()
+  private ByteBuffer duplicate (boolean readOnly)
+  {
+    int pos = position();
+    reset();
+    int mark = position();
+    position(pos);
+    DirectByteBufferImpl result
+      = new DirectByteBufferImpl (owner, address, capacity (), limit (),
+				  pos, readOnly);
+    if (mark != pos)
+      {
+	result.position(mark);
+	result.mark();
+	result.position(pos);
+      }
+    return result;
+  }
+
+  public ByteBuffer duplicate ()
   {
-    return new DirectByteBufferImpl (address, position () + offset, remaining (), remaining (), 0, -1, isReadOnly ());
+    return duplicate(isReadOnly());
   }
 
   public ByteBuffer asReadOnlyBuffer ()
   {
-    return new DirectByteBufferImpl (
-      address, offset, capacity (), limit (), position (), -1, true);
+    return duplicate(true);
   }
 
   public boolean isReadOnly ()
@@ -161,161 +201,161 @@
 
   public CharBuffer asCharBuffer ()
   {
-    return new CharViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
-  }
-  
-  public DoubleBuffer asDoubleBuffer ()
-  {
-    return new DoubleViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
+    return new CharViewBufferImpl (this, remaining() >> 1);
   }
-  
-  public FloatBuffer asFloatBuffer ()
+
+  public ShortBuffer asShortBuffer ()
   {
-    return new FloatViewBufferImpl (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 ShortBuffer asShortBuffer ()
+
+  public FloatBuffer asFloatBuffer ()
   {
-    return new ShortViewBufferImpl (this, position (), remaining (), remaining (), 0, -1, isReadOnly (), order());
+    return new FloatViewBufferImpl (this, remaining() >> 2);
   }
-  
-  final public char getChar ()
+
+  public DoubleBuffer asDoubleBuffer ()
+  {
+    return new DoubleViewBufferImpl (this, remaining() >> 3);
+  }
+
+  public char getChar ()
   {
     return ByteBufferHelper.getChar(this, order());
   }
   
-  final public ByteBuffer putChar (char value)
+  public ByteBuffer putChar (char value)
   {
     ByteBufferHelper.putChar(this, value, order());
     return this;
   }
   
-  final public char getChar (int index)
+  public char getChar (int index)
   {
     return ByteBufferHelper.getChar(this, index, order());
   }
   
-  final public ByteBuffer putChar (int index, char value)
+  public ByteBuffer putChar (int index, char value)
   {
     ByteBufferHelper.putChar(this, index, value, order());
     return this;
   }
 
-  final public short getShort ()
+  public short getShort ()
   {
     return ByteBufferHelper.getShort(this, order());
   }
   
-  final public ByteBuffer putShort (short value)
+  public ByteBuffer putShort (short value)
   {
     ByteBufferHelper.putShort(this, value, order());
     return this;
   }
   
-  final public short getShort (int index)
+  public short getShort (int index)
   {
     return ByteBufferHelper.getShort(this, index, order());
   }
   
-  final public ByteBuffer putShort (int index, short value)
+  public ByteBuffer putShort (int index, short value)
   {
     ByteBufferHelper.putShort(this, index, value, order());
     return this;
   }
 
-  final public int getInt ()
+  public int getInt ()
   {
     return ByteBufferHelper.getInt(this, order());
   }
   
-  final public ByteBuffer putInt (int value)
+  public ByteBuffer putInt (int value)
   {
     ByteBufferHelper.putInt(this, value, order());
     return this;
   }
   
-  final public int getInt (int index)
+  public int getInt (int index)
   {
     return ByteBufferHelper.getInt(this, index, order());
   }
   
-  final public ByteBuffer putInt (int index, int value)
+  public ByteBuffer putInt (int index, int value)
   {
     ByteBufferHelper.putInt(this, index, value, order());
     return this;
   }
 
-  final public long getLong ()
+  public long getLong ()
   {
     return ByteBufferHelper.getLong(this, order());
   }
   
-  final public ByteBuffer putLong (long value)
+  public ByteBuffer putLong (long value)
   {
     ByteBufferHelper.putLong (this, value, order());
     return this;
   }
   
-  final public long getLong (int index)
+  public long getLong (int index)
   {
     return ByteBufferHelper.getLong (this, index, order());
   }
   
-  final public ByteBuffer putLong (int index, long value)
+  public ByteBuffer putLong (int index, long value)
   {
     ByteBufferHelper.putLong (this, index, value, order());
     return this;
   }
 
-  final public float getFloat ()
+  public float getFloat ()
   {
     return ByteBufferHelper.getFloat (this, order());
   }
   
-  final public ByteBuffer putFloat (float value)
+  public ByteBuffer putFloat (float value)
   {
     ByteBufferHelper.putFloat (this, value, order());
     return this;
   }
   
-  public final float getFloat (int index)
+  public float getFloat (int index)
   {
     return ByteBufferHelper.getFloat (this, index, order());
   }
 
-  final public ByteBuffer putFloat (int index, float value)
+  public ByteBuffer putFloat (int index, float value)
   {
     ByteBufferHelper.putFloat (this, index, value, order());
     return this;
   }
 
-  final public double getDouble ()
+  public double getDouble ()
   {
     return ByteBufferHelper.getDouble (this, order());
   }
 
-  final public ByteBuffer putDouble (double value)
+  public ByteBuffer putDouble (double value)
   {
     ByteBufferHelper.putDouble (this, value, order());
     return this;
   }
   
-  final public double getDouble (int index)
+  public double getDouble (int index)
   {
     return ByteBufferHelper.getDouble (this, index, order());
   }
   
-  final public ByteBuffer putDouble (int index, double value)
+  public ByteBuffer putDouble (int index, double value)
   {
     ByteBufferHelper.putDouble (this, index, value, order());
     return this;
Index: java/nio/MappedByteBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/MappedByteBuffer.java,v
retrieving revision 1.10
diff -u -r1.10 MappedByteBuffer.java
--- java/nio/MappedByteBuffer.java	12 Oct 2003 17:51:53 -0000	1.10
+++ java/nio/MappedByteBuffer.java	8 Apr 2004 21:25:27 -0000
@@ -44,28 +44,46 @@
  */
 public abstract class MappedByteBuffer extends ByteBuffer
 {
-  private boolean loaded = false;
-  
   MappedByteBuffer (int capacity, int limit, int position, int mark)
   {
     super (capacity, limit, position, mark);
   }
   
+  void forceImpl()
+  {
+  }
+
   public final MappedByteBuffer force ()
   {
-    // FIXME: Flush to disk here.
+    forceImpl();
     return this;
   }
     
+  boolean isLoadedImpl()
+  {
+    load();
+    return true;
+  }
+
   public final boolean isLoaded ()
   {
-    return loaded;
+    return isLoadedImpl();
   }
     
+  void loadImpl()
+  {
+  }
+
   public final MappedByteBuffer load ()
   {
-    // FIXME: Try to load all pages into memory.
-    loaded = true;
+    loadImpl();
     return this;
   }
+
+  void unmapImpl ()
+  {
+    forceImpl();
+  }
+
+  public void finalize () { unmapImpl(); }
 }
Index: java/nio/MappedByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/MappedByteBufferImpl.java,v
retrieving revision 1.7
diff -u -r1.7 MappedByteBufferImpl.java
--- java/nio/MappedByteBufferImpl.java	17 Feb 2004 21:44:54 -0000	1.7
+++ java/nio/MappedByteBufferImpl.java	8 Apr 2004 21:25:27 -0000
@@ -39,73 +39,79 @@
 package java.nio;
 
 import java.io.IOException;
-import java.nio.channels.FileChannelImpl;
 import gnu.classpath.RawData;
 
-public class MappedByteBufferImpl extends MappedByteBuffer
+final class MappedByteBufferImpl extends MappedByteBuffer
 {
   boolean readOnly;
-  RawData map_address;
-  public FileChannelImpl ch;
-  
-  public MappedByteBufferImpl (FileChannelImpl ch) throws IOException
-  {
-    super ((int) ch.size (), (int) ch.size (), 0, -1);
-    
-    this.ch = ch;
-    map_address = ch.map_address;
-    long si = ch.size () / 1;
-    limit ((int) si);
-  }
+  RawData address;
 
-  public MappedByteBufferImpl (FileChannelImpl ch, int offset, int capacity, int limit, int position, int mark, boolean readOnly)
+  /** Posix uses this for the pointer returned by mmap;
+   * Win32 uses it for the pointer returned by MapViewOfFile. */
+  public RawData implPtr;
+  /** Posix uses this for the actual length passed to mmap;
+   * Win32 uses it for the pointer returned by CreateFileMapping. */
+  public long implLen;
+  
+  public MappedByteBufferImpl (RawData address, int size, boolean readOnly)
+    throws IOException
   {
-    super (capacity, limit, position, mark);
-
-    this.ch = ch;
-    this.array_offset = offset;
+    super(size, size, 0, -1);
+    this.address = address;
     this.readOnly = readOnly;
   }
-  
+
   public boolean isReadOnly ()
   {
     return readOnly;
   }
   
-  public static byte getImpl (FileChannelImpl ch, int index,
-			      int limit, RawData map_address)
-  {
-    throw new Error ("Not implemented");
-  }
-  
-  public static void putImpl (FileChannelImpl ch, int index,
-			      int limit, byte value, RawData map_address)
-  {
-    throw new Error ("Not implemented");
-  }
-
   public byte get ()
   {
-    byte result = get (position());
-    position (position() + 1);
+    int pos = position();
+    if (pos >= limit())
+      throw new BufferUnderflowException();
+    byte result = DirectByteBufferImpl.getImpl(address, pos);
+    position (pos + 1);
     return result;
   }
 
   public ByteBuffer put (byte value)
   {
-    put (position(), value);
-    position (position() + 1);
+    int pos = position();
+    if (pos >= limit())
+      throw new BufferUnderflowException();
+    DirectByteBufferImpl.putImpl(address, pos, value);
+    position(pos + 1);
     return this;
   }
 
   public byte get (int index)
   {
-    return getImpl (ch, index, limit (), map_address);
+    if (index >= limit())
+      throw new BufferUnderflowException();
+    return DirectByteBufferImpl.getImpl(address, index);
+  }
+
+  public ByteBuffer get (byte[] dst, int offset, int length)
+  {
+    if (offset < 0 || length < 0 || offset + length > dst.length)
+      throw new IndexOutOfBoundsException ();
+    if (length > remaining())
+      throw new BufferUnderflowException();
+
+    int index = position();
+    DirectByteBufferImpl.getImpl(address, index, dst, offset, length);
+    position(index+length);
+
+    return this;
   }
 
   public ByteBuffer put (int index, byte value)
   {
-    putImpl (ch, index, limit (), value, map_address);
+    if (index >= limit())
+      throw new BufferUnderflowException();
+    DirectByteBufferImpl.putImpl(address, index, value);
     return this;
   }
 
@@ -129,17 +135,39 @@
 
   public ByteBuffer slice ()
   {
-    throw new Error ("Not implemented");
+    int rem = remaining();
+    return new DirectByteBufferImpl (this,
+				     DirectByteBufferImpl
+				     .adjustAddress(address, position()),
+				     rem, rem, 0, isReadOnly ());
+  }
+
+  private ByteBuffer duplicate (boolean readOnly)
+  {
+    int pos = position();
+    reset();
+    int mark = position();
+    position(pos);
+    DirectByteBufferImpl result
+      = new DirectByteBufferImpl (this, address, capacity (), limit (),
+				  pos, readOnly);
+    if (mark != pos)
+      {
+	result.position(mark);
+	result.mark();
+	result.position(pos);
+      }
+    return result;
   }
 
   public ByteBuffer duplicate ()
   {
-    throw new Error ("Not implemented");
+    return duplicate(isReadOnly());
   }
 
   public ByteBuffer asReadOnlyBuffer ()
   {
-    throw new Error ("Not implemented");
+    return duplicate(true);
   }
 
   public CharBuffer asCharBuffer ()
@@ -172,135 +200,144 @@
     return new DoubleViewBufferImpl (this, remaining() >> 3);
   }
 
-  final public char getChar ()
+  public char getChar ()
   {
     return ByteBufferHelper.getChar(this, order());
   }
   
-  final public ByteBuffer putChar (char value)
+  public ByteBuffer putChar (char value)
   {
     ByteBufferHelper.putChar(this, value, order());
     return this;
   }
   
-  final public char getChar (int index)
+  public char getChar (int index)
   {
     return ByteBufferHelper.getChar(this, index, order());
   }
   
-  final public ByteBuffer putChar (int index, char value)
+  public ByteBuffer putChar (int index, char value)
   {
     ByteBufferHelper.putChar(this, index, value, order());
     return this;
   }
 
-  final public short getShort ()
+  public short getShort ()
   {
     return ByteBufferHelper.getShort(this, order());
   }
   
-  final public ByteBuffer putShort (short value)
+  public ByteBuffer putShort (short value)
   {
     ByteBufferHelper.putShort(this, value, order());
     return this;
   }
   
-  final public short getShort (int index)
+  public short getShort (int index)
   {
     return ByteBufferHelper.getShort(this, index, order());
   }
   
-  final public ByteBuffer putShort (int index, short value)
+  public ByteBuffer putShort (int index, short value)
   {
     ByteBufferHelper.putShort(this, index, value, order());
     return this;
   }
 
-  final public int getInt ()
+  public int getInt ()
   {
     return ByteBufferHelper.getInt(this, order());
   }
   
-  final public ByteBuffer putInt (int value)
+  public ByteBuffer putInt (int value)
   {
     ByteBufferHelper.putInt(this, value, order());
     return this;
   }
   
-  final public int getInt (int index)
+  public int getInt (int index)
   {
     return ByteBufferHelper.getInt(this, index, order());
   }
   
-  final public ByteBuffer putInt (int index, int value)
+  public ByteBuffer putInt (int index, int value)
   {
     ByteBufferHelper.putInt(this, index, value, order());
     return this;
   }
 
-  final public long getLong ()
+  public long getLong ()
   {
     return ByteBufferHelper.getLong(this, order());
   }
   
-  final public ByteBuffer putLong (long value)
+  public ByteBuffer putLong (long value)
   {
     ByteBufferHelper.putLong (this, value, order());
     return this;
   }
   
-  final public long getLong (int index)
+  public long getLong (int index)
   {
     return ByteBufferHelper.getLong (this, index, order());
   }
   
-  final public ByteBuffer putLong (int index, long value)
+  public ByteBuffer putLong (int index, long value)
   {
     ByteBufferHelper.putLong (this, index, value, order());
     return this;
   }
 
-  final public float getFloat ()
+  public float getFloat ()
   {
     return ByteBufferHelper.getFloat (this, order());
   }
   
-  final public ByteBuffer putFloat (float value)
+  public ByteBuffer putFloat (float value)
   {
     ByteBufferHelper.putFloat (this, value, order());
     return this;
   }
   
-  public final float getFloat (int index)
+  public float getFloat (int index)
   {
     return ByteBufferHelper.getFloat (this, index, order());
   }
 
-  final public ByteBuffer putFloat (int index, float value)
+  public ByteBuffer putFloat (int index, float value)
   {
     ByteBufferHelper.putFloat (this, index, value, order());
     return this;
   }
 
-  final public double getDouble ()
+  public double getDouble ()
   {
     return ByteBufferHelper.getDouble (this, order());
   }
 
-  final public ByteBuffer putDouble (double value)
+  public ByteBuffer putDouble (double value)
   {
     ByteBufferHelper.putDouble (this, value, order());
     return this;
   }
   
-  final public double getDouble (int index)
+  public double getDouble (int index)
   {
     return ByteBufferHelper.getDouble (this, index, order());
   }
   
-  final public ByteBuffer putDouble (int index, double value)
+  public ByteBuffer putDouble (int index, double value)
   {
     ByteBufferHelper.putDouble (this, index, value, order());
     return this;
   }
+
+  // NOTE: In libgcj these methods are implemented in natFileChannelXxx.cc,
+  // because they're small, and to put them next to FileChannelImpl::mapImpl.
+  native void unmapImpl ();
+  native boolean isLoadedImpl ();
+    // FIXME: Try to load all pages into memory.
+  native void loadImpl();
+
+  native void forceImpl();
 }

--Boundary-00=_vNcdA682kQi84UV--




From MAILER-DAEMON Thu Apr 08 17:51:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBhQr-0005Xb-JY
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 17:51:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBhQo-0005X7-Pf
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:51:30 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBhQH-0005Qc-Hj
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:51:28 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBhQG-0005Po-9o
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 17:50:56 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i38LorpH015720
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 23:50:54 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBgUN-000385-00
	for <commit-classpath@gnu.org>; Thu, 08 Apr 2004 22:51:07 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Apr 2004 23:50:40 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_wkcdAZcg0XKmYQO"
Message-Id: <200404082350.40323.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.security.AccessController
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 21:51:32 -0000


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

Hi list,


I just commited the attached patch to fix all @return tags.


Michael


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

	* java/security/AccessController.java:
	Fixed all @return tags.


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

Index: java/security/AccessController.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/AccessController.java,v
retrieving revision 1.5
diff -u -r1.5 AccessController.java
--- java/security/AccessController.java	6 May 2002 16:19:20 -0000	1.5
+++ java/security/AccessController.java	8 Apr 2004 21:49:14 -0000
@@ -91,7 +91,7 @@
    *
    * @param action the <code>PrivilegedAction</code> whose <code>run()</code>
    * should be be called.
-   * @returns the result of the <code>action.run()</code> method.
+   * @return the result of the <code>action.run()</code> method.
    */
   public static Object doPrivileged(PrivilegedAction action)
   {
@@ -110,7 +110,7 @@
    * should be be called.
    * @param context the <code>AccessControlContext</code> whose protection
    * domains should be added to the protection domain of the calling class.
-   * @returns the result of the <code>action.run()</code> method.
+   * @return the result of the <code>action.run()</code> method.
    */
   public static Object doPrivileged(PrivilegedAction action,
 				    AccessControlContext context)
@@ -130,7 +130,7 @@
    *
    * @param action the <code>PrivilegedExceptionAction</code> whose
    * <code>run()</code> should be be called.
-   * @returns the result of the <code>action.run()</code> method.
+   * @return the result of the <code>action.run()</code> method.
    * @exception PrivilegedActionException wrapped around any exception that
    * is thrown in the <code>run()</code> method.
    */
@@ -162,7 +162,7 @@
    * <code>run()</code> should be be called.
    * @param context the <code>AccessControlContext</code> whose protection
    * domains should be added to the protection domain of the calling class.
-   * @returns the result of the <code>action.run()</code> method.
+   * @return the result of the <code>action.run()</code> method.
    * @exception PrivilegedActionException wrapped around any exception that
    * is thrown in the <code>run()</code> method.
    */

--Boundary-00=_wkcdAZcg0XKmYQO--




From MAILER-DAEMON Thu Apr 08 18:03:58 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBhcr-00017z-Rh
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 18:03:57 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBhcn-00017N-Uq
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 18:03:53 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBhcH-0000za-6H
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 18:03:53 -0400
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BBhZU-0000Ja-Qm
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 18:00:29 -0400
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i38M0RMC006117
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 18:00:27 -0400
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 i38M0Rj24995
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 18:00:27 -0400
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
	i38M0Qe1023697
	for <commit-classpath@gnu.org>; Thu, 8 Apr 2004 18:00:26 -0400
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-TO2cfhjSiIKZQA2Ttq9c"
Message-Id: <1081461626.2783.130.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Thu, 08 Apr 2004 18:00:26 -0400
Subject: Patch: Comment out calls to _gtk_accel_group_attach
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 22:03:56 -0000


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

Hi,

I just committed this patch, which disables calls to
_gtk_accel_group_attach, a private GTK function.  These calls were
preventing AWT programs from running under JamVM.

Tom

2004-04-08  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
	(accel_attach): Comment out _gtk_accel_group_attach call.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
	(setupAccelGroup): Likewise.


--=-TO2cfhjSiIKZQA2Ttq9c
Content-Disposition: attachment; filename=classpath-gtk-accel.patch
Content-Type: text/x-patch; name=classpath-gtk-accel.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkMenuPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c	29 Mar 2004 07:07:27 -0000	1.7
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c	8 Apr 2004 21:23:09 -0000
@@ -46,8 +46,12 @@
   GtkAccelGroup *accel;
 
   accel = gtk_menu_get_accel_group (GTK_MENU (menu_item->submenu));
+  // FIXME: _gtk_accel_group_attach is a GTK-private function, so
+  // we'll need a different approach here:
+#if 0
   _gtk_accel_group_attach (accel, 
     G_OBJECT (gtk_widget_get_toplevel (GTK_WIDGET(menu_item))));
+#endif
 }
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c	29 Mar 2004 07:07:27 -0000	1.6
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c	8 Apr 2004 21:23:09 -0000
@@ -91,7 +91,11 @@
   gdk_threads_enter ();
   menu = GTK_MENU (GTK_MENU_ITEM (ptr1)->submenu);
   gtk_menu_set_accel_group (menu, gtk_accel_group_new ());
+  // FIXME: _gtk_accel_group_attach is a GTK-private function, so
+  // we'll need a different approach here:
+#if 0
   _gtk_accel_group_attach (gtk_menu_get_accel_group (menu),
 			   G_OBJECT (gtk_widget_get_toplevel (ptr2)));
+#endif
   gdk_threads_leave ();
 }

--=-TO2cfhjSiIKZQA2Ttq9c--




From MAILER-DAEMON Thu Apr 08 19:13:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBihz-0003Vs-MJ
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 19:13:19 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBihx-0003VT-31
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 19:13:17 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBihQ-0003Nz-KY
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 19:13:15 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBihQ-0003Nq-4C
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 19:12:44 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-108.ewetel.net
	[80.228.94.108])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i38NCgpH001321
	for <commit-classpath@gnu.org>; Fri, 9 Apr 2004 01:12:42 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBhlY-0003Mm-00
	for <commit-classpath@gnu.org>; Fri, 09 Apr 2004 00:12:56 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 9 Apr 2004 01:12:27 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_bxddArlK6YOYM19"
Message-Id: <200404090112.27947.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: Stubs for two NIO methods
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 08 Apr 2004 23:13:17 -0000


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

Hi list,


I just commited the attached patch to add stubs for two NIO methods that 
were missing.


Michael
 

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

	* include/gnu_java_nio_PipeImpl.h,
	include/gnu_java_nio_SelectorImpl.h,
	native/jni/java-nio/gnu_java_nio_PipeImpl.c,
	native/jni/java-nio/gnu_java_nio_SelectorImpl.c:
	New files.
	* native/jni/java-nio/Makefile.am:
	Build gnu_java_nio_PipeImpl.c and gnu_java_nio_SelectorImpl.c.
	* include/Makefile.am:
	Generate gnu_java_nio_PipeImpl.h and gnu_java_nio_SelectorImpl.h.


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

Index: include/gnu_java_nio_PipeImpl.h
===================================================================
RCS file: include/gnu_java_nio_PipeImpl.h
diff -N include/gnu_java_nio_PipeImpl.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_nio_PipeImpl.h	8 Apr 2004 23:08:25 -0000
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_PipeImpl__
+#define __gnu_java_nio_PipeImpl__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT void JNICALL Java_gnu_java_nio_PipeImpl_nativeInit (JNIEnv *env, jobject, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_nio_PipeImpl__ */
Index: include/gnu_java_nio_SelectorImpl.h
===================================================================
RCS file: include/gnu_java_nio_SelectorImpl.h
diff -N include/gnu_java_nio_SelectorImpl.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_nio_SelectorImpl.h	8 Apr 2004 23:08:25 -0000
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_SelectorImpl__
+#define __gnu_java_nio_SelectorImpl__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT jint JNICALL Java_gnu_java_nio_SelectorImpl_implSelect (JNIEnv *env, jclass, jintArray, jintArray, jintArray, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_nio_SelectorImpl__ */
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.12
diff -u -r1.12 Makefile.am
--- include/Makefile.am	8 Apr 2004 20:04:13 -0000	1.12
+++ include/Makefile.am	8 Apr 2004 23:08:25 -0000
@@ -39,6 +39,8 @@
 $(top_srcdir)/include/gnu_java_net_PlainDatagramSocketImpl.h \
 $(top_srcdir)/include/gnu_java_net_PlainSocketImpl.h \
 $(top_srcdir)/include/gnu_java_nio_NIOServerSocket.h \
+$(top_srcdir)/include/gnu_java_nio_PipeImpl.h \
+$(top_srcdir)/include/gnu_java_nio_SelectorImpl.h \
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h \
 $(top_srcdir)/include/java_io_FileDescriptor.h \
 $(top_srcdir)/include/java_io_File.h \
@@ -133,6 +135,10 @@
 	$(JAVAH) -o $@ gnu.java.net.PlainSocketImpl
 $(top_srcdir)/include/gnu_java_nio_NIOServerSocket.h: $(top_srcdir)/gnu/java/nio/NIOServerSocket.java
 	$(JAVAH) -o $@ gnu.java.nio.NIOServerSocket
+$(top_srcdir)/include/gnu_java_nio_PipeImpl.h: $(top_srcdir)/gnu/java/nio/PipeImpl.java
+	$(JAVAH) -o $@ gnu.java.nio.PipeImpl
+$(top_srcdir)/include/gnu_java_nio_SelectorImpl.h: $(top_srcdir)/gnu/java/nio/SelectorImpl.java
+	$(JAVAH) -o $@ gnu.java.nio.SelectorImpl
 $(top_srcdir)/include/java_io_FileDescriptor.h: $(top_srcdir)/java/io/FileDescriptor.java
 	$(JAVAH) -o $@ java.io.FileDescriptor
 $(top_srcdir)/include/java_io_File.h: $(top_srcdir)/java/io/File.java
Index: native/jni/java-nio/gnu_java_nio_PipeImpl.c
===================================================================
RCS file: native/jni/java-nio/gnu_java_nio_PipeImpl.c
diff -N native/jni/java-nio/gnu_java_nio_PipeImpl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-nio/gnu_java_nio_PipeImpl.c	8 Apr 2004 23:08:25 -0000
@@ -0,0 +1,54 @@
+/* gnu_java_nio_PipeImpl.c - Native methods for PipeImpl class
+   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_nio_PipeImpl.h"
+
+#define IO_EXCEPTION "java/io/IOException"
+
+JNIEXPORT void JNICALL
+Java_gnu_java_nio_PipeImpl_nativeInit (JNIEnv *env, jobject obj,
+				       jobject provider)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "gnu.java.nio.PipeImpl.nativeInit(): not implemented");
+}
+
Index: native/jni/java-nio/gnu_java_nio_SelectorImpl.c
===================================================================
RCS file: native/jni/java-nio/gnu_java_nio_SelectorImpl.c
diff -N native/jni/java-nio/gnu_java_nio_SelectorImpl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-nio/gnu_java_nio_SelectorImpl.c	8 Apr 2004 23:08:25 -0000
@@ -0,0 +1,56 @@
+/* gnu_java_nio_SelectorImpl.c - Native methods for SelectorImpl class
+   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_nio_SelectorImpl.h"
+
+#define IO_EXCEPTION "java/io/IOException"
+
+JNIEXPORT jint JNICALL
+Java_gnu_java_nio_SelectorImpl_implSelect (JNIEnv *env, jclass obj,
+					   jintArray read, jintArray write,
+					   jintArray except, jlong timeout)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "gnu.java.nio.SelectorImpl.implSelect(): not implemented");
+  return 0;
+}
+
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- native/jni/java-nio/Makefile.am	8 Apr 2004 20:04:13 -0000	1.3
+++ native/jni/java-nio/Makefile.am	8 Apr 2004 23:08:25 -0000
@@ -1,6 +1,8 @@
 pkglib_LTLIBRARIES = libjavanio.la
 
 libjavanio_la_SOURCES = gnu_java_nio_NIOServerSocket.c \
+			gnu_java_nio_PipeImpl.c \
+			gnu_java_nio_SelectorImpl.c \
 			gnu_java_nio_channels_FileChannelImpl.c \
 			java_nio_DirectByteBufferImpl.c \
 			java_nio_FileLockImpl.c

--Boundary-00=_bxddArlK6YOYM19--




From MAILER-DAEMON Thu Apr 08 23:49:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBn1d-0003yO-9D
	for mharc-commit-classpath@gnu.org; Thu, 08 Apr 2004 23:49:53 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBn0Z-0003YN-Ud
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 23:48:47 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBmz4-0002Yb-FW
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 23:47:45 -0400
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 1BBmz3-000298-UG
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 23:47:14 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BBmw3-0003k9-9T
	for commit-classpath@gnu.org; Thu, 08 Apr 2004 23:44:07 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 0C93C622EF
	for <commit-classpath@gnu.org>; Fri,  9 Apr 2004 03:43:46 +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 08875-03 for <commit-classpath@gnu.org>;
	Fri,  9 Apr 2004 03:43:45 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-80-190.adsl.solnet.ch
	[212.41.80.190])
	by mail01.solnet.ch (Postfix) with ESMTP id 7CC75622DB
	for <commit-classpath@gnu.org>; Fri,  9 Apr 2004 03:43:39 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 8EB40B6765; Fri,  9 Apr 2004 05:41:49 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040409034149.8EB40B6765@reali.dnsalias.net>
Date: Fri,  9 Apr 2004 05:41:49 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040409 FAILED
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 03:49:51 -0000

P java/net/MulticastSocket.java
P java/net/NetPermission.java
P java/net/NetworkInterface.java
P java/net/NoRouteToHostException.java
P java/net/PasswordAuthentication.java
P java/net/PortUnreachableException.java
P java/net/ProtocolException.java
P java/net/ServerSocket.java
P java/net/Socket.java
P java/net/SocketAddress.java
P java/net/SocketException.java
P java/net/SocketImpl.java
P java/net/SocketImplFactory.java
P java/net/SocketOptions.java
P java/net/SocketTimeoutException.java
P java/net/URI.java
P java/net/URISyntaxException.java
P java/net/URL.java
P java/net/URLClassLoader.java
P java/net/URLConnection.java
P java/net/URLDecoder.java
P java/net/URLEncoder.java
P java/net/URLStreamHandler.java
P java/net/URLStreamHandlerFactory.java
P java/net/UnknownHostException.java
P java/net/UnknownServiceException.java
P java/nio/Buffer.java
P java/nio/ByteBufferImpl.java
P java/nio/CharBufferImpl.java
P java/nio/DirectByteBufferImpl.java
P java/nio/DoubleBufferImpl.java
P java/nio/DoubleViewBufferImpl.java
P java/nio/FloatBufferImpl.java
P java/nio/FloatViewBufferImpl.java
P java/nio/IntBufferImpl.java
P java/nio/IntViewBufferImpl.java
P java/nio/LongBufferImpl.java
P java/nio/LongViewBufferImpl.java
P java/nio/MappedByteBuffer.java
P java/nio/MappedByteBufferImpl.java
P java/nio/ShortBufferImpl.java
P java/nio/ShortViewBufferImpl.java
P java/nio/channels/AlreadyConnectedException.java
P java/nio/channels/AsynchronousCloseException.java
P java/nio/channels/ByteChannel.java
P java/nio/channels/CancelledKeyException.java
P java/nio/channels/Channel.java
P java/nio/channels/Channels.java
P java/nio/channels/ClosedByInterruptException.java
P java/nio/channels/ClosedChannelException.java
P java/nio/channels/ClosedSelectorException.java
P java/nio/channels/ConnectionPendingException.java
P java/nio/channels/DatagramChannel.java
P java/nio/channels/FileChannel.java
cvs server: java/nio/channels/FileChannelImpl.java is no longer in the repository
P java/nio/channels/FileLock.java
P java/nio/channels/FileLockInterruptionException.java
P java/nio/channels/GatheringByteChannel.java
P java/nio/channels/IllegalBlockingModeException.java
P java/nio/channels/IllegalSelectorException.java
P java/nio/channels/InterruptibleChannel.java
P java/nio/channels/Makefile.am
P java/nio/channels/NoConnectionPendingException.java
P java/nio/channels/NonReadableChannelException.java
P java/nio/channels/NonWritableChannelException.java
P java/nio/channels/NotYetBoundException.java
P java/nio/channels/NotYetConnectedException.java
P java/nio/channels/OverlappingFileLockException.java
P java/nio/channels/Pipe.java
P java/nio/channels/ReadableByteChannel.java
P java/nio/channels/ScatteringByteChannel.java
P java/nio/channels/SelectableChannel.java
P java/nio/channels/SelectionKey.java
P java/nio/channels/Selector.java
P java/nio/channels/ServerSocketChannel.java
P java/nio/channels/SocketChannel.java
P java/nio/channels/UnresolvedAddressException.java
P java/nio/channels/UnsupportedAddressTypeException.java
P java/nio/channels/WritableByteChannel.java
P java/nio/channels/spi/AbstractInterruptibleChannel.java
P java/nio/channels/spi/AbstractSelectableChannel.java
P java/nio/channels/spi/AbstractSelectionKey.java
P java/nio/channels/spi/AbstractSelector.java
P java/nio/channels/spi/SelectorProvider.java
P java/nio/charset/spi/CharsetProvider.java
P java/security/AccessController.java
P lib/Makefile.am
P native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
P native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
P native/jni/java-io/java_io_VMObjectStreamClass.c
P native/jni/java-nio/Makefile.am
U native/jni/java-nio/gnu_java_nio_PipeImpl.c
U native/jni/java-nio/gnu_java_nio_SelectorImpl.c
U native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
P native/jni/java-nio/java_nio_DirectByteBufferImpl.c
cvs server: native/jni/java-nio/java_nio_FileChannelImpl.c is no longer in the repository
U resource/gnu/regexp/.cvsignore
P vm/reference/java/io/VMObjectStreamClass.java
delete old source tree
copy cvs tree to source tree



From MAILER-DAEMON Fri Apr 09 09:17:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBvt5-00082A-E0
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 09:17:39 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBvoN-0006Cy-Oe
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:12:47 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBvjI-00045z-Fl
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:07:33 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBven-0003Of-7O
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:02:53 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BBveK-0001ds-00; Fri, 09 Apr 2004 15:02:24 +0200
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200404082222.18202.konqueror@gmx.de>
References: <200404081643.59869.konqueror@gmx.de>
	<1081455009.2783.122.camel@tortoise.toronto.redhat.com>
	<200404082222.18202.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-q1Jodw7RASvBnFcWliQf"
Message-Id: <1081515746.13170.130.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 15:02:26 +0200
Cc: commit classpath <commit-classpath@gnu.org>
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 13:17:34 -0000


--=-q1Jodw7RASvBnFcWliQf
Content-Type: multipart/mixed; boundary="=-QW0aViPvkt04X+tIiCfQ"


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

Hi,

What do you think about the attached version?
It works out of the box on my system (Debian comes with automake set to
1.4, you need automake-1.x for automake 1.x, same for aclocal). Could
this be made more general for other systems?

Cheers,

Mark

--=-QW0aViPvkt04X+tIiCfQ
Content-Disposition: inline; filename=autogen.sh
Content-Transfer-Encoding: base64
Content-Type: text/x-sh; name=autogen.sh; charset=iso-8859-1

IyEvYmluL3NoDQoNCnNldCAtZQ0KDQpMSUJUT09MSVpFPWxpYnRvb2xpemUNCiR7TElCVE9PTEla
RX0gLS12ZXJzaW9uIHwgaGVhZCAtMQ0KZWNobyAibGlidG9vbGl6ZTogbWluaW11bSB2ZXJzaW9u
IHJlcXVpcmVkOiAxLjQuMiINCg0KQVVUT0NPTkY9YXV0b2NvbmYNCiR7QVVUT0NPTkZ9IC0tdmVy
c2lvbiB8IGhlYWQgLTENCmVjaG8gImF1dG9jb25mOiBtaW5pbXVtIHZlcnNpb24gcmVxdWlyZWQ6
IDIuNTkiDQoNCiMgQXV0b2hlYWRlciBpcyBwYXJ0IG9mIGF1dG9jb25mDQpBVVRPSEVBREVSPWF1
dG9oZWFkZXINCiR7QVVUT0hFQURFUn0gLS12ZXJzaW9uIHwgaGVhZCAtMQ0KZWNobyAiYXV0b2hl
YWRlcjogbWluaW11bSB2ZXJzaW9uIHJlcXVpcmVkOiAyLjU5Ig0KDQpBVVRPTUFLRT1hdXRvbWFr
ZQ0KaWYgdGVzdCAteCAvdXNyL2Jpbi9hdXRvbWFrZS0xLjc7IHRoZW4NCiAgQVVUT01BS0U9L3Vz
ci9iaW4vYXV0b21ha2UtMS43DQpmaQ0KJHtBVVRPTUFLRX0gLS12ZXJzaW9uIHwgaGVhZCAtMQ0K
ZWNobyAiYXV0b21ha2U6IG1pbmltdW0gdmVyc2lvbiByZXF1aXJlZDogMS43LjAiDQoNCiMgQWNs
b2NhbCBpcyBwYXJ0IG9mIGF1dG9tYWtlDQpBQ0xPQ0FMPWFjbG9jYWwNCmlmIHRlc3QgLXggL3Vz
ci9iaW4vYWNsb2NhbC0xLjc7IHRoZW4NCiAgQUNMT0NBTD0vdXNyL2Jpbi9hY2xvY2FsLTEuNw0K
ZmkNCiR7QUNMT0NBTH0gLS12ZXJzaW9uIHwgaGVhZCAtMQ0KZWNobyAiYWNsb2NhbDogbWluaW11
bSB2ZXJzaW9uIHJlcXVpcmVkOiAxLjcuMCINCg0KZWNobyAibGlidG9vbGl6ZSAuLi4iDQoke0xJ
QlRPT0xJWkV9IC0tZm9yY2UgLS1jb3B5DQoNCmVjaG8gImFjbG9jYWwgLi4uIg0KJHtBQ0xPQ0FM
fQ0KDQplY2hvICJhdXRvaGVhZGVyIC4uLiINCiR7QVVUT0hFQURFUn0gLS1mb3JjZQ0KDQplY2hv
ICJhdXRvbWFrZSAuLi4iDQoke0FVVE9NQUtFfSAtLWFkZC1taXNzaW5nIC0tY29weQ0KDQplY2hv
ICJhdXRvY29uZiAuLi4iDQoke0FVVE9DT05GfSAtLWZvcmNlDQoNCmVjaG8gIkZpbmlzaGVkIg0K


--=-QW0aViPvkt04X+tIiCfQ--

--=-q1Jodw7RASvBnFcWliQf
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)

iD8DBQBAdp7hxVhZCJWr9QwRAsEdAJ9vEK3Vj6ESbDc9qWSguj+3YxQEdgCeLSLx
Z7UpM4UL+DGOX5c94xm7Fv0=
=LQ1X
-----END PGP SIGNATURE-----

--=-q1Jodw7RASvBnFcWliQf--




From MAILER-DAEMON Fri Apr 09 09:35:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBwAU-0001Rk-GB
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 09:35:38 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBwAO-0001Iz-5K
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:35:32 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBwAJ-0001He-Vx
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:35:28 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBwAJ-0001Gl-IC
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:35:27 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BBwA9-0001fF-00; Fri, 09 Apr 2004 15:35:17 +0200
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <1081515746.13170.130.camel@elsschot.wildebeest.org>
References: <200404081643.59869.konqueror@gmx.de>
	<1081455009.2783.122.camel@tortoise.toronto.redhat.com>
	<200404082222.18202.konqueror@gmx.de>
	<1081515746.13170.130.camel@elsschot.wildebeest.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-xQox9UqtvAf6l2F7JtR8"
Message-Id: <1081517719.13170.134.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 15:35:19 +0200
Cc: commit classpath <commit-classpath@gnu.org>
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 13:35:36 -0000


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

Hi,

Since libtoolize now regenerates the config.guess and config.sub files
we should remove them from CVS.

2004-04-09  Mark Wielaard  <mark@klomp.org>

        * config.guess: Removed automatically generated file.
        * config.sub: Likewise.

Cheers,

Mark

--=-xQox9UqtvAf6l2F7JtR8
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)

iD8DBQBAdqaVxVhZCJWr9QwRAkG/AJ4nDctoSNdxI+6Z9/PmuCiLB+XVXACffgqF
xbI0/b3l4Cutf5gDxjBmxvU=
=XSFx
-----END PGP SIGNATURE-----

--=-xQox9UqtvAf6l2F7JtR8--




From MAILER-DAEMON Fri Apr 09 09:40:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBwF2-0004IS-AU
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 09:40:20 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBwEy-0004GT-7G
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:40:16 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBwEQ-00040L-Bi
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:40:13 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBwEP-0003zy-VK
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 09:39:42 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-018.ewetel.net
	[80.228.95.18])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i39DdcNj027170;
	Fri, 9 Apr 2004 15:39:39 +0200 (MEST)
Received: from asterix.konqueror.de ([192.168.1.3])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBvIX-00010X-00; Fri, 09 Apr 2004 14:39:53 +0200
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 9 Apr 2004 15:50:10 +0200
User-Agent: KMail/1.5.4
References: <200404081643.59869.konqueror@gmx.de>
	<200404082222.18202.konqueror@gmx.de>
	<1081515746.13170.130.camel@elsschot.wildebeest.org>
In-Reply-To: <1081515746.13170.130.camel@elsschot.wildebeest.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: quoted-printable
Content-Description: clearsigned data
Content-Disposition: inline
Message-Id: <200404091550.15311.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit classpath <commit-classpath@gnu.org>
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 13:40:17 -0000

=2D----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am Freitag, 9. April 2004 15:02 schrieb Mark Wielaard:
> Hi,
>
> What do you think about the attached version?
> It works out of the box on my system (Debian comes with automake
> set to 1.4, you need automake-1.x for automake 1.x, same for
> aclocal). Could this be made more general for other systems?


Good idea but please prefer automake 1.8 over 1.7 (even with its=20
warning-mania).


Michael
=2D --=20
Homepage: http://www.worldforge.org/
=2D----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAdqoWWSOgCCdjSDsRAt6tAJ9WcdBXqU6gEnPXtmG7v08Ez9JE2gCdG7fZ
ceCl+faAINZH1U+xy3CGn2M=3D
=3DbrKE
=2D----END PGP SIGNATURE-----




From MAILER-DAEMON Fri Apr 09 10:01:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBwZc-0000YL-Fu
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 10:01:36 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBwZT-0000N5-2m
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:01:27 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBwYu-0008Ce-Cz
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:01:23 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBwYu-0008By-2p
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:00:52 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BBwYt-0002NU-00
	for <commit-classpath@gnu.org>; Fri, 09 Apr 2004 16:00:51 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBwYj-0002Kf-00; Fri, 09 Apr 2004 16:00:41 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i39E0eLT019588;
	Fri, 9 Apr 2004 16:00:41 +0200 (MEST)
Message-ID: <4076AC87.3060008@kaffe.org>
Date: Fri, 09 Apr 2004 16:00:39 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Mark Wielaard <mark@klomp.org>
References: <200404081643.59869.konqueror@gmx.de>	<1081455009.2783.122.camel@tortoise.toronto.redhat.com>	<200404082222.18202.konqueror@gmx.de>
	<1081515746.13170.130.camel@elsschot.wildebeest.org>
In-Reply-To: <1081515746.13170.130.camel@elsschot.wildebeest.org>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by AMaViS perl-11
Cc: commit classpath <commit-classpath@gnu.org>,
	Michael Koch <konqueror@gmx.de>
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 14:01:33 -0000

Mark Wielaard wrote:
> Hi,
> 
> What do you think about the attached version?
> It works out of the box on my system (Debian comes with automake set to
> 1.4, you need automake-1.x for automake 1.x, same for aclocal). Could
> this be made more general for other systems?

Hardly, since it depends on the path setting for the test. You could to 
try to pick up specific apis by using aclocal-17 directly. If it;s not 
installed, than the system maybe doesn't have aclocal 1.7 installed. I 
have no idea how well this works with the different mechanisms different 
systems have employed to work out coexistance of different autotools apis.

anyway, I thought that autoreconf took care of picking the right 
versions automatically. Can't we just have

autoreconf

in autogen.sh and be done with it?

cheers,
dalibor topic



From MAILER-DAEMON Fri Apr 09 10:03:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBwb8-0001fT-HD
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 10:03:10 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBwb4-0001f5-SQ
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:03:06 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBwb2-0001eR-FH
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:03:05 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBwb1-0001e9-6w
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:03:03 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BBwam-0001p5-00; Fri, 09 Apr 2004 16:02:48 +0200
From: Mark Wielaard <mark@klomp.org>
To: tromey@redhat.com
In-Reply-To: <1081369536.13170.38.camel@elsschot.wildebeest.org>
References: <1080236148.18716.161.camel@elsschot.wildebeest.org>
	<87wu58qpmw.fsf@fleche.redhat.com>
	<1080295746.18716.463.camel@elsschot.wildebeest.org>
	<200403261128.55981.konqueror@gmx.de>
	<1080301292.18716.480.camel@elsschot.wildebeest.org>
	<871xn8h9mt.fsf@fleche.redhat.com>
	<1081118952.7548.253.camel@elsschot.wildebeest.org>
	<87ekr28gnj.fsf@fleche.redhat.com>
	<1081369536.13170.38.camel@elsschot.wildebeest.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-C2pOg3TdBCmueGgsjJEH"
Message-Id: <1081519370.13170.146.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 16:02:50 +0200
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 14:03:07 -0000


--=-C2pOg3TdBCmueGgsjJEH
Content-Type: multipart/mixed; boundary="=-GFnIigbj9t+4bJyKnC/X"


--=-GFnIigbj9t+4bJyKnC/X
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Wed, 2004-04-07 at 22:25, Mark Wielaard wrote:
> On Mon, 2004-04-05 at 19:43, Tom Tromey wrote:
> > >>>>> "Mark" =3D=3D Mark Wielaard <mark@klomp.org> writes:
> >=20
> > Mark> The attached patch does that and enables -Wall for GNU Classpath.
> >=20
> > Nice.  I skimmed it and it generally looks fine to me.
> >=20
> > Mark> It fixes all issues found when compiling with -std=3Dc89. Lots in=
 the gtk
> > Mark> peers I am afraid. So please yell and scream if this is to intrus=
ive. It
> > Mark> would be good if the gtk-peer stuff in libgcj was also compiled w=
ith
> > Mark> this flag.
> >=20
> > I think it is a requirement, not just nice to have.  Otherwise we're
> > going to end up reintroducing code that isn't C89.
> >=20
> > Here's an untested patch for the GUI branch.
> >=20
> > from  Tom Tromey  <tromey@redhat.com>
> >=20
> > 	* Makefile.am (WARNINGS): Added -std=3Dc89.
>=20
> Thanks for that.
>=20
> Here is the gtk+ peer part of my patch.
> I'll commit this to classpath now.
> Could someone commit it to libgcj mainline and/or gui?
> (I only have a 3.4 branch checkout on my development machine at the
> moment.)
>=20
> I want to test the other part of my patch first more carefully before
> committing to classpath and enabling -std=3Dc89

OK I tested some more and here is what I came up with:
-ansi -std=3Dc89 -pedantic -Wall -Wno-long-long -D_POSIX_SOURCE
-D_BSD_SOURCE
This gives us ISO C90 pedantic ansi, but with longlong (jlong) support
and modern POSIX and BSD C library functions/prototypes (we actually
need fsync and ftruncate for example which aren't in ISO C 90 so the
glibc headers wouldn't define it with the above two defines).

I have even gone through the complete source to make sure we can clean
it up so much to enable even -Werror. But when discussion some of the
changes on irc people pointed out that some of the "fixes" actually only
made the warnings go away and not the real problem gcc was warning about
(especially with the "dereferencing type-punned pointer will break
strict-aliasing rules" warnings).

So here is just the minimal safe patch (mostly just wat Tom already
reviewed) to enable the above without -Werror. With all the language
lawyering going on I didn't dare to make changes that might infuriate
some C purist :) I'll study the warnings that are now generated by
default some more and suggest fixes, but others are more then welcome to
do the same!

If someone could enable the above flags also for libgcj and/or add at
least the native/gtk-peer parts to libgcj (mainline/gui-branch) that
would be nice.

2004-04-09  Mark Wielaard  <mark@klomp.org>

      * configure.ac: Set AM_CFLAGS to ISO C90 pedantic ansi, but with
      longlong (jlong) support and modern POSIX and BSD C library
      funtions/prototypes.
      * native/fdlibm/Makefile.am: Cancel out project wide AM_CFLAGS.
      * native/fdlibm/mprec.h: Remove C++ comments.
      * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Turn C++
      comments into C comments.
      * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c:
      Likewise.
      * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c:
      Likewise.
      * native/jni/java-io/FileDescriptor.c: Likewise.
      * native/jni/java-io/java_io_File.c: Likewise.
      * native/jni/java-io/javaio.c: Remove unused fprintf calls.
      * native/jni/java-net/javanet.c: Turn C++ comments into C comments.
      * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c:
      Likewise.
      * native/target/generic/target_generic_file.h: Likewise.
      * native/target/generic/target_generic_network.h: Likewise.

Cheers,

Mark



--=-GFnIigbj9t+4bJyKnC/X
Content-Disposition: inline; filename=ansi-pedantic.patch
Content-Type: text/x-patch; name=ansi-pedantic.patch; charset=iso-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IGNvbmZpZ3VyZS5hYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNz
cGF0aC9jbGFzc3BhdGgvY29uZmlndXJlLmFjLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNA0K
ZGlmZiAtdSAtcjEuMTQgY29uZmlndXJlLmFjDQotLS0gY29uZmlndXJlLmFjCTggQXByIDIwMDQg
MjA6MDQ6MTIgLTAwMDAJMS4xNA0KKysrIGNvbmZpZ3VyZS5hYwk5IEFwciAyMDA0IDEzOjQ2OjM3
IC0wMDAwDQpAQCAtMTE4LDEyICsxMTgsMTYgQEANCiAgIGRubCBXZSB3YW50IHRvIGF2b2lkIC1P
MiBhdCB0aGUgbW9tZW50LCBnY2MgMi45NiBmcm9tIFJlZCBIYXQgNw0KICAgZG5sIGNhbm5vdCBj
b21waWxlIHNvbWUgbmF0aXZlIGZ1bmN0aW9ucyAoZ2NjIGVycm9ycykgd2l0aCB0aGlzDQogICBk
bmwgZmxhZy4NCi0gIENGTEFHUz0iLWciIA0KKyAgQ0ZMQUdTPSItZyINCiANCiAgIGRubCBXZSB3
YW50IHdhcm5pbmdzLCBsb3RzIG9mIHdhcm5pbmdzIDotKQ0KKyAgQU1fQ0ZMQUdTPQ0KICAgaWYg
dGVzdCAieCR7R0NDfSIgPSB4eWVzOyB0aGVuDQotICAgIEpBUEhBUl9HUkVQX0NGTEFHUygtV2Fs
bCwgWyBDRkxBR1M9IiRDRkxBR1MgLVdhbGwiIF0pDQorICAgIGRubCBXZSB3YW50IElTTyBDOTAg
cGVkYW50aWMgYW5zaSwgYnV0IHdpdGggbG9uZ2xvbmcgKGpsb25nKSBzdXBwb3J0DQorICAgIGRu
bCBhbmQgbW9kZXJuIFBPU0lYIGFuZCBCU0QgQyBsaWJyYXJ5IGZ1bnRpb25zL3Byb3RvdHlwZXMu
DQorICAgIEFNX0NGTEFHUz0nLWFuc2kgLXN0ZD1jODkgLXBlZGFudGljIC1XYWxsIC1Xbm8tbG9u
Zy1sb25nIC1EX1BPU0lYX1NPVVJDRSAtRF9CU0RfU09VUkNFJw0KICAgZmkNCisgIEFDX1NVQlNU
KEFNX0NGTEFHUykNCiANCiAgIGRubCBDaGVjayBmb3IgQVdUIHJlbGF0ZWQgZ3RocmVhZC9ndGsv
bGliYXJ0X2xncGwNCiAgIGlmIHRlc3QgIngke0NPTVBJTEVfR1RLX1BFRVJ9IiA9IHh5ZXM7IHRo
ZW4NCkluZGV4OiBuYXRpdmUvZmRsaWJtL01ha2VmaWxlLmFtDQo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmls
ZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9uYXRpdmUvZmRsaWJtL01ha2VmaWxlLmFt
LHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yDQpkaWZmIC11IC1yMS4yIE1ha2VmaWxlLmFtDQot
LS0gbmF0aXZlL2ZkbGlibS9NYWtlZmlsZS5hbQk3IEZlYiAyMDAyIDE0OjE4OjQ1IC0wMDAwCTEu
Mg0KKysrIG5hdGl2ZS9mZGxpYm0vTWFrZWZpbGUuYW0JOSBBcHIgMjAwNCAxMzo0NjozNyAtMDAw
MA0KQEAgLTE1LDcgKzE1LDYgQEANCiAJCQllX3NxcnQuYyBcDQogCQkJZmRsaWJtLmggXA0KIAkJ
CWllZWVmcC5oIFwNCi0JCQlqYXZhLWFzc2VydC5oIFwNCiAJCQlrX2Nvcy5jIFwNCiAJCQlrX3Jl
bV9waW8yLmMgXA0KIAkJCWtfc2luLmMgXA0KQEAgLTQ2LDYgKzQ1LDEwIEBADQogCQkJd19zcXJ0
LmMgDQogDQogbGliZmRsaWJtX2xhX0xERkxBR1MgPSAtbW9kdWxlIC12ZXJzaW9uLWluZm8gQExJ
QlZFUlNJT05AIA0KKw0KKyMgV2UganVzdCB3YW50IHRoZSBzdGFuZGFyZCBmbGFncyBmb3IgZmRs
aWJtIHNpbmNlIGl0IGlzIGFuIHVwc3RyZWFtIGxpYg0KKyMgYW5kIG91ciBub3JtYWwgLWFuc2kg
LXBlZGFudGljIC1XYWxsIC1XZXJyb3IgYnJlYWtzIHRoaXMgbGliLg0KK0FNX0NGTEFHUyA9IA0K
IA0KIElOQ0xVREVTID0gIEBFWFRSQV9JTkNMVURFU0AgXA0KIAkgICAgIC1JJCh0b3BfYnVpbGRk
aXIpL2luY2x1ZGUgDQpJbmRleDogbmF0aXZlL2ZkbGlibS9tcHJlYy5oDQo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpS
Q1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9uYXRpdmUvZmRsaWJtL21wcmVj
Lmgsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMNCmRpZmYgLXUgLXIxLjMgbXByZWMuaA0KLS0t
IG5hdGl2ZS9mZGxpYm0vbXByZWMuaAkyOSBNYXIgMjAwNCAwNzowNzoyNiAtMDAwMAkxLjMNCisr
KyBuYXRpdmUvZmRsaWJtL21wcmVjLmgJOSBBcHIgMjAwNCAxMzo0NjozNyAtMDAwMA0KQEAgLTMy
LDEwICszMiw2IEBADQogI2luY2x1ZGUgPGNvbmZpZy5oPg0KICNpbmNsdWRlICJpZWVlZnAuaCIN
CiANCi0vLyAjaW5jbHVkZSA8bWF0aC5oPg0KLS8vICNpbmNsdWRlIDxmbG9hdC5oPg0KLS8vICNp
bmNsdWRlIDxlcnJuby5oPg0KLQ0KICNpZiBkZWZpbmVkIEhBVkVfU1RESU5UX0gNCiAjaW5jbHVk
ZSA8c3RkaW50Lmg+DQogI2VsaWYgZGVmaW5lZCBIQVZFX0lOVFRZUEVTX0gNCkBAIC02MSw3ICs1
Nyw3IEBADQogI2VuZGlmDQogDQogI2lmICFkZWZpbmVkIEhBVkVfQlNEX0lOVDMyX0RFRklORUQg
JiYgIWRlZmluZWQgSEFWRV9JTlQzMl9ERUZJTkVEDQotLy8gRklYTUUgLS0gdGhpcyBjb3VsZCBo
YXZlIHByb2JsZW1zIHdpdGggc3lzdGVtcyB0aGF0IGRvbid0IGRlZmluZSBTSSB0byBiZSA0DQor
LyogRklYTUUgdGhpcyBjb3VsZCBoYXZlIHByb2JsZW1zIHdpdGggc3lzdGVtcyB0aGF0IGRvbid0
IGRlZmluZSBTSSB0byBiZSA0ICovDQogdHlwZWRlZiBpbnQgaW50MzJfdCBfX2F0dHJpYnV0ZV9f
KChtb2RlKFNJKSkpOw0KIA0KIC8qIFRoaXMgaXMgYSBibGF0YW50IGhhY2s6IG9uIFNvbGFyaXMg
Mi41LCBwdGhyZWFkLmggZGVmaW5lcyB1aW50MzJfdA0KSW5kZXg6IG5hdGl2ZS9qbmkvZ3RrLXBl
ZXIvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a01lbnVQZWVyLmMNCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBm
aWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL25hdGl2ZS9qbmkvZ3RrLXBlZXIvZ251
X2phdmFfYXd0X3BlZXJfZ3RrX0d0a01lbnVQZWVyLmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAx
LjgNCmRpZmYgLXUgLXIxLjggZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a01lbnVQZWVyLmMNCi0t
LSBuYXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtNZW51UGVlci5j
CTggQXByIDIwMDQgMjE6NTY6MDAgLTAwMDAJMS44DQorKysgbmF0aXZlL2puaS9ndGstcGVlci9n
bnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrTWVudVBlZXIuYwk5IEFwciAyMDA0IDEzOjQ2OjM3IC0w
MDAwDQpAQCAtMSw1ICsxLDUgQEANCiAvKiBndGttZW51cGVlci5jIC0tIE5hdGl2ZSBpbXBsZW1l
bnRhdGlvbiBvZiBHdGtNZW51UGVlcg0KLSAgIENvcHlyaWdodCAoQykgMTk5OSBGcmVlIFNvZnR3
YXJlIEZvdW5kYXRpb24sIEluYy4NCisgICBDb3B5cmlnaHQgKEMpIDE5OTksIDIwMDQgRnJlZSBT
b2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIENs
YXNzcGF0aC4NCiANCkBAIC00Niw4ICs0Niw4IEBADQogICBHdGtBY2NlbEdyb3VwICphY2NlbDsN
CiANCiAgIGFjY2VsID0gZ3RrX21lbnVfZ2V0X2FjY2VsX2dyb3VwIChHVEtfTUVOVSAobWVudV9p
dGVtLT5zdWJtZW51KSk7DQotICAvLyBGSVhNRTogX2d0a19hY2NlbF9ncm91cF9hdHRhY2ggaXMg
YSBHVEstcHJpdmF0ZSBmdW5jdGlvbiwgc28NCi0gIC8vIHdlJ2xsIG5lZWQgYSBkaWZmZXJlbnQg
YXBwcm9hY2ggaGVyZToNCisgIC8qIEZJWE1FOiBfZ3RrX2FjY2VsX2dyb3VwX2F0dGFjaCBpcyBh
IEdUSy1wcml2YXRlIGZ1bmN0aW9uLCBzbw0KKyAgICAgd2UnbGwgbmVlZCBhIGRpZmZlcmVudCBh
cHByb2FjaCBoZXJlOiAqLw0KICNpZiAwDQogICBfZ3RrX2FjY2VsX2dyb3VwX2F0dGFjaCAoYWNj
ZWwsIA0KICAgICBHX09CSkVDVCAoZ3RrX3dpZGdldF9nZXRfdG9wbGV2ZWwgKEdUS19XSURHRVQo
bWVudV9pdGVtKSkpKTsNCkluZGV4OiBuYXRpdmUvam5pL2d0ay1wZWVyL2dudV9qYXZhX2F3dF9w
ZWVyX2d0a19HdGtQb3B1cE1lbnVQZWVyLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9jbGFzc3BhdGgvY2xhc3NwYXRoL25hdGl2ZS9qbmkvZ3RrLXBlZXIvZ251X2phdmFfYXd0X3Bl
ZXJfZ3RrX0d0a1BvcHVwTWVudVBlZXIuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNw0KZGlm
ZiAtdSAtcjEuNyBnbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrUG9wdXBNZW51UGVlci5jDQotLS0g
bmF0aXZlL2puaS9ndGstcGVlci9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrUG9wdXBNZW51UGVl
ci5jCTggQXByIDIwMDQgMjE6NTY6MDEgLTAwMDAJMS43DQorKysgbmF0aXZlL2puaS9ndGstcGVl
ci9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrUG9wdXBNZW51UGVlci5jCTkgQXByIDIwMDQgMTM6
NDY6MzcgLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0KIC8qIGd0a3BvcHVwbWVudXBlZXIuYyAtLSBO
YXRpdmUgaW1wbGVtZW50YXRpb24gb2YgR3RrUG9wdXBNZW51UGVlcg0KLSAgIENvcHlyaWdodCAo
QykgMTk5OSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCisgICBDb3B5cmlnaHQgKEMp
IDE5OTksIDIwMDQgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQogDQogVGhpcyBmaWxl
IGlzIHBhcnQgb2YgR05VIENsYXNzcGF0aC4NCiANCkBAIC05MSw4ICs5MSw4IEBADQogICBnZGtf
dGhyZWFkc19lbnRlciAoKTsNCiAgIG1lbnUgPSBHVEtfTUVOVSAoR1RLX01FTlVfSVRFTSAocHRy
MSktPnN1Ym1lbnUpOw0KICAgZ3RrX21lbnVfc2V0X2FjY2VsX2dyb3VwIChtZW51LCBndGtfYWNj
ZWxfZ3JvdXBfbmV3ICgpKTsNCi0gIC8vIEZJWE1FOiBfZ3RrX2FjY2VsX2dyb3VwX2F0dGFjaCBp
cyBhIEdUSy1wcml2YXRlIGZ1bmN0aW9uLCBzbw0KLSAgLy8gd2UnbGwgbmVlZCBhIGRpZmZlcmVu
dCBhcHByb2FjaCBoZXJlOg0KKyAgLyogRklYTUU6IF9ndGtfYWNjZWxfZ3JvdXBfYXR0YWNoIGlz
IGEgR1RLLXByaXZhdGUgZnVuY3Rpb24sIHNvDQorICAgICB3ZSdsbCBuZWVkIGEgZGlmZmVyZW50
IGFwcHJvYWNoIGhlcmU6ICovDQogI2lmIDANCiAgIF9ndGtfYWNjZWxfZ3JvdXBfYXR0YWNoIChn
dGtfbWVudV9nZXRfYWNjZWxfZ3JvdXAgKG1lbnUpLA0KIAkJCSAgIEdfT0JKRUNUIChndGtfd2lk
Z2V0X2dldF90b3BsZXZlbCAocHRyMikpKTsNCkluZGV4OiBuYXRpdmUvam5pL2phdmEtaW8vRmls
ZURlc2NyaXB0b3IuYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9j
bGFzc3BhdGgvbmF0aXZlL2puaS9qYXZhLWlvL0ZpbGVEZXNjcmlwdG9yLmMsdg0KcmV0cmlldmlu
ZyByZXZpc2lvbiAxLjE3DQpkaWZmIC11IC1yMS4xNyBGaWxlRGVzY3JpcHRvci5jDQotLS0gbmF0
aXZlL2puaS9qYXZhLWlvL0ZpbGVEZXNjcmlwdG9yLmMJMjkgTWFyIDIwMDQgMDc6MDc6MjcgLTAw
MDAJMS4xNw0KKysrIG5hdGl2ZS9qbmkvamF2YS1pby9GaWxlRGVzY3JpcHRvci5jCTkgQXByIDIw
MDQgMTM6NDY6MzcgLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0KIC8qIEZpbGVEZXNjcmlwdG9yLmMg
LSBOYXRpdmUgbWV0aG9kcyBmb3IgamF2YS5pby5GaWxlRGVzY3JpcHRvciBjbGFzcw0KLSAgIENv
cHlyaWdodCAoQykgMTk5OCwyMDAzIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAg
IENvcHlyaWdodCAoQykgMTk5OCwgMjAwMywgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24s
IEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTY1
LDE5ICs2NSwxOSBAQA0KIA0KICNpbmNsdWRlICJqYXZhX2lvX0ZpbGVEZXNjcmlwdG9yLmgiDQog
DQotLy8gRklYTUU6IFRoaXMgY2FuJ3QgYmUgcmlnaHQuICBOZWVkIGNvbnZlcnRlciBtYWNyb3MN
CisvKiBGSVhNRTogVGhpcyBjYW4ndCBiZSByaWdodC4gIE5lZWQgY29udmVydGVyIG1hY3JvcyAq
Lw0KICNkZWZpbmUgQ09OVkVSVF9KTE9OR19UT19JTlQoeCkgVEFSR0VUX05BVElWRV9NQVRIX0lO
VF9JTlQ2NF9UT19JTlQzMih4KQ0KICNkZWZpbmUgQ09OVkVSVF9JTlRfVE9fSkxPTkcoeCkgVEFS
R0VUX05BVElWRV9NQVRIX0lOVF9JTlQzMl9UT19JTlQ2NCh4KQ0KIA0KLS8vIEZJWE1FOiBUaGlz
IGNhbid0IGJlIHJpZ2h0LiAgTmVlZCBjb252ZXJ0ZXIgbWFjcm9zDQorLyogRklYTUU6IFRoaXMg
Y2FuJ3QgYmUgcmlnaHQuICBOZWVkIGNvbnZlcnRlciBtYWNyb3MgKi8NCiAjZGVmaW5lIENPTlZF
UlRfSkxPTkdfVE9fT0ZGX1QoeCkgVEFSR0VUX05BVElWRV9NQVRIX0lOVF9JTlQ2NF9UT19JTlQz
Mih4KQ0KICNkZWZpbmUgQ09OVkVSVF9PRkZfVF9UT19KTE9ORyh4KSBUQVJHRVRfTkFUSVZFX01B
VEhfSU5UX0lOVDMyX1RPX0lOVDY0KHgpDQogDQotLy8gRklYTUU6IFRoaXMgY2FuJ3QgYmUgcmln
aHQuICBOZWVkIGNvbnZlcnRlciBtYWNyb3MNCisvKiBGSVhNRTogVGhpcyBjYW4ndCBiZSByaWdo
dC4gIE5lZWQgY29udmVydGVyIG1hY3JvcyAqLw0KICNkZWZpbmUgQ09OVkVSVF9KSU5UX1RPX0lO
VCh4KSAoKGludCkoeCAmIDB4RkZGRkZGRkYpKQ0KICNkZWZpbmUgQ09OVkVSVF9JTlRfVE9fSklO
VCh4KSAoKGludCkoeCAmIDB4RkZGRkZGRkYpKQ0KIA0KLS8vIEZJWE1FOiBUaGlzIGNhbid0IGJl
IHJpZ2h0LiAgTmVlZCBjb252ZXJ0ZXIgbWFjcm9zDQorLyogRklYTUU6IFRoaXMgY2FuJ3QgYmUg
cmlnaHQuICBOZWVkIGNvbnZlcnRlciBtYWNyb3MgKi8NCiAjZGVmaW5lIENPTlZFUlRfU1NJWkVf
VF9UT19KSU5UKHgpICgoamludCkoeCAmIDB4RkZGRkZGRkYpKQ0KICNkZWZpbmUgQ09OVkVSVF9K
SU5UX1RPX1NTSVpFX1QoeCkgKHgpDQogDQpAQCAtNDIwLDcgKzQyMCw3IEBADQogICAgICAgcmV0
dXJuKDApOw0KICAgICB9DQogDQotLy8gRklYTUUgTllJID8/PyB3aHkgb25seSBqaW50IGFuZCBu
b3Qgamxvbmc/DQorLyogRklYTUUgTllJID8/PyB3aHkgb25seSBqaW50IGFuZCBub3Qgamxvbmc/
ICovDQogICByZXR1cm4oVEFSR0VUX05BVElWRV9NQVRIX0lOVF9JTlQ2NF9UT19JTlQzMihieXRl
c19hdmFpbGFibGUpKTsNCiB9DQogDQpJbmRleDogbmF0aXZlL2puaS9qYXZhLWlvL2phdmFfaW9f
RmlsZS5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0
aC9uYXRpdmUvam5pL2phdmEtaW8vamF2YV9pb19GaWxlLmMsdg0KcmV0cmlldmluZyByZXZpc2lv
biAxLjEyDQpkaWZmIC11IC1yMS4xMiBqYXZhX2lvX0ZpbGUuYw0KLS0tIG5hdGl2ZS9qbmkvamF2
YS1pby9qYXZhX2lvX0ZpbGUuYwkyOSBNYXIgMjAwNCAwNzowNzoyNyAtMDAwMAkxLjEyDQorKysg
bmF0aXZlL2puaS9qYXZhLWlvL2phdmFfaW9fRmlsZS5jCTkgQXByIDIwMDQgMTM6NDY6MzcgLTAw
MDANCkBAIC0xLDUgKzEsNSBAQA0KIC8qIEZpbGUuYyAtIE5hdGl2ZSBtZXRob2RzIGZvciBqYXZh
LmlvLkZpbGUgY2xhc3MNCi0gICBDb3B5cmlnaHQgKEMpIDE5OTggRnJlZSBTb2Z0d2FyZSBGb3Vu
ZGF0aW9uLCBJbmMuDQorICAgQ29weXJpZ2h0IChDKSAxOTk4LCAyMDA0IEZyZWUgU29mdHdhcmUg
Rm91bmRhdGlvbiwgSW5jLg0KIA0KIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBDbGFzc3BhdGgu
DQogDQpAQCAtODEsNyArODEsNyBAQA0KICAgVEFSR0VUX05BVElWRV9GSUxFX09QRU5fQ1JFQVRF
KGZpbGVuYW1lLGZkLHJlc3VsdCk7DQogICBpZiAocmVzdWx0ICE9IFRBUkdFVF9OQVRJVkVfT0sp
DQogICAgIHsNCi0vLz8/PyBOWUkNCisgICAgICAvKiBYWFggPz8/IE5ZSSAqLw0KICAgICAgIGlm
IChlcnJubyAhPSBFRVhJU1QpDQogICAgICAgICBKQ0xfVGhyb3dFeGNlcHRpb24oZW52LA0KICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICJqYXZhL2lvL0lPRXhjZXB0aW9uIiwNCkluZGV4OiBu
YXRpdmUvam5pL2phdmEtaW8vamF2YWlvLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9jbGFzc3BhdGgvY2xhc3NwYXRoL25hdGl2ZS9qbmkvamF2YS1pby9qYXZhaW8uYyx2DQpyZXRy
aWV2aW5nIHJldmlzaW9uIDEuMTENCmRpZmYgLXUgLXIxLjExIGphdmFpby5jDQotLS0gbmF0aXZl
L2puaS9qYXZhLWlvL2phdmFpby5jCTI5IE1hciAyMDA0IDA3OjA3OjI3IC0wMDAwCTEuMTENCisr
KyBuYXRpdmUvam5pL2phdmEtaW8vamF2YWlvLmMJOSBBcHIgMjAwNCAxMzo0NjozNyAtMDAwMA0K
QEAgLTEsNSArMSw1IEBADQogLyogamF2YWlvLmMgLSBDb21tb24gamF2YS5pbyBuYXRpdmUgZnVu
Y3Rpb25zDQotICAgQ29weXJpZ2h0IChDKSAxOTk4LCAyMDAyIEZyZWUgU29mdHdhcmUgRm91bmRh
dGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykgMTk5OCwgMjAwMiwgMjAwNCBGcmVlIFNvZnR3
YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3Nw
YXRoLg0KIA0KQEAgLTY0LDcgKzY0LDYgQEANCiAgIGludCAgICAgICAgZmQ7DQogICBpbnQgICAg
ICAgIHJlc3VsdDsNCiANCi0vLyBmcHJpbnRmKHN0ZGVyciwiY2FsbCAlcyAobGluZSAlZCk6XG4i
LF9fRlVOQ1RJT05fXyxfX0xJTkVfXyk7DQogICBmaWxlbmFtZSA9IEpDTF9qc3RyaW5nX3RvX2Nz
dHJpbmcoZW52LCBuYW1lKTsgDQogICBpZiAoZmlsZW5hbWUgPT0gTlVMTCkNCiAgICAgcmV0dXJu
KC0xKTsNCkBAIC0xMDEsNyArMTAwLDYgQEANCiAgIGludCAgICAgICAgZmQ7DQogICBpbnQgICAg
ICAgIHJlc3VsdDsNCiANCi0vLyBmcHJpbnRmKHN0ZGVyciwiY2FsbCAlcyAobGluZSAlZCk6XG4i
LF9fRlVOQ1RJT05fXyxfX0xJTkVfXyk7DQogICBmaWxlbmFtZSA9IEpDTF9qc3RyaW5nX3RvX2Nz
dHJpbmcoZW52LCBuYW1lKTsgDQogICBpZiAoZmlsZW5hbWUgPT0gTlVMTCkNCiAgICAgcmV0dXJu
KC0xKTsNCkBAIC0xNjMsNyArMTYxLDYgQEANCiAgIGpsb25nIGN1cnJlbnRfb2Zmc2V0LCBuZXdf
b2Zmc2V0Ow0KICAgaW50ICAgcmVzdWx0Ow0KIA0KLS8vIGZwcmludGYoc3RkZXJyLCJjYWxsICVz
IChsaW5lICVkKTpcbiIsX19GVU5DVElPTl9fLF9fTElORV9fKTsNCiAgIFRBUkdFVF9OQVRJVkVf
RklMRV9TRUVLX0NVUlJFTlQoZmQsVEFSR0VUX05BVElWRV9NQVRIX0lOVF9JTlQ2NF9DT05TVF8w
LGN1cnJlbnRfb2Zmc2V0LHJlc3VsdCk7DQogICBpZiAocmVzdWx0ICE9IFRBUkdFVF9OQVRJVkVf
T0spDQogICAgIEpDTF9UaHJvd0V4Y2VwdGlvbihlbnYsDQpAQCAtMTk1LDcgKzE5Miw2IEBADQog
ICBqbG9uZyBsZW5ndGg7DQogICBpbnQgICByZXN1bHQ7DQogDQotLy8gZnByaW50ZihzdGRlcnIs
ImNhbGwgJXMgKGxpbmUgJWQpOlxuIixfX0ZVTkNUSU9OX18sX19MSU5FX18pOw0KICAgVEFSR0VU
X05BVElWRV9GSUxFX1NJWkUoZmQsbGVuZ3RoLHJlc3VsdCk7DQogICBpZiAocmVzdWx0ICE9IFRB
UkdFVF9OQVRJVkVfT0spDQogICAgIHsNCkBAIC0yMjksNyArMjI1LDYgQEANCiAgIGFzc2VydChv
ZmZzZXQ+PTApOw0KICAgYXNzZXJ0KGxlbj49MCk7DQogDQotLy8gZnByaW50ZihzdGRlcnIsImNh
bGwgJXMgKGxpbmUgJWQpOlxuIixfX0ZVTkNUSU9OX18sX19MSU5FX18pOw0KICAgaWYgKGxlbiA9
PSAwKQ0KICAgICByZXR1cm4gMDsgLyogTm90aGluZyB0b2RvLCBhbmQgR2V0Qnl0ZUFycmF5RWxl
bWVudHMoKSBzZWVtcyB1bmRlZmluZWQuICovDQogDQpAQCAtMjU4LDcgKzI1Myw2IEBADQogICBh
c3NlcnQob2Zmc2V0Pj0wKTsNCiAgIGFzc2VydChsZW4+PTApOw0KIA0KLS8vIGZwcmludGYoc3Rk
ZXJyLCJjYWxsICVzIChsaW5lICVkKTpcbiIsX19GVU5DVElPTl9fLF9fTElORV9fKTsNCiAgIGlm
ICgoZmQ9PTApIHx8IChmZD09MSkgfHwgKGZkPT0yKSkNCiAgIHsNCiAgICAgaWYgKGxlbiA9PSAw
KQ0KSW5kZXg6IG5hdGl2ZS9qbmkvamF2YS1uZXQvamF2YW5ldC5jDQo9PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg
ZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9uYXRpdmUvam5pL2phdmEtbmV0L2ph
dmFuZXQuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTUNCmRpZmYgLXUgLXIxLjE1IGphdmFu
ZXQuYw0KLS0tIG5hdGl2ZS9qbmkvamF2YS1uZXQvamF2YW5ldC5jCTI5IE1hciAyMDA0IDA3OjA3
OjM5IC0wMDAwCTEuMTUNCisrKyBuYXRpdmUvam5pL2phdmEtbmV0L2phdmFuZXQuYwk5IEFwciAy
MDA0IDEzOjQ2OjM4IC0wMDAwDQpAQCAtMSw1ICsxLDUgQEANCiAvKiBqYXZhbmV0LmMgLSBDb21t
b24gaW50ZXJuYWwgZnVuY3Rpb25zIGZvciB0aGUgamF2YS5uZXQgcGFja2FnZQ0KLSAgIENvcHly
aWdodCAoQykgMTk5OCwgMjAwMiBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCisgICBD
b3B5cmlnaHQgKEMpIDE5OTgsIDIwMDIsIDIwMDQgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJ
bmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIENsYXNzcGF0aC4NCiANCkBAIC02ODEs
NyArNjgxLDcgQEANCiAgICAgfQ0KICAgREJHKCJfamF2YW5ldF9iaW5kKCk6IFBhc3QgbmF0aXZl
X2ZkIGxvb2t1cFxuIik7DQogDQotLy8gTllJID8/Pw0KKyAgLyogWFhYIE5ZSSA/Pz8gKi8NCiAg
IF9qYXZhbmV0X3NldF9vcHRpb24gKGVudiwgdGhpcywgU09DS09QVF9TT19SRVVTRUFERFIsIA0K
IAkJICAgICAgIF9qYXZhbmV0X2NyZWF0ZV9ib29sZWFuIChlbnYsIEpOSV9UUlVFKSk7DQogDQpA
QCAtMTA5OSw3ICsxMDk5LDggQEANCiANCiAgICAgICAgIFRBUkdFVF9OQVRJVkVfTkVUV09SS19T
T0NLRVRfU0VUX09QVElPTl9TT19USU1FT1VUKGZkLG9wdHZhbCxyZXN1bHQpOw0KICNlbmRpZg0K
LQlyZXN1bHQgPSBUQVJHRVRfTkFUSVZFX09LOyAgLy8gaWdub3JlIGVycm9ycyBhbmQgZG8gbm90
IHRocm93IGFuIGV4Y2VwdGlvbg0KKwkvKiBpZ25vcmUgZXJyb3JzIGFuZCBkbyBub3QgdGhyb3cg
YW4gZXhjZXB0aW9uLiAqLw0KKwlyZXN1bHQgPSBUQVJHRVRfTkFUSVZFX09LOw0KICAgICAgICAg
YnJlYWs7DQogDQogICAgICAgY2FzZSBTT0NLT1BUX1NPX1NOREJVRjoNCkluZGV4OiBuYXRpdmUv
am5pL2phdmEtbmlvL2dudV9qYXZhX25pb19jaGFubmVsc19GaWxlQ2hhbm5lbEltcGwuYw0KPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvbmF0aXZlL2pu
aS9qYXZhLW5pby9nbnVfamF2YV9uaW9fY2hhbm5lbHNfRmlsZUNoYW5uZWxJbXBsLmMsdg0KcmV0
cmlldmluZyByZXZpc2lvbiAxLjENCmRpZmYgLXUgLXIxLjEgZ251X2phdmFfbmlvX2NoYW5uZWxz
X0ZpbGVDaGFubmVsSW1wbC5jDQotLS0gbmF0aXZlL2puaS9qYXZhLW5pby9nbnVfamF2YV9uaW9f
Y2hhbm5lbHNfRmlsZUNoYW5uZWxJbXBsLmMJOCBBcHIgMjAwNCAyMDowNDoxMyAtMDAwMAkxLjEN
CisrKyBuYXRpdmUvam5pL2phdmEtbmlvL2dudV9qYXZhX25pb19jaGFubmVsc19GaWxlQ2hhbm5l
bEltcGwuYwk5IEFwciAyMDA0IDEzOjQ2OjM4IC0wMDAwDQpAQCAtNzQsMTkgKzc0LDE5IEBADQog
DQogI2RlZmluZSBJT19FWENFUFRJT04gImphdmEvaW8vSU9FeGNlcHRpb24iDQogDQotLy8gRklY
TUU6IFRoaXMgY2FuJ3QgYmUgcmlnaHQuICBOZWVkIGNvbnZlcnRlciBtYWNyb3MNCisvKiBGSVhN
RTogVGhpcyBjYW4ndCBiZSByaWdodC4gIE5lZWQgY29udmVydGVyIG1hY3Jvcy4gKi8NCiAjZGVm
aW5lIENPTlZFUlRfSkxPTkdfVE9fSU5UKHgpIFRBUkdFVF9OQVRJVkVfTUFUSF9JTlRfSU5UNjRf
VE9fSU5UMzIoeCkNCiAjZGVmaW5lIENPTlZFUlRfSU5UX1RPX0pMT05HKHgpIFRBUkdFVF9OQVRJ
VkVfTUFUSF9JTlRfSU5UMzJfVE9fSU5UNjQoeCkNCiANCi0vLyBGSVhNRTogVGhpcyBjYW4ndCBi
ZSByaWdodC4gIE5lZWQgY29udmVydGVyIG1hY3Jvcw0KKy8qIEZJWE1FOiBUaGlzIGNhbid0IGJl
IHJpZ2h0LiAgTmVlZCBjb252ZXJ0ZXIgbWFjcm9zLiAqLw0KICNkZWZpbmUgQ09OVkVSVF9KTE9O
R19UT19PRkZfVCh4KSBUQVJHRVRfTkFUSVZFX01BVEhfSU5UX0lOVDY0X1RPX0lOVDMyKHgpDQog
I2RlZmluZSBDT05WRVJUX09GRl9UX1RPX0pMT05HKHgpIFRBUkdFVF9OQVRJVkVfTUFUSF9JTlRf
SU5UMzJfVE9fSU5UNjQoeCkNCiANCi0vLyBGSVhNRTogVGhpcyBjYW4ndCBiZSByaWdodC4gIE5l
ZWQgY29udmVydGVyIG1hY3Jvcw0KKy8qIEZJWE1FOiBUaGlzIGNhbid0IGJlIHJpZ2h0LiAgTmVl
ZCBjb252ZXJ0ZXIgbWFjcm9zICovDQogI2RlZmluZSBDT05WRVJUX0pJTlRfVE9fSU5UKHgpICgo
aW50KSh4ICYgMHhGRkZGRkZGRikpDQogI2RlZmluZSBDT05WRVJUX0lOVF9UT19KSU5UKHgpICgo
aW50KSh4ICYgMHhGRkZGRkZGRikpDQogDQotLy8gRklYTUU6IFRoaXMgY2FuJ3QgYmUgcmlnaHQu
ICBOZWVkIGNvbnZlcnRlciBtYWNyb3MNCisvKiBGSVhNRTogVGhpcyBjYW4ndCBiZSByaWdodC4g
IE5lZWQgY29udmVydGVyIG1hY3Jvcy4gKi8NCiAjZGVmaW5lIENPTlZFUlRfU1NJWkVfVF9UT19K
SU5UKHgpICgoamludCkoeCAmIDB4RkZGRkZGRkYpKQ0KICNkZWZpbmUgQ09OVkVSVF9KSU5UX1RP
X1NTSVpFX1QoeCkgKHgpDQogDQpAQCAtMjUzLDcgKzI1Myw3IEBADQogICAgICAgcmV0dXJuIDA7
DQogICAgIH0NCiANCi0gIC8vIEZJWE1FIE5ZSSA/Pz8gd2h5IG9ubHkgamludCBhbmQgbm90IGps
b25nPw0KKyAgLyogRklYTUUgTllJID8/PyB3aHkgb25seSBqaW50IGFuZCBub3Qgamxvbmc/ICov
DQogICByZXR1cm4gVEFSR0VUX05BVElWRV9NQVRIX0lOVF9JTlQ2NF9UT19JTlQzMihieXRlc19h
dmFpbGFibGUpOw0KIH0NCiANCkluZGV4OiBuYXRpdmUvdGFyZ2V0L2dlbmVyaWMvdGFyZ2V0X2dl
bmVyaWNfZmlsZS5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2Ns
YXNzcGF0aC9uYXRpdmUvdGFyZ2V0L2dlbmVyaWMvdGFyZ2V0X2dlbmVyaWNfZmlsZS5oLHYNCnJl
dHJpZXZpbmcgcmV2aXNpb24gMS4xNQ0KZGlmZiAtdSAtcjEuMTUgdGFyZ2V0X2dlbmVyaWNfZmls
ZS5oDQotLS0gbmF0aXZlL3RhcmdldC9nZW5lcmljL3RhcmdldF9nZW5lcmljX2ZpbGUuaAkyOSBN
YXIgMjAwNCAwNzowNzo0MCAtMDAwMAkxLjE1DQorKysgbmF0aXZlL3RhcmdldC9nZW5lcmljL3Rh
cmdldF9nZW5lcmljX2ZpbGUuaAk5IEFwciAyMDA0IDEzOjQ2OjM4IC0wMDAwDQpAQCAtMSw1ICsx
LDUgQEANCi0vKiBnZW5lcmljX21hdGhfaW50NjQuaCAtIE5hdGl2ZSBtZXRob2RzIGZvciA2NGJp
dCBtYXRoIG9wZXJhdGlvbnMNCi0gICBDb3B5cmlnaHQgKEMpIDE5OTggRnJlZSBTb2Z0d2FyZSBG
b3VuZGF0aW9uLCBJbmMuDQorLyogdGFyZ2V0X2dlbmVyaWNfZmlsZSAtIE5hdGl2ZSBtZXRob2Rz
IGZvciBmaWxlIG9wZXJhdGlvbnMNCisgICBDb3B5cmlnaHQgKEMpIDE5OTgsIDIwMDQgRnJlZSBT
b2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIENs
YXNzcGF0aC4NCiANCkBAIC03OTUsNyArNzk1LDcgQEANCiAqIE5vdGVzICAgICAgOiAtDQogXCoq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqLw0KIA0KLS8vPz8/IG5hbWUgYWxzIGJ1ZmZlcj8NCisvKiBYWFggPz8/IG5h
bWUgYWxzIGJ1ZmZlcj8gKi8NCiAjaWZuZGVmIFRBUkdFVF9OQVRJVkVfRklMRV9SRUFEX0RJUg0K
ICAgI2luY2x1ZGUgPHN5cy90eXBlcy5oPg0KICAgI2luY2x1ZGUgPGRpcmVudC5oPg0KSW5kZXg6
IG5hdGl2ZS90YXJnZXQvZ2VuZXJpYy90YXJnZXRfZ2VuZXJpY19uZXR3b3JrLmgNCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL25hdGl2ZS90YXJnZXQv
Z2VuZXJpYy90YXJnZXRfZ2VuZXJpY19uZXR3b3JrLmgsdg0KcmV0cmlldmluZyByZXZpc2lvbiAx
LjEwDQpkaWZmIC11IC1yMS4xMCB0YXJnZXRfZ2VuZXJpY19uZXR3b3JrLmgNCi0tLSBuYXRpdmUv
dGFyZ2V0L2dlbmVyaWMvdGFyZ2V0X2dlbmVyaWNfbmV0d29yay5oCTI5IE1hciAyMDA0IDA3OjA3
OjQwIC0wMDAwCTEuMTANCisrKyBuYXRpdmUvdGFyZ2V0L2dlbmVyaWMvdGFyZ2V0X2dlbmVyaWNf
bmV0d29yay5oCTkgQXByIDIwMDQgMTM6NDY6MzggLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0KLS8q
IGdlbmVyaWNfbWF0aF9pbnQ2NC5oIC0gTmF0aXZlIG1ldGhvZHMgZm9yIDY0Yml0IG1hdGggb3Bl
cmF0aW9ucw0KLSAgIENvcHlyaWdodCAoQykgMTk5OCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24s
IEluYy4NCisvKiB0YXJnZXRfZ2VuZXJpY19uZXR3b3JrLmggLSBOYXRpdmUgbWV0aG9kcyBmb3Ig
bmV0d29yayBvcGVyYXRpb25zLg0KKyAgIENvcHlyaWdodCAoQykgMTk5OCwgMjAwNCBGcmVlIFNv
ZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xh
c3NwYXRoLg0KIA0KQEAgLTE0Myw3ICsxNDMsNyBAQA0KICogTm90ZXMgICAgICA6IC0NCiBcKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovDQogDQotLy9OWUk/Pz8gcmVlbnRyYW50Pw0KKy8qIFhYWCBOWUk/Pz8gcmVl
bnRyYW50PyAqLw0KICNpZm5kZWYgVEFSR0VUX05BVElWRV9ORVRXT1JLX0dFVF9IT1NUTkFNRV9C
WV9BRERSRVNTDQogICAjaW5jbHVkZSA8bmV0ZGIuaD4NCiAgICNkZWZpbmUgVEFSR0VUX05BVElW
RV9ORVRXT1JLX0dFVF9IT1NUTkFNRV9CWV9BRERSRVNTKGFkZHJlc3MsbmFtZSxtYXhOYW1lTGVu
LHJlc3VsdCkgXA0KQEAgLTE4MSw3ICsxODEsNyBAQA0KICogTm90ZXMgICAgICA6IC0NCiBcKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovDQogDQotLy9OWUk/Pz8gcmVlbnRyYW50Pw0KKy8qIFhYWCBOWUk/Pz8gcmVl
bnRyYW50PyAqLw0KICNpZm5kZWYgVEFSR0VUX05BVElWRV9ORVRXT1JLX0dFVF9IT1NUTkFNRV9C
WV9OQU1FDQogICAjaW5jbHVkZSA8bmV0ZGIuaD4NCiAgICNkZWZpbmUgVEFSR0VUX05BVElWRV9O
RVRXT1JLX0dFVF9IT1NUTkFNRV9CWV9OQU1FKG5hbWUsYWRkcmVzc2VzLG1heEFkZHJlc3NTaXpl
LGFkZHJlc3NDb3VudCxyZXN1bHQpIFwNCkBAIC0zMTcsNyArMzE3LDcgQEANCiAqIE5vdGVzICAg
ICAgOiAtDQogXCoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqLw0KIA0KLS8vPz8/IGFkZHJlc3MgaW4gbmV0d29yayBi
eXRlIG9yZGVyPw0KKy8qIFhYWCA/Pz8gYWRkcmVzcyBpbiBuZXR3b3JrIGJ5dGUgb3JkZXI/ICov
DQogI2lmbmRlZiBUQVJHRVRfTkFUSVZFX05FVFdPUktfU09DS0VUX0JJTkQNCiAgICNpbmNsdWRl
IDxzeXMvdHlwZXMuaD4NCiAgICNpbmNsdWRlIDxzeXMvc29ja2V0Lmg+DQpAQCAtMzQ3LDcgKzM0
Nyw3IEBADQogKiBOb3RlcyAgICAgIDogLQ0KIFwqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8NCiANCi0vLz8/PyBh
ZGRyZXNzIGluIG5ldHdvcmsgYnl0ZSBvcmRlcj8NCisvKiBYWFggPz8/IGFkZHJlc3MgaW4gbmV0
d29yayBieXRlIG9yZGVyPyAqLw0KICNpZm5kZWYgVEFSR0VUX05BVElWRV9ORVRXT1JLX1NPQ0tF
VF9MSVNURU4NCiAgICNpbmNsdWRlIDxzeXMvc29ja2V0Lmg+DQogICAjZGVmaW5lIFRBUkdFVF9O
QVRJVkVfTkVUV09SS19TT0NLRVRfTElTVEVOKHNvY2tldERlc2NyaXB0b3IsbWF4UXVldWVMZW5n
dGgscmVzdWx0KSBcDQpAQCAtMzY3LDcgKzM2Nyw3IEBADQogKiBOb3RlcyAgICAgIDogLQ0KIFwq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKi8NCiANCi0vLz8/PyBhZGRyZXNzIGluIG5ldHdvcmsgYnl0ZSBvcmRlcj8N
CisvKiBYWFggPz8/IGFkZHJlc3MgaW4gbmV0d29yayBieXRlIG9yZGVyPyAqLw0KICNpZm5kZWYg
VEFSR0VUX05BVElWRV9ORVRXT1JLX1NPQ0tFVF9BQ0NFUFQNCiAgICNpbmNsdWRlIDxzeXMvdHlw
ZXMuaD4NCiAgICNpbmNsdWRlIDxzeXMvc29ja2V0Lmg+DQo=

--=-GFnIigbj9t+4bJyKnC/X--

--=-C2pOg3TdBCmueGgsjJEH
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)

iD8DBQBAdq0JxVhZCJWr9QwRAnLCAJ93+XR96Z5FYc1ZuznJ2Y+m/tzsrACgiajS
mkr6Szl8MK3RuptofDjlQW4=
=QIM2
-----END PGP SIGNATURE-----

--=-C2pOg3TdBCmueGgsjJEH--




From MAILER-DAEMON Fri Apr 09 10:44:33 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBxFB-0004h8-Cx
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 10:44:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBxDD-000486-Bv
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:42:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBxBg-0003TD-WD
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:41:28 -0400
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBxB1-0002pD-N8
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:40:15 -0400
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Fri, 9 Apr 2004 16:40:10 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADD7F@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: FileDescriptor
Thread-Index: AcQeQI9k8Hltyd0FSzuRocHp8irnYg==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "commit-classpath" <commit-classpath@gnu.org>
Subject: FYI: Patch: FileDescriptor
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 14:44:32 -0000

Hi,

Committed.

Regards,
Jeroen

2004-04-09  Jeroen Frijters  <jeroen@frijters.net>

        * java/io/FileDescriptor.java (FileDescriptor): Added public
        constructor. (valid): Added null check.

Index: java/io/FileDescriptor.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/FileDescriptor.java,v
retrieving revision 1.21
diff -u -r1.21 FileDescriptor.java
--- java/io/FileDescriptor.java	8 Apr 2004 20:04:12 -0000	1.21
+++ java/io/FileDescriptor.java	9 Apr 2004 13:38:14 -0000
@@ -83,6 +83,14 @@
   /**
    * This method is used to initialize an invalid FileDescriptor
object.
    */
+  public FileDescriptor()
+  {
+    channel =3D null;
+  }
+
+  /**
+   * This method is used to initialize a FileDescriptor object.
+   */
   FileDescriptor(ByteChannel channel)
   {
     this.channel =3D channel;
@@ -125,6 +133,6 @@
    */
   public boolean valid ()
   {
-    return channel.isOpen();
+    return channel !=3D null && channel.isOpen();
   }
 }



From MAILER-DAEMON Fri Apr 09 10:47:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBxIF-0006RL-CB
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 10:47:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBxID-0006PT-9i
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:47:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBxHh-00066P-BD
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:47:40 -0400
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBxHg-000649-RC
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:47:08 -0400
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Fri, 9 Apr 2004 16:45:56 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADD80@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: FileChannelImpl
Thread-Index: AcQeQV1V4kwlr5bTTeCVUqNYALcArQ==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "commit-classpath" <commit-classpath@gnu.org>
Subject: FYI: Patch: FileChannelImpl
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 14:47:41 -0000

Hi,

Committed.

Regards,
Jeroen

2004-04-09  Jeroen Frijters  <jeroen@frijters.net>

        * gnu/java/nio/channels/FileChannelImpl.java (fd, mode): Made
private.
        (length, pos): Removed. (FileChannelImpl (int, int)): Removed.
        (implPosition, seek, implTruncate, unlock, lock): Added throws
clause.

Index: gnu/java/nio/channels/FileChannelImpl.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/nio/channels/FileChannelImpl.java,
v
retrieving revision 1.1
diff -u -r1.1 FileChannelImpl.java
--- gnu/java/nio/channels/FileChannelImpl.java	8 Apr 2004 20:04:12
-0000	1.1
+++ gnu/java/nio/channels/FileChannelImpl.java	9 Apr 2004 13:20:20
-0000
@@ -97,11 +97,9 @@
   // However, this is necessary because if open() throws an exception
   // we want to make sure this has the value -1.  This is the most
   // efficient way to accomplish that.
-  int fd =3D -1;
+  private int fd =3D -1;
=20
-  int mode;
-  int length;
-  long pos;
+  private int mode;
=20
   public FileChannelImpl ()
   {
@@ -120,19 +118,12 @@
=20
   private native int open (String path, int mode) throws
FileNotFoundException;
=20
-  /** Attach to an already-opened file.  */
-  public FileChannelImpl (int desc, int mode)
-  {
-    fd =3D desc;
-    this.mode =3D mode;
-  }
-
   public native int available () throws IOException;
-  private native long implPosition ();
-  private native void seek (long newPosition);
-  private native void implTruncate (long size);
+  private native long implPosition () throws IOException;
+  private native void seek (long newPosition) throws IOException;
+  private native void implTruncate (long size) throws IOException;
  =20
-  public native void unlock (long pos, long len);
+  public native void unlock (long pos, long len) throws IOException;
=20
   public native long size () throws IOException;
    =20
@@ -356,7 +347,7 @@
    * Otherwise return false.
    */
   private native boolean lock(long position, long size,
-			      boolean shared, boolean wait);
+			      boolean shared, boolean wait) throws
IOException;
  =20
   public FileLock lock (long position, long size, boolean shared)
     throws IOException



From MAILER-DAEMON Fri Apr 09 10:55:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBxPr-0001hs-IP
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 10:55:35 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBxPo-0001gF-6p
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:55:32 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBxNe-00010i-G3
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:53:49 -0400
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30)
	id 1BBxMz-0000Ve-No; Fri, 09 Apr 2004 10:52:37 -0400
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Fri, 9 Apr 2004 16:47:35 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADD81@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: URLConnection
Thread-Index: AcQeQZjcetaqHsODQVC+VFq4U9xV5A==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "commit-classpath" <commit-classpath@gnu.org>
Cc: classpath@gnu.org
Subject: FYI: Patch: URLConnection
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 14:55:33 -0000

Hi,

Committed.

Regards,
Jeroen

2004-04-09  Jeroen Frijters  <jeroen@frijters.net>

        * java/net/URLConnection.java: (setContentHandlerFactory): Fixed
        to check static field instead of argument.

Index: java/net/URLConnection.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/net/URLConnection.java,v
retrieving revision 1.24
diff -u -r1.24 URLConnection.java
--- java/net/URLConnection.java	8 Apr 2004 17:25:02 -0000	1.24
+++ java/net/URLConnection.java	9 Apr 2004 14:44:49 -0000
@@ -872,7 +872,7 @@
    */
   public static synchronized void
setContentHandlerFactory(ContentHandlerFactory factory)
   {
-    if (factory !=3D null)
+    if (URLConnection.factory !=3D null)
       throw new Error("ContentHandlerFactory already set");
=20
     // Throw an exception if an extant security mgr precludes



From MAILER-DAEMON Fri Apr 09 10:59:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBxTK-000381-Bd
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 10:59:10 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBxR3-0002EA-1S
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:56:49 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBxPk-0001ew-ON
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 10:56:00 -0400
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by monty-python.gnu.org with smtp (Exim 4.30)
	id 1BBxPj-0001dK-D0; Fri, 09 Apr 2004 10:55:27 -0400
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id 435b33c2_8a34_11d8_9a5d_00304811e8c8_10894;
	Fri, 09 Apr 2004 09:43:28 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i39ErbKq001937; 
	Fri, 9 Apr 2004 09:53:37 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i39Eracp001936;
	Fri, 9 Apr 2004 09:53:36 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404091453.i39Eracp001936@arch20m.dellroad.org>
In-Reply-To: <1081519370.13170.146.camel@elsschot.wildebeest.org>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 9 Apr 2004 09:53:36 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 14:59:09 -0000

Mark Wielaard wrote:
> OK I tested some more and here is what I came up with:
> -ansi -std=c89 -pedantic -Wall -Wno-long-long -D_POSIX_SOURCE
> -D_BSD_SOURCE
> This gives us ISO C90 pedantic ansi, but with longlong (jlong) support
> and modern POSIX and BSD C library functions/prototypes (we actually
> need fsync and ftruncate for example which aren't in ISO C 90 so the
> glibc headers wouldn't define it with the above two defines).

Haven't tried this patch but am suspicious of it.

_BSD_SOURCE is a Linux-ism and means nothing on FreeBSD. However,
_POSIX_SOURCE on FreeBSD (as it should) will have the effect of
removing all non-POSIX declarations from the #include'd namespace.

Surely Classpath uses some non-POSIX functions (otherwise why would
_BSD_SOURCE be required on Linux?), so hopes are dim on this working.

I'd prefer to not have Linux specific code in Classpath if we can
help it (the biggest offender is that Classpath won't even build
unless "make" is really "gmake").

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Fri Apr 09 11:22:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBxpc-0003zz-RJ
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 11:22:12 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBxpH-0003fr-LC
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:21:51 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBxp7-0003YQ-NS
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:21:46 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBxp6-0003Xg-MU
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:21:40 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BBxok-00021k-00; Fri, 09 Apr 2004 17:21:18 +0200
From: Mark Wielaard <mark@klomp.org>
To: Archie Cobbs <archie@dellroad.org>
In-Reply-To: <200404091453.i39Eracp001936@arch20m.dellroad.org>
References: <200404091453.i39Eracp001936@arch20m.dellroad.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-QKM8XtAYnSuiDrXPFe3p"
Message-Id: <1081524078.13170.182.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 17:21:18 +0200
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 15:22:10 -0000


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

Hi Archie,

On Fri, 2004-04-09 at 16:53, Archie Cobbs wrote:
> > This gives us ISO C90 pedantic ansi, but with longlong (jlong) support
> > and modern POSIX and BSD C library functions/prototypes (we actually
> > need fsync and ftruncate for example which aren't in ISO C 90 so the
> > glibc headers wouldn't define it with the above two defines).
>=20
> Haven't tried this patch but am suspicious of it.

Could you try it and report how well it does/doesn't work?

> _BSD_SOURCE is a Linux-ism and means nothing on FreeBSD. However,
> _POSIX_SOURCE on FreeBSD (as it should) will have the effect of
> removing all non-POSIX declarations from the #include'd namespace.
>
> Surely Classpath uses some non-POSIX functions (otherwise why would
> _BSD_SOURCE be required on Linux?), so hopes are dim on this working.

Thanks for the info, I came up with the above settings by trial and
error. I hope they are as strict as needeed. There should indeed not be
any non-POSIX-isms in the current source except when the build can
detect that it is save to use in the build environment (that is why we
use the autotools). Enabling the compiler checks (only gcc at the
moment, but that is what most people use) should help us catch such
things. I would love to hear better suggestions on gcc compiler flags
that help us with this.

My main concern was that some older GNU/Linux and BSDs distributions are
still stuck on gcc-2.95 which doesn't accept all constructs that gcc-3.x
does. The AM_CLFAGS that are set when gcc is detected should make use
aware when this happens. When all warnings are cleaned up we can even
add -Werror to make sure no new suspicious code sneaks in.

> I'd prefer to not have Linux specific code in Classpath if we can
> help it (the biggest offender is that Classpath won't even build
> unless "make" is really "gmake").

I thought automake would take care of making sure the correct make was
available/selected. If the build doesn't use gmake when it should could
you provide a patch that makes it do that? And/Or make our autotools
setup better so it doesn't depend on gmake if not necessary?

Thanks,

Mark

--=-QKM8XtAYnSuiDrXPFe3p
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)

iD8DBQBAdr9txVhZCJWr9QwRAukdAKCTMI4heNab7LSCNawO1FckvzzpqACfTPJg
xC8IOYI2DIlCZtwSbTbFD5A=
=u1zT
-----END PGP SIGNATURE-----

--=-QKM8XtAYnSuiDrXPFe3p--




From MAILER-DAEMON Fri Apr 09 11:27:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBxuH-0006LU-0A
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 11:27:01 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBxuC-0006KZ-1X
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:26:56 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBxp7-0003YZ-TL
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:22:15 -0400
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 1BBxo8-0001xD-67; Fri, 09 Apr 2004 11:20:40 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30)
	id 1BBxn0-00064y-Rs; Fri, 09 Apr 2004 11:19:30 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-018.ewetel.net
	[80.228.95.18])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i39FJEre016598;
	Fri, 9 Apr 2004 17:19:15 +0200 (MEST)
Received: from asterix.konqueror.de ([192.168.1.3])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BBwqv-0005SQ-00; Fri, 09 Apr 2004 16:19:29 +0200
From: Michael Koch <konqueror@gmx.de>
To: "Jeroen Frijters" <jeroen@sumatra.nl>,
	"commit-classpath" <commit-classpath@gnu.org>
Date: Fri, 9 Apr 2004 17:29:50 +0200
User-Agent: KMail/1.5.4
References: <788B535AB1F9CB49BB9C229372B50ACC0ADD81@LEMBU.sumatrasoftware.com>
In-Reply-To: <788B535AB1F9CB49BB9C229372B50ACC0ADD81@LEMBU.sumatrasoftware.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Description: clearsigned data
Content-Disposition: inline
Message-Id: <200404091729.51341.konqueror@gmx.de>
X-CheckCompat: OK
Cc: classpath@gnu.org
Subject: Re: FYI: Patch: URLConnection
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 15:26:57 -0000

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am Freitag, 9. April 2004 16:47 schrieb Jeroen Frijters:

> @@ -872,7 +872,7 @@
>     */
>    public static synchronized void
> setContentHandlerFactory(ContentHandlerFactory factory)
>    {
> -    if (factory != null)
> +    if (URLConnection.factory != null)
>        throw new Error("ContentHandlerFactory already set");

Thx, but how did you find this ? By reading source or using some tool?


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

iD8DBQFAdsFvWSOgCCdjSDsRAgV7AJ0ctFAlxVSYRIM3pxN+NOhuXjNc/QCfWgXp
mVHDnKiVBmIGCk+bX0Xsgk8=
=yFsJ
-----END PGP SIGNATURE-----




From MAILER-DAEMON Fri Apr 09 11:32:59 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBy01-00015f-72
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 11:32:57 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBxzx-000106-1K
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:32:53 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBxzP-0000HZ-6u
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:32:51 -0400
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30)
	id 1BBxzO-0000Bs-Rk; Fri, 09 Apr 2004 11:32:18 -0400
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Fri, 9 Apr 2004 17:32:05 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADD85@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: URLConnection
Thread-Index: AcQeRg9AyY5A85h+QiOT+mlHACnBVgAAaQhw
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "Michael Koch" <konqueror@gmx.de>,
	"commit-classpath" <commit-classpath@gnu.org>
Cc: classpath@gnu.org
Subject: RE: FYI: Patch: URLConnection
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 15:32:53 -0000

Michael Koch wrote:
> Am Freitag, 9. April 2004 16:47 schrieb Jeroen Frijters:
>=20
> > @@ -872,7 +872,7 @@
> >     */
> >    public static synchronized void
> > setContentHandlerFactory(ContentHandlerFactory factory)
> >    {
> > -    if (factory !=3D null)
> > +    if (URLConnection.factory !=3D null)
> >        throw new Error("ContentHandlerFactory already set");
>=20
> Thx, but how did you find this ? By reading source or using some tool?

I was trying to start Eclipse 3.0M8 and it barfed on this. Of course,
after I fixed that it barfed on something else ;-)

Regards,
Jeroen



From MAILER-DAEMON Fri Apr 09 11:36:28 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBy3P-0004vI-MY
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 11:36:27 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBy3M-0004to-Lw
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:36:24 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBy3E-0004pQ-Am
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:36:16 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBy3D-0004of-Va
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:36:16 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BBy2y-00023X-00; Fri, 09 Apr 2004 17:36:00 +0200
From: Mark Wielaard <mark@klomp.org>
To: Archie Cobbs <archie@dellroad.org>
In-Reply-To: <1081524078.13170.182.camel@elsschot.wildebeest.org>
References: <200404091453.i39Eracp001936@arch20m.dellroad.org>
	<1081524078.13170.182.camel@elsschot.wildebeest.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-2+gc/vnMiuPdgFOGeWPJ"
Message-Id: <1081524962.13170.191.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 17:36:02 +0200
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 15:36:25 -0000


--=-2+gc/vnMiuPdgFOGeWPJ
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Fri, 2004-04-09 at 17:21, Mark Wielaard wrote:
> On Fri, 2004-04-09 at 16:53, Archie Cobbs wrote:
> > Surely Classpath uses some non-POSIX functions (otherwise why would
> > _BSD_SOURCE be required on Linux?), so hopes are dim on this working.
>
> Thanks for the info, I came up with the above settings by trial and
> error. I hope they are as strict as needeed. There should indeed not be
> any non-POSIX-isms in the current source except when the build can
> detect that it is save to use in the build environment (that is why we
> use the autotools).

Just to make this more clear. Under ISO C 90 some newer C library
functions aren't available, so glibc correctly hides them. That is why
we need the _BSD_SOURCE defined on GNU systems when compiling with
-std=3Dc89. It will define those newer ISO C/Posix functions that came
from old BSD and GNU systems and are always available there. If there is
another flag for use with BSD systems that enable these function
declarations under strict ISO C 90 rules we must add that to the
AM_CFLAGS.

Cheers,

Mark

--=-2+gc/vnMiuPdgFOGeWPJ
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)

iD8DBQBAdsLixVhZCJWr9QwRAp4CAJ9AFRKR8JuXbfmSazyExA88Eksy6ACdHO1d
8pgc3ZUmMIucNoMgyusMb18=
=6R5S
-----END PGP SIGNATURE-----

--=-2+gc/vnMiuPdgFOGeWPJ--




From MAILER-DAEMON Fri Apr 09 11:37:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBy3x-0005Ne-Nz
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 11:37:01 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBy3s-0005Kh-OA
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:36:56 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBy3M-0004tQ-4T
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:36:55 -0400
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by monty-python.gnu.org with smtp (Exim 4.30)
	id 1BBy2n-0004Rn-OQ; Fri, 09 Apr 2004 11:35:49 -0400
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id 0a4ccff4_8a3a_11d8_83cc_00304811e8c8_17454;
	Fri, 09 Apr 2004 10:24:49 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i39FZ1Kq014289; 
	Fri, 9 Apr 2004 10:35:01 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i39FZ0RO014282;
	Fri, 9 Apr 2004 10:35:00 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404091535.i39FZ0RO014282@arch20m.dellroad.org>
In-Reply-To: <1081524078.13170.182.camel@elsschot.wildebeest.org>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 9 Apr 2004 10:35:00 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 15:36:57 -0000

Mark Wielaard wrote:
> > Haven't tried this patch but am suspicious of it.
> 
> Could you try it and report how well it does/doesn't work?

That may take me a while because my machine has gcc 2.95 and all the
wrong versions of autoxxx.

Since _POSIX_SOURCE restricts the available namespace from what it
otherwise would be, why do we need to include it at all?

> > Surely Classpath uses some non-POSIX functions (otherwise why would
> > _BSD_SOURCE be required on Linux?), so hopes are dim on this working.
> 
> Thanks for the info, I came up with the above settings by trial and
> error. I hope they are as strict as needeed. There should indeed not be
> any non-POSIX-isms in the current source except when the build can
> detect that it is save to use in the build environment (that is why we
> use the autotools).

Then how about making the autotools not add the -D_POSIX_SOURCE flag unless
it detects that there is no need to use any non-POSIX functions. But my
guess is reliably determining this condition could get very tedious.

> My main concern was that some older GNU/Linux and BSDs distributions are
> still stuck on gcc-2.95 which doesn't accept all constructs that gcc-3.x
> does. The AM_CLFAGS that are set when gcc is detected should make use
> aware when this happens. When all warnings are cleaned up we can even
> add -Werror to make sure no new suspicious code sneaks in.

Not sure what you're saying, but please don't break building with gcc-2.95.

> > I'd prefer to not have Linux specific code in Classpath if we can
> > help it (the biggest offender is that Classpath won't even build
> > unless "make" is really "gmake").
> 
> I thought automake would take care of making sure the correct make was
> available/selected. If the build doesn't use gmake when it should could
> you provide a patch that makes it do that? And/Or make our autotools
> setup better so it doesn't depend on gmake if not necessary?

It's because of "sinclude $(JAVA_DEPEND)" in lib/Makefile.am. This is
not an automake command so it passes through unmodified. Unfortunately
there's no workaround that I know of (automake doesn't have a generic
include function).

In pratice this is not a major problem, we just have to specify that
gmake is required to build Classpath on non-Linux platforms; lots of
other apps have a similar requirement.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Fri Apr 09 11:52:12 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BByIe-0003AJ-G4
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 11:52:12 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BByGv-0002Xi-Gk
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:50:25 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BByFv-0001Vh-Qx
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:49:56 -0400
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by monty-python.gnu.org with smtp (Exim 4.30)
	id 1BByFv-0001UB-3s; Fri, 09 Apr 2004 11:49:23 -0400
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id e6bc2ce0_8a3b_11d8_80be_00304811e8c8_19649;
	Fri, 09 Apr 2004 10:38:08 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i39FmKKq018295; 
	Fri, 9 Apr 2004 10:48:20 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i39FmJec018290;
	Fri, 9 Apr 2004 10:48:19 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404091548.i39FmJec018290@arch20m.dellroad.org>
In-Reply-To: <1081524962.13170.191.camel@elsschot.wildebeest.org>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 9 Apr 2004 10:48:19 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 15:52:06 -0000

Mark Wielaard wrote:
> > On Fri, 2004-04-09 at 16:53, Archie Cobbs wrote:
> > > Surely Classpath uses some non-POSIX functions (otherwise why would
> > > _BSD_SOURCE be required on Linux?), so hopes are dim on this working.
> >
> > Thanks for the info, I came up with the above settings by trial and
> > error. I hope they are as strict as needeed. There should indeed not be
> > any non-POSIX-isms in the current source except when the build can
> > detect that it is save to use in the build environment (that is why we
> > use the autotools).
> 
> Just to make this more clear. Under ISO C 90 some newer C library
> functions aren't available, so glibc correctly hides them. That is why
> we need the _BSD_SOURCE defined on GNU systems when compiling with
> -std=c89. It will define those newer ISO C/Posix functions that came
> from old BSD and GNU systems and are always available there. If there is
> another flag for use with BSD systems that enable these function
> declarations under strict ISO C 90 rules we must add that to the
> AM_CFLAGS.

I'm not an expert on this stuff so my apologies if I'm confused...

First of all, it seems like -std=c89 specifies the variant of the
C language that the compiler expects, whereas _BSD_SOURCE and
_POSIX_SOURCE affect what declarations (and #define's) are included
in the namespace visible to the compiler from #include files.

So these two things seem to be orthogonal, so I don't understand what
you mean by "we need the _BSD_SOURCE defined on GNU systems when compiling
with -std=c89".

On the other hand, it would make sense if you said: "we need the _BSD_SOURCE
defined on GNU systems when compiling with _POSIX_SOURCE".

Now, back to my other question: why not just get rid of _POSIX_SOURCE?
That seems to solve the problem in all cases (unless I'm confused, which
is probably the case :-)

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Fri Apr 09 11:56:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BByMT-00048w-Ld
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 11:56:09 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BByMR-00047n-KT
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:56:07 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BByMF-00043B-6a
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:56:06 -0400
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 1BByGm-0002Jc-AG
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:50:16 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BByGa-0008HR-VZ
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 11:50:05 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BByGK-00027V-00; Fri, 09 Apr 2004 17:49:48 +0200
From: Mark Wielaard <mark@klomp.org>
To: Archie Cobbs <archie@dellroad.org>
In-Reply-To: <200404091535.i39FZ0RO014282@arch20m.dellroad.org>
References: <200404091535.i39FZ0RO014282@arch20m.dellroad.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-ZLeNf53CV2vEROzMJW99"
Message-Id: <1081525789.13170.203.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 17:49:50 +0200
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 15:56:08 -0000


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

Hi,

On Fri, 2004-04-09 at 17:35, Archie Cobbs wrote:
> Mark Wielaard wrote:
>
> > My main concern was that some older GNU/Linux and BSDs distributions ar=
e
> > still stuck on gcc-2.95 which doesn't accept all constructs that gcc-3.=
x
> > does. The AM_CLFAGS that are set when gcc is detected should make use
> > aware when this happens. When all warnings are cleaned up we can even
> > add -Werror to make sure no new suspicious code sneaks in.
>=20
> Not sure what you're saying, but please don't break building with gcc-2.9=
5.

Aha! OK, then in the end you will like my patch (even if you don't like
the c compiler flags that I currently use for it). Since the reason I
went through all the trouble was because I noticed the build was broken
for gcc-2.95. What I want to achieve with the new setup is that we
easily find out about such issues even when we use "modern" gcc-3.x. The
-ansi -std=3Dc89 -pedantic setup almost makes sure this is the case,
except for the fact that we need longlong support (so we add
-Wno-long-long) which is also supported with gcc-2.95 and we need access
to "modern" POSIX/GNU/BSD networking/file funtions like ftruncate and
fsync which are available on almost any system we care about (and when
they aren't out auto* setup should make sure the functions that do
depend on those features do work anyway (with less functionality of
course).

The side benefit will be that when we do finally add -Werror we can be
pretty sure that GNU Classpath compiles out of the box with not only
gcc-2.95 and gcc-3.x, but on almost any ISO C 90 compliant environment
(with longlong support and "modern" POSIX/GNU/BSD networking/file c
library methods).

> > I thought automake would take care of making sure the correct make was
> > available/selected. If the build doesn't use gmake when it should could
> > you provide a patch that makes it do that? And/Or make our autotools
> > setup better so it doesn't depend on gmake if not necessary?
>=20
> It's because of "sinclude $(JAVA_DEPEND)" in lib/Makefile.am. This is
> not an automake command so it passes through unmodified. Unfortunately
> there's no workaround that I know of (automake doesn't have a generic
> include function).
>=20
> In pratice this is not a major problem, we just have to specify that
> gmake is required to build Classpath on non-Linux platforms; lots of
> other apps have a similar requirement.

Could you supply a patch for INSTALL that documents this?

Thanks,

Mark

--=-ZLeNf53CV2vEROzMJW99
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)

iD8DBQBAdsYdxVhZCJWr9QwRAnhWAJ0ZKdlMEI/UwI+yekHAp/LbdJ1QTQCeNtqo
gskjz7lu4k1jWT//nT5IUwY=
=Sf1T
-----END PGP SIGNATURE-----

--=-ZLeNf53CV2vEROzMJW99--




From MAILER-DAEMON Fri Apr 09 12:06:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BByWB-0002pt-Kp
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 12:06:11 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BByW8-0002oZ-SJ
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 12:06:08 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BByVX-00027J-DZ
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 12:06:02 -0400
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by monty-python.gnu.org with smtp (Exim 4.30)
	id 1BByVW-00025h-Lx; Fri, 09 Apr 2004 12:05:30 -0400
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id 4087ac70_8a3e_11d8_9b5a_00304811e8c8_22308;
	Fri, 09 Apr 2004 10:54:58 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i39G5AKq022341; 
	Fri, 9 Apr 2004 11:05:10 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i39G59T4022340;
	Fri, 9 Apr 2004 11:05:09 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404091605.i39G59T4022340@arch20m.dellroad.org>
In-Reply-To: <1081525789.13170.203.camel@elsschot.wildebeest.org>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 9 Apr 2004 11:05:09 -0500 (CDT)
Action: 
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=ELM1081526709-22277-0_
Content-Transfer-Encoding: 7bit
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 16:06:09 -0000


--ELM1081526709-22277-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII

Mark Wielaard wrote:
> > Not sure what you're saying, but please don't break building with gcc-2.95.
> 
> Aha! OK, then in the end you will like my patch (even if you don't like
> the c compiler flags that I currently use for it). Since the reason I
> went through all the trouble was because I noticed the build was broken
> for gcc-2.95. What I want to achieve with the new setup is that we
> easily find out about such issues even when we use "modern" gcc-3.x. The
> -ansi -std=c89 -pedantic setup almost makes sure this is the case,
> except for the fact that we need longlong support (so we add
> -Wno-long-long) which is also supported with gcc-2.95 and we need access
> to "modern" POSIX/GNU/BSD networking/file funtions like ftruncate and
> fsync which are available on almost any system we care about (and when
> they aren't out auto* setup should make sure the functions that do
> depend on those features do work anyway (with less functionality of
> course).

Great! Then I'm all for it :-)

> > It's because of "sinclude $(JAVA_DEPEND)" in lib/Makefile.am. This is
> > not an automake command so it passes through unmodified. Unfortunately
> > there's no workaround that I know of (automake doesn't have a generic
> > include function).
> 
> Could you supply a patch for INSTALL that documents this?

Done.. see attached.

Thanks,
-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com

--ELM1081526709-22277-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/x-patch
Content-Disposition: attachment; filename=xx
Content-Description: 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2005
diff -u -r1.2005 ChangeLog
--- ChangeLog	9 Apr 2004 15:02:21 -0000	1.2005
+++ ChangeLog	9 Apr 2004 16:03:25 -0000
@@ -1,3 +1,7 @@
+2004-03-25  Archie Cobbs  <archie@dellroad.org>
+
+	* INSTALL: Document GNU make requirement for building.
+
 2004-04-09  Dalibor Topic  <robilad@kaffe.org>
 
 	* java/lang/SecurityManager.java: (checkAccess): Use getThreadGroup().
Index: INSTALL
===================================================================
RCS file: /cvsroot/classpath/classpath/INSTALL,v
retrieving revision 1.17
diff -u -r1.17 INSTALL
--- INSTALL	27 Jan 2004 22:00:42 -0000	1.17
+++ INSTALL	9 Apr 2004 16:03:25 -0000
@@ -11,6 +11,8 @@
 ------------------------------------------------------------------
 Suggested Software
 ------------------------------------------------------------------
+	GNU make ("gmake") is required for building Classpath.
+
 	For any build environment involving native libraries, these 
 	new versions of autoconf, automake, and libtool are required
         if changes are made that require rebuilding configure, Makefile.in,
@@ -55,10 +57,10 @@
   --enable-load-library   enable to use JNI native methods default=yes
                           (disabled automatically using --enable-cni)
 
-2).  Type "make" to build the package.  There is no longer a
+2).  Type "gmake" to build the package.  There is no longer a
 dependency problem and we aim to keep it that way.
 
-3).  Type "make install" to install everything.  This may require
+3).  Type "gmake install" to install everything.  This may require
 being the superuser. The default install path is /usr/local/classpath
 you may change it by giving configure the --prefix=<path> option.
 

--ELM1081526709-22277-0_--



From MAILER-DAEMON Fri Apr 09 12:10:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BByZx-0005RN-77
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 12:10:05 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BByZt-0005Oz-Pb
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 12:10:01 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BByZo-0005MU-Ln
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 12:09:59 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BByZn-0005LM-W8
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 12:09:56 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BByZY-0002E5-00; Fri, 09 Apr 2004 18:09:40 +0200
From: Mark Wielaard <mark@klomp.org>
To: Archie Cobbs <archie@dellroad.org>
In-Reply-To: <200404091548.i39FmJec018290@arch20m.dellroad.org>
References: <200404091548.i39FmJec018290@arch20m.dellroad.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-he+ZvarbGYo+KWbM15wr"
Message-Id: <1081526982.13170.216.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 18:09:42 +0200
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 16:10:03 -0000


--=-he+ZvarbGYo+KWbM15wr
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Fri, 2004-04-09 at 17:48, Archie Cobbs wrote:
> Now, back to my other question: why not just get rid of _POSIX_SOURCE?
> That seems to solve the problem in all cases (unless I'm confused, which
> is probably the case :-)

No, you seem to get it. I was confused during some of my earlier
experiments. gcc sets the POSIX_VERSION when -std=3Dc89 is in effect which
is why I thought I needed _POSIX_SOURCE. I am running some more tests,
but it seems you are right the we only need _BSD_SOURCE.

Thanks,

Mark

P.S. It will still not compile with gcc-2.95, but it will when all
warnings that are now produced by default are fixed. Soon, I hope.

--=-he+ZvarbGYo+KWbM15wr
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)

iD8DBQBAdsrGxVhZCJWr9QwRAqiBAJ901PuDppma2mx9+bIVxQmI2P6Q+ACgk+Ag
ppxApOuTaEANgVGwbsMg1Ds=
=OBxG
-----END PGP SIGNATURE-----

--=-he+ZvarbGYo+KWbM15wr--




From MAILER-DAEMON Fri Apr 09 12:20:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BByjZ-0008PZ-HC
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 12:20:01 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BByjV-0008O4-LT
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 12:19:57 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BByiy-0008DF-K0
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 12:19:55 -0400
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by monty-python.gnu.org with smtp (Exim 4.30)
	id 1BByix-0008Cp-Ur; Fri, 09 Apr 2004 12:19:24 -0400
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id 1bdac2d4_8a40_11d8_95fd_00304811e8c8_24804;
	Fri, 09 Apr 2004 11:08:15 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i39GIRKq022622; 
	Fri, 9 Apr 2004 11:18:27 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i39GIRVl022621;
	Fri, 9 Apr 2004 11:18:27 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404091618.i39GIRVl022621@arch20m.dellroad.org>
In-Reply-To: <1081526982.13170.216.camel@elsschot.wildebeest.org>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 9 Apr 2004 11:18:27 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 16:19:59 -0000

Mark Wielaard wrote:
> > Now, back to my other question: why not just get rid of _POSIX_SOURCE?
> > That seems to solve the problem in all cases (unless I'm confused, which
> > is probably the case :-)
> 
> No, you seem to get it. I was confused during some of my earlier
> experiments. gcc sets the POSIX_VERSION when -std=c89 is in effect which
> is why I thought I needed _POSIX_SOURCE. I am running some more tests,
> but it seems you are right the we only need _BSD_SOURCE.

Cool.. thanks for making these unglamorous but important changes.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Fri Apr 09 13:09:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBzVa-00056k-41
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 13:09:38 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBzVN-0004z2-Sj
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 13:09:25 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBzVI-0004rh-M9
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 13:09:22 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBzVH-0004qV-G9
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 13:09:19 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BBzV3-0002NG-00; Fri, 09 Apr 2004 19:09:05 +0200
From: Mark Wielaard <mark@klomp.org>
To: Dalibor Topic <robilad@kaffe.org>
In-Reply-To: <4076AC87.3060008@kaffe.org>
References: <200404081643.59869.konqueror@gmx.de>
	<1081455009.2783.122.camel@tortoise.toronto.redhat.com>
	<200404082222.18202.konqueror@gmx.de>
	<1081515746.13170.130.camel@elsschot.wildebeest.org>
	<4076AC87.3060008@kaffe.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-N0ht1NT90A2HziFD1fJg"
Message-Id: <1081530547.13170.246.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 19:09:07 +0200
Cc: commit classpath <commit-classpath@gnu.org>,
	Michael Koch <konqueror@gmx.de>
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 17:09:28 -0000


--=-N0ht1NT90A2HziFD1fJg
Content-Type: multipart/mixed; boundary="=-KufPWVJMEWsRZsuSI42M"


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

Hi,

On Fri, 2004-04-09 at 16:00, Dalibor Topic wrote:
> anyway, I thought that autoreconf took care of picking the right=20
> versions automatically. Can't we just have
>=20
> autoreconf
>=20
> in autogen.sh and be done with it?

No, because autoreconf (at least the version that comes with GNU
Autoconf 2.59 on my system) also doesn't automatically pick up the right
version :{

I added the suggestion of Michael to also test for the 1.8 versions of
these tools to make the script a little bit more robust. But it still
feel very fragile to me. How do other projects handle this if they don't
require people to just issue these commands by hand (so they can select
the right versions themselves)?

2004-04-09  Mark Wielaard  <mark@klomp.org>

        * autogen.sh: Check for explicit versions of the autotools installe=
d
        in /usr/bin.

Cheers,

Mark

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

SW5kZXg6IGF1dG9nZW4uc2gNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3Bh
dGgvY2xhc3NwYXRoL2F1dG9nZW4uc2gsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMNCmRpZmYg
LXUgLXIxLjMgYXV0b2dlbi5zaA0KLS0tIGF1dG9nZW4uc2gJOCBBcHIgMjAwNCAyMDoyMjo0MCAt
MDAwMAkxLjMNCisrKyBhdXRvZ2VuLnNoCTkgQXByIDIwMDQgMTc6MDc6MDQgLTAwMDANCkBAIC0y
LDI2ICsyLDUxIEBADQogDQogc2V0IC1lDQogDQotbGlidG9vbGl6ZSAtLXZlcnNpb24gfCBoZWFk
IC0xDQorTElCVE9PTElaRT1saWJ0b29saXplDQorJHtMSUJUT09MSVpFfSAtLXZlcnNpb24gfCBo
ZWFkIC0xDQogZWNobyAibGlidG9vbGl6ZTogbWluaW11bSB2ZXJzaW9uIHJlcXVpcmVkOiAxLjQu
MiINCi1hdXRvY29uZiAtLXZlcnNpb24gfCBoZWFkIC0xDQorDQorQVVUT0NPTkY9YXV0b2NvbmYN
Ciske0FVVE9DT05GfSAtLXZlcnNpb24gfCBoZWFkIC0xDQogZWNobyAiYXV0b2NvbmY6IG1pbmlt
dW0gdmVyc2lvbiByZXF1aXJlZDogMi41OSINCi1hdXRvbWFrZSAtLXZlcnNpb24gfCBoZWFkIC0x
DQorDQorIyBBdXRvaGVhZGVyIGlzIHBhcnQgb2YgYXV0b2NvbmYNCitBVVRPSEVBREVSPWF1dG9o
ZWFkZXINCiske0FVVE9IRUFERVJ9IC0tdmVyc2lvbiB8IGhlYWQgLTENCitlY2hvICJhdXRvaGVh
ZGVyOiBtaW5pbXVtIHZlcnNpb24gcmVxdWlyZWQ6IDIuNTkiDQorDQorQVVUT01BS0U9YXV0b21h
a2UNCitpZiB0ZXN0IC14IC91c3IvYmluL2F1dG9tYWtlLTEuODsgdGhlbg0KKyAgQVVUT01BS0U9
L3Vzci9iaW4vYXV0b21ha2UtMS44DQorZWxpZiB0ZXN0IC14IC91c3IvYmluL2F1dG9tYWtlLTEu
NzsgdGhlbg0KKyAgQVVUT01BS0U9L3Vzci9iaW4vYXV0b21ha2UtMS43DQorZmkNCiske0FVVE9N
QUtFfSAtLXZlcnNpb24gfCBoZWFkIC0xDQogZWNobyAiYXV0b21ha2U6IG1pbmltdW0gdmVyc2lv
biByZXF1aXJlZDogMS43LjAiDQogDQorIyBBY2xvY2FsIGlzIHBhcnQgb2YgYXV0b21ha2UNCitB
Q0xPQ0FMPWFjbG9jYWwNCitpZiB0ZXN0IC14IC91c3IvYmluL2FjbG9jYWwtMS44OyB0aGVuDQor
ICBBQ0xPQ0FMPS91c3IvYmluL2FjbG9jYWwtMS44DQorZWxpZiB0ZXN0IC14IC91c3IvYmluL2Fj
bG9jYWwtMS43OyB0aGVuDQorICBBQ0xPQ0FMPS91c3IvYmluL2FjbG9jYWwtMS43DQorZmkNCisk
e0FDTE9DQUx9IC0tdmVyc2lvbiB8IGhlYWQgLTENCitlY2hvICJhY2xvY2FsOiBtaW5pbXVtIHZl
cnNpb24gcmVxdWlyZWQ6IDEuNy4wIg0KKw0KIGVjaG8gImxpYnRvb2xpemUgLi4uIg0KLWxpYnRv
b2xpemUgLS1mb3JjZSAtLWNvcHkNCiske0xJQlRPT0xJWkV9IC0tZm9yY2UgLS1jb3B5DQogDQog
ZWNobyAiYWNsb2NhbCAuLi4iDQotYWNsb2NhbA0KKyR7QUNMT0NBTH0NCiANCiBlY2hvICJhdXRv
aGVhZGVyIC4uLiINCi1hdXRvaGVhZGVyIC0tZm9yY2UNCiske0FVVE9IRUFERVJ9IC0tZm9yY2UN
CiANCiBlY2hvICJhdXRvbWFrZSAuLi4iDQotYXV0b21ha2UgLS1hZGQtbWlzc2luZyAtLWNvcHkN
Ciske0FVVE9NQUtFfSAtLWFkZC1taXNzaW5nIC0tY29weQ0KIA0KIGVjaG8gImF1dG9jb25mIC4u
LiINCi1hdXRvY29uZiAtLWZvcmNlDQorJHtBVVRPQ09ORn0gLS1mb3JjZQ0KIA0KIGVjaG8gIkZp
bmlzaGVkIg0K

--=-KufPWVJMEWsRZsuSI42M--

--=-N0ht1NT90A2HziFD1fJg
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)

iD8DBQBAdtizxVhZCJWr9QwRAkTfAJwO0+WcQQU/wiBzR6dLizQvecYMfwCfdUYK
9dH3WmsZOdL5eepOhf7Uf1o=
=jwcf
-----END PGP SIGNATURE-----

--=-N0ht1NT90A2HziFD1fJg--




From MAILER-DAEMON Fri Apr 09 13:37:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BBzw2-0001Yq-UJ
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 13:36:58 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BBzvM-0000w1-0f
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 13:36:16 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BBzuT-0008Qs-7X
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 13:35:21 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BBzu3-0007u0-Ss
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 13:34:56 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BBzts-0002PW-00; Fri, 09 Apr 2004 19:34:44 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org, java-patches@gcc.gnu.org
In-Reply-To: <1081519370.13170.146.camel@elsschot.wildebeest.org>
References: <1080236148.18716.161.camel@elsschot.wildebeest.org>
	<87wu58qpmw.fsf@fleche.redhat.com>
	<1080295746.18716.463.camel@elsschot.wildebeest.org>
	<200403261128.55981.konqueror@gmx.de>
	<1080301292.18716.480.camel@elsschot.wildebeest.org>
	<871xn8h9mt.fsf@fleche.redhat.com>
	<1081118952.7548.253.camel@elsschot.wildebeest.org>
	<87ekr28gnj.fsf@fleche.redhat.com>
	<1081369536.13170.38.camel@elsschot.wildebeest.org>
	<1081519370.13170.146.camel@elsschot.wildebeest.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-LvvOse/WP618qK3FmB7N"
Message-Id: <1081532086.13170.277.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Fri, 09 Apr 2004 19:34:47 +0200
Cc: 
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 17:36:48 -0000


--=-LvvOse/WP618qK3FmB7N
Content-Type: multipart/mixed; boundary="=-V6Ug/uOCqGwYhn/ETq+m"


--=-V6Ug/uOCqGwYhn/ETq+m
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

Here is another part of the native C cleanup.

2004-04-09  Mark Wielaard  <mark@klomp.org>

        * configure.ac (AM_CFLAGS): Don't define _POSIX_SOURCE.

        * native/jni/gtk-peer/gthread-jni.c (maybe_rethrow): Explicitly
        malloc and free buf.

        * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
        (GET_NATIVE_FD): Remove macro.
        (get_native_fd): Replace GET_NATIVE_FD macro.

        * native/target/generic/target_generic_misc.h
        (TARGET_NATIVE_MISC_FORMAT_STRING): Remove unused macro.

With this I believe the only things that make the native sources
uncompilable with gcc-2.95 are the following:

../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComp=
onentPeer.c:670: warning: ISO C forbids passing arg 6 of `g_signal_handlers=
_block_matched' between function pointer and `void *'
../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComp=
onentPeer.c: In function `Java_gnu_java_awt_peer_gtk_GtkComponentPeer_remov=
eExposeFilter':
../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComp=
onentPeer.c:714: warning: ISO C forbids passing arg 6 of `g_signal_handlers=
_disconnect_matched' between function pointer and `void *'
../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComp=
onentPeer.c:716: warning: ISO C forbids passing arg 6 of `g_signal_handlers=
_unblock_matched' between function pointer and `void *'

Could one of the gtk-peer hackers look at those?
It seems just casting the argument to a gpointer fixes all, but there is
some c macro magic going on here.

BTW. There are some other interesting warnings in the gtk-peer sources.

Cheers,

Mark

--=-V6Ug/uOCqGwYhn/ETq+m
Content-Disposition: attachment; filename=cleanup.patch
Content-Type: text/x-patch; name=cleanup.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IGNvbmZpZ3VyZS5hYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNz
cGF0aC9jbGFzc3BhdGgvY29uZmlndXJlLmFjLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNQ0K
ZGlmZiAtdSAtcjEuMTUgY29uZmlndXJlLmFjDQotLS0gY29uZmlndXJlLmFjCTkgQXByIDIwMDQg
MTQ6MDQ6NDggLTAwMDAJMS4xNQ0KKysrIGNvbmZpZ3VyZS5hYwk5IEFwciAyMDA0IDE3OjMyOjI0
IC0wMDAwDQpAQCAtMTI1LDcgKzEyNSw3IEBADQogICBpZiB0ZXN0ICJ4JHtHQ0N9IiA9IHh5ZXM7
IHRoZW4NCiAgICAgZG5sIFdlIHdhbnQgSVNPIEM5MCBwZWRhbnRpYyBhbnNpLCBidXQgd2l0aCBs
b25nbG9uZyAoamxvbmcpIHN1cHBvcnQNCiAgICAgZG5sIGFuZCBtb2Rlcm4gUE9TSVggYW5kIEJT
RCBDIGxpYnJhcnkgZnVudGlvbnMvcHJvdG90eXBlcy4NCi0gICAgQU1fQ0ZMQUdTPSctYW5zaSAt
c3RkPWM4OSAtcGVkYW50aWMgLVdhbGwgLVduby1sb25nLWxvbmcgLURfUE9TSVhfU09VUkNFIC1E
X0JTRF9TT1VSQ0UnDQorICAgIEFNX0NGTEFHUz0nLWFuc2kgLXN0ZD1jODkgLXBlZGFudGljIC1X
YWxsIC1Xbm8tbG9uZy1sb25nIC1EX0JTRF9TT1VSQ0UnDQogICBmaQ0KICAgQUNfU1VCU1QoQU1f
Q0ZMQUdTKQ0KIA0KSW5kZXg6IG5hdGl2ZS9qbmkvZ3RrLXBlZXIvZ3RocmVhZC1qbmkuYw0KPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvbmF0aXZlL2pu
aS9ndGstcGVlci9ndGhyZWFkLWpuaS5jLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS45DQpkaWZm
IC11IC1yMS45IGd0aHJlYWQtam5pLmMNCi0tLSBuYXRpdmUvam5pL2d0ay1wZWVyL2d0aHJlYWQt
am5pLmMJNyBBcHIgMjAwNCAyMDoyODo1NCAtMDAwMAkxLjkNCisrKyBuYXRpdmUvam5pL2d0ay1w
ZWVyL2d0aHJlYWQtam5pLmMJOSBBcHIgMjAwNCAxNzozMjoyNCAtMDAwMA0KQEAgLTkxLDI4ICs5
MSw0MCBAQA0KIHN0YXRpYyB2b2lkIG1heWJlX3JldGhyb3coSk5JRW52ICpnZGtfZW52LCBjaGFy
ICptZXNzYWdlLCBjaGFyICpmaWxlLCBpbnQgbGluZSkgew0KICAganRocm93YWJsZSBjYXVzZTsN
CiANCi0gIC8qIHJldGhyb3cgaWYgYW4gZXhjZXB0aW9uIGhhcHBlbmVkICovDQotICBpZiAoKGNh
dXNlID0gKCpnZGtfZW52KS0+RXhjZXB0aW9uT2NjdXJyZWQoZ2RrX2VudikpICE9IE5VTEwpIHsN
CiAgICAganN0cmluZyBqbWVzc2FnZTsNCi0gIGpjbGFzcyBvYmpfY2xhc3M7DQorICAgIGpjbGFz
cyBvYmpfY2xhc3M7DQogICAgIGpvYmplY3Qgb2JqOw0KICAgICBqbWV0aG9kSUQgY3RvcjsNCisg
ICAgaW50IGxlbjsNCisgICAgY2hhciAqYnVmOw0KIA0KLSAgICAvKiBhbGxvY2F0ZSBsb2NhbCBt
ZXNzYWdlIGluIEphdmEgKi8NCi0gICAgaW50IGxlbiA9IHN0cmxlbihtZXNzYWdlKSArIHN0cmxl
bihmaWxlKSArIDI1Ow0KLSAgICBjaGFyIGJ1ZlsgbGVuIF07DQotICAgIGJ6ZXJvKGJ1ZiwgbGVu
KTsNCi0gICAgc3ByaW50ZihidWYsICIlcyAoYXQgJXM6JWQpIiwgbWVzc2FnZSwgZmlsZSwgbGlu
ZSk7DQotICAgIGptZXNzYWdlID0gKCpnZGtfZW52KS0+TmV3U3RyaW5nVVRGKGdka19lbnYsIGJ1
Zik7DQorICAgIC8qIHJldGhyb3cgaWYgYW4gZXhjZXB0aW9uIGhhcHBlbmVkICovDQorICAgIGlm
ICgoY2F1c2UgPSAoKmdka19lbnYpLT5FeGNlcHRpb25PY2N1cnJlZChnZGtfZW52KSkgIT0gTlVM
TCkNCisgICAgICB7DQorDQorCS8qIGFsbG9jYXRlIGxvY2FsIG1lc3NhZ2UgaW4gSmF2YSAqLw0K
KwlsZW4gPSBzdHJsZW4obWVzc2FnZSkgKyBzdHJsZW4oZmlsZSkgKyAyNTsNCisJYnVmID0gKGNo
YXIgKikgbWFsbG9jKGxlbik7DQorCWlmIChidWYgIT0gTlVMTCkNCisJICB7DQorCSAgICBiemVy
byhidWYsIGxlbik7DQorCSAgICBzcHJpbnRmKGJ1ZiwgIiVzIChhdCAlczolZCkiLCBtZXNzYWdl
LCBmaWxlLCBsaW5lKTsNCisJICAgIGptZXNzYWdlID0gKCpnZGtfZW52KS0+TmV3U3RyaW5nVVRG
KGdka19lbnYsIGJ1Zik7DQorCSAgICBmcmVlKGJ1Zik7DQorCSAgfQ0KKwllbHNlDQorCSAgam1l
c3NhZ2UgPSBOVUxMOw0KICAgICANCi0gICAgLyogY3JlYXRlIFJ1bnRpbWVFeGNlcHRpb24gd3Jh
cHBlciBvYmplY3QgKi8NCi0gICAgb2JqX2NsYXNzID0gKCpnZGtfZW52KS0+RmluZENsYXNzIChn
ZGtfZW52LCAiamF2YS9sYW5nL1J1bnRpbWVFeGNlcHRpb24iKTsNCi0gICAgY3RvciA9ICgqZ2Rr
X2VudiktPkdldE1ldGhvZElEKGdka19lbnYsIG9ial9jbGFzcywgIjxpbml0PiIsICIoTGphdmEv
bGFuZ1N0cmluZztMamF2YS9sYW5nL1Rocm93YWJsZSlWIik7DQotICAgIG9iaiA9ICgqZ2RrX2Vu
diktPk5ld09iamVjdCAoZ2RrX2Vudiwgb2JqX2NsYXNzLCBjdG9yLCBqbWVzc2FnZSwgY2F1c2Up
Ow0KKwkvKiBjcmVhdGUgUnVudGltZUV4Y2VwdGlvbiB3cmFwcGVyIG9iamVjdCAqLw0KKwlvYmpf
Y2xhc3MgPSAoKmdka19lbnYpLT5GaW5kQ2xhc3MgKGdka19lbnYsDQorCQkJImphdmEvbGFuZy9S
dW50aW1lRXhjZXB0aW9uIik7DQorCWN0b3IgPSAoKmdka19lbnYpLT5HZXRNZXRob2RJRChnZGtf
ZW52LCBvYmpfY2xhc3MsICI8aW5pdD4iLA0KKwkiKExqYXZhL2xhbmdTdHJpbmc7TGphdmEvbGFu
Zy9UaHJvd2FibGUpViIpOw0KKwlvYmogPSAoKmdka19lbnYpLT5OZXdPYmplY3QgKGdka19lbnYs
IG9ial9jbGFzcywgY3Rvciwgam1lc3NhZ2UsIGNhdXNlKTsNCiANCi0gICAgLyogdGhyb3cgaXQg
Ki8NCi0gICAgKCpnZGtfZW52KS0+VGhyb3coZ2RrX2VudiwgKGp0aHJvd2FibGUpb2JqKTsNCi0g
ICAgfQ0KKwkvKiB0aHJvdyBpdCAqLw0KKwkoKmdka19lbnYpLT5UaHJvdyhnZGtfZW52LCAoanRo
cm93YWJsZSlvYmopOw0KKyAgICAgIH0NCiB9DQogDQogLyogVGhpcyBtYWNybyBpcyB1c2VkIHRv
IGluY2x1ZGUgYSBzb3VyY2UgbG9jYXRpb24gaW4gdGhlIGV4Y2VwdGlvbiBtZXNzYWdlICovDQpJ
bmRleDogbmF0aXZlL2puaS9qYXZhLW5pby9nbnVfamF2YV9uaW9fY2hhbm5lbHNfRmlsZUNoYW5u
ZWxJbXBsLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3Nw
YXRoL25hdGl2ZS9qbmkvamF2YS1uaW8vZ251X2phdmFfbmlvX2NoYW5uZWxzX0ZpbGVDaGFubmVs
SW1wbC5jLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yDQpkaWZmIC11IC1yMS4yIGdudV9qYXZh
X25pb19jaGFubmVsc19GaWxlQ2hhbm5lbEltcGwuYw0KLS0tIG5hdGl2ZS9qbmkvamF2YS1uaW8v
Z251X2phdmFfbmlvX2NoYW5uZWxzX0ZpbGVDaGFubmVsSW1wbC5jCTkgQXByIDIwMDQgMTQ6MDQ6
NTAgLTAwMDAJMS4yDQorKysgbmF0aXZlL2puaS9qYXZhLW5pby9nbnVfamF2YV9uaW9fY2hhbm5l
bHNfRmlsZUNoYW5uZWxJbXBsLmMJOSBBcHIgMjAwNCAxNzozMjoyNSAtMDAwMA0KQEAgLTkwLDIx
ICs5MCwyNyBAQA0KICNkZWZpbmUgQ09OVkVSVF9TU0laRV9UX1RPX0pJTlQoeCkgKChqaW50KSh4
ICYgMHhGRkZGRkZGRikpDQogI2RlZmluZSBDT05WRVJUX0pJTlRfVE9fU1NJWkVfVCh4KSAoeCkN
CiANCi0jZGVmaW5lIEdFVF9OQVRJVkVfRkQobmF0aXZlX2ZkKQkJCQkJXA0KLSAgamNsYXNzIGNs
YXp6X2ZjID0gKCplbnYpLT5GaW5kQ2xhc3MgKGVudiwgImdudS9qYXZhL25pby9jaGFubmVscy9G
aWxlQ2hhbm5lbEltcGwiKTsgXA0KLSAgaWYgKCFjbGF6el9mYykJCQkJCQkJXA0KLSAgICB7CQkJ
CQkJCQkJXA0KLSAgICAgIEpDTF9UaHJvd0V4Y2VwdGlvbihlbnYsIElPX0VYQ0VQVElPTiwgIklu
dGVybmFsIGVycm9yIik7CQlcDQotICAgICAgbmF0aXZlX2ZkID0gLTE7CQkJCQkJCVwNCi0gICAg
fQkJCQkJCQkJCVwNCi0gIGpmaWVsZElEIGZpZWxkX2ZkID0gKCplbnYpLT5HZXRGaWVsZElEIChl
bnYsIGNsYXp6X2ZjLCAiZmQiLCAiSSIpOwlcDQotICBpZiAoIWZpZWxkX2ZkKQkJCQkJCQlcDQot
ICAgIHsJCQkJCQkJCQlcDQotICAgICAgSkNMX1Rocm93RXhjZXB0aW9uKGVudiwgSU9fRVhDRVBU
SU9OLCAiSW50ZXJuYWwgZXJyb3IiKTsJCVwNCi0gICAgICBuYXRpdmVfZmQgPSAtMTsJCQkJCQkJ
XA0KLSAgICB9CQkJCQkJCQkJXA0KLQkJCQkJCQkJCVwNCi0gIG5hdGl2ZV9mZCA9ICgqZW52KS0+
R2V0SW50RmllbGQgKGVudiwgb2JqLCBmaWVsZF9mZCk7DQorc3RhdGljIGppbnQgZ2V0X25hdGl2
ZV9mZChKTklFbnYgKmVudiwgam9iamVjdCBvYmopDQorew0KKyAgamNsYXNzIGNsYXp6X2ZjOw0K
KyAgamZpZWxkSUQgZmllbGRfZmQ7DQorDQorICBjbGF6el9mYyA9ICgqZW52KS0+RmluZENsYXNz
IChlbnYsICJnbnUvamF2YS9uaW8vY2hhbm5lbHMvRmlsZUNoYW5uZWxJbXBsIik7DQorICBpZiAo
IWNsYXp6X2ZjKQ0KKyAgICB7DQorICAgICAgSkNMX1Rocm93RXhjZXB0aW9uKGVudiwgSU9fRVhD
RVBUSU9OLCAiSW50ZXJuYWwgZXJyb3IiKTsNCisgICAgICByZXR1cm4gLTE7DQorICAgIH0NCisN
CisgIGZpZWxkX2ZkID0gKCplbnYpLT5HZXRGaWVsZElEIChlbnYsIGNsYXp6X2ZjLCAiZmQiLCAi
SSIpOw0KKyAgaWYgKCFmaWVsZF9mZCkJCQkJCQkJDQorICAgIHsJCQkJCQkJCQkNCisgICAgICBK
Q0xfVGhyb3dFeGNlcHRpb24oZW52LCBJT19FWENFUFRJT04sICJJbnRlcm5hbCBlcnJvciIpOwkJ
DQorICAgICAgcmV0dXJuIC0xOwkJCQkJCQkNCisgICAgfQkJCQkJCQkJCQ0KKw0KKyAgcmV0dXJu
ICgqZW52KS0+R2V0SW50RmllbGQgKGVudiwgb2JqLCBmaWVsZF9mZCk7DQorfQ0KIA0KIC8qDQog
ICogTGlicmFyeSBpbml0aWFsaXphdGlvbiByb3V0aW5lLiAgQ2FsbGVkIGFzIHBhcnQgb2YgamF2
YS5pby5GaWxlRGVzY3JpcHRvcg0KQEAgLTIyMiw3ICsyMjgsNyBAQA0KICAgaW50IG5hdGl2ZV9m
ZDsNCiAgIGludCByZXN1bHQ7DQogDQotICBHRVRfTkFUSVZFX0ZEKG5hdGl2ZV9mZCk7DQorICBu
YXRpdmVfZmQgPSBnZXRfbmF0aXZlX2ZkKGVudiwgb2JqKTsNCiAgIA0KICAgVEFSR0VUX05BVElW
RV9GSUxFX0NMT1NFKG5hdGl2ZV9mZCxyZXN1bHQpOw0KICAgaWYgKHJlc3VsdCAhPSBUQVJHRVRf
TkFUSVZFX09LKQ0KQEAgLTI0Myw3ICsyNDksNyBAQA0KICAgamxvbmcgYnl0ZXNfYXZhaWxhYmxl
Ow0KICAgaW50ICAgcmVzdWx0Ow0KIA0KLSAgR0VUX05BVElWRV9GRChuYXRpdmVfZmQpOw0KKyAg
bmF0aXZlX2ZkID0gZ2V0X25hdGl2ZV9mZChlbnYsIG9iaik7DQogICANCiAgIFRBUkdFVF9OQVRJ
VkVfRklMRV9BVkFJTEFCTEUobmF0aXZlX2ZkLGJ5dGVzX2F2YWlsYWJsZSxyZXN1bHQpOw0KICAg
aWYgKHJlc3VsdCAhPSBUQVJHRVRfTkFUSVZFX09LKQ0KQEAgLTI3NSw3ICsyODEsNyBAQA0KICAg
amxvbmcgZmlsZV9zaXplOw0KICAgaW50ICAgcmVzdWx0Ow0KIA0KLSAgR0VUX05BVElWRV9GRChu
YXRpdmVfZmQpOw0KKyAgbmF0aXZlX2ZkID0gZ2V0X25hdGl2ZV9mZChlbnYsIG9iaik7DQogDQog
ICBUQVJHRVRfTkFUSVZFX0ZJTEVfU0laRShuYXRpdmVfZmQsIGZpbGVfc2l6ZSwgcmVzdWx0KTsN
CiAgIGlmIChyZXN1bHQgIT0gVEFSR0VUX05BVElWRV9PSykNCkBAIC0yOTksNyArMzA1LDcgQEAN
CiAgIGpsb25nIGN1cnJlbnRfb2Zmc2V0Ow0KICAgaW50ICAgcmVzdWx0Ow0KIA0KLSAgR0VUX05B
VElWRV9GRChuYXRpdmVfZmQpOw0KKyAgbmF0aXZlX2ZkID0gZ2V0X25hdGl2ZV9mZChlbnYsIG9i
aik7DQogDQogICBUQVJHRVRfTkFUSVZFX0ZJTEVfVEVMTChuYXRpdmVfZmQsIGN1cnJlbnRfb2Zm
c2V0LCByZXN1bHQpOw0KICAgaWYgKHJlc3VsdCAhPSBUQVJHRVRfTkFUSVZFX09LKQ0KQEAgLTMy
Myw3ICszMjksNyBAQA0KICAgamxvbmcgbmV3X29mZnNldDsNCiAgIGludCAgIHJlc3VsdDsNCiAN
Ci0gIEdFVF9OQVRJVkVfRkQobmF0aXZlX2ZkKTsNCisgIG5hdGl2ZV9mZCA9IGdldF9uYXRpdmVf
ZmQoZW52LCBvYmopOw0KIA0KICNpZiAwDQogICAvKiBTaG91bGQgdGhlcmUgYmUgc3VjaCBhbiBl
eGNlcHRpb24/IEFsbCBuYXRpdmUgbGF5ZXIgbWFjcm9zIHNob3VsZA0KQEAgLTM3MCw3ICszNzYs
NyBAQA0KICAgY2hhciAgZGF0YTsNCiAgIGludCAgIHJlc3VsdDsNCiANCi0gIEdFVF9OQVRJVkVf
RkQobmF0aXZlX2ZkKTsNCisgIG5hdGl2ZV9mZCA9IGdldF9uYXRpdmVfZmQoZW52LCBvYmopOw0K
IA0KICNpZiAwDQogICAvKiBTaG91bGQgdGhlcmUgYmUgc3VjaCBhbiBleGNlcHRpb24/IEFsbCBu
YXRpdmUgbGF5ZXIgbWFjcm9zIHNob3VsZA0KQEAgLTQ4OCw3ICs0OTQsNyBAQA0KICAgc3NpemVf
dCBieXRlc19yZWFkOw0KICAgaW50ICAgICByZXN1bHQ7IA0KIA0KLSAgR0VUX05BVElWRV9GRChu
YXRpdmVfZmQpOw0KKyAgbmF0aXZlX2ZkID0gZ2V0X25hdGl2ZV9mZChlbnYsIG9iaik7DQogDQog
ICBieXRlc19yZWFkID0gMDsNCiAgIGRvDQpAQCAtNTI0LDcgKzUzMCw3IEBADQogICBzc2l6ZV90
IG47DQogICBpbnQgICAgIHJlc3VsdDsgDQogDQotICBHRVRfTkFUSVZFX0ZEKG5hdGl2ZV9mZCk7
DQorICBuYXRpdmVfZmQgPSBnZXRfbmF0aXZlX2ZkKGVudiwgb2JqKTsNCiANCiAgIGJ1ZnB0ciA9
ICgqZW52KS0+R2V0Qnl0ZUFycmF5RWxlbWVudHMoZW52LCBidWZmZXIsIDApOw0KICAgaWYgKCFi
dWZwdHIpDQpAQCAtNTcyLDcgKzU3OCw3IEBADQogICBzc2l6ZV90IGJ5dGVzX3dyaXR0ZW47DQog
ICBpbnQgICAgIHJlc3VsdDsgDQogDQotICBHRVRfTkFUSVZFX0ZEKG5hdGl2ZV9mZCk7DQorICBu
YXRpdmVfZmQgPSBnZXRfbmF0aXZlX2ZkKGVudiwgb2JqKTsNCiAgIG5hdGl2ZV9kYXRhID0gKGNo
YXIpKENPTlZFUlRfSklOVF9UT19JTlQoYikgJiAweEZGKTsNCiANCiAgIGRvDQpAQCAtNjAxLDcg
KzYwNyw3IEBADQogICBzc2l6ZV90IG47DQogICBpbnQgICAgIHJlc3VsdDsgDQogDQotICBHRVRf
TkFUSVZFX0ZEKG5hdGl2ZV9mZCk7DQorICBuYXRpdmVfZmQgPSBnZXRfbmF0aXZlX2ZkKGVudiwg
b2JqKTsNCiAgICAgDQogICBidWZwdHIgPSAoKmVudiktPkdldEJ5dGVBcnJheUVsZW1lbnRzKGVu
diwgYnVmZmVyLCAwKTsNCiAgIGlmICghYnVmcHRyKQ0KSW5kZXg6IG5hdGl2ZS90YXJnZXQvZ2Vu
ZXJpYy90YXJnZXRfZ2VuZXJpY19taXNjLmgNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9jbGFzc3BhdGgvY2xhc3NwYXRoL25hdGl2ZS90YXJnZXQvZ2VuZXJpYy90YXJnZXRfZ2VuZXJp
Y19taXNjLmgsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjkNCmRpZmYgLXUgLXIxLjkgdGFyZ2V0
X2dlbmVyaWNfbWlzYy5oDQotLS0gbmF0aXZlL3RhcmdldC9nZW5lcmljL3RhcmdldF9nZW5lcmlj
X21pc2MuaAkyOSBNYXIgMjAwNCAwNzowNzo0MCAtMDAwMAkxLjkNCisrKyBuYXRpdmUvdGFyZ2V0
L2dlbmVyaWMvdGFyZ2V0X2dlbmVyaWNfbWlzYy5oCTkgQXByIDIwMDQgMTc6MzI6MjUgLTAwMDAN
CkBAIC02OCwzOCArNjgsNiBAQA0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKiogTWFj
cm9zICoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8NCiANCiAvKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KipcDQotKiBOYW1lICAgICAgIDogVEFSR0VUX05BVElWRV9NSVNDX0ZPUk1BVF9TVFJJTkcNCi0q
IFB1cnBvc2UgICAgOiBmb3JtYXQgYSBzdHJpbmcgd2l0aCBhcmd1bWVudHMNCi0qIElucHV0ICAg
ICAgOiBidWZmZXIgICAgIC0gYnVmZmVyIGZvciBzdHJpbmcNCi0qICAgICAgICAgICAgICBidWZm
ZXJTaXplIC0gc2l6ZSBvZiBidWZmZXINCi0qICAgICAgICAgICAgICBmb3JtYXQgICAgIC0gZm9y
bWF0IHN0cmluZyAobGlrZSBwcmludGYpDQotKiAgICAgICAgICAgICAgYXJncyAgICAgICAtIG9w
dGlvbmFsIGFyZ3VtZW50cyAoR05VIENQUCBvbmx5ISkNCi0qIE91dHB1dCAgICAgOiAtDQotKiBS
ZXR1cm4gICAgIDogLQ0KLSogU2lkZS1lZmZlY3Q6IHVua25vd24NCi0qIE5vdGVzICAgICAgOiAt
IHRoaXMgbWFjcm8gY2FuIG9ubHkgYmUgdXNlZCB3aXRoIGEgR05VIGdjYyAoQ1BQKQ0KLSogICAg
ICAgICAgICAgIC0gdGhpcyBpcyBhICJzYWZlIiBtYWNybyB0byBmb3JtYXQgc3RyaW5nOyBidWZm
ZXItDQotKiAgICAgICAgICAgICAgICBvdmVyZmxvd3Mgd2lsbCBiZSBhdm9pZGVkLiBEaXJlY3Qg
dXNhZ2Ugb2YgZS4gZy4NCi0qICAgICAgICAgICAgICAgIHNucHJpbnRmKCkgaXMgbm90IHBlcm1p
dHRlZCBiZWNhdXNlIGl0IGlzIG5vdCBBTlNJIEMNCi0qICAgICAgICAgICAgICAgIChub3QgcG9y
dGFibGUhKQ0KLSogICAgICAgICAgICAgIC0gZG8gbm90IHVzZSB0aGlzIHJvdXRpbmUgaW4gYSBm
dW5jdGlvbiB3aXRob3V0DQotKiAgICAgICAgICAgICAgICB2YXJpYWJsZSBudW1iZXIgb2YgYXJn
dW1lbnRzIChlbGxpcHNlcyksIGJlY2F1c2UNCi0qICAgICAgICAgICAgICAgIHZhX2xpc3QvdmFf
c3RhcnQvdmFfZW5kIGlzIHVzZWQhDQotXCoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KLQ0KLSNpZm5kZWYgVEFS
R0VUX05BVElWRV9NSVNDX0ZPUk1BVF9TVFJJTkcNCi0gICNpZmRlZiBfX0dOVUNfXw0KLSAgICAj
aW5jbHVkZSA8c3RkYXJnLmg+DQotICAgICNkZWZpbmUgVEFSR0VUX05BVElWRV9NSVNDX0ZPUk1B
VF9TVFJJTkcoYnVmZmVyLGJ1ZmZlclNpemUsZm9ybWF0LGFyZ3MuLi4pIFwNCi0gICAgICBkbyB7
IFwNCi0gICAgICAgIHNucHJpbnRmKGJ1ZmZlcixidWZmZXJTaXplLGZvcm1hdCwgIyMgYXJncyk7
IFwNCi0gICAgICB9IHdoaWxlICgwKQ0KLSAgI2Vsc2UNCi0gICAgI2Vycm9yIFRBUkdFVF9OQVRJ
VkVfTUlTQ19GT1JNQVRfU1RSSU5HIHdpdGggdmFyaWFibGUgbnVtYmVyIG9mIGFyZ3VtZW50cyBp
cyBvbmx5IHN1cHBvcnRlZCBieSBHTlUgZ2NjISBVc2UgVEFSR0VUX05BVElWRV9GT1JNQVRfU1RS
SU5HPG4+IGluc3RlYWQuDQotICAjZW5kaWYNCi0jZW5kaWYNCi0NCi0vKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKipc
DQogKiBOYW1lICAgICAgIDogVEFSR0VUX05BVElWRV9NSVNDX0ZPUk1BVF9TVFJJTkc8bj4NCiAq
IFB1cnBvc2UgICAgOiBmb3JtYXQgYSBzdHJpbmcgKHdpdGggYSBmaXhlZCBudW1iZXIgb2YpIGFy
Z3VtZW50cw0KICogSW5wdXQgICAgICA6IGJ1ZmZlciAgICAgLSBidWZmZXIgZm9yIHN0cmluZw0K


--=-V6Ug/uOCqGwYhn/ETq+m--

--=-LvvOse/WP618qK3FmB7N
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)

iD8DBQBAdt62xVhZCJWr9QwRApCnAJ92IS7xLVDPHe72A6DiLW9QcOIQiQCeKgr4
c68dcgb5DK3/okMAmJLzQeA=
=JEhP
-----END PGP SIGNATURE-----

--=-LvvOse/WP618qK3FmB7N--




From MAILER-DAEMON Fri Apr 09 14:17:56 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BC0Zg-00088i-Bn
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 14:17:56 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BC0ZX-00085Y-8g
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 14:17:47 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BC0Yz-0007qw-5a
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 14:17:44 -0400
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 1BC0Yy-0007lc-Qg
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 14:17:12 -0400
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BC0Yx-0001Gz-Fs
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 14:17:11 -0400
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i39IH5MC024151;
	Fri, 9 Apr 2004 14:17:05 -0400
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 i39IH3j28612; 
	Fri, 9 Apr 2004 14:17:03 -0400
Received: from [127.0.0.1] (tortoise.toronto.redhat.com [172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i39IGvcU007047; Fri, 9 Apr 2004 14:16:59 -0400
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: Mark Wielaard <mark@klomp.org>
In-Reply-To: <1081532086.13170.277.camel@elsschot.wildebeest.org>
References: <1080236148.18716.161.camel@elsschot.wildebeest.org>
	<87wu58qpmw.fsf@fleche.redhat.com>
	<1080295746.18716.463.camel@elsschot.wildebeest.org>
	<200403261128.55981.konqueror@gmx.de>
	<1080301292.18716.480.camel@elsschot.wildebeest.org>
	<871xn8h9mt.fsf@fleche.redhat.com>
	<1081118952.7548.253.camel@elsschot.wildebeest.org>
	<87ekr28gnj.fsf@fleche.redhat.com>
	<1081369536.13170.38.camel@elsschot.wildebeest.org>
	<1081519370.13170.146.camel@elsschot.wildebeest.org>
	<1081532086.13170.277.camel@elsschot.wildebeest.org>
Content-Type: text/plain
Message-Id: <1081520182.5815.14.camel@localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Fri, 09 Apr 2004 14:16:23 +0000
Content-Transfer-Encoding: 7bit
Cc: commit classpath <commit-classpath@gnu.org>,
	libgcj patches <java-patches@gcc.gnu.org>
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 18:17:49 -0000

On Fri, 2004-04-09 at 17:34, Mark Wielaard wrote:
> Hi,
> 
> Here is another part of the native C cleanup.
> 
> 2004-04-09  Mark Wielaard  <mark@klomp.org>
> 
>         * configure.ac (AM_CFLAGS): Don't define _POSIX_SOURCE.
> 
>         * native/jni/gtk-peer/gthread-jni.c (maybe_rethrow): Explicitly
>         malloc and free buf.
> 
>         * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
>         (GET_NATIVE_FD): Remove macro.
>         (get_native_fd): Replace GET_NATIVE_FD macro.
> 
>         * native/target/generic/target_generic_misc.h
>         (TARGET_NATIVE_MISC_FORMAT_STRING): Remove unused macro.
> 
> With this I believe the only things that make the native sources
> uncompilable with gcc-2.95 are the following:
> 
> ../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:670: warning: ISO C forbids passing arg 6 of `g_signal_handlers_block_matched' between function pointer and `void *'
> ../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: In function `Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter':
> ../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:714: warning: ISO C forbids passing arg 6 of `g_signal_handlers_disconnect_matched' between function pointer and `void *'
> ../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:716: warning: ISO C forbids passing arg 6 of `g_signal_handlers_unblock_matched' between function pointer and `void *'
> 
> Could one of the gtk-peer hackers look at those?
> It seems just casting the argument to a gpointer fixes all, but there is
> some c macro magic going on here.

Try updating your source tree.  These calls seem to have been replaced
with other GLib functions (at least on Classpath HEAD and libgcj
java-gui-branch).

Tom





From MAILER-DAEMON Fri Apr 09 15:29:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BC1gh-0005Lh-0h
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 15:29:15 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BC1bv-0003jI-2C
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 15:24:19 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BC1Zy-0001uJ-BV
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 15:22:52 -0400
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 1BC1ZT-0001OH-6Q
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 15:21:47 -0400
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by mx20.gnu.org with smtp (Exim 4.30) id 1BC1YW-0005zm-St
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 15:20:48 -0400
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id 5a528b5a_8a59_11d8_87dd_00304811e8c8_21302;
	Fri, 09 Apr 2004 14:08:57 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i39JJ8Kq034599; 
	Fri, 9 Apr 2004 14:19:08 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i39JJ8r8034598;
	Fri, 9 Apr 2004 14:19:08 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404091919.i39JJ8r8034598@arch20m.dellroad.org>
In-Reply-To: <1081530547.13170.246.camel@elsschot.wildebeest.org>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 9 Apr 2004 14:19:08 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=ELM1081538348-34579-0_
Content-Transfer-Encoding: 7bit
Cc: commit classpath <commit-classpath@gnu.org>,
	Michael Koch <konqueror@gmx.de>
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 19:29:12 -0000


--ELM1081538348-34579-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII

Mark Wielaard wrote:
> feel very fragile to me. How do other projects handle this if they don't
> require people to just issue these commands by hand (so they can select
> the right versions themselves)?

Attached is the autogen.sh script from the eXosip project.
It seems like a fairly complete example.

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com

--ELM1081538348-34579-0_
Content-Transfer-Encoding: 7bit
Content-Type: application/x-sh
Content-Disposition: attachment; filename=autogen.sh
Content-Description: 

#!/bin/sh
#
# $Id: autogen.sh,v 1.1 2003/12/01 20:34:24 archie Exp $
#
DIE=0
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
test "$srcdir" = "." && srcdir=`pwd`

PROJECT=src

# failure subroutine.
# syntax: do-something || fail
fail() {
    status=$?
    echo "Last command failed with status $status in directory $(pwd)."
    echo "Aborting."
    exit $status
}

(autoconf${AUTOCONF_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
    echo
    echo "You must have autoconf installed to compile $PROJECT from CVS."
    echo "Download the appropriate package for your distribution,"
    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/autoconf/"
    DIE=1
}

(libtool --version) < /dev/null > /dev/null 2>&1 || {
    echo
    echo "You must have libtool installed to compile $PROJECT from CVS."
    echo "Download the appropriate package for your distribution,"
    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/libtool/"
    DIE=1
}

(automake${AUTOMAKE_SUFFIX} --version) < /dev/null > /dev/null 2>&1 || {
    echo
    echo "You must have automake installed to compile $PROJECT from CVS."
    echo "Download the appropriate package for your distribution,"
    echo "or get the source tarball at ftp://ftp.gnu.org/gnu/automake/"
    DIE=1
}

if test "$DIE" -eq 1; then
    exit 1
fi

test -f include/eXosip/eXosip.h || {
        echo "You must run this script in the top-level $PROJECT directory"
        exit 1
}

case "$CC" in
*xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
esac

ACLOCAL_FLAGS="-I ${srcdir}/scripts ${ACLOCAL_FLAGS}"

(
echo "Cleaning stuff generated by libtoolize"
rm -f scripts/ltmain.sh scripts/config.guess scripts/config.sub

echo "Running libtoolize --copy"
libtoolize --copy || fail

echo "Cleaning stuff generated by aclocal"
rm -f aclocal.m4

echo "Running aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS"
aclocal${AUTOMAKE_SUFFIX} $ACLOCAL_FLAGS || fail

echo "Cleaning stuff generated by autoheader"
rm -f config.h.in

echo "Running autoheader${AUTOCONF_SUFFIX}"
autoheader${AUTOCONF_SUFFIX} || fail

echo "Cleaning stuff generated by automake"
find . -name '*.am' -print | 
	while read file
	do # remove all .in files with a corresponding .am file
	    sed 's/\.am$/.in/g' | xargs rm -f
	done
rm -f depcomp install-sh missing mkinstalldirs
rm -f stamp-h*

echo "Running automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt"
automake${AUTOMAKE_SUFFIX} --add-missing --gnu $am_opt || fail

echo "Cleaning stuff generated by autoconf"
rm -f configure
rm -rf autom4te-*.cache/

echo "Running autoconf${AUTOCONF_SUFFIX}"
    autoconf${AUTOCONF_SUFFIX} || fail

echo "Finished"
) || fail

echo 
echo "$PROJECT is now ready for configuration."

--ELM1081538348-34579-0_--



From MAILER-DAEMON Fri Apr 09 18:57:00 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BC4vk-0007cQ-6t
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 18:57:00 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BC4qF-0005Vs-JH
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 18:51:19 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BC4oX-0004cX-Ba
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 18:50:04 -0400
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 1BC4oW-0004Yg-7B
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 18:49:32 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BC4ma-0007FC-2Q
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 18:47:32 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BC4mH-00039L-00; Sat, 10 Apr 2004 00:47:13 +0200
From: Mark Wielaard <mark@klomp.org>
To: Thomas Fitzsimmons <fitzsim@redhat.com>
In-Reply-To: <1081520182.5815.14.camel@localhost.localdomain>
References: <1080236148.18716.161.camel@elsschot.wildebeest.org>
	<87wu58qpmw.fsf@fleche.redhat.com>
	<1080295746.18716.463.camel@elsschot.wildebeest.org>
	<200403261128.55981.konqueror@gmx.de>
	<1080301292.18716.480.camel@elsschot.wildebeest.org>
	<871xn8h9mt.fsf@fleche.redhat.com>
	<1081118952.7548.253.camel@elsschot.wildebeest.org>
	<87ekr28gnj.fsf@fleche.redhat.com>
	<1081369536.13170.38.camel@elsschot.wildebeest.org>
	<1081519370.13170.146.camel@elsschot.wildebeest.org>
	<1081532086.13170.277.camel@elsschot.wildebeest.org>
	<1081520182.5815.14.camel@localhost.localdomain>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-ShPYp0+B8p5y1KXMoJU5"
Message-Id: <1081550835.13170.286.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 10 Apr 2004 00:47:15 +0200
Cc: commit classpath <commit-classpath@gnu.org>,
	libgcj patches <java-patches@gcc.gnu.org>
Subject: Re: gtk-peer compile fixes for gcc-2.95
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 09 Apr 2004 22:56:53 -0000


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

Hi,

On Fri, 2004-04-09 at 16:16, Thomas Fitzsimmons wrote:
> On Fri, 2004-04-09 at 17:34, Mark Wielaard wrote:
> > With this I believe the only things that make the native sources
> > uncompilable with gcc-2.95 are the following:
> >=20
> > ../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_Gtk=
ComponentPeer.c:670: warning: ISO C forbids passing arg 6 of `g_signal_hand=
lers_block_matched' between function pointer and `void *'
> > ../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_Gtk=
ComponentPeer.c: In function `Java_gnu_java_awt_peer_gtk_GtkComponentPeer_r=
emoveExposeFilter':
> > ../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_Gtk=
ComponentPeer.c:714: warning: ISO C forbids passing arg 6 of `g_signal_hand=
lers_disconnect_matched' between function pointer and `void *'
> > ../../../../classpath-cvs/native/jni/gtk-peer/gnu_java_awt_peer_gtk_Gtk=
ComponentPeer.c:716: warning: ISO C forbids passing arg 6 of `g_signal_hand=
lers_unblock_matched' between function pointer and `void *'
> >=20
> > Could one of the gtk-peer hackers look at those?
> > It seems just casting the argument to a gpointer fixes all, but there i=
s
> > some c macro magic going on here.
>=20
> Try updating your source tree.  These calls seem to have been replaced
> with other GLib functions (at least on Classpath HEAD and libgcj
> java-gui-branch).

You didn't think I would check something in when I hadn't tested it
against the latest and greatest CVS source did you :)

Although the warning messages refer to `g_signal_handlers_block_matched'
and `g_signal_handlers_unblock_matched' and complains about argument 6
that isn't what our source actually calls (that is way I said that there
is some C macro magic going on). The source in question actually calls
'g_signal_handlers_block_by_func',
'g_signal_handlers_disconnect_by_func' and
'g_signal_handlers_unblock_by_func' which have only 3 arguments.

Cheers,

Mark



--=-ShPYp0+B8p5y1KXMoJU5
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)

iD8DBQBAdyfyxVhZCJWr9QwRAqbHAJ9XED2fGBSuU/4FXuHH8CEEwgw2IwCgqfKP
OmoNzzLKsE+Hd2dzZcF9VYU=
=oypx
-----END PGP SIGNATURE-----

--=-ShPYp0+B8p5y1KXMoJU5--




From MAILER-DAEMON Fri Apr 09 23:44:59 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BC9QR-0003UU-85
	for mharc-commit-classpath@gnu.org; Fri, 09 Apr 2004 23:44:59 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BC9QL-0003HR-VQ
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 23:44:53 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BC9Pm-0002bS-7Z
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 23:44:49 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BC9Pl-0002Xn-S5
	for commit-classpath@gnu.org; Fri, 09 Apr 2004 23:44:17 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 3B5B4623D3
	for <commit-classpath@gnu.org>; Sat, 10 Apr 2004 03:43:56 +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 62999-07 for <commit-classpath@gnu.org>;
	Sat, 10 Apr 2004 03:43:55 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-80-190.adsl.solnet.ch
	[212.41.80.190])
	by mail01.solnet.ch (Postfix) with ESMTP id EACC9623CB
	for <commit-classpath@gnu.org>; Sat, 10 Apr 2004 03:43:49 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id B98DCB6757; Sat, 10 Apr 2004 05:41:59 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040410034159.B98DCB6757@reali.dnsalias.net>
Date: Sat, 10 Apr 2004 05:41:59 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040410 FAILED
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 10 Apr 2004 03:44:57 -0000

update cvs source tree
P .cvsignore
P ChangeLog
P INSTALL
P autogen.sh
cvs server: config.guess is no longer in the repository
cvs server: config.sub is no longer in the repository
P configure.ac
P gnu/java/nio/channels/FileChannelImpl.java
P java/io/FileDescriptor.java
P java/lang/SecurityManager.java
P java/net/URLConnection.java
P native/fdlibm/Makefile.am
P native/fdlibm/mprec.h
P native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
P native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
P native/jni/gtk-peer/gthread-jni.c
P native/jni/java-io/FileDescriptor.c
P native/jni/java-io/java_io_File.c
P native/jni/java-io/javaio.c
P native/jni/java-net/javanet.c
P native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
P native/target/generic/target_generic_file.h
P native/target/generic/target_generic_misc.h
P native/target/generic/target_generic_network.h
delete old source tree
copy cvs tree to source tree



From MAILER-DAEMON Sat Apr 10 08:11:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCHKo-0000y0-7n
	for mharc-commit-classpath@gnu.org; Sat, 10 Apr 2004 08:11:42 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCHKl-0000vx-9Z
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 08:11:39 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCHJw-0000nB-WE
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 08:11:20 -0400
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 1BCHHt-0008Vt-8h
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 08:08:41 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BCH3J-0005Sq-2k
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 07:53:37 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BCH38-0004xe-00; Sat, 10 Apr 2004 13:53:26 +0200
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <20040410034159.B98DCB6757@reali.dnsalias.net>
References: <20040410034159.B98DCB6757@reali.dnsalias.net>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-3Znrm04YCeJ7KKGwlUvl"
Message-Id: <1081598009.13170.299.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 10 Apr 2004 13:53:29 +0200
Cc: commit-classpath@gnu.org
Subject: Re: classpath daily snapshot 20040410 FAILED
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 10 Apr 2004 12:11:39 -0000


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

Hi Michael,

On Sat, 2004-04-10 at 05:41, Michael Koch wrote:
> update cvs source tree
> [...]
> delete old source tree
> copy cvs tree to source tree

Any indication why it FAILED?

Cheers,

Mark

--=-3Znrm04YCeJ7KKGwlUvl
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)

iD8DBQBAd+A4xVhZCJWr9QwRAsXNAKCco2Tdo3wOut7ycK2Nm3A/jfqEWQCeLb6v
HKJdhSExaZV5cYO9489a0HM=
=WJKZ
-----END PGP SIGNATURE-----

--=-3Znrm04YCeJ7KKGwlUvl--




From MAILER-DAEMON Sat Apr 10 09:19:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCIO9-0003x8-5L
	for mharc-commit-classpath@gnu.org; Sat, 10 Apr 2004 09:19:13 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCIO7-0003wm-4R
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 09:19:11 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCINv-0003u5-L5
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 09:19:10 -0400
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 1BCINv-0003tv-Aj
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 09:18:59 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BCIEQ-0006fH-62
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 09:09:10 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BCIEH-0005At-00
	for <commit-classpath@gnu.org>; Sat, 10 Apr 2004 15:09:01 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-fardJIG4e2e7+rYKBYEi"
Message-Id: <1081602542.13170.311.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 10 Apr 2004 15:09:04 +0200
Subject: Re-add java-assert.h to native/fdlibm/Makefile.am
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 10 Apr 2004 13:19:11 -0000


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

Hi,

I accidentally already removed java-assert.h from
native/fdlibm/Makefile.am during my first native C cleanup patch. This
breaks make distcheck. So this patch adds it back for now. It is a
libgcj-ism though so I like to get rid of it in the near future.

2004-04-10  Mark Wielaard  <mark@klomp.org>

  * native/fdlibm/Makefile.am (libfdlibm_la_SOURCES): Add java-assert.h.

Cheers,

Mark

--- native/fdlibm/Makefile.am   9 Apr 2004 14:04:48 -0000       1.3
+++ native/fdlibm/Makefile.am   10 Apr 2004 13:07:21 -0000
@@ -15,6 +15,7 @@
                        e_sqrt.c \
                        fdlibm.h \
                        ieeefp.h \
+                       java-assert.h \
                        k_cos.c \
                        k_rem_pio2.c \
                        k_sin.c \


--=-fardJIG4e2e7+rYKBYEi
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)

iD8DBQBAd/HtxVhZCJWr9QwRAoCPAJ9YpSwFV1lvnPqUDFsD/r9xXGCzPQCeI7Ww
zeDwELCEbmIAKJRIOzPIpyg=
=2V7m
-----END PGP SIGNATURE-----

--=-fardJIG4e2e7+rYKBYEi--




From MAILER-DAEMON Sat Apr 10 10:49:12 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCJnE-0007KQ-Ij
	for mharc-commit-classpath@gnu.org; Sat, 10 Apr 2004 10:49:12 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCJnB-0007Jc-Vd
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 10:49:09 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCJmf-0007Ex-5j
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 10:49:08 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCJme-0007Ea-Ql
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 10:48:36 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-116.ewetel.net
	[80.228.94.116])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3AEmXpH000278;
	Sat, 10 Apr 2004 16:48:34 +0200 (MEST)
Received: from asterix.konqueror.de ([192.168.1.3])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BCIqn-00037S-00; Sat, 10 Apr 2004 15:48:49 +0200
From: Michael Koch <konqueror@gmx.de>
To: "Jeroen Frijters" <jeroen@sumatra.nl>,
	"commit-classpath" <commit-classpath@gnu.org>
Date: Sat, 10 Apr 2004 16:59:09 +0200
User-Agent: KMail/1.5.4
References: <788B535AB1F9CB49BB9C229372B50ACC0ADD80@LEMBU.sumatrasoftware.com>
In-Reply-To: <788B535AB1F9CB49BB9C229372B50ACC0ADD80@LEMBU.sumatrasoftware.com>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
Content-Description: clearsigned data
Content-Disposition: inline
Message-Id: <200404101659.09772.konqueror@gmx.de>
X-CheckCompat: OK
Cc: 
Subject: Re: FYI: Patch: FileChannelImpl
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 10 Apr 2004 14:49:10 -0000

=2D----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am Freitag, 9. April 2004 16:45 schrieb Jeroen Frijters:

> -  /** Attach to an already-opened file.  */
> -  public FileChannelImpl (int desc, int mode)
> -  {
> -    fd =3D desc;
> -    this.mode =3D mode;
> -  }


Hi Jeroen,


can you please re-add the above constructor. Its needed from JNI. I=20
forgot about this, sorry.


Michael
=2D --=20
Homepage: http://www.worldforge.org/
=2D----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAeAu9WSOgCCdjSDsRApwpAJ9Urc9KECCLbZGp+cym8XP6E9gokgCeO7fm
OOBAVDB3pJNbiNeOnCJqvOU=3D
=3D1zZp
=2D----END PGP SIGNATURE-----




From MAILER-DAEMON Sat Apr 10 13:02:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCLsV-0000vW-8d
	for mharc-commit-classpath@gnu.org; Sat, 10 Apr 2004 13:02:47 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCLsP-0000tg-JK
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 13:02:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCLrm-0000gS-EB
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 13:02:33 -0400
Received: from [213.228.0.169] (helo=postfix3-2.free.fr)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCLrl-0000fn-Pb
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 13:02:01 -0400
Received: from kaffe.org (cachan-3-82-66-125-112.fbx.proxad.net
	[82.66.125.112])
	by postfix3-2.free.fr (Postfix) with ESMTP id D6289C271
	for <commit-classpath@gnu.org>; Sat, 10 Apr 2004 19:01:59 +0200 (CEST)
Message-ID: <40782884.7050209@kaffe.org>
Date: Sat, 10 Apr 2004 19:01:56 +0200
From: Guilhem Lavaux <guilhem@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030630
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath@gnu.org
X-Enigmail-Version: 0.76.1.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enigC9C610AC3B58DFE1C0A92249"
Subject: FYI: java.text.FieldPosition
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 10 Apr 2004 17:02:43 -0000

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enigC9C610AC3B58DFE1C0A92249
Content-Type: multipart/mixed; boundary="------------050506020201060005040001"

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

Hi,

Here is an obvious to make FieldPosition behaves the way the java doc 
says it should.

ChangeLog entry:

2004-04-10  Guilhem Lavaux <guilhem@kaffe.org>

	* java/text/FieldPosition.java
	(FieldPosition) Constructor now behaves as it should according
	to the java documentation.

Cheers,

Guilhem.

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

Index: java/text/FieldPosition.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/FieldPosition.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 FieldPosition.java
--- java/text/FieldPosition.java	27 Nov 2003 11:50:55 -0000	1.7
+++ java/text/FieldPosition.java	10 Apr 2004 16:58:48 -0000
@@ -72,13 +72,13 @@
   /**
    * This method initializes a new instance of <code>FieldPosition</code>
    * to have the specified field attribute. The attribute will be used as
-   * an id.
+   * an id. It is formally equivalent to calling FieldPosition(field, -1).
    *
    * @param field The field format attribute.
    */
   public FieldPosition (Format.Field field)
   {
-    this.field_attribute = field;
+    this(field, -1);
   }
 
   /**

--------------050506020201060005040001--

--------------enigC9C610AC3B58DFE1C0A92249
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFAeCiHWRk4qbNiTwgRAmqRAJ9PPDZ1HT3ehZ8AEiHPnkYQQHEWfQCfTWwp
0HSIjwStTASCBivqUWtSyFQ=
=P6fZ
-----END PGP SIGNATURE-----

--------------enigC9C610AC3B58DFE1C0A92249--




From MAILER-DAEMON Sat Apr 10 13:30:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCMHc-0002K9-9E
	for mharc-commit-classpath@gnu.org; Sat, 10 Apr 2004 13:28:44 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCMHP-0002Ea-9n
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 13:28:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCM8l-0006tz-Da
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 13:20:08 -0400
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 1BCM8k-0006jE-G6
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 13:19:34 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BCM76-0002N9-MP
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 13:17:52 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-116.ewetel.net
	[80.228.94.116])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3AHHiNj025445
	for <commit-classpath@gnu.org>; Sat, 10 Apr 2004 19:17:45 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BCLBB-0008JC-00
	for <commit-classpath@gnu.org>; Sat, 10 Apr 2004 18:18:01 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 10 Apr 2004 19:17:32 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_swCeAWVg/xFjxKU"
Message-Id: <200404101917.32846.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: ignoring more files
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 10 Apr 2004 17:28:34 -0000


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

Hi list,


I just commited the attached patch to ingore more files when using cvs 
commands.


Michael


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

	* .cvsignore: Ignore ltmain.sh.
	* gnu/java/nio/channels/.cvsignore,
	gnu/regexp/.cvsignore: New files.


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

Index: .cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/.cvsignore,v
retrieving revision 1.9
diff -u -r1.9 .cvsignore
--- .cvsignore	9 Apr 2004 13:42:18 -0000	1.9
+++ .cvsignore	10 Apr 2004 17:09:39 -0000
@@ -8,6 +8,7 @@
 config.h.in
 config.h
 libtool
+ltmain.sh
 Makefile
 Makefile.in
 stamp-h
Index: gnu/java/nio/channels/.cvsignore
===================================================================
RCS file: gnu/java/nio/channels/.cvsignore
diff -N gnu/java/nio/channels/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/nio/channels/.cvsignore	10 Apr 2004 17:09:39 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: gnu/regexp/.cvsignore
===================================================================
RCS file: gnu/regexp/.cvsignore
diff -N gnu/regexp/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/regexp/.cvsignore	10 Apr 2004 17:09:39 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

--Boundary-00=_swCeAWVg/xFjxKU--




From MAILER-DAEMON Sat Apr 10 16:56:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCPWy-0002Ic-Sx
	for mharc-commit-classpath@gnu.org; Sat, 10 Apr 2004 16:56:48 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCPWv-0002Hx-RX
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 16:56:45 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCPT6-0001Q9-31
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 16:53:20 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCPT5-0001PM-1S
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 16:52:47 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-116.ewetel.net
	[80.228.94.116])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i3AKqire026456
	for <commit-classpath@gnu.org>; Sat, 10 Apr 2004 22:52:45 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BCOH4-0000E0-00
	for <commit-classpath@gnu.org>; Sat, 10 Apr 2004 21:36:18 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 10 Apr 2004 22:35:49 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_lqFeAvBIJI+xfJ7"
Message-Id: <200404102235.49560.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: install library (again)
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 10 Apr 2004 20:56:46 -0000


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

Hi list,


I wrote the attached patch to clean up my mess I did before. Now we have 
only one option to specify with arguments:

--with-glibj=zip  installs glibj.zip only
--with-glibj=flat  installs class files only
--with-glibj=both installs glibj.zip and class files

If not specified this option defaults to "zip".

Okay to commit ?


Michael


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

	* configure.ac: Call only CLASSPATH_WITH_GLIBJ to get what to install.
	* acinclude.m4
	(CLASSPATH_WITH_GLIBJ): New function to specify what to install.
	(CLASSPATH_ENABLE_GLIBJ): Removed.
	(CLASSPATH_ENABLE_CLASS_INSTALL): Removed.
	* lib/Makefile.am: Handle INSTALL_GLIBJ_ZIP and INSTALL_CLASS_FILES.


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

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/acinclude.m4,v
retrieving revision 1.33
diff -u -r1.33 acinclude.m4
--- acinclude.m4	8 Apr 2004 20:32:20 -0000	1.33
+++ acinclude.m4	10 Apr 2004 20:26:35 -0000
@@ -555,47 +555,38 @@
 ])
 
 dnl -----------------------------------------------------------
-dnl CLASSPATH_ENABLE_GLIBJ - allow user to specify without zip
+dnl CLASSPATH_WITH_GLIBJ - specify what to install
 dnl -----------------------------------------------------------
-AC_DEFUN([CLASSPATH_ENABLE_GLIBJ],
+AC_DEFUN([CLASSPATH_WITH_GLIBJ],
 [
-  AC_ARG_ENABLE([glibj],
-                [AS_HELP_STRING([--enable-glibj],[enable creation of glibj.zip [default=yes]])],
-                [
-                  if test "x${enableval}" = xyes; then
-      		    AC_PATH_PROG(ZIP, zip)
-                  elif test "x${enableval}" = xno; then
-                    ZIP=
-                  else
-                   ZIP="${enableval}"
-                  fi
-		],
-  		[
+  AC_ARG_WITH([glibj],
+              [AS_HELP_STRING([--with-glibj],[define what to install (zip|flat|both) [default=zip]])],
+              [
+                if test "x${withval}" = xyes || test "x${withval}" = xzip; then
+      		  AC_PATH_PROG(ZIP, zip)
+		  install_class_files=no
+		elif test "x${withval}" = xboth; then
+		  AC_PATH_PROG(ZIP, zip)
+		  install_class_files=yes
+		elif test "x${withval}" = xflat; then
+		  ZIP=
+		  install_class_files=yes
+                elif test "x${withval}" = xno || test "x${withval}" = xnone; then
                   ZIP=
-		])
-
-  AC_SUBST(ZIP)
-  AM_CONDITIONAL(CREATE_GLIBJ, test "x${ZIP}" != x)
-])
-
-dnl -----------------------------------------------------------
-dnl CLASSPATH_ENABLE_CLASS_INSTALL
-dnl   - allow user to install all classfiles
-dnl -----------------------------------------------------------
-AC_DEFUN([CLASSPATH_ENABLE_CLASS_INSTALL],
-[
-  AC_ARG_ENABLE([class-install],
-		[AS_HELP_STRING([--enable-class-install],[enable installation of class files [default=no]])],
-		[
-                  case "${enableval}" in
-                    yes) ENABLE_CLASS_INSTALL=yes ;;
-                    no) ENABLE_CLASS_INSTALL=no ;;
-                    *) ENABLE_CLASS_INSTALL=no ;;
-                  esac
-		],
-		[ENABLE_CLASS_INSTALL=no])
-
-  AM_CONDITIONAL(INSTALL_CLASSFILES, test "x${ENABLE_CLASS_INSTALL}" = xyes)
+		  install_class_files=no
+                else
+		  AC_MSG_ERROR([unknown value given to --with-glibj])
+                fi
+	      ],
+  	      [
+		AC_PATH_PROG(ZIP, zip)
+		install_class_files=no
+	      ])
+  if test "x${ZIP}" = x && test "x${install_class_files}" = xno; then
+    AC_MSG_ERROR([you need to either install class files or glibj.zip])
+  fi
+  AM_CONDITIONAL(INSTALL_GLIBJ_ZIP, test "x${ZIP}" != x)
+  AM_CONDITIONAL(INSTALL_CLASS_FILES, test "x${install_class_files}" = xyes)
 ])
 
 dnl -----------------------------------------------------------
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.14
diff -u -r1.14 configure.ac
--- configure.ac	8 Apr 2004 20:04:12 -0000	1.14
+++ configure.ac	10 Apr 2004 20:26:35 -0000
@@ -251,14 +251,9 @@
 AC_PATH_PROG(FIND, find)
 
 dnl -----------------------------------------------------------
-dnl Create glibj.zip (enabled by default)
+dnl Specify what to install (install only glibj.zip by default)
 dnl -----------------------------------------------------------
-CLASSPATH_ENABLE_GLIBJ
-
-dnl -----------------------------------------------------------
-dnl Install class files (disabled by default)
-dnl -----------------------------------------------------------
-CLASSPATH_ENABLE_CLASS_INSTALL
+CLASSPATH_WITH_GLIBJ
 
 dnl -----------------------------------------------------------
 dnl Enable API documentation generation (disabled by default)
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.56
diff -u -r1.56 Makefile.am
--- lib/Makefile.am	8 Apr 2004 20:32:20 -0000	1.56
+++ lib/Makefile.am	10 Apr 2004 20:26:35 -0000
@@ -62,13 +62,13 @@
 
 JAVAH = $(USER_JAVAH) $(ARG_JNI_JAVAH) $(ARG_CLASSPATH_JAVAH) .:$(USER_CLASSLIB)
 
-if CREATE_GLIBJ
+if INSTALL_GLIBJ_ZIP
 
 dist_pkgdata_DATA = glibj.zip
 
-endif # CREATE_GLIBJ
+endif # INSTALL_GLIBJ_ZIP
 
-if INSTALL_CLASSFILES
+if INSTALL_CLASS_FILES
 
 noinst_DATA = genclasses compile-classes resources
 
@@ -86,7 +86,7 @@
 	rm -rf $(DESTDIR)$(pkgdatadir)/javax
 	rm -rf $(DESTDIR)$(pkgdatadir)/org
 
-endif # INSTALL_CLASSFILES
+endif # INSTALL_CLASS_FILES
 
 .PHONY: genclasses
 

--Boundary-00=_lqFeAvBIJI+xfJ7--




From MAILER-DAEMON Sat Apr 10 23:44:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCVtp-0002hz-Ac
	for mharc-commit-classpath@gnu.org; Sat, 10 Apr 2004 23:44:49 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCVtm-0002gC-8G
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 23:44:46 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCVtC-00024p-9G
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 23:44:42 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCVtB-00024R-VO
	for commit-classpath@gnu.org; Sat, 10 Apr 2004 23:44:10 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 2AA016240F
	for <commit-classpath@gnu.org>; Sun, 11 Apr 2004 03:43: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 19758-01 for <commit-classpath@gnu.org>;
	Sun, 11 Apr 2004 03:43:48 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-80-190.adsl.solnet.ch
	[212.41.80.190])
	by mail01.solnet.ch (Postfix) with ESMTP id F3C5A6242F
	for <commit-classpath@gnu.org>; Sun, 11 Apr 2004 03:43:42 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 8D4C0B6C97; Sun, 11 Apr 2004 05:41:50 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040411034150.8D4C0B6C97@reali.dnsalias.net>
Date: Sun, 11 Apr 2004 05:41:50 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040411 FAILED
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 11 Apr 2004 03:44:47 -0000

update cvs source tree
P .cvsignore
P ChangeLog
U gnu/java/nio/channels/.cvsignore
U gnu/regexp/.cvsignore
P java/text/FieldPosition.java
P native/fdlibm/Makefile.am
delete old source tree
copy cvs tree to source tree



From MAILER-DAEMON Sun Apr 11 08:29:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCe5h-0005UV-Pn
	for mharc-commit-classpath@gnu.org; Sun, 11 Apr 2004 08:29:37 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCe5e-0005Rt-7V
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 08:29:34 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCdoP-00017G-Hz
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 08:12:16 -0400
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCdfU-0007M1-2u
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 08:02:32 -0400
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Sun, 11 Apr 2004 14:02:09 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADD8C@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: FileChannelImpl
Thread-Index: AcQfCudCc4bYMP77RgKfStBTQL2kkAAsVlnA
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "Michael Koch" <konqueror@gmx.de>,
	"commit-classpath" <commit-classpath@gnu.org>
Cc: 
Subject: FYI: Patch: FileChannelImpl
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 11 Apr 2004 12:29:35 -0000

Michael Koch wrote:
> > -  /** Attach to an already-opened file.  */
> > -  public FileChannelImpl (int desc, int mode)
> > -  {
> > -    fd =3D desc;
> > -    this.mode =3D mode;
> > -  }
>=20
> can you please re-add the above constructor. Its needed from JNI. I=20
> forgot about this, sorry.

Oops. Sorry about that. I added it back.

Regards,
Jeroen

2004-04-11  Jeroen Frijters  <jeroen@frijters.net>

        * gnu/java/nio/channels/FileChannelImpl.java:
        (FileChannelImpl(int,int)) Restored previously removed
constructor
        and made it private.

Index: gnu/java/nio/channels/FileChannelImpl.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/nio/channels/FileChannelImpl.java,
v
retrieving revision 1.2
diff -u -r1.2 FileChannelImpl.java
--- gnu/java/nio/channels/FileChannelImpl.java	9 Apr 2004 14:46:04
-0000	1.2
+++ gnu/java/nio/channels/FileChannelImpl.java	11 Apr 2004 11:55:58
-0000
@@ -112,6 +112,13 @@
     this.mode =3D mode;
   }
=20
+  /* Used by init() (native code) */
+  private FileChannelImpl (int fd, int mode)
+  {
+    this.fd =3D fd;
+    this.mode =3D mode;
+  }
+
   public static FileChannelImpl in;
   public static FileChannelImpl out;
   public static FileChannelImpl err;





From MAILER-DAEMON Sun Apr 11 09:14:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCenL-0000Gc-NU
	for mharc-commit-classpath@gnu.org; Sun, 11 Apr 2004 09:14:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCenJ-0000E3-EG
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 09:14:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCenE-000088-OV
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 09:14:38 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCenE-00007N-1n
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 09:14:36 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BCen5-0000WP-00
	for <commit-classpath@gnu.org>; Sun, 11 Apr 2004 15:14:27 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-0VRP7UcHx0P8EyKSXSRW"
Message-Id: <1081689269.13170.360.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 11 Apr 2004 15:14:29 +0200
Subject: FYI: native JNI FileChannelImpl.size() implemented
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 11 Apr 2004 13:14:42 -0000


--=-0VRP7UcHx0P8EyKSXSRW
Content-Type: multipart/mixed; boundary="=-7vMYJ7lvts2jf2UVaQMC"


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

Hi,

The following implements the native JNI FileChannelImpl.size() method.
It is a simple copy/paste of the old FileDescriptor.getNativeLenght()
implementation.

2004-04-11  Mark Wielaard  <mark@klomp.org>

       * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
       (Java_gnu_java_nio_channels_FileChannelImpl_size): Implemented.

This solves a large number of mauve failures that depended on being able
to get the size of a file.

Cheers,

Mark

--=-7vMYJ7lvts2jf2UVaQMC
Content-Disposition: inline; filename=FileChannelImpl.patch
Content-Type: text/x-patch; name=FileChannelImpl.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IG5hdGl2ZS9qbmkvamF2YS1uaW8vZ251X2phdmFfbmlvX2NoYW5uZWxzX0ZpbGVDaGFu
bmVsSW1wbC5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNz
cGF0aC9uYXRpdmUvam5pL2phdmEtbmlvL2dudV9qYXZhX25pb19jaGFubmVsc19GaWxlQ2hhbm5l
bEltcGwuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMw0KZGlmZiAtdSAtcjEuMyBnbnVfamF2
YV9uaW9fY2hhbm5lbHNfRmlsZUNoYW5uZWxJbXBsLmMNCi0tLSBuYXRpdmUvam5pL2phdmEtbmlv
L2dudV9qYXZhX25pb19jaGFubmVsc19GaWxlQ2hhbm5lbEltcGwuYwk5IEFwciAyMDA0IDE3OjM1
OjU2IC0wMDAwCTEuMw0KKysrIG5hdGl2ZS9qbmkvamF2YS1uaW8vZ251X2phdmFfbmlvX2NoYW5u
ZWxzX0ZpbGVDaGFubmVsSW1wbC5jCTExIEFwciAyMDA0IDEzOjA5OjQwIC0wMDAwDQpAQCAtMjY2
LDggKzI2NiwyMSBAQA0KIEpOSUVYUE9SVCBqbG9uZyBKTklDQUxMDQogSmF2YV9nbnVfamF2YV9u
aW9fY2hhbm5lbHNfRmlsZUNoYW5uZWxJbXBsX3NpemUgKEpOSUVudiAqZW52LCBqb2JqZWN0IG9i
aikNCiB7DQotICBKQ0xfVGhyb3dFeGNlcHRpb24gKGVudiwgSU9fRVhDRVBUSU9OLCAiamF2YS5u
aW8uRmlsZUNoYW5uZWxJbXBsLnNpemUoKTogbm90IGltcGxlbWVudGVkIik7DQotICByZXR1cm4g
VEFSR0VUX05BVElWRV9NQVRIX0lOVF9JTlQ2NF9DT05TVF8wOw0KKyAgaW50ICAgbmF0aXZlX2Zk
Ow0KKyAgamxvbmcgZmlsZV9zaXplOw0KKyAgaW50ICAgcmVzdWx0Ow0KKw0KKyAgbmF0aXZlX2Zk
ID0gZ2V0X25hdGl2ZV9mZChlbnYsIG9iaik7DQorDQorICBUQVJHRVRfTkFUSVZFX0ZJTEVfU0la
RShuYXRpdmVfZmQsIGZpbGVfc2l6ZSwgcmVzdWx0KTsNCisgIGlmIChyZXN1bHQgIT0gVEFSR0VU
X05BVElWRV9PSykNCisgICAgew0KKyAgICAgIEpDTF9UaHJvd0V4Y2VwdGlvbihlbnYsIElPX0VY
Q0VQVElPTiwNCisJCQkgVEFSR0VUX05BVElWRV9MQVNUX0VSUk9SX1NUUklORygpKTsNCisgICAg
ICByZXR1cm4gVEFSR0VUX05BVElWRV9NQVRIX0lOVF9JTlQ2NF9DT05TVF9NSU5VU18xOw0KKyAg
ICB9DQorDQorICByZXR1cm4gZmlsZV9zaXplOw0KIH0NCiAvKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8NCiAv
Kg0K

--=-7vMYJ7lvts2jf2UVaQMC--

--=-0VRP7UcHx0P8EyKSXSRW
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)

iD8DBQBAeUS0xVhZCJWr9QwRArdbAJ9ViKeH9giiArYwbf+ATIida1VgKACdG7WE
WFAWqG/O9lJCdFF1ocJXzZk=
=FReX
-----END PGP SIGNATURE-----

--=-0VRP7UcHx0P8EyKSXSRW--




From MAILER-DAEMON Sun Apr 11 09:44:33 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCfGD-0002ul-EI
	for mharc-commit-classpath@gnu.org; Sun, 11 Apr 2004 09:44:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCfG8-0002rE-7O
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 09:44:28 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCfFb-0002Xo-AU
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 09:44:27 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCfFa-0002Wy-W3
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 09:43:55 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 24CDF622AB
	for <commit-classpath@gnu.org>; Sun, 11 Apr 2004 13:43:33 +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 37552-01 for <commit-classpath@gnu.org>;
	Sun, 11 Apr 2004 13:43:32 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-80-190.adsl.solnet.ch
	[212.41.80.190])
	by mail01.solnet.ch (Postfix) with ESMTP id EB77C60DF8
	for <commit-classpath@gnu.org>; Sun, 11 Apr 2004 13:43:26 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 3B7F5B6D4E; Sun, 11 Apr 2004 15:41:35 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040411134135.3B7F5B6D4E@reali.dnsalias.net>
Date: Sun, 11 Apr 2004 15:41:35 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040411 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 11 Apr 2004 13:44:29 -0000




From MAILER-DAEMON Sun Apr 11 17:02:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCm6K-00074m-Qw
	for mharc-commit-classpath@gnu.org; Sun, 11 Apr 2004 17:02:48 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCm6E-00071O-E1
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 17:02:42 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCm6C-0006zF-UQ
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 17:02:41 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCm6B-0006wS-KG
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 17:02:39 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BCm62-0001dq-00
	for <commit-classpath@gnu.org>; Sun, 11 Apr 2004 23:02:30 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-H6EQGJr4BpmXjP9tgbjF"
Message-Id: <1081717352.13170.509.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 11 Apr 2004 23:02:32 +0200
Subject: FYI: VMObjectStreamClass getFieldReference() fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 11 Apr 2004 21:02:43 -0000


--=-H6EQGJr4BpmXjP9tgbjF
Content-Type: multipart/mixed; boundary="=-VIL1wEG4f6FqyYYeas6Y"


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

Hi,

The new native JNI VMObjectStreamClass getFieldReference() function for
setting final fields during serialization had a little flaw. We need to
get the declaring class of the field and not the class of the object we
are now serializing. This is pointed out by the SerTest in mauve which
tests whether serialization handles shadowed fields correctly.

Another thing that we should explicitly set is the field type in case
the field is not a primitive type. This is needed for the GetFieldID
call. It is a bit ugly because we actually have construct it ourselves.

2004-04-11  Mark Wielaard  <mark@klomp.org>

        * native/jni/java-io/java_io_VMObjectStreamClass.c
        (throwInternalError): Just return when everything fails.
        (getFieldReference): Get field declaring class, not object class.
        Calculate field type descriptor if not yet given.

This fixes a couple of Mauve regressions.

Cheers,

Mark

--=-VIL1wEG4f6FqyYYeas6Y
Content-Disposition: inline; filename=VMObjectStreamClass.patch
Content-Type: text/x-patch; name=VMObjectStreamClass.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IG5hdGl2ZS9qbmkvamF2YS1pby9qYXZhX2lvX1ZNT2JqZWN0U3RyZWFtQ2xhc3MuYw0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvbmF0aXZl
L2puaS9qYXZhLWlvL2phdmFfaW9fVk1PYmplY3RTdHJlYW1DbGFzcy5jLHYNCnJldHJpZXZpbmcg
cmV2aXNpb24gMS40DQpkaWZmIC11IC1yMS40IGphdmFfaW9fVk1PYmplY3RTdHJlYW1DbGFzcy5j
DQotLS0gbmF0aXZlL2puaS9qYXZhLWlvL2phdmFfaW9fVk1PYmplY3RTdHJlYW1DbGFzcy5jCTgg
QXByIDIwMDQgMDY6NDc6NTMgLTAwMDAJMS40DQorKysgbmF0aXZlL2puaS9qYXZhLWlvL2phdmFf
aW9fVk1PYmplY3RTdHJlYW1DbGFzcy5jCTExIEFwciAyMDA0IDIxOjAwOjIyIC0wMDAwDQpAQCAt
MzksNiArMzksOSBAQA0KICNpbmNsdWRlIDxqbmkuaD4NCiAjaW5jbHVkZSA8amNsLmg+DQogDQor
I2luY2x1ZGUgPHN0ZGxpYi5oPg0KKyNpbmNsdWRlIDxzdHJpbmcuaD4NCisNCiAjaW5jbHVkZSAi
amF2YV9pb19WTU9iamVjdFN0cmVhbUNsYXNzLmgiDQogDQogLyoNCkBAIC02OCw2ICs3MSwxMCBA
QA0KICAganN0cmluZyBtZXNzYWdlOw0KIA0KICAgaW50ZXJuYWxFcnJvckNsYXNzID0gKCplbnYp
LT5GaW5kQ2xhc3MoZW52LCAiamF2YS9sYW5nL0ludGVybmFsRXJyb3IiKTsNCisgIC8qKiBKdXN0
IGdpdmUgdXAgaWYgdGhpcyBhbHNvIGZhaWxzLiAqLw0KKyAgaWYgKGludGVybmFsRXJyb3JDbGFz
cyA9PSBOVUxMKQ0KKyAgICByZXR1cm47DQorDQogICBwcmV2aW91c0V4Y2VwdGlvbiA9ICgqZW52
KS0+RXhjZXB0aW9uT2NjdXJyZWQoZW52KTsNCiANCiAgIGlmIChwcmV2aW91c0V4Y2VwdGlvbiA9
PSBOVUxMKQ0KQEAgLTk3LDE0ICsxMDQsMjAgQEANCiB9DQogDQogc3RhdGljIGpmaWVsZElEIGdl
dEZpZWxkUmVmZXJlbmNlKEpOSUVudiAqZW52LCBqb2JqZWN0IGZpZWxkLCANCi0JCQkJICBqb2Jq
ZWN0IG9iamVjdCwgY29uc3QgY2hhciAqdHlwZSkNCisJCQkJICBqb2JqZWN0IG9iamVjdCwgY2hh
ciAqdHlwZSkNCiB7DQorICBqY2xhc3MgY2xhc3NDbGFzczsNCiAgIGpjbGFzcyBmaWVsZENsYXNz
Ow0KLSAgamNsYXNzIG9iamVjdENsYXNzOw0KKyAgamNsYXNzIGRlY2xhcmluZ0NsYXNzOw0KKyAg
amNsYXNzIHR5cGVDbGFzczsNCiAgIGpmaWVsZElEIGZpZDsNCiAgIGNvbnN0IGpieXRlICpmaWVs
ZF9uYW1lOw0KKyAgY29uc3QgamJ5dGUgKnR5cGVfbmFtZTsNCisgIHNpemVfdCB0eXBlX2xlbjsN
CiAgIGptZXRob2RJRCBtaWQ7DQogICBqc3RyaW5nIG5hbWU7DQorICBqc3RyaW5nIHRuYW1lOw0K
KyAgaW50IGk7DQogDQogICBmaWVsZENsYXNzID0gKCplbnYpLT5HZXRPYmplY3RDbGFzcyhlbnYs
IGZpZWxkKTsNCiANCkBAIC0xMTcsMTUgKzEzMCw3OSBAQA0KIA0KICAgbmFtZSA9ICgqZW52KS0+
Q2FsbE9iamVjdE1ldGhvZChlbnYsIGZpZWxkLCBtaWQpOw0KICAgZmllbGRfbmFtZSA9ICgqZW52
KS0+R2V0U3RyaW5nVVRGQ2hhcnMoZW52LCBuYW1lLCBOVUxMKTsNCi0gIA0KLSAgb2JqZWN0Q2xh
c3MgPSAoKmVudiktPkdldE9iamVjdENsYXNzKGVudiwgb2JqZWN0KTsNCi0gIGZpZCA9ICgqZW52
KS0+R2V0RmllbGRJRChlbnYsIG9iamVjdENsYXNzLCBmaWVsZF9uYW1lLCB0eXBlKTsNCisgDQor
ICBtaWQgPSAoKmVudiktPkdldE1ldGhvZElEKGVudiwgZmllbGRDbGFzcywNCisJCQkgICAgImdl
dERlY2xhcmluZ0NsYXNzIiwNCisJCQkgICAgIigpTGphdmEvbGFuZy9DbGFzczsiKTsNCisgIGlm
IChtaWQgPT0gTlVMTCB8fCAoKmVudiktPkV4Y2VwdGlvbk9jY3VycmVkKGVudikgIT0gTlVMTCkN
CisgICAgew0KKyAgICAgIHRocm93SW50ZXJuYWxFcnJvcihlbnYpOw0KKyAgICAgIHJldHVybiBO
VUxMOw0KKyAgICB9DQorDQorICBkZWNsYXJpbmdDbGFzcyA9ICgqZW52KS0+Q2FsbE9iamVjdE1l
dGhvZChlbnYsIGZpZWxkLCBtaWQpOw0KKw0KKyAgLyogRG8gd2UgbmVlZCB0byBmaW5kIG91dCB0
aGUgZXhhY3QgdHlwZSBkZXNjcmlwdG9yIG9mIHRoZSBmaWVsZD8gKi8NCisgIGlmICh0eXBlID09
IE5VTEwpDQorICAgIHsNCisgICAgICBtaWQgPSAoKmVudiktPkdldE1ldGhvZElEKGVudiwgZmll
bGRDbGFzcywNCisJCQkJImdldFR5cGUiLA0KKwkJCQkiKClMamF2YS9sYW5nL0NsYXNzOyIpOw0K
Kw0KKyAgICAgIGlmIChtaWQgPT0gTlVMTCB8fCAoKmVudiktPkV4Y2VwdGlvbk9jY3VycmVkKGVu
dikgIT0gTlVMTCkNCisJew0KKwkgIHRocm93SW50ZXJuYWxFcnJvcihlbnYpOw0KKwkgIHJldHVy
biBOVUxMOw0KKwl9DQorDQorICAgICAgdHlwZUNsYXNzID0gKCplbnYpLT5DYWxsT2JqZWN0TWV0
aG9kKGVudiwgZmllbGQsIG1pZCk7DQorICAgICAgY2xhc3NDbGFzcyA9ICgqZW52KS0+RmluZENs
YXNzKGVudiwgImphdmEvbGFuZy9DbGFzcyIpOw0KKw0KKyAgICAgIG1pZCA9ICgqZW52KS0+R2V0
TWV0aG9kSUQoZW52LCBjbGFzc0NsYXNzLA0KKwkJCQkiZ2V0TmFtZSIsDQorCQkJCSIoKUxqYXZh
L2xhbmcvU3RyaW5nOyIpOw0KKw0KKyAgICAgIGlmIChtaWQgPT0gTlVMTCB8fCAoKmVudiktPkV4
Y2VwdGlvbk9jY3VycmVkKGVudikgIT0gTlVMTCkNCisJew0KKwkgIHRocm93SW50ZXJuYWxFcnJv
cihlbnYpOw0KKwkgIHJldHVybiBOVUxMOw0KKwl9DQorDQorICAgICAgdG5hbWUgPSAoKmVudikt
PkNhbGxPYmplY3RNZXRob2QoZW52LCB0eXBlQ2xhc3MsIG1pZCk7DQorICAgICAgdHlwZV9uYW1l
ID0gKCplbnYpLT5HZXRTdHJpbmdVVEZDaGFycyhlbnYsIHRuYW1lLCBOVUxMKTsNCisNCisgICAg
ICAvKg0KKyAgICAgICAqIFRoZSBhY3R1YWwgZmllbGQgdHlwZSBkZXNjcmlwdG9yIHN0YXJ0cyB3
aXRoICdMJywgZW5kcyB3aXRoICc7Jw0KKyAgICAgICAqIGFuZCBoYXMgJy8nIGluc3RlYWQgb2Yg
Jy4nLg0KKyAgICAgICAqLw0KKyAgICAgIHR5cGVfbGVuID0gc3RybGVuKChjaGFyICopIHR5cGVf
bmFtZSk7DQorICAgICAgdHlwZSA9IChjaGFyICopIG1hbGxvYyh0eXBlX2xlbiArIDMpOw0KKyAg
ICAgIHR5cGVbMF0gPSAnTCc7DQorICAgICAgdHlwZVt0eXBlX2xlbiArIDFdID0gJzsnOw0KKyAg
ICAgIHR5cGVbdHlwZV9sZW4gKyAyXSA9ICdcMCc7DQorDQorICAgICAgZm9yIChpID0gMDsgaSA8
IHR5cGVfbGVuOyBpKyspDQorCWlmICh0eXBlX25hbWVbaV0gPT0gJy4nKQ0KKwkgIHR5cGVbaSAr
IDFdID0gJy8nOw0KKyAgICAgICAgZWxzZQ0KKwkgIHR5cGVbaSArIDFdID0gdHlwZV9uYW1lW2ld
Ow0KKw0KKyAgICAgICgqZW52KS0+UmVsZWFzZVN0cmluZ1VURkNoYXJzKGVudiwgdG5hbWUsIHR5
cGVfbmFtZSk7DQorICAgIH0NCisgIGVsc2UNCisgICAgdHlwZV9sZW4gPSAtMTsNCisNCisgIGZp
ZCA9ICgqZW52KS0+R2V0RmllbGRJRChlbnYsIGRlY2xhcmluZ0NsYXNzLCBmaWVsZF9uYW1lLCAo
Y29uc3QgY2hhciAqKXR5cGUpOw0KICAgaWYgKGZpZCA9PSBOVUxMKQ0KICAgICB7DQogICAgICAg
dGhyb3dJbnRlcm5hbEVycm9yKGVudik7DQogICAgICAgcmV0dXJuIE5VTEw7DQogICAgIH0NCiAg
ICgqZW52KS0+UmVsZWFzZVN0cmluZ1VURkNoYXJzKGVudiwgbmFtZSwgZmllbGRfbmFtZSk7DQor
DQorICAvKiBEaWQgd2UgY3JlYXRlIHRoZSB0eXBlIG91cnNlbHZlcz8gKi8NCisgIGlmICh0eXBl
X2xlbiAhPSAtMSkNCisgICAgZnJlZSh0eXBlKTsNCiAgIA0KICAgcmV0dXJuIGZpZDsNCiB9DQo=

--=-VIL1wEG4f6FqyYYeas6Y--

--=-H6EQGJr4BpmXjP9tgbjF
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)

iD8DBQBAebJoxVhZCJWr9QwRAnFjAJ9SykbocCypGf/DFEfhNkDibt0FRwCcCeIf
+I/pfnwVac+Bs6XewGufF58=
=d0Tn
-----END PGP SIGNATURE-----

--=-H6EQGJr4BpmXjP9tgbjF--




From MAILER-DAEMON Sun Apr 11 23:17:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCrx9-0004n3-0o
	for mharc-commit-classpath@gnu.org; Sun, 11 Apr 2004 23:17:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCrx6-0004mg-VS
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 23:17:40 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCrx5-0004mS-Mj
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 23:17:40 -0400
Received: from [24.25.9.101] (helo=ms-smtp-02-eri0.southeast.rr.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCrx5-0004mN-CP
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 23:17:39 -0400
Received: from [10.0.0.2] (rdu57-9-048.nc.rr.com [66.57.9.48])
	by ms-smtp-02-eri0.southeast.rr.com (8.12.10/8.12.7) with ESMTP id
	i3C4HbkF011592; Mon, 12 Apr 2004 00:17:37 -0400 (EDT)
From: "C. Brian Jones" <cbj@gnu.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200404102235.49560.konqueror@gmx.de>
References: <200404102235.49560.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-mwFJDn2zwks2sGBFY+mg"
Message-Id: <1081743456.3175.20.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Mon, 12 Apr 2004 00:17:37 -0400
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Cc: commit-classpath@gnu.org
Subject: Re: Patch: install library (again)
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 03:17:41 -0000


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

Okay, thanks.

On Sat, 2004-04-10 at 16:35, Michael Koch wrote:
> Hi list,
>=20
>=20
> I wrote the attached patch to clean up my mess I did before. Now we have=20
> only one option to specify with arguments:
>=20
> --with-glibj=3Dzip  installs glibj.zip only
> --with-glibj=3Dflat  installs class files only
> --with-glibj=3Dboth installs glibj.zip and class files
>=20
> If not specified this option defaults to "zip".
>=20
> Okay to commit ?
>=20
>=20
> Michael
>=20
>=20
> 2004-04-10  Michael Koch  <konqueror@gmx.de>
>=20
> 	* configure.ac: Call only CLASSPATH_WITH_GLIBJ to get what to install.
> 	* acinclude.m4
> 	(CLASSPATH_WITH_GLIBJ): New function to specify what to install.
> 	(CLASSPATH_ENABLE_GLIBJ): Removed.
> 	(CLASSPATH_ENABLE_CLASS_INSTALL): Removed.
> 	* lib/Makefile.am: Handle INSTALL_GLIBJ_ZIP and INSTALL_CLASS_FILES.
>=20
>=20
> ______________________________________________________________________
> _______________________________________________
> Commit-classpath mailing list
> Commit-classpath@gnu.org
> http://mail.gnu.org/mailman/listinfo/commit-classpath

--=-mwFJDn2zwks2sGBFY+mg
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)

iD8DBQBAehhgcEcmdY33uzYRAivYAJ4w0ZZ4RhNxScbIsuAWAwOilcPhrQCglqXo
jVE33FHbJQIi2wLdnw6yny0=
=K1o/
-----END PGP SIGNATURE-----

--=-mwFJDn2zwks2sGBFY+mg--




From MAILER-DAEMON Mon Apr 12 00:00:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCscf-0007v9-24
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 00:00:37 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCscc-0007uT-TJ
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 00:00:34 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCscb-0007u1-L9
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 00:00:34 -0400
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 1BCscb-0007gi-FG
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 00:00:33 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BCsPm-00055f-5a
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 23:47:18 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 644B662369
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 03:45:26 +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 63399-09 for <commit-classpath@gnu.org>;
	Mon, 12 Apr 2004 03:45:25 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-90-124.adsl.solnet.ch
	[212.41.90.124])
	by mail01.solnet.ch (Postfix) with ESMTP id 4EE8162368
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 03:45:20 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 68223B6F25; Mon, 12 Apr 2004 05:43:26 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040412034326.68223B6F25@reali.dnsalias.net>
Date: Mon, 12 Apr 2004 05:43:26 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040412 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 04:00:35 -0000




From MAILER-DAEMON Mon Apr 12 00:26:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCt1i-0002lT-S3
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 00:26:30 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCt1g-0002kx-MM
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 00:26:28 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCt1f-0002ka-EP
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 00:26:27 -0400
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 1BCt1f-0002ac-7A
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 00:26:27 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BCozK-0002iI-Ag
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 20:07:50 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BCovU-0004Cj-Ph
	for commit-classpath@gnu.org; Sun, 11 Apr 2004 20:03:48 -0400
From: "anonymous" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:80 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8540
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.6) Gecko/20040206 Firefox/0.8
X-Apparently-From: 206.191.47.130
X-Copy-To: Array
Message-Id: <E1BCovU-0004Cj-Ph@savannah.gnu.org>
Date: Sun, 11 Apr 2004 20:03:48 -0400
Subject: [bugs #8540] gnu.java.net.protocol.http.Connection doesn't handle
	null from DataInputStream.readLine()
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 04:26:29 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.




/**************************************************************************/
[bugs #8540] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8540>
Project: classpath
Submitted by: 0
On: Sun 04/11/04 at 20:03

Severity:  5 - Average
Resolution:  None
Assigned to:  None
Status:  Open
Platform Version:  None


Summary:  gnu.java.net.protocol.http.Connection doesn't handle null from DataInputStream.readLine()

Original Submission:  Like the summary says.

Though it was a bug with my HTTP sender which returned a malformed HTTP response, Connection doesn't check the return value of inputStream.readLine() in receiveReply() before using indexOf on it.

The current version of Connection in  CVS (1.16) has this problem.

Mark Baker -- distobj@acm.org











For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8540>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Mon Apr 12 01:14:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCtlx-0001Jb-Fm
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 01:14:17 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCtkS-0007CD-TN
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 01:12:44 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCtjU-0005dt-2r
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 01:11:56 -0400
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 1BCtfy-0002iZ-3M
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 01:08:06 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BCubw-000129-Gm
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 02:08:00 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-238.ewetel.net
	[80.228.94.238])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3C67wPZ008671
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 08:07:58 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BCtg8-0003zn-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 07:08:16 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 08:07:48 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_0IjeAWQYltuFa18"
Message-Id: <200404120807.48714.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: centralizing classpath module options
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 05:14:15 -0000


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

Hi list,


I wrote the attached patch to centralize classpath's module options.

What do you think about this step ? Okay to commit ?


Michael


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

	* configure.ac: Initialize CLASSPATH_MODULE.
	* native/fdlibm/Makefile.am,
	native/jni/classpath/Makefile.am,
	native/jni/gtk-peer/Makefile.am,
	native/jni/java-awt/Makefile.am,
	native/jni/java-io/Makefile.am,
	native/jni/java-lang/Makefile.am,
	native/jni/java-net/Makefile.am,
	native/jni/java-nio/Makefile.am,
	native/jni/java-util/Makefile.am:
	Use new @CLASSPATH_MODULE@.

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

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.18
diff -u -r1.18 configure.ac
--- configure.ac	12 Apr 2004 05:51:58 -0000	1.18
+++ configure.ac	12 Apr 2004 06:03:59 -0000
@@ -20,7 +20,9 @@
 dnl We will not track/change lib version until we reach version 1.0
 dnl at which time we'll have to be more anal about such things
 dnl -----------------------------------------------------------
-AC_SUBST(LIBVERSION, "0:0:0")
+#AC_SUBST(LIBVERSION, "0:0:0")
+CLASSPATH_MODULE="-module -release ${VERSION}"
+AC_SUBST(CLASSPATH_MODULE)
 
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE(1.7.0)
Index: native/fdlibm/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/fdlibm/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- native/fdlibm/Makefile.am	10 Apr 2004 13:10:29 -0000	1.4
+++ native/fdlibm/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -45,7 +45,7 @@
 			w_remainder.c \
 			w_sqrt.c 
 
-libfdlibm_la_LDFLAGS = -module -version-info @LIBVERSION@ 
+libfdlibm_la_LDFLAGS = @CLASSPATH_MODULE@ 
 
 # We just want the standard flags for fdlibm since it is an upstream lib
 # and our normal -ansi -pedantic -Wall -Werror breaks this lib.
Index: native/jni/classpath/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/classpath/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- native/jni/classpath/Makefile.am	5 Nov 2001 03:03:27 -0000	1.1
+++ native/jni/classpath/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -5,7 +5,7 @@
 				primlib.c primlib.h \
 				native_state.c native_state.h
 
-libclasspath_la_LDFLAGS = -module -version-info @LIBVERSION@
+libclasspath_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES =  -I. @EXTRA_INCLUDES@ \
 	    -I$(top_srcdir)/include \
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- native/jni/gtk-peer/Makefile.am	12 Feb 2004 16:53:09 -0000	1.7
+++ native/jni/gtk-peer/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -36,7 +36,7 @@
 			gtkpeer.h 
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo
-libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTK_LIBS@
+libgtkpeer_la_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
 	   @GTK_CFLAGS@ \
Index: native/jni/java-awt/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-awt/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- native/jni/java-awt/Makefile.am	12 Feb 2004 16:53:09 -0000	1.1
+++ native/jni/java-awt/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -3,7 +3,7 @@
 libjavaawt_la_SOURCES = gnu_java_awt_EmbeddedWindow.c
 			
 
-libjavaawt_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavaawt_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavaawt_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-io/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- native/jni/java-io/Makefile.am	15 Mar 2004 23:08:48 -0000	1.13
+++ native/jni/java-io/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -7,7 +7,7 @@
 			java_io_ObjectInputStream.c \
 			java_io_VMObjectStreamClass.c
 
-libjavaio_la_LDFLAGS = -module -version-info @LIBVERSION@ 
+libjavaio_la_LDFLAGS = @CLASSPATH_MODULE@ 
 
 libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-lang/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- native/jni/java-lang/Makefile.am	16 Jul 2003 12:21:07 -0000	1.6
+++ native/jni/java-lang/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -11,8 +11,8 @@
 
 libjavalang_la_LIBADD = $(wildcard $(top_builddir)/native/fdlibm/*.lo) \
 			$(top_builddir)/native/jni/classpath/jcl.lo
-libjavalang_la_LDFLAGS = -module -version-info @LIBVERSION@
-libjavalangreflect_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavalang_la_LDFLAGS = @CLASSPATH_MODULE@
+libjavalangreflect_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
 	   -I$(top_srcdir)/native/jni/classpath \
Index: native/jni/java-net/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-net/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- native/jni/java-net/Makefile.am	19 Sep 2003 06:12:39 -0000	1.5
+++ native/jni/java-net/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -7,7 +7,7 @@
 			gnu_java_net_PlainDatagramSocketImpl.c \
                         gnu_java_net_PlainSocketImpl.c
 
-libjavanet_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavanet_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- native/jni/java-nio/Makefile.am	8 Apr 2004 23:11:20 -0000	1.4
+++ native/jni/java-nio/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -7,7 +7,7 @@
 			java_nio_DirectByteBufferImpl.c \
 			java_nio_FileLockImpl.c
 
-libjavanio_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavanio_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-util/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-util/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- native/jni/java-util/Makefile.am	9 Feb 2002 21:32:16 -0000	1.3
+++ native/jni/java-util/Makefile.am	12 Apr 2004 06:03:59 -0000
@@ -2,7 +2,7 @@
 
 libjavautil_la_SOURCES = java_util_TimeZone.c
 
-libjavautil_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavautil_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
            -I$(top_srcdir)/include \

--Boundary-00=_0IjeAWQYltuFa18--




From MAILER-DAEMON Mon Apr 12 03:57:23 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCwJn-0002u6-4S
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 03:57:23 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCwJe-0002iT-Pw
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 03:57:14 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCwJG-0001yg-2X
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 03:56:57 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCwJE-0001ts-41
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 03:56:48 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-055.ewetel.net
	[80.228.95.55])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3C8umPZ016635
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 10:56:49 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BCwJW-0004EV-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 09:57:06 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 10:56:38 +0200
User-Agent: KMail/1.5.4
References: <200404120807.48714.konqueror@gmx.de>
In-Reply-To: <200404120807.48714.konqueror@gmx.de>
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_GnleAKj/mj47y/n"
Message-Id: <200404121056.38611.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Re: Patch: centralizing classpath module options
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 07:57:21 -0000


--Boundary-00=_GnleAKj/mj47y/n
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Am Montag, 12. April 2004 08:07 schrieb Michael Koch:
> Hi list,
>
>
> I wrote the attached patch to centralize classpath's module options.
>
> What do you think about this step ? Okay to commit ?
>
>
> Michael
>
>
> 2004-04-12  Michael Koch  <konqueror@gmx.de>
>
> 	* configure.ac: Initialize CLASSPATH_MODULE.
> 	* native/fdlibm/Makefile.am,
> 	native/jni/classpath/Makefile.am,
> 	native/jni/gtk-peer/Makefile.am,
> 	native/jni/java-awt/Makefile.am,
> 	native/jni/java-io/Makefile.am,
> 	native/jni/java-lang/Makefile.am,
> 	native/jni/java-net/Makefile.am,
> 	native/jni/java-nio/Makefile.am,
> 	native/jni/java-util/Makefile.am:
> 	Use new @CLASSPATH_MODULE@.

I attached the wrong patch to this mail. Now the correct one.


Michael

--Boundary-00=_GnleAKj/mj47y/n
Content-Type: text/x-diff;
  charset="iso-8859-1";
  name="module.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="module.diff"

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.18
diff -u -r1.18 configure.ac
--- configure.ac	12 Apr 2004 05:51:58 -0000	1.18
+++ configure.ac	12 Apr 2004 08:56:06 -0000
@@ -21,6 +21,8 @@
 dnl at which time we'll have to be more anal about such things
 dnl -----------------------------------------------------------
 AC_SUBST(LIBVERSION, "0:0:0")
+CLASSPATH_MODULE="-module -version-info ${LIBVERSION}"
+AC_SUBST(CLASSPATH_MODULE)
 
 AC_PREREQ(2.59)
 AM_INIT_AUTOMAKE(1.7.0)
Index: native/fdlibm/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/fdlibm/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- native/fdlibm/Makefile.am	10 Apr 2004 13:10:29 -0000	1.4
+++ native/fdlibm/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -45,7 +45,7 @@
 			w_remainder.c \
 			w_sqrt.c 
 
-libfdlibm_la_LDFLAGS = -module -version-info @LIBVERSION@ 
+libfdlibm_la_LDFLAGS = @CLASSPATH_MODULE@ 
 
 # We just want the standard flags for fdlibm since it is an upstream lib
 # and our normal -ansi -pedantic -Wall -Werror breaks this lib.
Index: native/jni/classpath/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/classpath/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- native/jni/classpath/Makefile.am	5 Nov 2001 03:03:27 -0000	1.1
+++ native/jni/classpath/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -5,7 +5,7 @@
 				primlib.c primlib.h \
 				native_state.c native_state.h
 
-libclasspath_la_LDFLAGS = -module -version-info @LIBVERSION@
+libclasspath_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES =  -I. @EXTRA_INCLUDES@ \
 	    -I$(top_srcdir)/include \
Index: native/jni/gtk-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- native/jni/gtk-peer/Makefile.am	12 Feb 2004 16:53:09 -0000	1.7
+++ native/jni/gtk-peer/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -36,7 +36,7 @@
 			gtkpeer.h 
 
 libgtkpeer_la_LIBADD = $(top_builddir)/native/jni/classpath/native_state.lo
-libgtkpeer_la_LDFLAGS = -module -version-info @LIBVERSION@ @GTK_LIBS@
+libgtkpeer_la_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
 	   @GTK_CFLAGS@ \
Index: native/jni/java-awt/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-awt/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- native/jni/java-awt/Makefile.am	12 Feb 2004 16:53:09 -0000	1.1
+++ native/jni/java-awt/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -3,7 +3,7 @@
 libjavaawt_la_SOURCES = gnu_java_awt_EmbeddedWindow.c
 			
 
-libjavaawt_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavaawt_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavaawt_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-io/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- native/jni/java-io/Makefile.am	15 Mar 2004 23:08:48 -0000	1.13
+++ native/jni/java-io/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -7,7 +7,7 @@
 			java_io_ObjectInputStream.c \
 			java_io_VMObjectStreamClass.c
 
-libjavaio_la_LDFLAGS = -module -version-info @LIBVERSION@ 
+libjavaio_la_LDFLAGS = @CLASSPATH_MODULE@ 
 
 libjavaio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-lang/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- native/jni/java-lang/Makefile.am	16 Jul 2003 12:21:07 -0000	1.6
+++ native/jni/java-lang/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -11,8 +11,8 @@
 
 libjavalang_la_LIBADD = $(wildcard $(top_builddir)/native/fdlibm/*.lo) \
 			$(top_builddir)/native/jni/classpath/jcl.lo
-libjavalang_la_LDFLAGS = -module -version-info @LIBVERSION@
-libjavalangreflect_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavalang_la_LDFLAGS = @CLASSPATH_MODULE@
+libjavalangreflect_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
 	   -I$(top_srcdir)/native/jni/classpath \
Index: native/jni/java-net/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-net/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- native/jni/java-net/Makefile.am	19 Sep 2003 06:12:39 -0000	1.5
+++ native/jni/java-net/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -7,7 +7,7 @@
 			gnu_java_net_PlainDatagramSocketImpl.c \
                         gnu_java_net_PlainSocketImpl.c
 
-libjavanet_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavanet_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanet_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- native/jni/java-nio/Makefile.am	8 Apr 2004 23:11:20 -0000	1.4
+++ native/jni/java-nio/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -7,7 +7,7 @@
 			java_nio_DirectByteBufferImpl.c \
 			java_nio_FileLockImpl.c
 
-libjavanio_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavanio_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
Index: native/jni/java-util/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-util/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- native/jni/java-util/Makefile.am	9 Feb 2002 21:32:16 -0000	1.3
+++ native/jni/java-util/Makefile.am	12 Apr 2004 08:56:06 -0000
@@ -2,7 +2,7 @@
 
 libjavautil_la_SOURCES = java_util_TimeZone.c
 
-libjavautil_la_LDFLAGS = -module -version-info @LIBVERSION@
+libjavautil_la_LDFLAGS = @CLASSPATH_MODULE@
 
 INCLUDES = -I. @EXTRA_INCLUDES@ \
            -I$(top_srcdir)/include \

--Boundary-00=_GnleAKj/mj47y/n--




From MAILER-DAEMON Mon Apr 12 05:38:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCxu2-0003dk-HA
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 05:38:54 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCxty-0003YV-2t
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 05:38:50 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCxtw-0003Vn-8J
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 05:38:48 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCxtv-0003UU-No
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 05:38:47 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BCyps-0003X5-00; Mon, 12 Apr 2004 12:38:40 +0200
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200404120807.48714.konqueror@gmx.de>
References: <200404120807.48714.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-+z5m/dG2b9UpNHjJ7dtU"
Message-Id: <1081766322.13170.547.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Mon, 12 Apr 2004 12:38:42 +0200
Cc: commit-classpath@gnu.org
Subject: Re: Patch: centralizing classpath module options
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 09:38:50 -0000


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

Hi,

On Mon, 2004-04-12 at 08:07, Michael Koch wrote:
> I wrote the attached patch to centralize classpath's module options.
>=20
> What do you think about this step ? Okay to commit ?
>
> 2004-04-12  Michael Koch  <konqueror@gmx.de>
>=20
> 	* configure.ac: Initialize CLASSPATH_MODULE.
> 	* native/fdlibm/Makefile.am,
> 	native/jni/classpath/Makefile.am,
> 	native/jni/gtk-peer/Makefile.am,
> 	native/jni/java-awt/Makefile.am,
> 	native/jni/java-io/Makefile.am,
> 	native/jni/java-lang/Makefile.am,
> 	native/jni/java-net/Makefile.am,
> 	native/jni/java-nio/Makefile.am,
> 	native/jni/java-util/Makefile.am:
> 	Use new @CLASSPATH_MODULE@.

Yes. It is a good idea to centralize as much as this in configure.ac. We
got some requests to version our JNI libraries and this makes it much
easier. Although I think we are still in rapid development mode were
library versioning doesn't make much sense since we don't expect other
projects to depend on older versions of GNU Classpath yet. This does
give people the option to make a derived version that does that anyway
though, which is good.

Cheers,

Mark

--=-+z5m/dG2b9UpNHjJ7dtU
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)

iD8DBQBAenGwxVhZCJWr9QwRAj5UAJ4/TlaXjkEljcnn8KRe+4qtTxVcCwCcCKXZ
vXnBQYHJfWYjhid1mGnS8xQ=
=Xy3U
-----END PGP SIGNATURE-----

--=-+z5m/dG2b9UpNHjJ7dtU--




From MAILER-DAEMON Mon Apr 12 06:10:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCyOz-0007d2-Op
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 06:10:53 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCyOv-0007ad-NS
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 06:10:49 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCyOm-0007V1-N5
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 06:10:46 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCyOd-0007Rc-62
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 06:10:31 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-055.ewetel.net
	[80.228.95.55])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3CBAUPZ013800
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 13:10:31 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BCyOu-0004ZX-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 12:10:48 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 13:10:20 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ckneAteS3HL3915"
Message-Id: <200404121310.20817.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.net - more jalopied
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 10:10:51 -0000


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

Hi list,


I just commited the attached patch to jalopy two more classes.


Michael


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

	* java/net/InetAddress.java,
	java/net/SocketPermission.java:
	Jalopied.

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

Index: java/net/InetAddress.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/InetAddress.java,v
retrieving revision 1.29
diff -u -r1.29 InetAddress.java
--- java/net/InetAddress.java	20 Mar 2004 14:04:44 -0000	1.29
+++ java/net/InetAddress.java	12 Apr 2004 11:08:18 -0000
@@ -7,7 +7,7 @@
 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
@@ -35,7 +35,6 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package java.net;
 
 import gnu.classpath.Configuration;
@@ -47,6 +46,7 @@
 import java.util.HashMap;
 import java.util.StringTokenizer;
 
+
 /**
  * This class models an Internet address.  It does not have a public
  * constructor.  Instead, new instances of this objects are created
@@ -81,17 +81,16 @@
    * Percentage of cache entries to purge when the table gets full.
    */
   private static final int DEFAULT_CACHE_PURGE_PCT = 30;
-  
+
   /**
    * The special IP address INADDR_ANY.
    */
   private static InetAddress inaddr_any;
-  
+
   /**
    * Dummy InetAddress, used to bind socket to any (all) network interfaces.
    */
   static InetAddress ANY_IF;
-    
 
   /**
    * The size of the cache.
@@ -116,44 +115,43 @@
   private static HashMap cache;
 
   static
-  {
-    // load the shared library needed for name resolution
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary ("javanet");
-      }
-    
-    // Look for properties that override default caching behavior
-    cache_size = Integer.getInteger ("gnu.java.net.dns_cache_size",
-				     DEFAULT_CACHE_SIZE).intValue();
-    cache_period = Integer.getInteger ("gnu.java.net.dns_cache_period",
-				       DEFAULT_CACHE_PERIOD * 60
-				       * 1000).intValue();
-
-    cache_purge_pct = Integer.getInteger ("gnu.java.net.dns_cache_purge_pct",
-					  DEFAULT_CACHE_PURGE_PCT).
-      intValue ();
-
-    // Fallback to  defaults if necessary
-    if ((cache_purge_pct < 1) || (cache_purge_pct > 100))
-      cache_purge_pct = DEFAULT_CACHE_PURGE_PCT;
-
-    // Create the cache
-    if (cache_size != 0)
-      cache = new HashMap (cache_size);
+    {
+      // load the shared library needed for name resolution
+      if (Configuration.INIT_LOAD_LIBRARY)
+	System.loadLibrary("javanet");
+
+      // Look for properties that override default caching behavior
+      cache_size =
+	Integer.getInteger("gnu.java.net.dns_cache_size", DEFAULT_CACHE_SIZE)
+	       .intValue();
+      cache_period =
+	Integer.getInteger("gnu.java.net.dns_cache_period",
+	                   DEFAULT_CACHE_PERIOD * 60 * 1000).intValue();
+
+      cache_purge_pct =
+	Integer.getInteger("gnu.java.net.dns_cache_purge_pct",
+	                   DEFAULT_CACHE_PURGE_PCT).intValue();
+
+      // Fallback to  defaults if necessary
+      if ((cache_purge_pct < 1) || (cache_purge_pct > 100))
+	cache_purge_pct = DEFAULT_CACHE_PURGE_PCT;
+
+      // Create the cache
+      if (cache_size != 0)
+	cache = new HashMap(cache_size);
 
-    // precompute the ANY_IF address
-    try
-      {
-        ANY_IF = getInaddrAny ();
-      }
-    catch (UnknownHostException uhe)
-      {
-        // Hmmm, make one up and hope that it works.
-        byte[] zeros = { 0, 0, 0, 0 };
-        ANY_IF = new InetAddress (zeros);
-      }
-  }
+      // precompute the ANY_IF address
+      try
+        {
+	  ANY_IF = getInaddrAny();
+        }
+      catch (UnknownHostException uhe)
+        {
+	  // Hmmm, make one up and hope that it works.
+	  byte[] zeros = { 0, 0, 0, 0 };
+	  ANY_IF = new InetAddress(zeros);
+        }
+    }
 
   /**
    * The Serialized Form specifies that an int 'address' is saved/restored.
@@ -181,7 +179,7 @@
    * The time this address was looked up.
    */
   transient long lookup_time;
-  
+
   /**
    * The field 'family' seems to be the AF_ value.
    * FIXME: Much of the code in the other java.net classes does not make
@@ -198,7 +196,7 @@
    *
    * @param ipaddr The IP number of this address as an array of bytes
    */
-  InetAddress (byte[] address)
+  InetAddress(byte[] address)
   {
     this (address, null, null);
   }
@@ -211,9 +209,9 @@
    * @param ipaddr The IP number of this address as an array of bytes
    * @param hostname The hostname of this IP address.
    */
-  InetAddress (byte[] address, String hostname)
+  InetAddress(byte[] address, String hostname)
   {
-    this (address, hostname, null);
+    this(address, hostname, null);
   }
 
   /**
@@ -226,22 +224,22 @@
    * @param hostname_alias A backup hostname to use if hostname is null to
    * prevent reverse lookup failures
    */
-  InetAddress (byte[] ipaddr, String hostname, String hostname_alias)
+  InetAddress(byte[] ipaddr, String hostname, String hostname_alias)
   {
-    addr = new byte [ipaddr.length];
+    addr = new byte[ipaddr.length];
 
     for (int i = 0; i < ipaddr.length; i++)
-      addr [i] = ipaddr [i];
+      addr[i] = ipaddr[i];
 
     this.hostName = hostname;
     this.hostname_alias = hostname_alias;
     lookup_time = System.currentTimeMillis();
 
-    family = 2;			/* AF_INET */
-    address = addr [3] & 0xff;
-    address |= ((addr [2] << 8) & 0xff00);
-    address |= ((addr [1] << 16) & 0xff0000);
-    address |= ((addr [0] << 24) & 0xff000000);
+    family = 2; /* AF_INET */
+    address = addr[3] & 0xff;
+    address |= ((addr[2] << 8) & 0xff00);
+    address |= ((addr[1] << 16) & 0xff0000);
+    address |= ((addr[0] << 24) & 0xff000000);
   }
 
   /**
@@ -257,75 +255,69 @@
   {
     // Mask against high order bits of 1110
     if (addr.length == 4)
-      return (addr [0] & 0xF0) == 0xE0;
-    
+      return (addr[0] & 0xF0) == 0xE0;
+
     return false;
   }
 
   /**
    * Utility routine to check if the InetAddress in a wildcard address
-   * 
+   *
    * @since 1.4
    */
   public boolean isAnyLocalAddress()
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-    return equals (ANY_IF);
+    return equals(ANY_IF);
   }
 
   /**
    * Utility routine to check if the InetAddress is a loopback address
-   * 
+   *
    * @since 1.4
    */
   public boolean isLoopbackAddress()
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-    
-    return addr [0] == 0x7F;
+    return addr[0] == 0x7F;
   }
 
   /**
    * Utility routine to check if InetAddress is a link local address
-   * 
+   *
    * @since 1.4
    */
   public boolean isLinkLocalAddress()
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-
     // XXX: This seems to not exist with IPv4 addresses
     return false;
   }
 
   /**
    * Utility routine to check if InetAddress is a site local address
-   * 
+   *
    * @since 1.4
    */
   public boolean isSiteLocalAddress()
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-
     // 10.0.0.0/8
-    if (addr [0] == 0x0A)
+    if (addr[0] == 0x0A)
       return true;
 
     // XXX: Suns JDK 1.4.1 (on Linux) seems to have a bug here:
     // it says 172.16.0.0 - 172.255.255.255 are site local addresses
-
     // 172.16.0.0/12
-    if (addr [0] == 0xAC
-        && (addr [1] & 0xF0) == 0x01)
+    if (addr[0] == 0xAC && (addr[1] & 0xF0) == 0x01)
       return true;
 
     // 192.168.0.0/16
-    if (addr [0] == 0xC0
-        && addr [1] == 0xA8)
+    if (addr[0] == 0xC0 && addr[1] == 0xA8)
       return true;
 
     // XXX: Do we need to check more addresses here ?
@@ -334,48 +326,43 @@
 
   /**
    * Utility routine to check if InetAddress is a global multicast address
-   * 
+   *
    * @since 1.4
    */
   public boolean isMCGlobal()
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-
     // XXX: This seems to not exist with IPv4 addresses
     return false;
   }
 
   /**
    * Utility reoutine to check if InetAddress is a node local multicast address
-   * 
+   *
    * @since 1.4
    */
   public boolean isMCNodeLocal()
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-
     // XXX: This seems to not exist with IPv4 addresses
     return false;
   }
 
   /**
    * Utility reoutine to check if InetAddress is a link local multicast address
-   * 
+   *
    * @since 1.4
    */
   public boolean isMCLinkLocal()
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-    
-    if (!isMulticastAddress())
+    if (! isMulticastAddress())
       return false;
 
-    return (addr [0] == 0xE0
-	    && addr [1] == 0x00
-	    && addr [2] == 0x00);
+    return (addr[0] == 0xE0 && addr[1] == 0x00 && addr[2] == 0x00);
   }
 
   /**
@@ -387,7 +374,6 @@
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-
     // XXX: This seems to not exist with IPv4 addresses
     return false;
   }
@@ -395,14 +381,13 @@
   /**
    * Utility reoutine to check if InetAddress is a organization local
    * multicast address
-   * 
+   *
    * @since 1.4
    */
   public boolean isMCOrgLocal()
   {
     // This is the IPv4 implementation.
     // Any class derived from InetAddress should override this.
-
     // XXX: This seems to not exist with IPv4 addresses
     return false;
   }
@@ -420,15 +405,15 @@
 
     try
       {
-        hostName = getHostByAddr (addr);
-        return hostName;
+	hostName = getHostByAddr(addr);
+	return hostName;
       }
     catch (UnknownHostException e)
       {
-        if (hostname_alias != null)
-          return hostname_alias;
-        else
-          return getHostAddress();
+	if (hostname_alias != null)
+	  return hostname_alias;
+	else
+	  return getHostAddress();
       }
   }
 
@@ -445,7 +430,7 @@
   }
 
   /**
-   * Returns the IP address of this object as a String.  The address is in 
+   * Returns the IP address of this object as a String.  The address is in
    * the dotted octet notation, for example, "127.0.0.1".
    *
    * @return The IP address of this object in String form
@@ -454,16 +439,16 @@
    */
   public String getHostAddress()
   {
-    StringBuffer sb = new StringBuffer (40);
-    
+    StringBuffer sb = new StringBuffer(40);
+
     for (int i = 0; i < addr.length; i++)
       {
-        sb.append (addr [i] & 0xff);
+	sb.append(addr[i] & 0xff);
 
-        if (i < (addr.length - 1))
-          sb.append (".");
+	if (i < (addr.length - 1))
+	  sb.append(".");
       }
-    
+
     return sb.toString();
   }
 
@@ -480,10 +465,10 @@
     int hash = 0;
     int len = addr.length;
     int i = len > 4 ? len - 4 : 0;
-    
-    for ( ; i < len;  i++)
+
+    for (; i < len; i++)
       hash = (hash << 8) | (addr[i] & 0xFF);
-    
+
     return hash;
   }
 
@@ -497,11 +482,11 @@
    * @return true if the passed in object's address is equal to this one's,
    * false otherwise
    */
-  public boolean equals (Object obj)
+  public boolean equals(Object obj)
   {
     if (! (obj instanceof InetAddress))
       return false;
-    
+
     // "The Java Class Libraries" 2nd edition says "If a machine has
     // multiple names instances of InetAddress for different name of
     // that same machine are not equal.  This is because they have
@@ -509,14 +494,14 @@
     // JDK 1.2 API documentation.  A little experimentation
     // shows that the latter is correct.
     byte[] addr2 = ((InetAddress) obj).addr;
-    
+
     if (addr.length != addr2.length)
       return false;
-    
+
     for (int i = 0; i < addr.length; i++)
-      if (addr [i] != addr2 [i])
+      if (addr[i] != addr2[i])
 	return false;
-    
+
     return true;
   }
 
@@ -531,14 +516,14 @@
   {
     String host;
     String address = getHostAddress();
-    
+
     if (hostName != null)
       host = hostName;
     else if (hostname_alias != null)
       host = hostname_alias;
     else
       host = address;
-    
+
     return host + "/" + address;
   }
 
@@ -554,10 +539,10 @@
    *
    * @since 1.4
    */
-  public static InetAddress getByAddress (byte[] addr)
+  public static InetAddress getByAddress(byte[] addr)
     throws UnknownHostException
   {
-    return getByAddress (null, addr);
+    return getByAddress(null, addr);
   }
 
   /**
@@ -571,55 +556,55 @@
    *
    * @since 1.4
    */
-  public static InetAddress getByAddress (String host, byte[] addr)
+  public static InetAddress getByAddress(String host, byte[] addr)
     throws UnknownHostException
   {
     if (addr.length == 4)
-      return new Inet4Address (addr, host);
+      return new Inet4Address(addr, host);
 
     if (addr.length == 16)
-      return new Inet6Address (addr, host);
-    
-    throw new UnknownHostException ("IP address has illegal length");
+      return new Inet6Address(addr, host);
+
+    throw new UnknownHostException("IP address has illegal length");
   }
-  
+
   /**
    * If host is a valid numeric IP address, return the numeric address.
    * Otherwise, return null.
    */
-  private static byte[] aton (String hostname)
+  private static byte[] aton(String hostname)
   {
-    StringTokenizer st = new StringTokenizer (hostname, ".");
-    
+    StringTokenizer st = new StringTokenizer(hostname, ".");
+
     if (st.countTokens() == 4)
       {
-        int index;
-        byte[] address = new byte [4];
-	
-        for (index = 0; index < 4; index++)
-          {
-            try
-              {
-                short n = Short.parseShort (st.nextToken());
-                
-                if ((n < 0) || (n > 255))
-                  break;
-                
-                address [index] = (byte) n;
-              }
-            catch (NumberFormatException e)
-              {
-                break;
-              }
-          }
+	int index;
+	byte[] address = new byte[4];
 
-        if (index == 4)
-          return address;
+	for (index = 0; index < 4; index++)
+	  {
+	    try
+	      {
+		short n = Short.parseShort(st.nextToken());
+
+		if ((n < 0) || (n > 255))
+		  break;
+
+		address[index] = (byte) n;
+	      }
+	    catch (NumberFormatException e)
+	      {
+		break;
+	      }
+	  }
+
+	if (index == 4)
+	  return address;
       }
 
     return null;
   }
-  
+
   /**
    * Returns an InetAddress object representing the IP address of the given
    * hostname.  This name can be either a hostname such as "www.urbanophile.com"
@@ -629,7 +614,7 @@
    * the InetAddress array returned from GetAllByName.
    *
    * @param hostname The name of the desired host, or null for the local machine.
-   * 
+   *
    * @return The address of the host as an InetAddress object.
    *
    * @exception UnknownHostException If no IP address for the host could
@@ -637,25 +622,25 @@
    * @exception SecurityException If a security manager exists and its
    * checkConnect method doesn't allow the operation
    */
-  public static InetAddress getByName (String hostname)
+  public static InetAddress getByName(String hostname)
     throws UnknownHostException
   {
     SecurityManager s = System.getSecurityManager();
     if (s != null)
-      s.checkConnect (hostname, -1);
-   
+      s.checkConnect(hostname, -1);
+
     // Default to current host if necessary
     if (hostname == null || hostname.length() == 0)
       return getLocalHost();
 
     // Assume that the host string is an IP address
-    byte[] address = aton (hostname);
+    byte[] address = aton(hostname);
     if (address != null)
-      return new InetAddress (address);
-   
+      return new InetAddress(address);
+
     // Try to resolve the host by DNS
-    InetAddress[] addresses = getAllByName (hostname);
-    return addresses [0];
+    InetAddress[] addresses = getAllByName(hostname);
+    return addresses[0];
   }
 
   /**
@@ -665,57 +650,57 @@
    * dotted decimal format such as "127.0.0.1".  If the value is null, the
    * hostname of the local machine is supplied by default.
    *
-   * @param @param hostname The name of the desired host, or null for the
+   * @param hostname The name of the desired host, or null for the
    * local machine.
    *
    * @return All addresses of the host as an array of InetAddress objects.
-   * 
+   *
    * @exception UnknownHostException If no IP address for the host could
    * be found
    * @exception SecurityException If a security manager exists and its
    * checkConnect method doesn't allow the operation
    */
-  public static InetAddress[] getAllByName (String hostname)
+  public static InetAddress[] getAllByName(String hostname)
     throws UnknownHostException
   {
     SecurityManager s = System.getSecurityManager();
     if (s != null)
-      s.checkConnect (hostname, -1);
-   
+      s.checkConnect(hostname, -1);
+
     // Default to current host if necessary
     if (hostname == null)
       {
-        InetAddress local = getLocalHost();
-        return getAllByName (local.getHostName());
+	InetAddress local = getLocalHost();
+	return getAllByName(local.getHostName());
       }
 
     // Check the cache for this host before doing a lookup
-    InetAddress[] addresses = checkCacheFor (hostname);
-    
+    InetAddress[] addresses = checkCacheFor(hostname);
+
     if (addresses != null)
       return addresses;
 
     // Not in cache, try the lookup
-    byte[][] iplist = getHostByName (hostname);
-    
+    byte[][] iplist = getHostByName(hostname);
+
     if (iplist.length == 0)
-      throw new UnknownHostException (hostname);
+      throw new UnknownHostException(hostname);
 
-    addresses = new InetAddress [iplist.length];
+    addresses = new InetAddress[iplist.length];
 
     for (int i = 0; i < iplist.length; i++)
       {
-        if (iplist[i].length != 4)
-          throw new UnknownHostException (hostname);
+	if (iplist[i].length != 4)
+	  throw new UnknownHostException(hostname);
 
-        // Don't store the hostname in order to force resolution of the
-        // canonical names of these ip's when the user asks for the hostname
-        // But do specify the host alias so if the IP returned won't
-        // reverse lookup we don't throw an exception.
-        addresses[i] = new InetAddress (iplist[i], null, hostname);
+	// Don't store the hostname in order to force resolution of the
+	// canonical names of these ip's when the user asks for the hostname
+	// But do specify the host alias so if the IP returned won't
+	// reverse lookup we don't throw an exception.
+	addresses[i] = new InetAddress(iplist[i], null, hostname);
       }
 
-    addToCache (hostname, addresses);
+    addToCache(hostname, addresses);
     return addresses;
   }
 
@@ -728,29 +713,28 @@
    *
    * @return The InetAddress for this hostname or null if not available
    */
-  private static synchronized InetAddress[] checkCacheFor (String hostname)
+  private static synchronized InetAddress[] checkCacheFor(String hostname)
   {
-    InetAddress[]addresses = null;
+    InetAddress[] addresses = null;
 
     if (cache_size == 0)
       return (null);
 
-    Object obj = cache.get (hostname);
+    Object obj = cache.get(hostname);
     if (obj == null)
       return (null);
 
     if (obj instanceof InetAddress[])
-      addresses = (InetAddress[])obj;
+      addresses = (InetAddress[]) obj;
 
     if (addresses == null)
       return (null);
 
     if (cache_period != -1)
-      if ((System.currentTimeMillis () - addresses[0].lookup_time) >
-          cache_period)
+      if ((System.currentTimeMillis() - addresses[0].lookup_time) > cache_period)
         {
-          cache.remove (hostname);
-          return (null);
+	  cache.remove(hostname);
+	  return (null);
         }
 
     return addresses;
@@ -765,19 +749,19 @@
    * @param hostname The hostname to cache this address under
    * @param obj The InetAddress or InetAddress array to store
    */
-  private static synchronized void addToCache (String hostname, Object obj)
+  private static synchronized void addToCache(String hostname, Object obj)
   {
     if (cache_size == 0)
       return;
-    
+
     // Check to see if hash table is full
     if (cache_size != -1)
-      if (cache.size () == cache_size)
+      if (cache.size() == cache_size)
         {
-          // FIXME Add code to purge later.
+	  // FIXME Add code to purge later.
         }
 
-    cache.put (hostname, obj);
+    cache.put(hostname, obj);
   }
 
   /**
@@ -788,12 +772,12 @@
    *
    * @exception UnknownHostException If an error occurs
    */
-  static InetAddress getInaddrAny () throws UnknownHostException
+  static InetAddress getInaddrAny() throws UnknownHostException
   {
     if (inaddr_any == null)
       {
-        byte[]tmp = lookupInaddrAny ();
-        inaddr_any = new InetAddress (tmp);
+	byte[] tmp = lookupInaddrAny();
+	inaddr_any = new InetAddress(tmp);
       }
 
     return (inaddr_any);
@@ -821,7 +805,7 @@
   public static InetAddress getLocalHost() throws UnknownHostException
   {
     String hostname = getLocalHostname();
-    return getByName (hostname);
+    return getByName(hostname);
   }
 
   /**
@@ -834,19 +818,19 @@
    * throw an UnknownHostException if the hostname cannot be determined.
    *
    * @param ip The IP address as a int array
-   * 
+   *
    * @return The hostname
    *
    * @exception UnknownHostException If the reverse lookup fails
    */
-  private static native String getHostByAddr (byte[] ip)
+  private static native String getHostByAddr(byte[] ip)
     throws UnknownHostException;
 
   /**
    * Returns a list of all IP addresses for a given hostname.  Will throw
    * an UnknownHostException if the hostname cannot be resolved.
    */
-  private static native byte[][] getHostByName (String hostname)
+  private static native byte[][] getHostByName(String hostname)
     throws UnknownHostException;
 
   /*
@@ -856,30 +840,30 @@
   {
     // FIXME: implement this
   }
-	  
-  private void readObject (ObjectInputStream ois)
+
+  private void readObject(ObjectInputStream ois)
     throws IOException, ClassNotFoundException
   {
     ois.defaultReadObject();
-    addr = new byte [4];
-    addr [3] = (byte) address;
-    
+    addr = new byte[4];
+    addr[3] = (byte) address;
+
     for (int i = 2; i >= 0; --i)
-      addr [i] = (byte) (address >>= 8);
-    
-    family = 2;  /* AF_INET  */
+      addr[i] = (byte) (address >>= 8);
+
+    family = 2; /* AF_INET  */
   }
 
-  private void writeObject (ObjectOutputStream oos) throws IOException
+  private void writeObject(ObjectOutputStream oos) throws IOException
   {
     // Build a 32 bit address from the last 4 bytes of a 4 byte IPv4 address
     // or a 16 byte IPv6 address.
     int len = addr.length;
     int i = len - 4;
-    
+
     for (; i < len; i++)
-      address = address << 8 | (((int) addr [i]) & 0xFF);
-    
+      address = address << 8 | (((int) addr[i]) & 0xFF);
+
     oos.defaultWriteObject();
   }
 }
Index: java/net/SocketPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/SocketPermission.java,v
retrieving revision 1.12
diff -u -r1.12 SocketPermission.java
--- java/net/SocketPermission.java	4 Nov 2003 10:07:50 -0000	1.12
+++ java/net/SocketPermission.java	12 Apr 2004 11:08:18 -0000
@@ -1,5 +1,5 @@
 /* SocketPermission.java -- Class modeling permissions for socket operations
-   Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2001, 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@
 import java.security.Permission;
 import java.security.PermissionCollection;
 
+
 /**
  * This class models a specific set of permssions for connecting to a
  * host.  There are two elements to this, the host/port combination and
@@ -103,12 +104,12 @@
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-public final class SocketPermission extends Permission
-  implements Serializable
+public final class SocketPermission extends Permission implements Serializable
 {
   static final long serialVersionUID = -7204263841984476862L;
 
 // FIXME: Needs serialization work, including readObject/writeObject methods.
+
   /**
    * A hostname/port combination as described above
    */
@@ -120,7 +121,7 @@
   private String actions;
 
   /**
-   * Initializes a new instance of <code>SocketPermission</code> with the 
+   * Initializes a new instance of <code>SocketPermission</code> with the
    * specified host/port combination and actions string.
    *
    * @param hostport The hostname/port number combination
@@ -136,18 +137,18 @@
 
   /**
    * Tests this object for equality against another.  This will be true if
-   * and only if the passed object is an instance of 
-   * <code>SocketPermission</code> and both its hostname/port combination 
+   * and only if the passed object is an instance of
+   * <code>SocketPermission</code> and both its hostname/port combination
    * and permissions string are identical.
    *
    * @param obj The object to test against for equality
    *
-   * @return <code>true</code> if object is equal to this object, 
+   * @return <code>true</code> if object is equal to this object,
    *         <code>false</code> otherwise.
    */
   public boolean equals(Object obj)
   {
-    if (!(obj instanceof SocketPermission))
+    if (! (obj instanceof SocketPermission))
       return (false);
 
     if (((SocketPermission) obj).hostport.equals(hostport))
@@ -158,7 +159,7 @@
   }
 
   /**
-   * Returns a hash code value for this object.  Overrides the 
+   * Returns a hash code value for this object.  Overrides the
    * <code>Permission.hashCode()</code>.
    *
    * @return A hash code
@@ -192,21 +193,21 @@
 
     if (actions.indexOf("listen") != -1)
       if (found)
-	  sb.append(",listen");
+	sb.append(",listen");
       else
-	{
+        {
 	  sb.append("listen");
 	  found = true;
-	}
+        }
 
     if (actions.indexOf("accept") != -1)
       if (found)
 	sb.append(",accept");
       else
-	{
+        {
 	  sb.append("accept");
 	  found = true;
-	}
+        }
 
     if (found)
       sb.append(",resolve");
@@ -231,7 +232,7 @@
 
   /**
    * Returns true if the permission object passed it is implied by the
-   * this permission.  This will be true if 
+   * this permission.  This will be true if
    * <p><ul>
    * <li>The argument is of type <code>SocketPermission</code>
    * <li>The actions list of the argument are in this object's actions
@@ -249,7 +250,7 @@
    *
    * @param perm The <code>Permission</code> to check against
    *
-   * @return <code>true</code> if the <code>Permission</code> is implied by 
+   * @return <code>true</code> if the <code>Permission</code> is implied by
    * this object, <code>false</code> otherwise.
    */
   public boolean implies(Permission perm)
@@ -266,72 +267,78 @@
     String ourlist = getActions();
     String theirlist = p.getActions();
 
-    if (!ourlist.startsWith(theirlist))
+    if (! ourlist.startsWith(theirlist))
       return (false);
 
     // Now check ports
-    int ourfirstport = 0, ourlastport = 0, theirfirstport = 0, theirlastport =
-      0;
+    int ourfirstport = 0;
+
+    // Now check ports
+    int ourlastport = 0;
+
+    // Now check ports
+    int theirfirstport = 0;
+
+    // Now check ports
+    int theirlastport = 0;
 
     // Get ours
     if (hostport.indexOf(":") == -1)
       {
-        ourfirstport = 0;
-        ourlastport = 65535;
+	ourfirstport = 0;
+	ourlastport = 65535;
       }
     else
       {
-        // FIXME:  Needs bulletproofing.
-        // This will dump if hostport if all sorts of bad data was passed to
-        // the constructor
-        String range = hostport.substring(hostport.indexOf(":") + 1);
-        if (range.startsWith("-"))
-          ourfirstport = 0;
-        else if (range.indexOf("-") == -1)
-          ourfirstport = Integer.parseInt(range);
-        else
-          ourfirstport =
-            Integer.parseInt(range.substring(0, range.indexOf("-")));
-
-        if (range.endsWith("-"))
-          ourlastport = 65535;
-        else if (range.indexOf("-") == -1)
-          ourlastport = Integer.parseInt(range);
-        else
-          ourlastport =
-            Integer.parseInt(range.
-                             substring(range.indexOf("-") + 1,
-                                       range.length()));
+	// FIXME:  Needs bulletproofing.
+	// This will dump if hostport if all sorts of bad data was passed to
+	// the constructor
+	String range = hostport.substring(hostport.indexOf(":") + 1);
+	if (range.startsWith("-"))
+	  ourfirstport = 0;
+	else if (range.indexOf("-") == -1)
+	  ourfirstport = Integer.parseInt(range);
+	else
+	  ourfirstport =
+	    Integer.parseInt(range.substring(0, range.indexOf("-")));
+
+	if (range.endsWith("-"))
+	  ourlastport = 65535;
+	else if (range.indexOf("-") == -1)
+	  ourlastport = Integer.parseInt(range);
+	else
+	  ourlastport =
+	    Integer.parseInt(range.substring(range.indexOf("-") + 1,
+	                                     range.length()));
       }
 
     // Get theirs
     if (p.hostport.indexOf(":") == -1)
       {
-        theirfirstport = 0;
-        ourlastport = 65535;
+	theirfirstport = 0;
+	ourlastport = 65535;
       }
     else
       {
-        // This will dump if hostport if all sorts of bad data was passed to
-        // the constructor
-        String range = p.hostport.substring(hostport.indexOf(":") + 1);
-        if (range.startsWith("-"))
-          theirfirstport = 0;
-        else if (range.indexOf("-") == -1)
-          theirfirstport = Integer.parseInt(range);
-        else
-          theirfirstport =
-            Integer.parseInt(range.substring(0, range.indexOf("-")));
-
-        if (range.endsWith("-"))
-          theirlastport = 65535;
-        else if (range.indexOf("-") == -1)
-          theirlastport = Integer.parseInt(range);
-        else
-          theirlastport =
-            Integer.parseInt(range.
-                             substring(range.indexOf("-") + 1,
-                                       range.length()));
+	// This will dump if hostport if all sorts of bad data was passed to
+	// the constructor
+	String range = p.hostport.substring(hostport.indexOf(":") + 1);
+	if (range.startsWith("-"))
+	  theirfirstport = 0;
+	else if (range.indexOf("-") == -1)
+	  theirfirstport = Integer.parseInt(range);
+	else
+	  theirfirstport =
+	    Integer.parseInt(range.substring(0, range.indexOf("-")));
+
+	if (range.endsWith("-"))
+	  theirlastport = 65535;
+	else if (range.indexOf("-") == -1)
+	  theirlastport = Integer.parseInt(range);
+	else
+	  theirlastport =
+	    Integer.parseInt(range.substring(range.indexOf("-") + 1,
+	                                     range.length()));
       }
 
     // Now check them
@@ -339,7 +346,10 @@
       return (false);
 
     // Finally we can check the hosts
-    String ourhost, theirhost;
+    String ourhost;
+
+    // Finally we can check the hosts
+    String theirhost;
 
     // Get ours
     if (hostport.indexOf(":") == -1)
@@ -358,20 +368,23 @@
       return (true);
 
     // Try the canonical names
-    String ourcanonical = null, theircanonical = null;
+    String ourcanonical = null;
+
+    // Try the canonical names
+    String theircanonical = null;
     try
       {
-        ourcanonical = InetAddress.getByName(ourhost).getHostName();
-        theircanonical = InetAddress.getByName(theirhost).getHostName();
+	ourcanonical = InetAddress.getByName(ourhost).getHostName();
+	theircanonical = InetAddress.getByName(theirhost).getHostName();
       }
     catch (UnknownHostException e)
       {
-        // Who didn't resolve?  Just assume current address is canonical enough
-        // Is this ok to do?
-        if (ourcanonical == null)
-          ourcanonical = ourhost;
-        if (theircanonical == null)
-          theircanonical = theirhost;
+	// Who didn't resolve?  Just assume current address is canonical enough
+	// Is this ok to do?
+	if (ourcanonical == null)
+	  ourcanonical = ourhost;
+	if (theircanonical == null)
+	  theircanonical = theirhost;
       }
 
     if (ourcanonical.equals(theircanonical))
@@ -380,9 +393,9 @@
     // Well, last chance.  Try for a wildcard
     if (ourhost.indexOf("*.") != -1)
       {
-        String wild_domain = ourhost.substring(ourhost.indexOf("*" + 1));
-        if (theircanonical.endsWith(wild_domain))
-          return (true);
+	String wild_domain = ourhost.substring(ourhost.indexOf("*" + 1));
+	if (theircanonical.endsWith(wild_domain))
+	  return (true);
       }
 
     // Didn't make it

--Boundary-00=_ckneAteS3HL3915--




From MAILER-DAEMON Mon Apr 12 07:34:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCzhy-0002aL-D0
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 07:34:34 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCzhv-0002aC-L7
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:34:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCzht-0002Zu-O5
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:34:30 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BCzht-0002Zf-3r
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:34:29 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-055.ewetel.net
	[80.228.95.55])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3CCYUPZ028004
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 14:34:31 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BCziC-0004hi-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 13:34:48 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 14:34:20 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_MzoeAJYapglbO2F"
Message-Id: <200404121434.20909.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.util.zip
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 11:34:32 -0000


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

Hi list,


I just commited the attached patch to jalopy java.util.zip and to get it 
more in line with libgcj.


Michael


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

	* java/util/zip/DeflaterOutputStream.java
	(write): Removed debug code.
	* java/util/zip/GZIPInputStream.java: Jalopied.
	* java/util/zip/GZIPOutputStream.java: Jalopied
	(write): Update CRC sum after actually writing data.
	* java/util/zip/InflaterInputStream.java: Jalopied.
	(InflaterInputStream): Check arguments before setting fields.
	(markSupported): Removed.


--Boundary-00=_MzoeAJYapglbO2F
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/DeflaterOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterOutputStream.java,v
retrieving revision 1.5
diff -u -r1.5 DeflaterOutputStream.java
--- java/util/zip/DeflaterOutputStream.java	4 Feb 2004 07:53:45 -0000	1.5
+++ java/util/zip/DeflaterOutputStream.java	12 Apr 2004 12:30:05 -0000
@@ -191,7 +191,6 @@
    */
   public void write(byte[] buf, int off, int len) throws IOException
   {
-    //    System.err.println("DOS with off " + off + " and len " + len);
     def.setInput(buf, off, len);
     deflate();
   }
Index: java/util/zip/GZIPInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/GZIPInputStream.java,v
retrieving revision 1.7
diff -u -r1.7 GZIPInputStream.java
--- java/util/zip/GZIPInputStream.java	4 Feb 2004 07:53:45 -0000	1.7
+++ java/util/zip/GZIPInputStream.java	12 Apr 2004 12:30:05 -0000
@@ -87,7 +87,6 @@
    */
   protected CRC32 crc; 
 
-
   /**
    * Indicates whether or not the end of the stream has been reached.
    */  
@@ -319,7 +318,6 @@
     readGZIPHeader = true;
     //System.err.println("Read GZIP header");
   }
-
 
   private void readFooter() throws IOException
   {
Index: java/util/zip/GZIPOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/GZIPOutputStream.java,v
retrieving revision 1.6
diff -u -r1.6 GZIPOutputStream.java
--- java/util/zip/GZIPOutputStream.java	4 Feb 2004 07:53:45 -0000	1.6
+++ java/util/zip/GZIPOutputStream.java	12 Apr 2004 12:30:05 -0000
@@ -1,5 +1,5 @@
 /* GZIPOutputStream.java - Create a file in gzip format
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,20 +45,21 @@
  * The "GZIP" format is described in RFC 1952.
  *
  * @author John Leuner
+ * @author Tom Tromey
  * @since JDK 1.1
  */
 
+/* Written using on-line Java Platform 1.2 API Specification
+ * and JCL book.
+ * Believed complete and correct.
+ */
 
 public class GZIPOutputStream extends DeflaterOutputStream
 {
-  //Variables
-
-  /* CRC-32 value for uncompressed data
+  /**
+   * CRC-32 value for uncompressed data
    */
-  
-  protected CRC32 crc = new CRC32(); 
-
-  // Constructors
+  protected CRC32 crc;
 
   /* Creates a GZIPOutputStream with the default buffer size
    *
@@ -66,21 +67,18 @@
    * @param out The stream to read data (to be compressed) from 
    * 
    */
-
-  public GZIPOutputStream(OutputStream out)  throws IOException
+  public GZIPOutputStream(OutputStream out) throws IOException
   {
     this(out, 4096);
   }
 
-  /* Creates a GZIPOutputStream with the specified buffer size
-   *
+  /**
+   * Creates a GZIPOutputStream with the specified buffer size
    *
    * @param out The stream to read compressed data from 
-   * 
    * @param size Size of the buffer to use 
    */
-
-  public GZIPOutputStream(OutputStream out, int size)  throws IOException
+  public GZIPOutputStream(OutputStream out, int size) throws IOException
   {
     super(out, new Deflater(Deflater.DEFAULT_COMPRESSION, true), size);
     
@@ -112,10 +110,11 @@
     //    System.err.println("wrote GZIP header (" + gzipHeader.length + " bytes )");
   }
   
-  public void write(byte[] buf, int off, int len) throws IOException
+  public synchronized void write(byte[] buf, int off, int len)
+    throws IOException
   {
-    crc.update(buf, off, len);
     super.write(buf, off, len);
+    crc.update(buf, off, len);
   }
   
   /** Writes remaining compressed output data to the output stream
@@ -129,7 +128,6 @@
 
   public void finish() throws IOException
   {
-
     super.finish();
 
     int totalin = def.getTotalIn();
Index: java/util/zip/InflaterInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/InflaterInputStream.java,v
retrieving revision 1.10
diff -u -r1.10 InflaterInputStream.java
--- java/util/zip/InflaterInputStream.java	4 Nov 2003 10:04:16 -0000	1.10
+++ java/util/zip/InflaterInputStream.java	12 Apr 2004 12:30:05 -0000
@@ -1,5 +1,6 @@
 /* InflaterInputStream.java - Input stream filter for decompressing
-   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -69,7 +70,6 @@
    */
   protected int len;
 
-
   /*
    * We just use this if we are decoding one byte at a time with the read() call
    */
@@ -109,17 +109,17 @@
   public InflaterInputStream(InputStream in, Inflater inf, int size) 
   {
     super(in);
-    this.inf = inf;
     this.len = 0;
-    
-    if (size <= 0)
-      throw new IllegalArgumentException("size <= 0");
-    buf = new byte[size]; //Create the buffer
 
     if (in == null)
-      throw new NullPointerException("InputStream null");
+      throw new NullPointerException ("in may not be null");
     if (inf == null)
-      throw new NullPointerException("Inflater null");
+      throw new NullPointerException ("inf may not be null");
+    if (size < 0)
+      throw new IllegalArgumentException ("size may not be negative");
+    
+    this.inf = inf;
+    this.buf = new byte [size];
   }
 
   /**
@@ -128,6 +128,8 @@
    */
   public int available() throws IOException
   {
+    // According to the JDK 1.2 docs, this should only ever return 0
+    // or 1 and should not be relied upon by Java programs.
     return inf.finished() ? 0 : 1;
   }
 
@@ -181,11 +183,13 @@
    */
   public int read(byte[] b, int off, int len) throws IOException
   {
-    if (len == 0) return 0;
+    if (len == 0)
+      return 0;
 
     for (;;)
       {
 	int count;
+	
 	try
 	  {
 	    count = inf.inflate(b, off, len);
@@ -217,22 +221,12 @@
   {
     if (n < 0)
       throw new IllegalArgumentException();
-    int len = 2048;
-    if (n < len)
-      len = (int) n;
-    byte[] tmp = new byte[len];
-    return (long) read(tmp);
-  }
 
-  /**
-   * Since this stream tends to buffer large (unpredictable?) amounts
-   * of stuff, it causes problems to the mark/reset mechanism.  Hence,
-   * it claims not to support mark.
-   *
-   * @return false
-   */
-  public boolean markSupported()
-  {
-    return false;
+    if (n == 0)
+      return 0;
+
+    int len = (int) Math.min(n, 2048);
+    byte[] buf = new byte[len];
+    return (long) read(buf);
   }
 }

--Boundary-00=_MzoeAJYapglbO2F--




From MAILER-DAEMON Mon Apr 12 07:35:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BCzir-0002k9-Vb
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 07:35:29 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BCzip-0002ja-6z
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:35:27 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BCzin-0002jM-Kf
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:35:25 -0400
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 1BCzin-0002jH-5u
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:35:25 -0400
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
	i3CCZOs1012392; Mon, 12 Apr 2004 08:35:24 -0400 (EDT)
From: "C. Brian Jones" <cbj@gnu.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200404121056.38611.konqueror@gmx.de>
References: <200404120807.48714.konqueror@gmx.de>
	<200404121056.38611.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-NP1iM42H3aMOqwb6sq3X"
Message-Id: <1081773324.3175.22.camel@lyta.haphazard.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Mon, 12 Apr 2004 08:35:24 -0400
X-Virus-Scanned: Symantec AntiVirus Scan Engine
Cc: commit-classpath@gnu.org
Subject: Re: Patch: centralizing classpath module options
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 11:35:28 -0000


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

On Mon, 2004-04-12 at 04:56, Michael Koch wrote:
> Am Montag, 12. April 2004 08:07 schrieb Michael Koch:
> > Hi list,
> >
> >
> > I wrote the attached patch to centralize classpath's module options.
> >
> > What do you think about this step ? Okay to commit ?

Okay.


--=-NP1iM42H3aMOqwb6sq3X
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)

iD8DBQBAeo0LcEcmdY33uzYRAlJVAJ9RF0nVNu7jOjBl+65ZkIo+VW9QRgCeLnN/
kwbOEwcIF+mLuWQ4yebEr0M=
=TIWx
-----END PGP SIGNATURE-----

--=-NP1iM42H3aMOqwb6sq3X--




From MAILER-DAEMON Mon Apr 12 08:05:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BD07H-0000A3-BA
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 08:00:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BD045-00079M-TP
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:57:25 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BD03O-0006fc-OE
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:56:43 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BD03N-0006dS-F9
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 07:56:41 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-055.ewetel.net
	[80.228.95.55])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i3CCuico008627
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 14:56:44 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BD03i-0004if-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 13:57:02 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 14:56:34 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_CIpeAykJo2+3uad"
Message-Id: <200404121456.34035.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: direct buffer implemmentation
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 12:00:30 -0000


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

Hi list,


I just commited a little patch to make the method "shiftDown" static by 
request of Guilhem Lavaux.


Michael


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

	* java/nio/DirectByteBufferImpl.java
	(shiftDown): Made static and give address of memory block as argument.
	* native/jni/java-nio/java_nio_DirectByteBufferImpl.c:
	Replaced "class" with "clazz".
	(shiftDown): Changed to new method signature.
	* include/java_nio_DirectByteBufferImpl.h: Regenerated.


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

Index: java/nio/DirectByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DirectByteBufferImpl.java,v
retrieving revision 1.8
diff -u -r1.8 DirectByteBufferImpl.java
--- java/nio/DirectByteBufferImpl.java	8 Apr 2004 21:25:59 -0000	1.8
+++ java/nio/DirectByteBufferImpl.java	12 Apr 2004 12:54:30 -0000
@@ -136,7 +136,7 @@
     return this;
   }
   
-  native void shiftDown (int dst_offset, int src_offset, int count);
+  static native void shiftDown (RawData address, int dst_offset, int src_offset, int count);
 
   public ByteBuffer compact ()
   {
Index: include/java_nio_DirectByteBufferImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/java_nio_DirectByteBufferImpl.h,v
retrieving revision 1.3
diff -u -r1.3 java_nio_DirectByteBufferImpl.h
--- include/java_nio_DirectByteBufferImpl.h	8 Apr 2004 20:04:13 -0000	1.3
+++ include/java_nio_DirectByteBufferImpl.h	12 Apr 2004 12:54:30 -0000
@@ -15,7 +15,7 @@
 extern JNIEXPORT jbyte JNICALL Java_java_nio_DirectByteBufferImpl_getImpl__Lgnu_classpath_RawData_2I (JNIEnv *env, jclass, jobject, jint);
 extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_putImpl (JNIEnv *env, jclass, jobject, jint, jbyte);
 extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_getImpl__Lgnu_classpath_RawData_2I_3BII (JNIEnv *env, jclass, jobject, jint, jbyteArray, jint, jint);
-extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jobject, jint, jint, jint);
+extern JNIEXPORT void JNICALL Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jclass, jobject, jint, jint, jint);
 extern JNIEXPORT jobject JNICALL Java_java_nio_DirectByteBufferImpl_adjustAddress (JNIEnv *env, jclass, jobject, jint);
 
 #ifdef __cplusplus

--Boundary-00=_CIpeAykJo2+3uad--




From MAILER-DAEMON Mon Apr 12 09:35:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BD1aq-0005mK-CP
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 09:35:20 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BD1ak-0005fe-5r
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:35:14 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BD1aR-0005N7-GF
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:35:06 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BD1aO-0005I4-EZ
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:34:52 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-055.ewetel.net
	[80.228.95.55])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3CEYopH024441
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 16:34:51 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BD1af-0004xI-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 15:35:09 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 16:34:40 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_AkqeA/IX5T05k+I"
Message-Id: <200404121634.40730.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.lang - fixes for HTML in javadocs
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 13:35:15 -0000


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

Hi list,


I just commited the attached patch to fix HTML in javadocs all over 
java.lang.


Michael


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

	* java/lang/ClassLoader.java,
	java/lang/Compiler.java,
	java/lang/Double.java,
	java/lang/Float.java,
	java/lang/Long.java,
	java/lang/Math.java,
	java/lang/Runtime.java,
	java/lang/RuntimePermission.java,
	java/lang/Short.java,
	java/lang/System.java,
	java/lang/reflect/InvocationHandler.java,
	java/lang/reflect/Proxy.java:
	Fixed HTML in javadocs.


--Boundary-00=_AkqeA/IX5T05k+I
Content-Type: text/x-diff;
  charset="us-ascii";
  name="lang.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="lang.diff"

Index: java/lang/ClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/ClassLoader.java,v
retrieving revision 1.28
diff -u -r1.28 ClassLoader.java
--- java/lang/ClassLoader.java	24 Sep 2003 22:23:26 -0000	1.28
+++ java/lang/ClassLoader.java	12 Apr 2004 14:32:03 -0000
@@ -249,7 +249,7 @@
    * it. Calls <code>loadClass(name, false)</code>.
    *
    * <p>Subclasses should not override this method but should override
-   * <code>findClass()</code> which is called by this method.
+   * <code>findClass()</code> which is called by this method.</p>
    *
    * @param name the name of the class relative to this ClassLoader
    * @return the loaded class
@@ -266,14 +266,14 @@
    * out if the class has already been loaded through this classloader by
    * calling <code>findLoadedClass()</code>. Then it calls
    * <code>loadClass()</code> on the parent classloader (or when there is
-   * no parent it uses the VM bootclassloader)</code>). If the class is still
+   * no parent it uses the VM bootclassloader). If the class is still
    * not loaded it tries to create a new class by calling
    * <code>findClass()</code>. Finally when <code>resolve</code> is
    * <code>true</code> it also calls <code>resolveClass()</code> on the
    * newly loaded class.
    *
    * <p>Subclasses should not override this method but should override
-   * <code>findClass()</code> which is called by this method.
+   * <code>findClass()</code> which is called by this method.</p>
    *
    * @param name the fully qualified name of the class to load
    * @param resolve whether or not to resolve the class
@@ -384,7 +384,7 @@
    * <code>findClass()</code> implementation. The name should use '.'
    * separators, and discard the trailing ".class".  The default protection
    * domain has the permissions of
-   * <code>Policy.getPolicy().getPermissions(new CodeSource(null, null))<code>.
+   * <code>Policy.getPolicy().getPermissions(new CodeSource(null, null))</code>.
    *
    * @param name the name to give the class, or null if unknown
    * @param data the data representing the classfile, in classfile format
@@ -407,7 +407,7 @@
    * Helper to define a class using a string of bytes. Subclasses should call
    * this method from their <code>findClass()</code> implementation. If the
    * domain is null, the default of
-   * <code>Policy.getPolicy().getPermissions(new CodeSource(null, null))<code>
+   * <code>Policy.getPolicy().getPermissions(new CodeSource(null, null))</code>
    * is used. Once a class has been defined in a package, all further classes
    * in that package must have the same set of certificates or a
    * SecurityException is thrown.
@@ -554,13 +554,13 @@
    * multiple resources with the same name that come from multiple locations.
    * It can also occur that a parent classloader offers a resource with a
    * certain name and the child classloader also offers a resource with that
-   * same name. <code>getResource() only offers the first resource (of the
+   * same name. <code>getResource()</code> only offers the first resource (of the
    * parent) with a given name. This method lists all resources with the
    * same name. The name should use '/' as path separators.
    *
    * <p>The Enumeration is created by first calling <code>getResources()</code>
    * on the parent classloader and then calling <code>findResources()</code>
-   * on this classloader.
+   * on this classloader.</p>
    *
    * @param name the resource name
    * @return an enumaration of all resources found
Index: java/lang/Compiler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Compiler.java,v
retrieving revision 1.6
diff -u -r1.6 Compiler.java
--- java/lang/Compiler.java	20 Mar 2002 20:04:32 -0000	1.6
+++ java/lang/Compiler.java	12 Apr 2004 14:32:03 -0000
@@ -81,7 +81,7 @@
   }
 
   /**
-   * Compile the classes whose name matches <code>classNames/code>.
+   * Compile the classes whose name matches <code>classNames</code>.
    *
    * @param classNames the name of classes to compile
    * @return <code>false</code> if no compiler is available or
Index: java/lang/Double.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Double.java,v
retrieving revision 1.32
diff -u -r1.32 Double.java
--- java/lang/Double.java	16 Jul 2003 12:21:07 -0000	1.32
+++ java/lang/Double.java	12 Apr 2004 14:32:04 -0000
@@ -392,9 +392,9 @@
    * <code>Double.NaN</code> as equal, but treats <code>0.0</code> and
    * <code>-0.0</code> as unequal.
    *
-   * <p>Note that <code>d1.equals(d2)<code> is identical to
+   * <p>Note that <code>d1.equals(d2)</code> is identical to
    * <code>doubleToLongBits(d1.doubleValue()) ==
-   *    doubleToLongBits(d2.doubleValue())<code>.
+   *    doubleToLongBits(d2.doubleValue())</code>.
    *
    * @param obj the object to compare
    * @return whether the objects are semantically equal
Index: java/lang/Float.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Float.java,v
retrieving revision 1.26
diff -u -r1.26 Float.java
--- java/lang/Float.java	16 Jul 2003 12:21:07 -0000	1.26
+++ java/lang/Float.java	12 Apr 2004 14:32:04 -0000
@@ -391,9 +391,9 @@
    * <code>Float.NaN</code> as equal, but treats <code>0.0</code> and
    * <code>-0.0</code> as unequal.
    *
-   * <p>Note that <code>f1.equals(f2)<code> is identical to
+   * <p>Note that <code>f1.equals(f2)</code> is identical to
    * <code>floatToIntBits(f1.floatValue()) ==
-   *    floatToIntBits(f2.floatValue())<code>.
+   *    floatToIntBits(f2.floatValue())</code>.
    *
    * @param obj the object to compare
    * @return whether the objects are semantically equal
Index: java/lang/Long.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Long.java,v
retrieving revision 1.17
diff -u -r1.17 Long.java
--- java/lang/Long.java	13 Jun 2002 17:28:54 -0000	1.17
+++ java/lang/Long.java	12 Apr 2004 14:32:04 -0000
@@ -225,7 +225,7 @@
    *
    * @param s the <code>String</code> to convert
    * @param radix the radix (base) to use in the conversion
-   * @return the <code>String</code> argument converted to </code>long</code>
+   * @return the <code>String</code> argument converted to <code>long</code>
    * @throws NumberFormatException if <code>s</code> cannot be parsed as a
    *         <code>long</code>
    */
Index: java/lang/Math.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Math.java,v
retrieving revision 1.15
diff -u -r1.15 Math.java
--- java/lang/Math.java	25 Sep 2003 17:13:52 -0000	1.15
+++ java/lang/Math.java	12 Apr 2004 14:32:04 -0000
@@ -564,7 +564,7 @@
 
   /**
    * Take the nearest integer to the argument.  This is equivalent to
-   * <code>(int) Math.floor(a + 0.5f). If the argument is NaN, the result
+   * <code>(int) Math.floor(a + 0.5f)</code>. If the argument is NaN, the result
    * is 0; otherwise if the argument is outside the range of int, the result
    * will be Integer.MIN_VALUE or Integer.MAX_VALUE, as appropriate.
    *
Index: java/lang/Runtime.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Runtime.java,v
retrieving revision 1.4
diff -u -r1.4 Runtime.java
--- java/lang/Runtime.java	27 Dec 2003 10:48:48 -0000	1.4
+++ java/lang/Runtime.java	12 Apr 2004 14:32:04 -0000
@@ -175,13 +175,13 @@
    *
    * <p>First, all shutdown hooks are run, in unspecified order, and
    * concurrently. Next, if finalization on exit has been enabled, all pending
-   * finalizers are run. Finally, the system calls <code>halt</code>.
+   * finalizers are run. Finally, the system calls <code>halt</code>.</p>
    *
    * <p>If this is run a second time after shutdown has already started, there
    * are two actions. If shutdown hooks are still executing, it blocks
    * indefinitely. Otherwise, if the status is nonzero it halts immediately;
    * if it is zero, it blocks indefinitely. This is typically called by
-   * <code>System.exit</code>.
+   * <code>System.exit</code>.</p>
    *
    * @param status the status to exit with
    * @throws SecurityException if permission is denied
@@ -314,23 +314,23 @@
    * <code>System.exit</code> was invoked), or when the user terminates
    * the virtual machine (such as by typing ^C, or logging off). There is
    * a security check to add hooks,
-   * <code>RuntimePermission("shutdownHooks")<code>.
+   * <code>RuntimePermission("shutdownHooks")</code>.
    *
    * <p>The hook must be an initialized, but unstarted Thread. The threads
    * are run concurrently, and started in an arbitrary order; and user
    * threads or daemons may still be running. Once shutdown hooks have
    * started, they must all complete, or else you must use <code>halt</code>,
    * to actually finish the shutdown sequence. Attempts to modify hooks
-   * after shutdown has started result in IllegalStateExceptions.
+   * after shutdown has started result in IllegalStateExceptions.</p>
    *
    * <p>It is imperative that you code shutdown hooks defensively, as you
    * do not want to deadlock, and have no idea what other hooks will be
    * running concurrently. It is also a good idea to finish quickly, as the
-   * virtual machine really wants to shut down!
+   * virtual machine really wants to shut down!</p>
    *
    * <p>There are no guarantees that such hooks will run, as there are ways
    * to forcibly kill a process. But in such a drastic case, shutdown hooks
-   * would do little for you in the first place.
+   * would do little for you in the first place.</p>
    *
    * @param hook an initialized, unstarted Thread
    * @throws IllegalArgumentException if the hook is already registered or run
@@ -363,7 +363,7 @@
   /**
    * De-register a shutdown hook. As when you registered it, there is a
    * security check to remove hooks,
-   * <code>RuntimePermission("shutdownHooks")<code>.
+   * <code>RuntimePermission("shutdownHooks")</code>.
    *
    * @param hook the hook to remove
    * @return true if the hook was successfully removed, false if it was not
@@ -437,7 +437,7 @@
 
   /**
    * Create a new subprocess with the specified command line. Calls
-   * <code>exec(cmdline, null, null)<code>. A security check is performed,
+   * <code>exec(cmdline, null, null)</code>. A security check is performed,
    * <code>checkExec</code>.
    *
    * @param cmdline the command to call
Index: java/lang/RuntimePermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/RuntimePermission.java,v
retrieving revision 1.6
diff -u -r1.6 RuntimePermission.java
--- java/lang/RuntimePermission.java	6 Mar 2002 19:44:44 -0000	1.6
+++ java/lang/RuntimePermission.java	12 Apr 2004 14:32:05 -0000
@@ -118,7 +118,7 @@
  *       access to in the system</td>
  *   <td>rogue code can stop arbitrary threads</td></tr>
  * <tr>
- *   <td><code>modifyThreadGroup</td>
+ *   <td><code>modifyThreadGroup</code></td>
  *   <td>allows the application to modify thread groups using any of the
  *       methods <code>destroy</code>, <code>resume</code>,
  *       <code>setDaemon</code>, <code>setMaxPriority</code>,
@@ -141,7 +141,7 @@
  *   <td>rogue code can write files, including viruses, and can modify the
  *       virtual machine binary; if not just fill up the disk</td></tr>
  * <tr>
- *   <td><code>loadLibrary.<code><em>library name</em></td>
+ *   <td><code>loadLibrary.</code><em>library name</em></td>
  *   <td>dynamic linking of the named library</td>
  *   <td>native code can bypass many security checks of pure Java</td></tr>
  * <tr>
Index: java/lang/Short.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Short.java,v
retrieving revision 1.14
diff -u -r1.14 Short.java
--- java/lang/Short.java	25 Feb 2002 20:02:58 -0000	1.14
+++ java/lang/Short.java	12 Apr 2004 14:32:05 -0000
@@ -60,13 +60,13 @@
 
   /**
    * The minimum value a <code>short</code> can represent is -32768 (or
-   * -2<sup>15</sup).
+   * -2<sup>15</sup>).
    */
   public static final short MIN_VALUE = -32768;
 
   /**
    * The minimum value a <code>short</code> can represent is 32767 (or
-   * 2<sup>15</sup).
+   * 2<sup>15</sup>).
    */
   public static final short MAX_VALUE = 32767;
 
@@ -144,7 +144,7 @@
    *
    * @param s the <code>String</code> to convert
    * @param radix the radix (base) to use in the conversion
-   * @return the <code>String</code> argument converted to </code>short</code>
+   * @return the <code>String</code> argument converted to <code>short</code>
    * @throws NumberFormatException if <code>s</code> cannot be parsed as a
    *         <code>short</code>
    */
Index: java/lang/System.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/System.java,v
retrieving revision 1.31
diff -u -r1.31 System.java
--- java/lang/System.java	27 Dec 2003 10:48:48 -0000	1.31
+++ java/lang/System.java	12 Apr 2004 14:32:05 -0000
@@ -417,53 +417,53 @@
    *
    * <p>The required properties include:
    * <dl>
-   * <dt>java.version         <dd>Java version number
-   * <dt>java.vendor          <dd>Java vendor specific string
-   * <dt>java.vendor.url      <dd>Java vendor URL
-   * <dt>java.home            <dd>Java installation directory
-   * <dt>java.vm.specification.version <dd>VM Spec version
-   * <dt>java.vm.specification.vendor  <dd>VM Spec vendor
-   * <dt>java.vm.specification.name    <dd>VM Spec name
-   * <dt>java.vm.version      <dd>VM implementation version
-   * <dt>java.vm.vendor       <dd>VM implementation vendor
-   * <dt>java.vm.name         <dd>VM implementation name
-   * <dt>java.specification.version    <dd>Java Runtime Environment version
-   * <dt>java.specification.vendor     <dd>Java Runtime Environment vendor
-   * <dt>java.specification.name       <dd>Java Runtime Environment name
-   * <dt>java.class.version   <dd>Java class version number
-   * <dt>java.class.path      <dd>Java classpath
-   * <dt>java.library.path    <dd>Path for finding Java libraries
-   * <dt>java.io.tmpdir       <dd>Default temp file path
-   * <dt>java.compiler        <dd>Name of JIT to use
-   * <dt>java.ext.dirs        <dd>Java extension path
-   * <dt>os.name              <dd>Operating System Name
-   * <dt>os.arch              <dd>Operating System Architecture
-   * <dt>os.version           <dd>Operating System Version
-   * <dt>file.separator       <dd>File separator ("/" on Unix)
-   * <dt>path.separator       <dd>Path separator (":" on Unix)
-   * <dt>line.separator       <dd>Line separator ("\n" on Unix)
-   * <dt>user.name            <dd>User account name
-   * <dt>user.home            <dd>User home directory
-   * <dt>user.dir             <dd>User's current working directory
+   * <dt>java.version</dt>         <dd>Java version number</dd>
+   * <dt>java.vendor</dt>          <dd>Java vendor specific string</dd>
+   * <dt>java.vendor.url</dt>      <dd>Java vendor URL</dd>
+   * <dt>java.home</dt>            <dd>Java installation directory</dd>
+   * <dt>java.vm.specification.version</dt> <dd>VM Spec version</dd>
+   * <dt>java.vm.specification.vendor</dt>  <dd>VM Spec vendor</dd>
+   * <dt>java.vm.specification.name</dt>    <dd>VM Spec name</dd>
+   * <dt>java.vm.version</dt>      <dd>VM implementation version</dd>
+   * <dt>java.vm.vendor</dt>       <dd>VM implementation vendor</dd>
+   * <dt>java.vm.name</dt>         <dd>VM implementation name</dd>
+   * <dt>java.specification.version</dt>    <dd>Java Runtime Environment version</dd>
+   * <dt>java.specification.vendor</dt>     <dd>Java Runtime Environment vendor</dd>
+   * <dt>java.specification.name</dt>       <dd>Java Runtime Environment name</dd>
+   * <dt>java.class.version</dt>   <dd>Java class version number</dd>
+   * <dt>java.class.path</dt>      <dd>Java classpath</dd>
+   * <dt>java.library.path</dt>    <dd>Path for finding Java libraries</dd>
+   * <dt>java.io.tmpdir</dt>       <dd>Default temp file path</dd>
+   * <dt>java.compiler</dt>        <dd>Name of JIT to use</dd>
+   * <dt>java.ext.dirs</dt>        <dd>Java extension path</dd>
+   * <dt>os.name</dt>              <dd>Operating System Name</dd>
+   * <dt>os.arch</dt>              <dd>Operating System Architecture</dd>
+   * <dt>os.version</dt>           <dd>Operating System Version</dd>
+   * <dt>file.separator</dt>       <dd>File separator ("/" on Unix)</dd>
+   * <dt>path.separator</dt>       <dd>Path separator (":" on Unix)</dd>
+   * <dt>line.separator</dt>       <dd>Line separator ("\n" on Unix)</dd>
+   * <dt>user.name</dt>            <dd>User account name</dd>
+   * <dt>user.home</dt>            <dd>User home directory</dd>
+   * <dt>user.dir</dt>             <dd>User's current working directory</dd>
    * </dl>
    *
    * In addition, gnu defines several other properties, where ? stands for
    * each character in '0' through '9':
    * <dl>
-   * <dl> gnu.classpath.home <dd> Path to the classpath libraries.
-   * <dl> gnu.classpath.version <dd> Version of the classpath libraries.
-   * <dl> gnu.classpath.vm.shortname <dd> Succinct version of the VM name;
-   *      used for finding property files in file system
-   * <dl> gnu.classpath.home.url <dd> Base URL; used for finding
-   *      property files in file system
-   * <dt> gnu.cpu.endian      <dd>big or little
-   * <dt> gnu.java.io.encoding_scheme_alias.ISO-8859-?   <dd>8859_?
-   * <dt> gnu.java.io.encoding_scheme_alias.iso-8859-?   <dd>8859_?
-   * <dt> gnu.java.io.encoding_scheme_alias.iso8859_?    <dd>8859_?
-   * <dt> gnu.java.io.encoding_scheme_alias.iso-latin-_? <dd>8859_?
-   * <dt> gnu.java.io.encoding_scheme_alias.latin?       <dd>8859_?
-   * <dt> gnu.java.io.encoding_scheme_alias.UTF-8        <dd>UTF8
-   * <dt> gnu.java.io.encoding_scheme_alias.utf-8        <dd>UTF8
+   * <dt>gnu.classpath.home</dt>         <dd>Path to the classpath libraries.</dd>
+   * <dt>gnu.classpath.version</dt>      <dd>Version of the classpath libraries.</dd>
+   * <dt>gnu.classpath.vm.shortname</dt> <dd>Succinct version of the VM name;
+   *     used for finding property files in file system</dd>
+   * <dt>gnu.classpath.home.url</dt>     <dd> Base URL; used for finding
+   *     property files in file system</dd>
+   * <dt>gnu.cpu.endian</dt>             <dd>big or little</dd>
+   * <dt>gnu.java.io.encoding_scheme_alias.ISO-8859-?</dt>   <dd>8859_?</dd>
+   * <dt>gnu.java.io.encoding_scheme_alias.iso-8859-?</dt>   <dd>8859_?</dd>
+   * <dt>gnu.java.io.encoding_scheme_alias.iso8859_?</dt>    <dd>8859_?</dd>
+   * <dt>gnu.java.io.encoding_scheme_alias.iso-latin-_?</dt> <dd>8859_?</dd>
+   * <dt>gnu.java.io.encoding_scheme_alias.latin?</dt>       <dd>8859_?</dd>
+   * <dt>gnu.java.io.encoding_scheme_alias.UTF-8</dt>        <dd>UTF8</dd>
+   * <dt>gnu.java.io.encoding_scheme_alias.utf-8</dt>        <dd>UTF8</dd>
    * </dl>
    *
    * @return the system properties, will never be null
Index: java/lang/reflect/InvocationHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/reflect/InvocationHandler.java,v
retrieving revision 1.2
diff -u -r1.2 InvocationHandler.java
--- java/lang/reflect/InvocationHandler.java	22 Jan 2002 22:27:00 -0000	1.2
+++ java/lang/reflect/InvocationHandler.java	12 Apr 2004 14:32:05 -0000
@@ -49,37 +49,38 @@
  * interface.  But in order for the proxy instance to do any good, it
  * needs to know what to do when interface methods are invoked!  So,
  * this interface is basically a cool wrapper that provides runtime
- * code generation needed by proxy instances.<p>
+ * code generation needed by proxy instances.
  *
- * While this interface was designed for use by Proxy, it will also
- * work on any object in general.<p>
+ * <p>While this interface was designed for use by Proxy, it will also
+ * work on any object in general.</p>
  *
- * Hints for implementing this class:<br>
+ * <p>Hints for implementing this class:</p>
+ * 
  * <ul>
- *  <li>Don't forget that Object.equals, Object.hashCode, and
- *      Object.toString will call this handler.  In particular,
- *      a naive call to proxy.equals, proxy.hashCode, or proxy.toString
- *      will put you in an infinite loop.  And remember that string
- *      concatenation also invokes toString.</li>
- *  <li>Obey the contract of the Method object you are handling, or
- *      the proxy instance will be forced to throw a
- *      {@link NullPointerException}, {@link ClassCastException},
- *      or {@link UndeclaredThrowableException}.</li>
- *  <li>Be prepared to wrap/unwrap primitives as necessary.</li>
- *  <li>The Method object may be owned by a different interface than
- *      what was actually used as the qualifying type of the method
- *      invocation in the Java source code. This means that it might
- *      not always be safe to throw an exception listed as belonging
- *      to the method's throws clause.</li>
+ * <li>Don't forget that Object.equals, Object.hashCode, and
+ *     Object.toString will call this handler.  In particular,
+ *     a naive call to proxy.equals, proxy.hashCode, or proxy.toString
+ *     will put you in an infinite loop.  And remember that string
+ *     concatenation also invokes toString.</li>
+ * <li>Obey the contract of the Method object you are handling, or
+ *     the proxy instance will be forced to throw a
+ *     {@link NullPointerException}, {@link ClassCastException},
+ *     or {@link UndeclaredThrowableException}.</li>
+ * <li>Be prepared to wrap/unwrap primitives as necessary.</li>
+ * <li>The Method object may be owned by a different interface than
+ *     what was actually used as the qualifying type of the method
+ *     invocation in the Java source code. This means that it might
+ *     not always be safe to throw an exception listed as belonging
+ *     to the method's throws clause.</li>
  * </ul>
  *
  * <p><small>For a fun time, create an InvocationHandler that handles the
- * methods of a proxy instance of the InvocationHandler interface!</small>
+ * methods of a proxy instance of the InvocationHandler interface!</small></p>
  *
  * @see Proxy
  * @see UndeclaredThrowableException
  *
- * @author Eric Blake <ebb9@email.byu.edu>
+ * @author Eric Blake (ebb9@email.byu.edu)
  * @since 1.3
  * @status updated to 1.4
  */
Index: java/lang/reflect/Proxy.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/reflect/Proxy.java,v
retrieving revision 1.11
diff -u -r1.11 Proxy.java
--- java/lang/reflect/Proxy.java	17 Oct 2003 18:37:00 -0000	1.11
+++ java/lang/reflect/Proxy.java	12 Apr 2004 14:32:06 -0000
@@ -211,35 +211,36 @@
    * Returns the proxy {@link Class} for the given ClassLoader and array
    * of interfaces, dynamically generating it if necessary.
    *
-   * There are several restrictions on this method, the violation of
+   * <p>There are several restrictions on this method, the violation of
    * which will result in an IllegalArgumentException or
-   * NullPointerException:
+   * NullPointerException:</p>
+   * 
    * <ul>
-   *  <li>All objects in `interfaces' must represent distinct interfaces.
-   *      Classes, primitive types, null, and duplicates are forbidden.</li>
-   *  <li>The interfaces must be visible in the specified ClassLoader.
-   *      In other words, for each interface i:
-   *      <code>Class.forName(i.getName(), false, loader) == i</code>
-   *      must be true.</li>
-   *  <li>All non-public interfaces (if any) must reside in the same
-   *      package, or the proxy class would be non-instantiable.  If
-   *      there are no non-public interfaces, the package of the proxy
-   *      class is unspecified.</li>
-   *  <li>All interfaces must be compatible - if two declare a method
-   *      with the same name and parameters, the return type must be
-   *      the same and the throws clause of the proxy class will be
-   *      the maximal subset of subclasses of the throws clauses for
-   *      each method that is overridden.</li>
-   *  <li>VM constraints limit the number of interfaces a proxy class
-   *      may directly implement (however, the indirect inheritance
-   *      of {@link Serializable} does not count against this limit).
-   *      Even though most VMs can theoretically have 65535
-   *      superinterfaces for a class, the actual limit is smaller
-   *      because a class's constant pool is limited to 65535 entries,
-   *      and not all entries can be interfaces.</li>
-   * </ul><p>
+   * <li>All objects in `interfaces' must represent distinct interfaces.
+   *     Classes, primitive types, null, and duplicates are forbidden.</li>
+   * <li>The interfaces must be visible in the specified ClassLoader.
+   *     In other words, for each interface i:
+   *     <code>Class.forName(i.getName(), false, loader) == i</code>
+   *     must be true.</li>
+   * <li>All non-public interfaces (if any) must reside in the same
+   *     package, or the proxy class would be non-instantiable.  If
+   *     there are no non-public interfaces, the package of the proxy
+   *     class is unspecified.</li>
+   * <li>All interfaces must be compatible - if two declare a method
+   *     with the same name and parameters, the return type must be
+   *     the same and the throws clause of the proxy class will be
+   *     the maximal subset of subclasses of the throws clauses for
+   *     each method that is overridden.</li>
+   * <li>VM constraints limit the number of interfaces a proxy class
+   *     may directly implement (however, the indirect inheritance
+   *     of {@link Serializable} does not count against this limit).
+   *     Even though most VMs can theoretically have 65535
+   *     superinterfaces for a class, the actual limit is smaller
+   *     because a class's constant pool is limited to 65535 entries,
+   *     and not all entries can be interfaces.</li>
+   * </ul>
    *
-   * Note that different orders of interfaces produce distinct classes.
+   * <p>Note that different orders of interfaces produce distinct classes.</p>
    *
    * @param loader the class loader to define the proxy class in; null
    *        implies the bootstrap class loader

--Boundary-00=_AkqeA/IX5T05k+I--




From MAILER-DAEMON Mon Apr 12 09:40:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BD1fh-0001s5-5y
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 09:40:21 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BD1fc-0001qM-KJ
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:40:16 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BD1fW-0001o9-VP
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:40:13 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BD1fV-0001mw-Uj
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:40:10 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-055.ewetel.net
	[80.228.95.55])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3CEeBpH027510
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 16:40:11 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BD1fp-0004xj-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 15:40:29 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 16:40:00 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ApqeALVlZlWSiA6"
Message-Id: <200404121640.01023.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: more cleanup
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 13:40:18 -0000


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

Hi list,


I just commited the attached patch to remove 
native/jni/java-io/FileDescriptor.c from cvs and to fix 
native/jni/java-nio/java_nio_DirectByteBufferImpl.c.


Michael


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

	* native/jni/java-io/FileDescriptor.c: Removed.
	* native/jni/java-io/Makefile.am: Don't compile FileDescriptor.c
	* native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c:
	Dont include java_io_FileDescriptor.h.
	* native/jni/java-nio/java_nio_DirectByteBufferImpl.c
	(shiftDown): Method signature fixed.


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

Index: native/jni/java-io/FileDescriptor.c
===================================================================
RCS file: native/jni/java-io/FileDescriptor.c
diff -N native/jni/java-io/FileDescriptor.c
--- native/jni/java-io/FileDescriptor.c	9 Apr 2004 14:04:49 -0000	1.18
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,745 +0,0 @@
-/* FileDescriptor.c - Native methods for java.io.FileDescriptor class
-   Copyright (C) 1998, 2003, 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. */
-
-/*
- * Note that these functions skip many error checks because these
- * checks are made in Java before the methods are invoked.  See
- * the Java source to FileDescriptor for more info
- *
- * Aaron M. Renn (arenn@urbanophile.com)
- *
- * Some of this coded adopted from the gcj native libraries
- */
-
-/* do not move; needed here because of some macro definitions */
-#include <config.h>
-
-#include <stdlib.h>
-
-/* FIXME: Need to make configure set these for us */
-/* #define HAVE_SYS_IOCTL_H */
-/* #define HAVE_SYS_FILIO_H */
-
-#include <jni.h>
-#include "jcl.h"
-
-#include "target_native.h"
-#ifndef WITHOUT_FILESYSTEM
-  #include "target_native_file.h"
-#endif
-#include "target_native_math_int.h"
-
-#include "java_io_FileDescriptor.h"
-
-/* FIXME: This can't be right.  Need converter macros */
-#define CONVERT_JLONG_TO_INT(x) TARGET_NATIVE_MATH_INT_INT64_TO_INT32(x)
-#define CONVERT_INT_TO_JLONG(x) TARGET_NATIVE_MATH_INT_INT32_TO_INT64(x)
-
-/* FIXME: This can't be right.  Need converter macros */
-#define CONVERT_JLONG_TO_OFF_T(x) TARGET_NATIVE_MATH_INT_INT64_TO_INT32(x)
-#define CONVERT_OFF_T_TO_JLONG(x) TARGET_NATIVE_MATH_INT_INT32_TO_INT64(x)
-
-/* FIXME: This can't be right.  Need converter macros */
-#define CONVERT_JINT_TO_INT(x) ((int)(x & 0xFFFFFFFF))
-#define CONVERT_INT_TO_JINT(x) ((int)(x & 0xFFFFFFFF))
-
-/* FIXME: This can't be right.  Need converter macros */
-#define CONVERT_SSIZE_T_TO_JINT(x) ((jint)(x & 0xFFFFFFFF))
-#define CONVERT_JINT_TO_SSIZE_T(x) (x)
-
-/* These values must be kept in sync with FileDescriptor.java.  */
-#define FILEDESCRIPTOR_FILESEEK_SET          0
-#define FILEDESCRIPTOR_FILESEEK_CUR          1
-#define FILEDESCRIPTOR_FILESEEK_END          2
-
-#define FILEDESCRIPTOR_FILEOPEN_FLAG_READ    1
-#define FILEDESCRIPTOR_FILEOPEN_FLAG_WRITE   2
-#define FILEDESCRIPTOR_FILEOPEN_FLAG_APPEND  4
-#define FILEDESCRIPTOR_FILEOPEN_FLAG_EXCL    8
-#define FILEDESCRIPTOR_FILEOPEN_FLAG_SYNC   16
-#define FILEDESCRIPTOR_FILEOPEN_FLAG_DSYNC  32
-
-/*************************************************************************/
-
-/*
- * Library initialization routine.  Called as part of java.io.FileDescriptor
- * static initialization.
- */
-JNIEXPORT void JNICALL
-Java_java_io_FileDescriptor_nativeInit(JNIEnv *env, jclass clazz)
-{
-  jfieldID field, filedes_field;
-  jobject filedes;
-
-  filedes_field = (*env)->GetFieldID(env, clazz, "nativeFd", "J");
-  if (! filedes_field)
-    return;
-
-#define INIT_FIELD(FIELDNAME, FDVALUE)					\
-  field = (*env)->GetStaticFieldID (env, clazz, FIELDNAME,		\
-				    "Ljava/io/FileDescriptor;");	\
-  if (! field)								\
-    return;								\
-  filedes = (*env)->GetStaticObjectField (env, clazz, field);           \
-  if (! filedes)							\
-    return;								\
-  (*env)->SetLongField (env, filedes, filedes_field, (jlong) FDVALUE);  \
-  if ((*env)->ExceptionOccurred (env))                                  \
-    return;
-
-  INIT_FIELD ("in", 0);
-  INIT_FIELD ("out", 1);
-  INIT_FIELD ("err", 2);
-
-#undef INIT_FIELD
-}
-
-/*************************************************************************/
-/*
- * Open the specified file and return a native file descriptor
- */
-JNIEXPORT jlong JNICALL
-Java_java_io_FileDescriptor_nativeOpen(JNIEnv *env, jobject obj, jstring name, 
-                                       jint jflags)
-{
-  const char *filename;
-  int        flags;
-  int        permissions;
-  int        native_fd;
-  int        result;
-
-  filename = JCL_jstring_to_cstring(env, name);
-  if (filename == NULL)
-    return(-1); /* Exception will already have been thrown */
-
-  /* get file/permission flags for open() */
-  if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_READ) && (jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_WRITE))
-    {
-      /* read/write */
-      flags       = TARGET_NATIVE_FILE_FILEFLAG_CREATE | TARGET_NATIVE_FILE_FILEFLAG_READWRITE;
-      permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL;
-    }
-  else if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_READ))
-    {
-      /* read */
-      flags       = TARGET_NATIVE_FILE_FILEFLAG_READ;
-      permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL;
-    }
-  else
-    {
-      /* write */
-      flags       = TARGET_NATIVE_FILE_FILEFLAG_CREATE | TARGET_NATIVE_FILE_FILEFLAG_WRITE;
-      if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_APPEND))
-        {
-           flags |= TARGET_NATIVE_FILE_FILEFLAG_APPEND;
-        }
-      else
-        {
-           flags |= TARGET_NATIVE_FILE_FILEFLAG_TRUNCATE;
-        }
-      permissions = TARGET_NATIVE_FILE_FILEPERMISSION_NORMAL;
-    }
-
-  if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_SYNC))
-    {
-      flags |= TARGET_NATIVE_FILE_FILEFLAG_SYNC;
-    }
-
-  if ((jflags & FILEDESCRIPTOR_FILEOPEN_FLAG_DSYNC))
-    {
-      flags |= TARGET_NATIVE_FILE_FILEFLAG_DSYNC;
-    }
-#ifdef O_BINARY
-  flags |= TARGET_NATIVE_FILE_FILEFLAG_BINARY;
-#endif
-
-  TARGET_NATIVE_FILE_OPEN(filename,native_fd,flags,permissions,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  if (result != TARGET_NATIVE_OK)
-    {
-      /* We can only throw FileNotFoundException.  */
-      JCL_ThrowException(env,
-                         "java/io/FileNotFoundException",
-                         TARGET_NATIVE_LAST_ERROR_STRING());
-      return TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1;
-    }
-
-  return CONVERT_INT_TO_JLONG(native_fd);
-}
-
-/*************************************************************************/
-/*
- * Closes the specified file descriptor and return status code.
- * Exception on error
- */
-JNIEXPORT jlong JNICALL
-Java_java_io_FileDescriptor_nativeClose(JNIEnv *env, jobject obj, jlong fd)
-{
-  int native_fd;
-  int result;
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
- 
-  TARGET_NATIVE_FILE_CLOSE(native_fd,result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env,
-                         "java/io/IOException",
-                         TARGET_NATIVE_LAST_ERROR_STRING());
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-    }
-
-  return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-}
-
-/*************************************************************************/
-/*
- * Writes a single byte to the specified file descriptor
- * Return status code, exception on error
- */
-JNIEXPORT jlong JNICALL
-Java_java_io_FileDescriptor_nativeWriteByte(JNIEnv *env, jobject obj,
-                                            jlong fd, jint b)
-{
-  int     native_fd;
-  char    native_data;
-  ssize_t bytes_written;
-  int     result; 
-
-  native_fd   = CONVERT_JLONG_TO_INT(fd);
-  native_data = (char)(CONVERT_JINT_TO_INT(b) & 0xFF);
-
-  do
-    {
-      TARGET_NATIVE_FILE_WRITE(native_fd, &native_data, 1, bytes_written, result);
-      if ((result != TARGET_NATIVE_OK)
-          && (TARGET_NATIVE_LAST_ERROR() != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-	}
-    }
-  while (result != TARGET_NATIVE_OK);
-
-  return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-}
-
-/*************************************************************************/
-/*
- * Writes a byte buffer to the specified file descriptor
- * Return status code, exception on error
- */
-JNIEXPORT jlong JNICALL
-Java_java_io_FileDescriptor_nativeWriteBuf(JNIEnv *env, jobject obj,
-                                           jlong fd, jbyteArray buf, 
-					   jint offset, jint len)
-{
-  int     native_fd;
-  jbyte   *bufptr;
-  ssize_t bytes_written;
-  ssize_t n;
-  int     result; 
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-  bufptr = (*env)->GetByteArrayElements(env, buf, 0);
-  if (!bufptr)
-    {
-      JCL_ThrowException(env, "java/io/IOException", "Unexpected JNI error");
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-    }
-
-  bytes_written = 0;
-  while (bytes_written < CONVERT_JINT_TO_SSIZE_T(len))
-    {
-      TARGET_NATIVE_FILE_WRITE(native_fd, (bufptr + offset + bytes_written), (len - bytes_written), n, result);
-      if ((result != TARGET_NATIVE_OK)
-          && (TARGET_NATIVE_LAST_ERROR() != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0);
-          return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-	}
-      bytes_written += n;
-    }
-
-  (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0);
-
-  return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-}
-
-/*************************************************************************/
-/*
- * Read a single byte from the file descriptor
- * Return byte read or -1 on eof, exception on error
- */
-JNIEXPORT jint JNICALL
-Java_java_io_FileDescriptor_nativeReadByte(JNIEnv *env, jobject obj, jlong fd)
-{
-  int     native_fd;
-  char    data;
-  ssize_t bytes_read;
-  int     result; 
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-  bytes_read = 0;
-  do
-    {
-      TARGET_NATIVE_FILE_READ(native_fd, &data, 1, bytes_read, result);
-      if ((result == TARGET_NATIVE_OK) && (bytes_read == 0))
-        {
-          return(-1);
-        }
-      if ((result != TARGET_NATIVE_OK)
-          && (TARGET_NATIVE_LAST_ERROR() != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          return(-1);
-	}
-    }
-  while (bytes_read != 1);
-
-  return((jint)(data & 0xFF));
-}
-
-/*************************************************************************/
-/*
- * Reads to a byte buffer from the specified file descriptor
- * Return number of bytes read or -1 on eof, exception on error
- */
-JNIEXPORT jint JNICALL
-Java_java_io_FileDescriptor_nativeReadBuf(JNIEnv *env, jobject obj,
-                                         jlong fd, jarray buf, jint offset,
-					 jint len)
-{
-  int     native_fd;
-  jbyte   *bufptr;
-  ssize_t bytes_read;
-  ssize_t n;
-  int     result; 
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-  bufptr = (*env)->GetByteArrayElements(env, buf, 0);
-  if (!bufptr)
-    {
-      JCL_ThrowException(env, "java/io/IOException", "Unexpected JNI error");
-      return(-1);
-    }
-
-  bytes_read = 0;
-  while (bytes_read < len)
-    {
-      TARGET_NATIVE_FILE_READ(native_fd, (bufptr + offset + bytes_read), (len - bytes_read), n, result);
-      if ((result == TARGET_NATIVE_OK) && (n == 0))
-        {
-          (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0);
-          if (bytes_read == 0)
-            return(-1); /* Signal end of file to Java */
-          else 
-            return(CONVERT_SSIZE_T_TO_JINT(bytes_read));
-        }
-      if ((result != TARGET_NATIVE_OK)
-          && (TARGET_NATIVE_LAST_ERROR() != TARGET_NATIVE_ERROR_INTERRUPT_FUNCTION_CALL))
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0);
-          return(-1);
-        }
-      bytes_read += n;
-    }
-
-  (*env)->ReleaseByteArrayElements(env, buf, bufptr, 0);
-  return(CONVERT_SSIZE_T_TO_JINT(bytes_read));
-}
-
-/*************************************************************************/
-/*
- * Return number of bytes that can be read from the file w/o blocking.
- * Exception on error
- */
-JNIEXPORT jint JNICALL
-Java_java_io_FileDescriptor_nativeAvailable(JNIEnv *env, jobject obj, jlong fd)
-{
-  int   native_fd;
-  jlong bytes_available;
-  int   result;
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-  TARGET_NATIVE_FILE_AVAILABLE(native_fd,bytes_available,result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env,
-                         "java/io/IOException",
-                         TARGET_NATIVE_LAST_ERROR_STRING());
-      return(0);
-    }
-
-/* FIXME NYI ??? why only jint and not jlong? */
-  return(TARGET_NATIVE_MATH_INT_INT64_TO_INT32(bytes_available));
-}
-
-/*************************************************************************/
-/*
- * Wrapper around lseek call.  Return new file position
- * Exception on error
- */
-JNIEXPORT jlong JNICALL
-Java_java_io_FileDescriptor_nativeSeek(JNIEnv *env, jobject obj, jlong fd,
-		                       jlong offset, jint whence,
-				       jboolean stop_at_eof)
-{
-  int   native_fd;
-  jlong file_size;
-  jlong current_offset, new_offset;
-  int   result;
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-#if 0
-  /* Should there be such an exception? All native layer macros should
-     be accepting 64bit-values if needed. It some target is not able
-     to handle such values it should simply operate with 32bit-values
-     and convert 64bit-values appriopated. In this case I assume
-     problems should not occurre: if some specific target is not able
-     to handle 64bit-values the system is limited to 32bit at all, thus
-     the application can not do a seek() or something else beyond the
-     32bit limit. It this true?
-  */
-
-  /* FIXME: What do we do if offset > the max value of off_t on this 32bit
-   * system?  How do we detect that and what do we do? */
-  if (CONVERT_OFF_T_TO_JLONG(native_offset) != offset)  
-    {
-      JCL_ThrowException(env, "java/io/IOException",
-                         "Cannot represent position correctly on this system");
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-    }
-#endif /* 0 */
-    
-  if (stop_at_eof)
-    {
-      /* get file size */
-      TARGET_NATIVE_FILE_SIZE(native_fd, file_size, result);
-      if (result != TARGET_NATIVE_OK)
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-        }
-
-      /* set file read/write position (seek) */
-      if      (whence == FILEDESCRIPTOR_FILESEEK_SET)
-        {
-          if (TARGET_NATIVE_MATH_INT_INT64_GT(offset,file_size))
-            offset = file_size;
-        }
-      else if (whence == FILEDESCRIPTOR_FILESEEK_CUR)
-        {
-          TARGET_NATIVE_FILE_TELL(native_fd, current_offset, result);
-          if (result != TARGET_NATIVE_OK)
-            {
-              JCL_ThrowException(env,
-                                 "java/io/IOException",
-                                 TARGET_NATIVE_LAST_ERROR_STRING());
-              return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-            }
-          if (TARGET_NATIVE_MATH_INT_INT64_GT(TARGET_NATIVE_MATH_INT_INT64_ADD(current_offset,offset),file_size))
-            {
-              offset = file_size;
-              whence = FILEDESCRIPTOR_FILESEEK_SET;
-            }
-        }
-      else if (TARGET_NATIVE_MATH_INT_INT64_GT(offset,0)) /* Default to END case */
-        {
-          offset = TARGET_NATIVE_MATH_INT_INT64_CONST_0;
-        }
-    }
-
-  /* Now do it */
-  result = TARGET_NATIVE_ERROR;
-  new_offset = TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1;
-  if (whence == FILEDESCRIPTOR_FILESEEK_SET)
-    TARGET_NATIVE_FILE_SEEK_BEGIN(native_fd, offset, new_offset, result);
-  if (whence == FILEDESCRIPTOR_FILESEEK_CUR)
-    TARGET_NATIVE_FILE_SEEK_CURRENT(native_fd, offset, new_offset, result);
-  if (whence == FILEDESCRIPTOR_FILESEEK_END)
-    TARGET_NATIVE_FILE_SEEK_END(native_fd, offset, new_offset, result);
-
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env,
-                         "java/io/IOException",
-                         TARGET_NATIVE_LAST_ERROR_STRING());
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-    }
-
-  return(new_offset);
-}
-
-/*************************************************************************/
-/*
- * Return the current position of the file pointer
- * Exception on error
- */
-JNIEXPORT jlong JNICALL
-Java_java_io_FileDescriptor_nativeGetFilePointer(JNIEnv *env, jobject obj, 
-		                                 jlong fd)
-{
-  int   native_fd;
-  jlong current_offset;
-  int   result;
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-  TARGET_NATIVE_FILE_TELL(native_fd, current_offset, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env,
-                         "java/io/IOException",
-                         TARGET_NATIVE_LAST_ERROR_STRING());
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-    }
-
-  return(current_offset);
-}
-
-/*************************************************************************/
-/*
- * Return the length of the file
- * Exception on error
- */
-JNIEXPORT jlong JNICALL
-Java_java_io_FileDescriptor_nativeGetLength(JNIEnv *env, jobject obj, jlong fd)
-{
-  int   native_fd;
-  jlong file_size;
-  int   result;
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-  TARGET_NATIVE_FILE_SIZE(native_fd, file_size, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env,
-                         "java/io/IOException",
-                         TARGET_NATIVE_LAST_ERROR_STRING());
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1);
-    }
-
-  return(file_size);
-}
-
-/*************************************************************************/
-/*
- * Set the length of the file
- * Exception on error
- */
-JNIEXPORT void JNICALL
-Java_java_io_FileDescriptor_nativeSetLength(JNIEnv *env, jobject obj, 
-		                            jlong fd, jlong len)
-{
-  int   native_fd;
-  jlong file_size;
-  int   bytes_written;
-  jlong save_offset,new_offset;
-  char  data;
-  int   result;
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-#if 0
-  /* Should there be such an exception? All native layer macros should
-     be accepting 64bit-values if needed. It some target is not able
-     to handle such values it should simply operate with 32bit-values
-     and convert 64bit-values appriopated. In this case I assume
-     problems should not occurre: if some specific target is not able
-     to handle 64bit-values the system is limited to 32bit at all, thus
-     the application can not do a seek() or something else beyond the
-     32bit limit. It this true?
-  */
-
-  /* FIXME: What do we do if len > the max value of off_t on this 32bit
-   * system?  How do we detect that and what do we do? */
-  if (CONVERT_OFF_T_TO_JLONG(native_len) != len)  
-    {
-      JCL_ThrowException(env, "java/io/IOException",
-                         "Cannot represent position correctly on this system");
-      return;
-    }
-#endif /* 0 */
-
-  /* get file size */
-  TARGET_NATIVE_FILE_SIZE(native_fd, file_size, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env,
-                         "java/io/IOException",
-                         TARGET_NATIVE_LAST_ERROR_STRING());
-      return;
-    }
-
-  if        (TARGET_NATIVE_MATH_INT_INT64_LT(file_size,len))
-    {
-      /* File is too short -- seek to one byte short of where we want,
-       * then write a byte */
-
-      /* Save off current position */
-      TARGET_NATIVE_FILE_TELL(native_fd, save_offset, result);
-      if (result != TARGET_NATIVE_OK)
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          return;
-        }
-
-      /* move to position n-1 */
-      TARGET_NATIVE_FILE_SEEK_BEGIN(native_fd, TARGET_NATIVE_MATH_INT_INT64_SUB(len,1), new_offset, result);
-      if (result != TARGET_NATIVE_OK)
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          return;
-        }
-
-      /* write a byte
-         Note: This will fail if we somehow get here in read only mode
-       * That shouldn't happen */
-      data='\0';
-      TARGET_NATIVE_FILE_WRITE(native_fd, &data, 1, bytes_written, result);
-      if (result != TARGET_NATIVE_OK)
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          return;
-        }
-
-      /* Reposition file pointer to where we started */
-      TARGET_NATIVE_FILE_SEEK_BEGIN(native_fd, save_offset, new_offset, result);
-      if (result != TARGET_NATIVE_OK)
-        {
-          JCL_ThrowException(env,
-                             "java/io/IOException",
-                             TARGET_NATIVE_LAST_ERROR_STRING());
-          return;
-        }
-    }
-    else if (TARGET_NATIVE_MATH_INT_INT64_GT(file_size,len))
-    {
-      /* File is too long - use ftruncate if available */
-#ifdef HAVE_FTRUNCATE
-      TARGET_NATIVE_FILE_TRUNCATE(native_fd, len, result);
-      if (result != TARGET_NATIVE_OK)
-      {
-        JCL_ThrowException(env,
-                           "java/io/IOException",
-                           TARGET_NATIVE_LAST_ERROR_STRING());
-        return;
-      }
-#else /* HAVE_FTRUNCATE */
-      /* FIXME: Probably operation isn't supported, but this exception
-       * is too harsh as it will probably crash the program without need
-      JCL_ThrowException(env, "java/lang/UnsupportedOperationException",
-        "not implemented - can't shorten files on this platform");
-      */
-      JCL_ThrowException(env, "java/io/IOException", 
-                         "Unable to shorten file length");
-#endif /* HAVE_FTRUNCATE */
-    }
-}
-
-/*************************************************************************/
-/*
- * Test file descriptor for validity
- */
-JNIEXPORT jboolean JNICALL
-Java_java_io_FileDescriptor_nativeValid(JNIEnv *env, jobject obj, jlong fd)
-{
-  int native_fd;
-  int result;
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-  TARGET_NATIVE_FILE_VALID_FILE_DESCRIPTOR(native_fd, result);
-
-  return((result == TARGET_NATIVE_OK)?JNI_TRUE:JNI_FALSE);
-}
-
-/*************************************************************************/
-/*
- * Flush data to deks
- * Exception on error
- */
-JNIEXPORT void JNICALL
-Java_java_io_FileDescriptor_nativeSync(JNIEnv *env, jobject obj, jlong fd)
-{
-#ifdef HAVE_FSYNC
-  int native_fd;
-  int result;
-
-  native_fd = CONVERT_JLONG_TO_INT(fd);
-
-  TARGET_NATIVE_FILE_FSYNC(native_fd, result);
-  /* FIXME: gcj does not throw an exception on EROFS or EINVAL.
-   * Should we emulate? */
-  if (result != TARGET_NATIVE_OK)
-  {
-    JCL_ThrowException(env,
-                       "java/io/SyncFailedException",
-                       TARGET_NATIVE_LAST_ERROR_STRING());
-  }
-#else
-  JCL_ThrowException(env, "java/io/SyncFailedException", 
-                     "Sync not supported");
-#endif
-}
-
Index: native/jni/java-io/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/Makefile.am,v
retrieving revision 1.14
diff -u -r1.14 Makefile.am
--- native/jni/java-io/Makefile.am	12 Apr 2004 10:43:41 -0000	1.14
+++ native/jni/java-io/Makefile.am	12 Apr 2004 14:37:36 -0000
@@ -3,7 +3,6 @@
 libjavaio_la_SOURCES = 	javaio.h \
 			javaio.c \
 			java_io_File.c \
-			FileDescriptor.c \
 			java_io_ObjectInputStream.c \
 			java_io_VMObjectStreamClass.c
 
Index: native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_nio_channels_FileChannelImpl.c
--- native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	11 Apr 2004 13:14:18 -0000	1.4
+++ native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	12 Apr 2004 14:37:36 -0000
@@ -50,9 +50,6 @@
 #endif
 #include "target_native_math_int.h"
 
-#include "java_io_FileDescriptor.h"
-
-
 #include "gnu_java_nio_channels_FileChannelImpl.h"
 
 /* These values must be kept in sync with FileChannelImpl.java.  */
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.6
diff -u -r1.6 java_nio_DirectByteBufferImpl.c
--- native/jni/java-nio/java_nio_DirectByteBufferImpl.c	8 Apr 2004 20:04:13 -0000	1.6
+++ native/jni/java-nio/java_nio_DirectByteBufferImpl.c	12 Apr 2004 14:37:36 -0000
@@ -81,7 +81,7 @@
 }
 
 JNIEXPORT void JNICALL
-Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jobject obj, jint dst_offset, jint src_offset, jint count)
+Java_java_nio_DirectByteBufferImpl_shiftDown (JNIEnv *env, jclass clazz, jobject address, jint dst_offset, jint src_offset, jint count)
 {
   JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.shiftDown(): not implemented");
 }

--Boundary-00=_ApqeALVlZlWSiA6--




From MAILER-DAEMON Mon Apr 12 09:48:28 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BD1nX-0001Mm-ES
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 09:48:27 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BD1nS-0001KH-Um
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:48:22 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BD1nO-0001Hw-J6
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:48:20 -0400
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BD1nN-0001HA-Tw
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 09:48:18 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-055.ewetel.net
	[80.228.95.55])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3CEmJAk002401
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 16:48:20 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BD1nh-0004y8-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 15:48:37 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 16:48:09 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_pwqeAvxXzI4U7j2"
Message-Id: <200404121648.09714.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.io - HTML fixes for javadocs
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 13:48:24 -0000


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

Hi list,


I just commited the attached patch to fix HTML in javadocs all over 
java.io.


Michael


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

	* java/io/CharArrayWriter.java,
	java/io/PipedInputStream.java,
	java/io/PipedReader.java,
	java/io/SerializablePermission.java,
	java/io/StreamTokenizer.java,
	java/io/WriteAbortedException.java:
	Fixed HTML in javadocs.


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

Index: java/io/CharArrayWriter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/CharArrayWriter.java,v
retrieving revision 1.8
diff -u -r1.8 CharArrayWriter.java
--- java/io/CharArrayWriter.java	23 Mar 2003 10:39:02 -0000	1.8
+++ java/io/CharArrayWriter.java	12 Apr 2004 14:45:45 -0000
@@ -50,8 +50,8 @@
   * following two properties:
   * <p>
   * <ul>
-  * <li><xmp>gnu.java.io.CharArrayWriter.initialBufferSize</xmp>
-  * <li><xmp>gnu.java.io.CharArrayWriter.bufferIncrementSize</xmp>
+  * <li><xmp>gnu.java.io.CharArrayWriter.initialBufferSize</xmp></li>
+  * <li><xmp>gnu.java.io.CharArrayWriter.bufferIncrementSize</xmp></li>
   * </ul>
   * <p>
   * There is a constructor that specified the initial buffer size and
Index: java/io/PipedInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/PipedInputStream.java,v
retrieving revision 1.14
diff -u -r1.14 PipedInputStream.java
--- java/io/PipedInputStream.java	9 Mar 2003 21:54:29 -0000	1.14
+++ java/io/PipedInputStream.java	12 Apr 2004 14:45:46 -0000
@@ -277,7 +277,7 @@
     * @param offset The index into the buffer at which to start writing.
     * @param len The maximum number of bytes to read.
     *
-    * @exception IOException If <code>close()/code> was called on this Piped
+    * @exception IOException If <code>close()</code> was called on this Piped
     *                        InputStream.
     */  
   public synchronized int read(byte[] buf, int offset, int len)
Index: java/io/PipedReader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/PipedReader.java,v
retrieving revision 1.14
diff -u -r1.14 PipedReader.java
--- java/io/PipedReader.java	9 Mar 2003 21:54:30 -0000	1.14
+++ java/io/PipedReader.java	12 Apr 2004 14:45:46 -0000
@@ -256,7 +256,7 @@
     * @param offset The index into the buffer at which to start writing.
     * @param len The maximum number of chars to read.
     *
-    * @exception IOException If <code>close()/code> was called on this Piped
+    * @exception IOException If <code>close()</code> was called on this Piped
     *                        Reader.
     */  
   public int read(char[] buf, int offset, int len)
Index: java/io/SerializablePermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/SerializablePermission.java,v
retrieving revision 1.8
diff -u -r1.8 SerializablePermission.java
--- java/io/SerializablePermission.java	23 Mar 2003 10:53:30 -0000	1.8
+++ java/io/SerializablePermission.java	12 Apr 2004 14:45:46 -0000
@@ -48,9 +48,9 @@
   * There are currently two allowable permission names for this class:
   * <ul>
   * <li><code>enableSubclassImplementation</code> - Allows a subclass to
-  * override the default serialization behavior of objects.
+  * override the default serialization behavior of objects.</li>
   * <li><code>enableSubstitution</code> - Allows substitution of one object
-  * for another during serialization or deserialization.
+  * for another during serialization or deserialization.</li>
   * </ul>
   *
   * @see java.security.BasicPermission
Index: java/io/StreamTokenizer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/StreamTokenizer.java,v
retrieving revision 1.15
diff -u -r1.15 StreamTokenizer.java
--- java/io/StreamTokenizer.java	16 Nov 2003 21:24:58 -0000	1.15
+++ java/io/StreamTokenizer.java	12 Apr 2004 14:45:46 -0000
@@ -73,12 +73,12 @@
    * The rules are as follows:
    * <ul>
    * <li>For a token consisting of a single ordinary character, this is the 
-   *     value of that character.
-   * <li>For a quoted string, this is the value of the quote character
-   * <li>For a word, this is TT_WORD
-   * <li>For a number, this is TT_NUMBER
-   * <li>For the end of the line, this is TT_EOL
-   * <li>For the end of the stream, this is TT_EOF
+   *     value of that character.</li>
+   * <li>For a quoted string, this is the value of the quote character</li>
+   * <li>For a word, this is TT_WORD</li>
+   * <li>For a number, this is TT_NUMBER</li>
+   * <li>For the end of the line, this is TT_EOL</li>
+   * <li>For the end of the stream, this is TT_EOF</li>
    * </ul>
    */
   public int ttype = TT_NONE;
@@ -141,13 +141,13 @@
    * following manner:
    * <ul>
    * <li>The values 'A' through 'Z', 'a' through 'z' and 0xA0 through 0xFF
-   *     are initialized as alphabetic
-   * <li>The values 0x00 through 0x20 are initialized as whitespace
-   * <li>The values '\'' and '"' are initialized as quote characters
-   * <li>'/' is a comment character
-   * <li>Numbers will be parsed
-   * <li>EOL is not treated as significant
-   * <li>C  and C++ (//) comments are not recognized
+   *     are initialized as alphabetic</li>
+   * <li>The values 0x00 through 0x20 are initialized as whitespace</li>
+   * <li>The values '\'' and '"' are initialized as quote characters</li>
+   * <li>'/' is a comment character</li>
+   * <li>Numbers will be parsed</li>
+   * <li>EOL is not treated as significant</li>
+   * <li>C  and C++ (//) comments are not recognized</li>
    * </ul>
    *
    * @param in The <code>Reader</code> to read chars from
@@ -251,13 +251,13 @@
    * returns it.  It also can set <code>sval</code> or <code>nval</code>
    * as described below.  The parsing strategy is as follows:
    * <ul>
-   * <li>Skip any whitespace characters.
+   * <li>Skip any whitespace characters.</li>
    * <li>If a numeric character is encountered, attempt to parse a numeric
    * value.  Leading '-' characters indicate a numeric only if followed by
    * another non-'-' numeric.  The value of the numeric token is terminated
    * by either the first non-numeric encountered, or the second occurrence of
    * '-' or '.'.  The token type returned is TT_NUMBER and <code>nval</code>
-   * is set to the value parsed.
+   * is set to the value parsed.</li>
    * <li>If an alphabetic character is parsed, all subsequent characters
    * are read until the first non-alphabetic or non-numeric character is
    * encountered.  The token type returned is TT_WORD and the value parsed
@@ -266,10 +266,10 @@
    * sequence terminates a word only if EOL signficance has been turned on.
    * The start of a comment also terminates a word.  Any character with a 
    * non-alphabetic and non-numeric attribute (such as white space, a quote,
-   * or a commet) are treated as non-alphabetic and terminate the word.
+   * or a commet) are treated as non-alphabetic and terminate the word.</li>
    * <li>If a comment character is parsed, then all remaining characters on
    * the current line are skipped and another token is parsed.  Any EOL or
-   * EOF's encountered are not discarded, but rather terminate the comment.
+   * EOF's encountered are not discarded, but rather terminate the comment.</li>
    * <li>If a quote character is parsed, then all characters up to the 
    * second occurrence of the same quote character are parsed into a
    * <code>String</code>.  This <code>String</code> is stored as
@@ -280,18 +280,18 @@
    * (carriage return), \" (double quote), \' (single quote), \\
    * (backslash), \XXX (octal esacpe)) are converted to the appropriate
    * char values.  Invalid esacape sequences are left in untranslated.  
-   * Unicode characters like ('\ u0000') are not recognized. 
+   * Unicode characters like ('\ u0000') are not recognized. </li>
    * <li>If the C++ comment sequence "//" is encountered, and the parser
    * is configured to handle that sequence, then the remainder of the line
    * is skipped and another token is read exactly as if a character with
-   * the comment attribute was encountered.
+   * the comment attribute was encountered.</li>
    * <li>If the C comment sequence "/*" is encountered, and the parser
    * is configured to handle that sequence, then all characters up to and
    * including the comment terminator sequence are discarded and another
-   * token is parsed.
+   * token is parsed.</li>
    * <li>If all cases above are not met, then the character is an ordinary
    * character that is parsed as a token by itself.  The char encountered
-   * is returned as the token type.
+   * is returned as the token type.</li>
    * </ul>
    *
    * @return The token type
@@ -635,15 +635,15 @@
    * 'x' is determined as follows.
    * <p>
    * <ul>
-   * <li>If no token has been read, then 'x' is "NOTHING" and 'n' is 0
-   * <li>If <code>ttype</code> is TT_EOF, then 'x' is "EOF"
-   * <li>If <code>ttype</code> is TT_EOL, then 'x' is "EOL"
-   * <li>If <code>ttype</code> is TT_WORD, then 'x' is <code>sval</code>
+   * <li>If no token has been read, then 'x' is "NOTHING" and 'n' is 0</li>
+   * <li>If <code>ttype</code> is TT_EOF, then 'x' is "EOF"</li>
+   * <li>If <code>ttype</code> is TT_EOL, then 'x' is "EOL"</li>
+   * <li>If <code>ttype</code> is TT_WORD, then 'x' is <code>sval</code></li>
    * <li>If <code>ttype</code> is TT_NUMBER, then 'x' is "n=strnval" where
-   * 'strnval' is <code>String.valueOf(nval)</code>.
+   * 'strnval' is <code>String.valueOf(nval)</code>.</li>
    * <li>If <code>ttype</code> is a quote character, then 'x' is
-   * <code>sval</code>
-   * <li>For all other cases, 'x' is <code>ttype</code>
+   * <code>sval</code></li>
+   * <li>For all other cases, 'x' is <code>ttype</code></li>
    * </ul>
    */
   public String toString()
Index: java/io/WriteAbortedException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/WriteAbortedException.java,v
retrieving revision 1.10
diff -u -r1.10 WriteAbortedException.java
--- java/io/WriteAbortedException.java	24 Feb 2002 04:25:16 -0000	1.10
+++ java/io/WriteAbortedException.java	12 Apr 2004 14:45:46 -0000
@@ -81,7 +81,7 @@
   /**
    * This method returns a message indicating what went wrong, in this
    * format:
-   * <code>super.getMessage() + (detail == null ? "" : "; " + detail)<code>.
+   * <code>super.getMessage() + (detail == null ? "" : "; " + detail)</code>.
    *
    * @return the chained message
    */

--Boundary-00=_pwqeAvxXzI4U7j2--




From MAILER-DAEMON Mon Apr 12 11:09:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BD33b-00006o-GB
	for mharc-commit-classpath@gnu.org; Mon, 12 Apr 2004 11:09:07 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BD33T-0008Uz-Ht
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 11:08:59 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BD33P-0008TZ-Iy
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 11:08:57 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BD33O-0008Ss-8D
	for commit-classpath@gnu.org; Mon, 12 Apr 2004 11:08:54 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-055.ewetel.net
	[80.228.95.55])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3CCkYcw025991
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 14:46:35 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BCzts-0004iL-00
	for <commit-classpath@gnu.org>; Mon, 12 Apr 2004 13:46:52 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Apr 2004 14:46:24 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_g+oeATA+0CLj69i"
Message-Id: <200404121446.24604.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: include/java_io_FileDescriptor.h
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 12 Apr 2004 15:09:01 -0000


--Boundary-00=_g+oeATA+0CLj69i
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I just commited the attached patch to remove 
include/java_io_FileDescriptor.h from CVS. Its not needed anymore 
because all native methods in java.net.FileDescripter were moved to 
gnu.java.nio.channels.FileChannelImpl.


Michael


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

	* include/java_io_FileDescriptor.h: Removed.
	* include/Makefile.am: Dont regenerate java_io_FileDescriptor.h.


--Boundary-00=_g+oeATA+0CLj69i
Content-Type: text/x-diff;
  charset="us-ascii";
  name="io.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="io.diff"

Index: include/java_io_FileDescriptor.h
===================================================================
RCS file: include/java_io_FileDescriptor.h
diff -N include/java_io_FileDescriptor.h
--- include/java_io_FileDescriptor.h	8 Apr 2004 20:04:13 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_io_FileDescriptor__
-#define __java_io_FileDescriptor__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_io_FileDescriptor__ */
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- include/Makefile.am	8 Apr 2004 23:11:19 -0000	1.13
+++ include/Makefile.am	12 Apr 2004 12:43:56 -0000
@@ -42,7 +42,6 @@
 $(top_srcdir)/include/gnu_java_nio_PipeImpl.h \
 $(top_srcdir)/include/gnu_java_nio_SelectorImpl.h \
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h \
-$(top_srcdir)/include/java_io_FileDescriptor.h \
 $(top_srcdir)/include/java_io_File.h \
 $(top_srcdir)/include/java_io_ObjectInputStream.h \
 $(top_srcdir)/include/java_io_VMObjectStreamClass.h \
@@ -139,8 +138,6 @@
 	$(JAVAH) -o $@ gnu.java.nio.PipeImpl
 $(top_srcdir)/include/gnu_java_nio_SelectorImpl.h: $(top_srcdir)/gnu/java/nio/SelectorImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.SelectorImpl
-$(top_srcdir)/include/java_io_FileDescriptor.h: $(top_srcdir)/java/io/FileDescriptor.java
-	$(JAVAH) -o $@ java.io.FileDescriptor
 $(top_srcdir)/include/java_io_File.h: $(top_srcdir)/java/io/File.java
 	$(JAVAH) -o $@ java.io.File
 $(top_srcdir)/include/java_io_ObjectInputStream.h: $(top_srcdir)/java/io/ObjectInputStream.java

--Boundary-00=_g+oeATA+0CLj69i--




From MAILER-DAEMON Tue Apr 13 00:06:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDFA1-0005Dp-2V
	for mharc-commit-classpath@gnu.org; Tue, 13 Apr 2004 00:04:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDF9V-0004QA-Ug
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 00:04:01 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDF8i-00039X-16
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 00:03:45 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDF8g-00035D-Ss
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 00:03:11 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 7C8BE622B5
	for <commit-classpath@gnu.org>; Tue, 13 Apr 2004 04:02: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 21975-07 for <commit-classpath@gnu.org>;
	Tue, 13 Apr 2004 04:02:48 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-90-124.adsl.solnet.ch
	[212.41.90.124])
	by mail01.solnet.ch (Postfix) with ESMTP id 642B062294
	for <commit-classpath@gnu.org>; Tue, 13 Apr 2004 04:02:43 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id E9103B86BA; Tue, 13 Apr 2004 06:00:47 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040413040047.E9103B86BA@reali.dnsalias.net>
Date: Tue, 13 Apr 2004 06:00:47 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040413 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 13 Apr 2004 04:04:30 -0000




From MAILER-DAEMON Tue Apr 13 05:55:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDKbk-0001xH-Qm
	for mharc-commit-classpath@gnu.org; Tue, 13 Apr 2004 05:53:32 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDKaZ-0001FA-VQ
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 05:52:19 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDKZX-0008Rn-Jm
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 05:51:49 -0400
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDKZ0-0007Rh-AA
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 05:50:42 -0400
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Tue, 13 Apr 2004 11:50:35 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADD9B@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: FileChannelImpl.java
Thread-Index: AcQhPMRw/vllf1ifTD6dw1pgc0iEqw==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "commit-classpath" <commit-classpath@gnu.org>
Subject: FYI: Patch: FileChannelImpl.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 13 Apr 2004 09:53:30 -0000

Hi,

Committed,

Regards,
Jeroen

2004-04-13  Jeroen Frijters <jeroen@frijters.net>

        * gnu/java/nio/channels/FileChannelImpl.java:
        (FileChannelImpl(int,int)) Made package private instead of
private.

Index: gnu/java/nio/channels/FileChannelImpl.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/nio/channels/FileChannelImpl.java,
v
retrieving revision 1.3
diff -u -r1.3 FileChannelImpl.java
--- gnu/java/nio/channels/FileChannelImpl.java	11 Apr 2004 12:02:06
-0000	1.3
+++ gnu/java/nio/channels/FileChannelImpl.java	13 Apr 2004 09:42:45
-0000
@@ -113,7 +113,7 @@
   }
=20
   /* Used by init() (native code) */
-  private FileChannelImpl (int fd, int mode)
+  FileChannelImpl (int fd, int mode)
   {
     this.fd =3D fd;
     this.mode =3D mode;



From MAILER-DAEMON Tue Apr 13 10:01:06 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDOTK-0005mX-FD
	for mharc-commit-classpath@gnu.org; Tue, 13 Apr 2004 10:01:06 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDOTH-0005kZ-BP
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 10:01:03 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDOSh-0005VY-Ci
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 10:00:59 -0400
Received: from [217.8.192.20] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDOSg-0005UJ-Rm
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 10:00:26 -0400
Received: from [217.8.220.212] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 1717517 for commit-classpath@gnu.org;
	Tue, 13 Apr 2004 16:00:29 +0200
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 13 Apr 2004 16:00:24 +0200
Message-Id: <20040413140024.824@smtp.mail.ch.easynet.net>
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
Subject: Patch: Some parts of javax.imageio.spi
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 13 Apr 2004 14:01:04 -0000

Hi list,

as you might remember, I had wrongly announced the completion of the
package javax.imageio.spi, even though I had just completed the single
class javax.imageio.spi.ServiceRegistry. So, I thought it would not hurt
to actually fulfill my promise. I'm not there yet, but some parts are
ready, and I wanted to get them off my hard disk.

As usual, see Mauve for unit tests.


2004-04-13  Sascha Brawer  <brawer@dandelis.ch>

        * javax/imageio/spi/IIOServiceProvider.java,
        javax/imageio/spi/ImageInputStreamSpi.java,
        javax/imageio/spi/ImageOutputStreamSpi.java,
        javax/imageio/spi/ImageReaderWriterSpi.java,
        javax/imageio/spi/ImageTranscoderSpi.java: Implemented.

        * javax/imageio/stream: New directory.

        * javax/imageio/stream/IIOByteBuffer.java,
        javax/imageio/stream/ImageInputStream.java: Implemented,
        but not documented.
        
        * javax/imageio/ImageReader.java,
        javax/imageio/ImageWriter.java,
        javax/imageio/ImageTranscoder.java,
        javax/imageio/stream/ImageOutputStream.java:
        Added empty class/interface in order to allow compilation of
        javax.imageio.spi.

(No diffs attached because all files are freshly added to cvs).

-- Sascha

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





From MAILER-DAEMON Tue Apr 13 15:39:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDTko-0006oG-LC
	for mharc-commit-classpath@gnu.org; Tue, 13 Apr 2004 15:39:30 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDTkk-0006nz-CX
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 15:39:26 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDTki-0006mj-U6
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 15:39:25 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDTki-0006mT-Ba
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 15:39:24 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BDTkY-00011o-00
	for <commit-classpath@gnu.org>; Tue, 13 Apr 2004 21:39:14 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-/PYP2r6OvArU7PiFBbG5"
Message-Id: <1081885156.4890.45.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Tue, 13 Apr 2004 21:39:16 +0200
Subject: FYI Fix array class type handling in VMObjectStreamClass
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 13 Apr 2004 19:39:26 -0000


--=-/PYP2r6OvArU7PiFBbG5
Content-Type: multipart/mixed; boundary="=-dF7UXmPyPXxVG1pOV1p3"


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

Hi,

The release of all the new runtime environments made it easier to test
some subtle serialization issues. One last remaining bug was that the
new code that I introduced handled array types as reference types. This
fixes that.

2004-04-13  Mark Wielaard  <mark@klomp.org>

	* native/jni/java-io/java_io_VMObjectStreamClass.c
	getFieldReference(): Array types are different from reference
	types.

With this all serialization related mauve tests should PASS.

Cheers,

Mark

--=-dF7UXmPyPXxVG1pOV1p3
Content-Disposition: inline; filename=VMObjectStreamClass.patch
Content-Type: text/x-patch; name=VMObjectStreamClass.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IG5hdGl2ZS9qbmkvamF2YS1pby9qYXZhX2lvX1ZNT2JqZWN0U3RyZWFtQ2xhc3MuYw0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvbmF0aXZl
L2puaS9qYXZhLWlvL2phdmFfaW9fVk1PYmplY3RTdHJlYW1DbGFzcy5jLHYNCnJldHJpZXZpbmcg
cmV2aXNpb24gMS41DQpkaWZmIC11IC1yMS41IGphdmFfaW9fVk1PYmplY3RTdHJlYW1DbGFzcy5j
DQotLS0gbmF0aXZlL2puaS9qYXZhLWlvL2phdmFfaW9fVk1PYmplY3RTdHJlYW1DbGFzcy5jCTEx
IEFwciAyMDA0IDIxOjA0OjI2IC0wMDAwCTEuNQ0KKysrIG5hdGl2ZS9qbmkvamF2YS1pby9qYXZh
X2lvX1ZNT2JqZWN0U3RyZWFtQ2xhc3MuYwkxMyBBcHIgMjAwNCAxOTozNjozMCAtMDAwMA0KQEAg
LTE3MiwyMCArMTcyLDMyIEBADQogICAgICAgdHlwZV9uYW1lID0gKCplbnYpLT5HZXRTdHJpbmdV
VEZDaGFycyhlbnYsIHRuYW1lLCBOVUxMKTsNCiANCiAgICAgICAvKg0KLSAgICAgICAqIFRoZSBh
Y3R1YWwgZmllbGQgdHlwZSBkZXNjcmlwdG9yIHN0YXJ0cyB3aXRoICdMJywgZW5kcyB3aXRoICc7
Jw0KLSAgICAgICAqIGFuZCBoYXMgJy8nIGluc3RlYWQgb2YgJy4nLg0KKyAgICAgICAqIElmIGl0
IGlzbid0IGFuIGFycmF5IGNsYXNzIHRoZW4gdGhlIGFjdHVhbCBmaWVsZCB0eXBlIGRlc2NyaXB0
b3INCisgICAgICAgKiBzdGFydHMgd2l0aCAnTCcsIGVuZHMgd2l0aCAnOycgYW5kIGhhcyAnLycg
aW5zdGVhZCBvZiAnLicuDQogICAgICAgICovDQogICAgICAgdHlwZV9sZW4gPSBzdHJsZW4oKGNo
YXIgKikgdHlwZV9uYW1lKTsNCi0gICAgICB0eXBlID0gKGNoYXIgKikgbWFsbG9jKHR5cGVfbGVu
ICsgMyk7DQotICAgICAgdHlwZVswXSA9ICdMJzsNCi0gICAgICB0eXBlW3R5cGVfbGVuICsgMV0g
PSAnOyc7DQotICAgICAgdHlwZVt0eXBlX2xlbiArIDJdID0gJ1wwJzsNCisgICAgICBpZiAodHlw
ZV9uYW1lWzBdICE9ICdbJykNCisgICAgICAgIHsNCisJICB0eXBlID0gKGNoYXIgKikgbWFsbG9j
KHR5cGVfbGVuICsgMyk7DQorCSAgdHlwZVswXSA9ICdMJzsNCisJICB0eXBlW3R5cGVfbGVuICsg
MV0gPSAnOyc7DQorCSAgdHlwZVt0eXBlX2xlbiArIDJdID0gJ1wwJzsNCisJICB0eXBlKys7DQor
CX0NCisgICAgICBlbHNlDQorCXsNCisJICB0eXBlID0gKGNoYXIgKikgbWFsbG9jKHR5cGVfbGVu
KTsNCisJICB0eXBlW3R5cGVfbGVuXSA9ICdcMCc7DQorCX0NCiANCiAgICAgICBmb3IgKGkgPSAw
OyBpIDwgdHlwZV9sZW47IGkrKykNCiAJaWYgKHR5cGVfbmFtZVtpXSA9PSAnLicpDQotCSAgdHlw
ZVtpICsgMV0gPSAnLyc7DQorCSAgdHlwZVtpXSA9ICcvJzsNCiAgICAgICAgIGVsc2UNCi0JICB0
eXBlW2kgKyAxXSA9IHR5cGVfbmFtZVtpXTsNCisJICB0eXBlW2ldID0gdHlwZV9uYW1lW2ldOw0K
Kw0KKyAgICAgIGlmICh0eXBlX25hbWVbMF0gIT0gJ1snKQ0KKwl0eXBlLS07DQogDQogICAgICAg
KCplbnYpLT5SZWxlYXNlU3RyaW5nVVRGQ2hhcnMoZW52LCB0bmFtZSwgdHlwZV9uYW1lKTsNCiAg
ICAgfQ0K

--=-dF7UXmPyPXxVG1pOV1p3--

--=-/PYP2r6OvArU7PiFBbG5
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)

iD8DBQBAfEHkxVhZCJWr9QwRAoJKAKCqzjlzJAi/S1JacYXk7xUelVoQhQCfa9T9
nuQB5GCAP/AKu/v8TDEzVTA=
=ok9t
-----END PGP SIGNATURE-----

--=-/PYP2r6OvArU7PiFBbG5--




From MAILER-DAEMON Tue Apr 13 17:20:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDVK5-000366-Ov
	for mharc-commit-classpath@gnu.org; Tue, 13 Apr 2004 17:20:01 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDVF2-0001tr-TZ
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 17:14:48 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDVBh-0008TU-7J
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 17:11:52 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDVBW-0008ME-LI
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 17:11:10 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id BF10862211
	for <commit-classpath@gnu.org>; Tue, 13 Apr 2004 21:11:07 +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 39370-09 for <commit-classpath@gnu.org>;
	Tue, 13 Apr 2004 21:11:00 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-90-124.adsl.solnet.ch
	[212.41.90.124])
	by mail01.solnet.ch (Postfix) with ESMTP id 0CBE26222C
	for <commit-classpath@gnu.org>; Tue, 13 Apr 2004 20:58:34 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id ED98C4EFBE; Tue, 13 Apr 2004 22:56:38 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040413205638.ED98C4EFBE@reali.dnsalias.net>
Date: Tue, 13 Apr 2004 22:56:38 +0200 (CEST)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: doc/www.gnu.org/newsitems.txt
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 13 Apr 2004 21:20:00 -0000

2004-04-13  Patrik Reali  <reali@acm.org>

	* doc/www.gnu.org/newsitems.txt: SableVM, Jikes RVM, JC releases

Index: doc/www.gnu.org/newsitems.txt
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/newsitems.txt,v
retrieving revision 1.4
diff -u -r1.4 newsitems.txt
--- doc/www.gnu.org/newsitems.txt	6 Apr 2004 22:06:38 -0000	1.4
+++ doc/www.gnu.org/newsitems.txt	13 Apr 2004 20:54:59 -0000
@@ -1,3 +1,19 @@
+<newsitem date="12 Apr 2004">
+SableVM 1.1.3 released (<createlink url="http://mail.gnu.org/archive/html/classpath/2004-04/msg00228.html" name="announcement">).
+</newsitem>
+
+<newsitem date="12 Apr 2004">
+JC 1.1 released (<createlink url="http://mail.gnu.org/archive/html/classpath/2004-04/msg00226.html" name="announcement">); upgraded to GNU Classpath 0.08.
+</newsitem>
+
+<newsitem date="12 Apr 2004">
+Jikes RVM 2.3.2 released (<createlink url="http://mail.gnu.org/archive/html/classpath/2004-04/msg00225.html" name="announcement">); upgraded to GNU Classpath 0.08 and completely built with free tools!
+</newsitem>
+
+<newsitem date="8 Apr 2004">
+The big NIO patch: java.io file operations now rely on java.nio.channels
+</newsitem>
+
 <newsitem date="29 Mar 2004">
 JamVM-1.1.2 released (<createlink name="announcement" url="http://mail.gnu.org/archive/html/classpath/2004-03/msg00267.html">) 
 </newsitem>



From MAILER-DAEMON Tue Apr 13 20:03:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDXrs-0002Ic-Ju
	for mharc-commit-classpath@gnu.org; Tue, 13 Apr 2004 20:03:04 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDXrp-0002FS-7a
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 20:03:01 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDXrF-0001ow-2C
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 20:02:56 -0400
Received: from [217.8.192.20] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDXoL-0000wu-OR
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 19:59:25 -0400
Received: from [217.8.220.212] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 1725860 for commit-classpath@gnu.org;
	Wed, 14 Apr 2004 01:59:25 +0200
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Wed, 14 Apr 2004 01:59:23 +0200
Message-Id: <20040413235923.4796@smtp.mail.ch.easynet.net>
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
Subject: FYI: java.awt.image.PixelInterleavedSampleModel
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 14 Apr 2004 00:03:03 -0000

Hi,

I've checked in java.awt.image.PixelInterleavedSampleModel, which was
missing from Classpath. For a unit test that checks the
createSubsetSampleModel() method, see Mauve.

-- Sascha

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



/* PixelInterleavedSampleModel.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 java.awt.image;


/**
 * A <code>SampleModel</code> that uses exactly one element of the
 * raster&#x2019;s {@link DataBuffer} per pixel, holds all bands in a
 * single bank, and stores band data in pixel-interleaved manner.
 *
 * @since 1.2
 *
 * @author <a href="mailto:brawer@dandelis.ch">Sascha Brawer</a>
 */
public class PixelInterleavedSampleModel
  extends ComponentSampleModel
{
  public PixelInterleavedSampleModel(int dataType, int width, int height,
                                     int pixelStride, int scanlineStride,
                                     int[] bandOffsets)
  {
    super(dataType, width, height, pixelStride, scanlineStride,
          bandOffsets);
  }

  
  /**
   * Creates a new <code>SampleModel</code> that is like this one, but
   * uses the specified width and height.
   *
   * @param width the number of pixels in the horizontal direction.
   *
   * @param height the number of pixels in the vertical direction.
   */
  public SampleModel createCompatibleSampleModel(int width, int height)
  {
    return new PixelInterleavedSampleModel(dataType, width, height,
                                           pixelStride, scanlineStride,
                                           bandOffsets);
  }


  /**
   * Creates a new <code>SampleModel</code> that is like this one, but
   * uses only a subset of its bands.
   *
   * @param bands an array whose elements indicate which bands shall
   * be part of the subset. For example, <code>[0, 2, 3]</code> would
   * create a SampleModel containing bands #0, #2 and #3.
   */
  public SampleModel createSubsetSampleModel(int[] bands)
  {
    int[] subOffsets;

    subOffsets = new int[bands.length];
    for (int i = 0; i < bands.length; i++)
      subOffsets[i] = bandOffsets[bands[i]];

    return new PixelInterleavedSampleModel(dataType, width, height,
                                           pixelStride, scanlineStride,
                                           subOffsets);
  }
}





From MAILER-DAEMON Tue Apr 13 22:15:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDZvY-0004Sp-PH
	for mharc-commit-classpath@gnu.org; Tue, 13 Apr 2004 22:15:00 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDZvV-0004Rq-RW
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 22:14:57 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDZum-0004DK-Tb
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 22:14:44 -0400
Received: from [217.8.192.20] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDZum-0004D7-Jr
	for commit-classpath@gnu.org; Tue, 13 Apr 2004 22:14:12 -0400
Received: from [217.8.220.212] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 1726619 for commit-classpath@gnu.org;
	Wed, 14 Apr 2004 04:14:12 +0200
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Wed, 14 Apr 2004 04:14:09 +0200
Message-Id: <20040414021409.8058@smtp.mail.ch.easynet.net>
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
Subject: Patch: ImageReaderWriterSpi
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 14 Apr 2004 02:14:59 -0000

Hi all,

I've committed the following patch.

-- Sascha

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


2004-04-14  Sascha Brawer  <brawer@dandelis.ch>
 
    * javax/imageio/spi/ImageReaderWriterSpi.java (getFormatNames):
    Return cloned names, for compatibility with JDK.


Index: javax/imageio/spi/ImageReaderWriterSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/spi/
ImageReaderWriterSpi.java,v
retrieving revision 1.1
diff -u -r1.1 ImageReaderWriterSpi.java
--- javax/imageio/spi/ImageReaderWriterSpi.java	13 Apr 2004 13:54:13 -0000	1.1
+++ javax/imageio/spi/ImageReaderWriterSpi.java	14 Apr 2004 02:07:53 -0000
@@ -300,7 +300,7 @@
    */
   public String[] getFormatNames()
   {
-    return names;
+    return (String[]) names.clone();
   }





From MAILER-DAEMON Wed Apr 14 00:02:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDbbQ-0002ek-0N
	for mharc-commit-classpath@gnu.org; Wed, 14 Apr 2004 00:02:20 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDbbK-0002cF-S1
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 00:02:14 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDbao-000228-Ih
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 00:02:13 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDban-00020I-O8
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 00:01:41 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id E6CCC622F3
	for <commit-classpath@gnu.org>; Wed, 14 Apr 2004 04:01:40 +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 67627-01 for <commit-classpath@gnu.org>;
	Wed, 14 Apr 2004 04:01:40 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-90-124.adsl.solnet.ch
	[212.41.90.124])
	by mail01.solnet.ch (Postfix) with ESMTP id C3FE5622EB
	for <commit-classpath@gnu.org>; Wed, 14 Apr 2004 04:01:39 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 7CDE0B8D4A; Wed, 14 Apr 2004 05:59:43 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040414035943.7CDE0B8D4A@reali.dnsalias.net>
Date: Wed, 14 Apr 2004 05:59:43 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040414 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 14 Apr 2004 04:02:15 -0000




From MAILER-DAEMON Wed Apr 14 02:09:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDdYW-0000rq-1V
	for mharc-commit-classpath@gnu.org; Wed, 14 Apr 2004 02:07:28 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDdYG-0000mT-6G
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 02:07:12 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDdXk-0000LJ-0R
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 02:07:11 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDdXX-00008t-Bt
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 02:06:27 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-164.ewetel.net
	[80.228.94.164])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3E66MPR008498;
	Wed, 14 Apr 2004 08:06:22 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BDcbj-0000RK-00; Wed, 14 Apr 2004 07:06:43 +0200
From: Michael Koch <konqueror@gmx.de>
To: Sascha Brawer <brawer@dandelis.ch>, <commit-classpath@gnu.org>
Date: Wed, 14 Apr 2004 08:05:49 +0200
User-Agent: KMail/1.5.4
References: <20040413140024.824@smtp.mail.ch.easynet.net>
In-Reply-To: <20040413140024.824@smtp.mail.ch.easynet.net>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404140805.52822.konqueror@gmx.de>
X-CheckCompat: OK
Cc: 
Subject: Re: Patch: Some parts of javax.imageio.spi
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 14 Apr 2004 06:07:13 -0000

Am Dienstag, 13. April 2004 16:00 schrieb Sascha Brawer:
> Hi list,
>
> as you might remember, I had wrongly announced the completion of the
> package javax.imageio.spi, even though I had just completed the
> single class javax.imageio.spi.ServiceRegistry. So, I thought it
> would not hurt to actually fulfill my promise. I'm not there yet, but
> some parts are ready, and I wanted to get them off my hard disk.
>
> As usual, see Mauve for unit tests.
>
>
> 2004-04-13  Sascha Brawer  <brawer@dandelis.ch>
>
>         * javax/imageio/spi/IIOServiceProvider.java,
>         javax/imageio/spi/ImageInputStreamSpi.java,
>         javax/imageio/spi/ImageOutputStreamSpi.java,
>         javax/imageio/spi/ImageReaderWriterSpi.java,
>         javax/imageio/spi/ImageTranscoderSpi.java: Implemented.
>
>         * javax/imageio/stream: New directory.
>
>         * javax/imageio/stream/IIOByteBuffer.java,
>         javax/imageio/stream/ImageInputStream.java: Implemented,
>         but not documented.
>
>         * javax/imageio/ImageReader.java,
>         javax/imageio/ImageWriter.java,
>         javax/imageio/ImageTranscoder.java,
>         javax/imageio/stream/ImageOutputStream.java:
>         Added empty class/interface in order to allow compilation of
>         javax.imageio.spi.
>
> (No diffs attached because all files are freshly added to cvs).

cvs can handle new files well in diffs ...

BTW: you broke "make distcheck" by forgetting the Makefile.am files.


Michael




From MAILER-DAEMON Wed Apr 14 07:04:23 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDiAn-0003oQ-OI
	for mharc-commit-classpath@gnu.org; Wed, 14 Apr 2004 07:03:17 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDi9e-0002ni-Hm
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 07:02:06 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDi80-0001aK-Ti
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 07:00:56 -0400
Received: from [217.8.192.20] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDi72-00013X-Eg
	for commit-classpath@gnu.org; Wed, 14 Apr 2004 06:59:24 -0400
Received: from [217.8.220.212] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 1736158; Wed, 14 Apr 2004 12:59:21 +0200
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Wed, 14 Apr 2004 12:59:16 +0200
Message-Id: <20040414105916.15106@smtp.mail.ch.easynet.net>
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: graydon hoare <graydon@redhat.com>
Subject: FYI: java/awt/image/Makefile.am
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 14 Apr 2004 11:02:59 -0000

2004-04-14  Sascha Brawer  <brawer@dandelis.ch>

	* java/awt/image/Makefile.am (EXTRA_DIST):
	Added PixelInterleavedSampleModel.java


Index: java/awt/image/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/image/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- java/awt/image/Makefile.am	19 Mar 2004 21:25:56 -0000	1.7
+++ java/awt/image/Makefile.am	14 Apr 2004 10:56:17 -0000
@@ -25,6 +25,7 @@
 MemoryImageSource.java \
 PackedColorModel.java \
 PixelGrabber.java \
+PixelInterleavedSampleModel.java \
 RGBImageFilter.java \
 Raster.java \
 RasterFormatException.java \





From MAILER-DAEMON Thu Apr 15 00:03:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BDy5l-0005en-C5
	for mharc-commit-classpath@gnu.org; Thu, 15 Apr 2004 00:03:09 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BDy5b-0005Lm-Hz
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 00:02:59 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BDy4t-0004CL-3W
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 00:02:48 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BDy4r-00049E-TW
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 00:02:14 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id E3E82622C3
	for <commit-classpath@gnu.org>; Thu, 15 Apr 2004 04:02:12 +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 01916-08 for <commit-classpath@gnu.org>;
	Thu, 15 Apr 2004 04:02:11 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-72-176.adsl.solnet.ch
	[212.41.72.176])
	by mail01.solnet.ch (Postfix) with ESMTP id F0B9862279
	for <commit-classpath@gnu.org>; Thu, 15 Apr 2004 04:02:10 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 5DA46B9C1D; Thu, 15 Apr 2004 06:00:13 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040415040013.5DA46B9C1D@reali.dnsalias.net>
Date: Thu, 15 Apr 2004 06:00:13 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040415 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 15 Apr 2004 04:03:06 -0000




From MAILER-DAEMON Thu Apr 15 04:06:33 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BE1pB-0008HM-UO
	for mharc-commit-classpath@gnu.org; Thu, 15 Apr 2004 04:02:17 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BE1p2-0008E6-DQ
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 04:02:08 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BE1oR-00082O-Bd
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 04:02:06 -0400
Received: from [217.8.192.20] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.30)
	id 1BE1bm-0004YT-KW; Thu, 15 Apr 2004 03:48:26 -0400
Received: from [217.8.199.55] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 1755098; Thu, 15 Apr 2004 09:48:26 +0200
From: Sascha Brawer <brawer@dandelis.ch>
To: GNU Classpath <classpath@gnu.org>
Date: Thu, 15 Apr 2004 09:48:21 +0200
Message-Id: <20040415074821.9796@smtp.mail.ch.easynet.net>
In-Reply-To: <20040414112144.189@smtp.mail.ch.easynet.net>
References: <20040414112144.189@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="==_20040415074821.24817-1_=="
Cc: commit-classpath@gnu.org, graydon hoare <graydon@redhat.com>
Subject: Re: Patch: java.awt.image.DataBuffer[Short|Float|Double]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 15 Apr 2004 08:02:14 -0000

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

Sascha Brawer <brawer@dandelis.ch> wrote on Wed, 14 Apr 2004 13:21:43 +0200:

>the following would provide support for java.awt.image.DataBuffer
>of TYPE_SHORT, TYPE_FLOAT and TYPE_DOUBLE. OK to commit?

Since nobody has expressed their objections, I've committed the attached
patch.
Thanks, by the way, for teaching me about cvs diff -N.

-- Sascha

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


2004-04-14  Sascha Brawer  <brawer@dandelis.ch>

	* java/awt/image/DataBufferShort.java,
	java/awt/image/DataBufferFloat.java,
	java/awt/image/DataBufferDouble.java: New files.

	* java/awt/image/Makefile.am (EXTRA_DIST): Added
	DataBufferShort.java, DataBufferFloat.java, and
	DataBufferDouble.java.

	* gnu/java/awt/Buffers.java (createBuffer, createBufferFromData,
	getData): Added support	for TYPE_SHORT, TYPE_FLOAT and TYPE_DOUBLE.

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

SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFz
c3BhdGgvY2xhc3NwYXRoL0NoYW5nZUxvZyx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMDMx
CmRpZmYgLXUgLXIxLjIwMzEgQ2hhbmdlTG9nCi0tLSBDaGFuZ2VMb2cJMTQgQXByIDIwMDQg
MTE6MDE6MTMgLTAwMDAJMS4yMDMxCisrKyBDaGFuZ2VMb2cJMTUgQXByIDIwMDQgMDc6NDE6
MDUgLTAwMDAKQEAgLTEsNSArMSwxOCBAQAogMjAwNC0wNC0xNCAgU2FzY2hhIEJyYXdlciAg
PGJyYXdlckBkYW5kZWxpcy5jaD4KIAorCSogamF2YS9hd3QvaW1hZ2UvRGF0YUJ1ZmZlclNo
b3J0LmphdmEsCisJamF2YS9hd3QvaW1hZ2UvRGF0YUJ1ZmZlckZsb2F0LmphdmEsCisJamF2
YS9hd3QvaW1hZ2UvRGF0YUJ1ZmZlckRvdWJsZS5qYXZhOiBOZXcgZmlsZXMuCisKKwkqIGph
dmEvYXd0L2ltYWdlL01ha2VmaWxlLmFtIChFWFRSQV9ESVNUKTogQWRkZWQKKwlEYXRhQnVm
ZmVyU2hvcnQuamF2YSwgRGF0YUJ1ZmZlckZsb2F0LmphdmEsIGFuZAorCURhdGFCdWZmZXJE
b3VibGUuamF2YS4KKworCSogZ251L2phdmEvYXd0L0J1ZmZlcnMuamF2YSAoY3JlYXRlQnVm
ZmVyLCBjcmVhdGVCdWZmZXJGcm9tRGF0YSwKKwlnZXREYXRhKTogQWRkZWQgc3VwcG9ydAlm
b3IgVFlQRV9TSE9SVCwgVFlQRV9GTE9BVCBhbmQgVFlQRV9ET1VCTEUuCisKKzIwMDQtMDQt
MTQgIFNhc2NoYSBCcmF3ZXIgIDxicmF3ZXJAZGFuZGVsaXMuY2g+CisKIAkqIGphdmEvYXd0
L2ltYWdlL01ha2VmaWxlLmFtIChFWFRSQV9ESVNUKToKIAlBZGRlZCBQaXhlbEludGVybGVh
dmVkU2FtcGxlTW9kZWwuamF2YQogCkluZGV4OiBqYXZhL2F3dC9pbWFnZS9NYWtlZmlsZS5h
bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRo
L2phdmEvYXd0L2ltYWdlL01ha2VmaWxlLmFtLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjgK
ZGlmZiAtdSAtcjEuOCBNYWtlZmlsZS5hbQotLS0gamF2YS9hd3QvaW1hZ2UvTWFrZWZpbGUu
YW0JMTQgQXByIDIwMDQgMTE6MDE6MTMgLTAwMDAJMS44CisrKyBqYXZhL2F3dC9pbWFnZS9N
YWtlZmlsZS5hbQkxNSBBcHIgMjAwNCAwNzo0MTowNSAtMDAwMApAQCAtMTIsNyArMTIsMTAg
QEAKIENyb3BJbWFnZUZpbHRlci5qYXZhIFwKIERhdGFCdWZmZXIuamF2YQlcCiBEYXRhQnVm
ZmVyQnl0ZS5qYXZhIFwKK0RhdGFCdWZmZXJEb3VibGUuamF2YSBcCitEYXRhQnVmZmVyRmxv
YXQuamF2YSBcCiBEYXRhQnVmZmVySW50LmphdmEgXAorRGF0YUJ1ZmZlclNob3J0LmphdmEg
XAogRGF0YUJ1ZmZlclVTaG9ydC5qYXZhIFwKIERpcmVjdENvbG9yTW9kZWwuamF2YSBcCiBG
aWx0ZXJlZEltYWdlU291cmNlLmphdmEgXApJbmRleDogamF2YS9hd3QvaW1hZ2UvRGF0YUJ1
ZmZlckRvdWJsZS5qYXZhCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IGphdmEvYXd0L2ltYWdl
L0RhdGFCdWZmZXJEb3VibGUuamF2YQpkaWZmIC1OIGphdmEvYXd0L2ltYWdlL0RhdGFCdWZm
ZXJEb3VibGUuamF2YQotLS0gL2Rldi9udWxsCTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAK
KysrIGphdmEvYXd0L2ltYWdlL0RhdGFCdWZmZXJEb3VibGUuamF2YQkxNSBBcHIgMjAwNCAw
Nzo0MTowNSAtMDAwMApAQCAtMCwwICsxLDE3NCBAQAorLyogQ29weXJpZ2h0IChDKSAyMDA0
ICBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24KKworVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05V
IENsYXNzcGF0aC4KKworR05VIENsYXNzcGF0aCBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2Fu
IHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5CitpdCB1bmRlciB0aGUgdGVybXMgb2Yg
dGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQordGhlIEZy
ZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgZWl0aGVyIHZlcnNpb24gMiwgb3IgKGF0IHlvdXIg
b3B0aW9uKQorYW55IGxhdGVyIHZlcnNpb24uCisKK0dOVSBDbGFzc3BhdGggaXMgZGlzdHJp
YnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwgYnV0CitXSVRIT1VU
IEFOWSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCitN
RVJDSEFOVEFCSUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBT
ZWUgdGhlIEdOVQorR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgor
CitZb3Ugc2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQ
dWJsaWMgTGljZW5zZQorYWxvbmcgd2l0aCBHTlUgQ2xhc3NwYXRoOyBzZWUgdGhlIGZpbGUg
Q09QWUlORy4gIElmIG5vdCwgd3JpdGUgdG8gdGhlCitGcmVlIFNvZnR3YXJlIEZvdW5kYXRp
b24sIEluYy4sIDU5IFRlbXBsZSBQbGFjZSwgU3VpdGUgMzMwLCBCb3N0b24sIE1BCiswMjEx
MS0xMzA3IFVTQS4KKworTGlua2luZyB0aGlzIGxpYnJhcnkgc3RhdGljYWxseSBvciBkeW5h
bWljYWxseSB3aXRoIG90aGVyIG1vZHVsZXMgaXMKK21ha2luZyBhIGNvbWJpbmVkIHdvcmsg
YmFzZWQgb24gdGhpcyBsaWJyYXJ5LiAgVGh1cywgdGhlIHRlcm1zIGFuZAorY29uZGl0aW9u
cyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgY292ZXIgdGhlIHdob2xlCitj
b21iaW5hdGlvbi4KKworQXMgYSBzcGVjaWFsIGV4Y2VwdGlvbiwgdGhlIGNvcHlyaWdodCBo
b2xkZXJzIG9mIHRoaXMgbGlicmFyeSBnaXZlIHlvdQorcGVybWlzc2lvbiB0byBsaW5rIHRo
aXMgbGlicmFyeSB3aXRoIGluZGVwZW5kZW50IG1vZHVsZXMgdG8gcHJvZHVjZSBhbgorZXhl
Y3V0YWJsZSwgcmVnYXJkbGVzcyBvZiB0aGUgbGljZW5zZSB0ZXJtcyBvZiB0aGVzZSBpbmRl
cGVuZGVudAorbW9kdWxlcywgYW5kIHRvIGNvcHkgYW5kIGRpc3RyaWJ1dGUgdGhlIHJlc3Vs
dGluZyBleGVjdXRhYmxlIHVuZGVyCit0ZXJtcyBvZiB5b3VyIGNob2ljZSwgcHJvdmlkZWQg
dGhhdCB5b3UgYWxzbyBtZWV0LCBmb3IgZWFjaCBsaW5rZWQKK2luZGVwZW5kZW50IG1vZHVs
ZSwgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBsaWNlbnNlIG9mIHRoYXQKK21v
ZHVsZS4gIEFuIGluZGVwZW5kZW50IG1vZHVsZSBpcyBhIG1vZHVsZSB3aGljaCBpcyBub3Qg
ZGVyaXZlZCBmcm9tCitvciBiYXNlZCBvbiB0aGlzIGxpYnJhcnkuICBJZiB5b3UgbW9kaWZ5
IHRoaXMgbGlicmFyeSwgeW91IG1heSBleHRlbmQKK3RoaXMgZXhjZXB0aW9uIHRvIHlvdXIg
dmVyc2lvbiBvZiB0aGUgbGlicmFyeSwgYnV0IHlvdSBhcmUgbm90CitvYmxpZ2F0ZWQgdG8g
ZG8gc28uICBJZiB5b3UgZG8gbm90IHdpc2ggdG8gZG8gc28sIGRlbGV0ZSB0aGlzCitleGNl
cHRpb24gc3RhdGVtZW50IGZyb20geW91ciB2ZXJzaW9uLiAqLworCitwYWNrYWdlIGphdmEu
YXd0LmltYWdlOworCisvKiBUaGlzIGlzIG9uZSBvZiBzZXZlcmFsIGNsYXNzZXMgdGhhdCBh
cmUgbmVhcmx5IGlkZW50aWNhbC4gTWF5YmUgd2UKKyAgIHNob3VsZCBoYXZlIGEgY2VudHJh
bCB0ZW1wbGF0ZSBhbmQgZ2VuZXJhdGUgYWxsIHRoZXNlIGZpbGVzLiBUaGlzCisgICBpcyBv
bmUgb2YgdGhlIGNhc2VzIHdoZXJlIHRlbXBsYXRlcyBvciBtYWNyb3Mgd291bGQgaGF2ZSBi
ZWVuCisgICB1c2VmdWwgdG8gaGF2ZSBpbiBKYXZhLgorCisgICBUaGlzIGZpbGUgaGFzIGJl
ZW4gY3JlYXRlZCB1c2luZyBzZWFyY2gtcmVwbGFjZS4gTXkgb25seSBmZWFyIGlzCisgICB0
aGF0IHRoZXNlIGNsYXNzZXMgd2lsbCBncm93IG91dC1vZi1zeW5jIGFzIG9mIGEgcmVzdWx0
IG9mIGNoYW5nZXMKKyAgIHRoYXQgYXJlIG5vdCBwcm9wYWdhdGVkIHRvIHRoZSBvdGhlciBm
aWxlcy4gQXMgYWx3YXlzLCBtaXJyb3JpbmcKKyAgIGNvZGUgaXMgYSBtYWludGVuYW5jZSBu
aWdodG1hcmUuICAqLworCisvKioKKyAqIEBzaW5jZSAxLjQKKyAqCisgKiBAYXV0aG9yIDxh
IGhyZWY9Im1haWx0bzpyb2xmd3JAaWkudWliLm5vIj5Sb2xmIFcuIFJhc211c3NlbjwvYT4K
KyAqIEBhdXRob3IgPGEgaHJlZj0ibWFpbHRvOmJyYXdlckBkYW5kZWxpcy5jaCI+U2FzY2hh
IEJyYXdlcjwvYT4KKyAqLworcHVibGljIGZpbmFsIGNsYXNzIERhdGFCdWZmZXJEb3VibGUK
KyAgZXh0ZW5kcyBEYXRhQnVmZmVyCit7CisgIHByaXZhdGUgZG91YmxlW10gZGF0YTsKKyAg
cHJpdmF0ZSBkb3VibGVbXVtdIGJhbmtEYXRhOworICAKKyAgcHVibGljIERhdGFCdWZmZXJE
b3VibGUoaW50IHNpemUpCisgIHsKKyAgICBzdXBlcihUWVBFX0RPVUJMRSwgc2l6ZSk7Cisg
ICAgZGF0YSA9IG5ldyBkb3VibGVbc2l6ZV07CisgIH0KKworICBwdWJsaWMgRGF0YUJ1ZmZl
ckRvdWJsZShpbnQgc2l6ZSwgaW50IG51bUJhbmtzKQorICB7CisgICAgc3VwZXIoVFlQRV9E
T1VCTEUsIHNpemUsIG51bUJhbmtzKTsKKyAgICBiYW5rRGF0YSA9IG5ldyBkb3VibGVbbnVt
QmFua3NdW3NpemVdOworICAgIGRhdGEgPSBiYW5rRGF0YVswXTsKKyAgfQorCisgIHB1Ymxp
YyBEYXRhQnVmZmVyRG91YmxlKGRvdWJsZVtdIGRhdGFBcnJheSwgaW50IHNpemUpCisgIHsK
KyAgICBzdXBlcihUWVBFX0RPVUJMRSwgc2l6ZSk7CisgICAgZGF0YSA9IGRhdGFBcnJheTsK
KyAgfQorICAgIAorICBwdWJsaWMgRGF0YUJ1ZmZlckRvdWJsZShkb3VibGVbXSBkYXRhQXJy
YXksIGludCBzaXplLCBpbnQgb2Zmc2V0KQorICB7CisgICAgc3VwZXIoVFlQRV9ET1VCTEUs
IHNpemUsIDEsIG9mZnNldCk7CisgICAgZGF0YSA9IGRhdGFBcnJheTsKKyAgfQorCisgIHB1
YmxpYyBEYXRhQnVmZmVyRG91YmxlKGRvdWJsZVtdW10gZGF0YUFycmF5LCBpbnQgc2l6ZSkK
KyAgeworICAgIHN1cGVyKFRZUEVfRE9VQkxFLCBzaXplLCBkYXRhQXJyYXkubGVuZ3RoKTsK
KyAgICBiYW5rRGF0YSA9IGRhdGFBcnJheTsKKyAgICBkYXRhID0gYmFua0RhdGFbMF07Cisg
IH0KKworICBwdWJsaWMgRGF0YUJ1ZmZlckRvdWJsZShkb3VibGVbXVtdIGRhdGFBcnJheSwg
aW50IHNpemUsIGludFtdIG9mZnNldHMpCisgIHsKKyAgICBzdXBlcihUWVBFX0RPVUJMRSwg
c2l6ZSwgZGF0YUFycmF5Lmxlbmd0aCwgb2Zmc2V0cyk7CisgICAgYmFua0RhdGEgPSBkYXRh
QXJyYXk7CisgICAgZGF0YSA9IGJhbmtEYXRhWzBdOworICB9CisKKyAgcHVibGljIGRvdWJs
ZVtdIGdldERhdGEoKQorICB7CisgICAgcmV0dXJuIGRhdGE7CisgIH0KKyAgICAKKyAgcHVi
bGljIGRvdWJsZVtdIGdldERhdGEoaW50IGJhbmspCisgIHsKKyAgICByZXR1cm4gYmFua0Rh
dGFbYmFua107CisgIH0KKyAgICAKKyAgcHVibGljIGRvdWJsZVtdW10gZ2V0QmFua0RhdGEo
KQorICB7CisgICAgcmV0dXJuIGJhbmtEYXRhOworICB9CisgIAorICBwdWJsaWMgaW50IGdl
dEVsZW0oaW50IGkpCisgIHsKKyAgICByZXR1cm4gKGludCkgZGF0YVtpK29mZnNldF07Cisg
IH0KKworICBwdWJsaWMgaW50IGdldEVsZW0oaW50IGJhbmssIGludCBpKQorICB7CisgICAg
cmV0dXJuIChpbnQpIGJhbmtEYXRhW2JhbmtdW2krb2Zmc2V0c1tiYW5rXV07CisgIH0KKwor
ICBwdWJsaWMgdm9pZCBzZXRFbGVtKGludCBpLCBpbnQgdmFsKQorICB7CisgICAgZGF0YVtp
K29mZnNldF0gPSAoZG91YmxlKSB2YWw7CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRFbGVt
KGludCBiYW5rLCBpbnQgaSwgaW50IHZhbCkKKyAgeworICAgIGJhbmtEYXRhW2JhbmtdW2kr
b2Zmc2V0c1tiYW5rXV0gPSAoZG91YmxlKSB2YWw7CisgIH0KKworICBwdWJsaWMgZmxvYXQg
Z2V0RWxlbUZsb2F0KGludCBpKQorICB7CisgICAgcmV0dXJuIChmbG9hdCkgZGF0YVtpK29m
ZnNldF07CisgIH0KKyAgICAKKyAgcHVibGljIGZsb2F0IGdldEVsZW1GbG9hdChpbnQgYmFu
aywgaW50IGkpCisgIHsKKyAgICByZXR1cm4gKGZsb2F0KSBiYW5rRGF0YVtiYW5rXVtpK29m
ZnNldHNbYmFua11dOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0RWxlbUZsb2F0KGludCBp
LCBmbG9hdCB2YWwpCisgIHsKKyAgICBkYXRhW2krb2Zmc2V0XSA9IHZhbDsKKyAgfQorCisg
IHB1YmxpYyB2b2lkIHNldEVsZW1GbG9hdChpbnQgYmFuaywgaW50IGksIGZsb2F0IHZhbCkK
KyAgeworICAgIGJhbmtEYXRhW2JhbmtdW2krb2Zmc2V0c1tiYW5rXV0gPSB2YWw7CisgIH0K
KworICBwdWJsaWMgZG91YmxlIGdldEVsZW1Eb3VibGUoaW50IGkpCisgIHsKKyAgICByZXR1
cm4gZGF0YVtpICsgb2Zmc2V0XTsKKyAgfQorICAgIAorICBwdWJsaWMgZG91YmxlIGdldEVs
ZW1Eb3VibGUoaW50IGJhbmssIGludCBpKQorICB7CisgICAgcmV0dXJuIGJhbmtEYXRhW2Jh
bmtdW2kgKyBvZmZzZXRzW2JhbmtdXTsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldEVsZW1E
b3VibGUoaW50IGksIGRvdWJsZSB2YWwpCisgIHsKKyAgICBkYXRhW2kgKyBvZmZzZXRdID0g
dmFsOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0RWxlbURvdWJsZShpbnQgYmFuaywgaW50
IGksIGRvdWJsZSB2YWwpCisgIHsKKyAgICBiYW5rRGF0YVtiYW5rXVtpICsgb2Zmc2V0c1ti
YW5rXV0gPSB2YWw7CisgIH0KK30KSW5kZXg6IGphdmEvYXd0L2ltYWdlL0RhdGFCdWZmZXJG
bG9hdC5qYXZhCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IGphdmEvYXd0L2ltYWdlL0RhdGFC
dWZmZXJGbG9hdC5qYXZhCmRpZmYgLU4gamF2YS9hd3QvaW1hZ2UvRGF0YUJ1ZmZlckZsb2F0
LmphdmEKLS0tIC9kZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBqYXZh
L2F3dC9pbWFnZS9EYXRhQnVmZmVyRmxvYXQuamF2YQkxNSBBcHIgMjAwNCAwNzo0MTowNSAt
MDAwMApAQCAtMCwwICsxLDE3MiBAQAorLyogQ29weXJpZ2h0IChDKSAyMDA0ICBGcmVlIFNv
ZnR3YXJlIEZvdW5kYXRpb24KKworVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIENsYXNzcGF0
aC4KKworR05VIENsYXNzcGF0aCBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJp
YnV0ZSBpdCBhbmQvb3IgbW9kaWZ5CitpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBH
ZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQordGhlIEZyZWUgU29mdHdh
cmUgRm91bmRhdGlvbjsgZWl0aGVyIHZlcnNpb24gMiwgb3IgKGF0IHlvdXIgb3B0aW9uKQor
YW55IGxhdGVyIHZlcnNpb24uCisKK0dOVSBDbGFzc3BhdGggaXMgZGlzdHJpYnV0ZWQgaW4g
dGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwgYnV0CitXSVRIT1VUIEFOWSBXQVJS
QU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCitNRVJDSEFOVEFC
SUxJVFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdO
VQorR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLgorCitZb3Ugc2hv
dWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGlj
ZW5zZQorYWxvbmcgd2l0aCBHTlUgQ2xhc3NwYXRoOyBzZWUgdGhlIGZpbGUgQ09QWUlORy4g
IElmIG5vdCwgd3JpdGUgdG8gdGhlCitGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4s
IDU5IFRlbXBsZSBQbGFjZSwgU3VpdGUgMzMwLCBCb3N0b24sIE1BCiswMjExMS0xMzA3IFVT
QS4KKworTGlua2luZyB0aGlzIGxpYnJhcnkgc3RhdGljYWxseSBvciBkeW5hbWljYWxseSB3
aXRoIG90aGVyIG1vZHVsZXMgaXMKK21ha2luZyBhIGNvbWJpbmVkIHdvcmsgYmFzZWQgb24g
dGhpcyBsaWJyYXJ5LiAgVGh1cywgdGhlIHRlcm1zIGFuZAorY29uZGl0aW9ucyBvZiB0aGUg
R05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgY292ZXIgdGhlIHdob2xlCitjb21iaW5hdGlv
bi4KKworQXMgYSBzcGVjaWFsIGV4Y2VwdGlvbiwgdGhlIGNvcHlyaWdodCBob2xkZXJzIG9m
IHRoaXMgbGlicmFyeSBnaXZlIHlvdQorcGVybWlzc2lvbiB0byBsaW5rIHRoaXMgbGlicmFy
eSB3aXRoIGluZGVwZW5kZW50IG1vZHVsZXMgdG8gcHJvZHVjZSBhbgorZXhlY3V0YWJsZSwg
cmVnYXJkbGVzcyBvZiB0aGUgbGljZW5zZSB0ZXJtcyBvZiB0aGVzZSBpbmRlcGVuZGVudAor
bW9kdWxlcywgYW5kIHRvIGNvcHkgYW5kIGRpc3RyaWJ1dGUgdGhlIHJlc3VsdGluZyBleGVj
dXRhYmxlIHVuZGVyCit0ZXJtcyBvZiB5b3VyIGNob2ljZSwgcHJvdmlkZWQgdGhhdCB5b3Ug
YWxzbyBtZWV0LCBmb3IgZWFjaCBsaW5rZWQKK2luZGVwZW5kZW50IG1vZHVsZSwgdGhlIHRl
cm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBsaWNlbnNlIG9mIHRoYXQKK21vZHVsZS4gIEFu
IGluZGVwZW5kZW50IG1vZHVsZSBpcyBhIG1vZHVsZSB3aGljaCBpcyBub3QgZGVyaXZlZCBm
cm9tCitvciBiYXNlZCBvbiB0aGlzIGxpYnJhcnkuICBJZiB5b3UgbW9kaWZ5IHRoaXMgbGli
cmFyeSwgeW91IG1heSBleHRlbmQKK3RoaXMgZXhjZXB0aW9uIHRvIHlvdXIgdmVyc2lvbiBv
ZiB0aGUgbGlicmFyeSwgYnV0IHlvdSBhcmUgbm90CitvYmxpZ2F0ZWQgdG8gZG8gc28uICBJ
ZiB5b3UgZG8gbm90IHdpc2ggdG8gZG8gc28sIGRlbGV0ZSB0aGlzCitleGNlcHRpb24gc3Rh
dGVtZW50IGZyb20geW91ciB2ZXJzaW9uLiAqLworCitwYWNrYWdlIGphdmEuYXd0LmltYWdl
OworCisvKiBUaGlzIGlzIG9uZSBvZiBzZXZlcmFsIGNsYXNzZXMgdGhhdCBhcmUgbmVhcmx5
IGlkZW50aWNhbC4gTWF5YmUgd2UKKyAgIHNob3VsZCBoYXZlIGEgY2VudHJhbCB0ZW1wbGF0
ZSBhbmQgZ2VuZXJhdGUgYWxsIHRoZXNlIGZpbGVzLiBUaGlzCisgICBpcyBvbmUgb2YgdGhl
IGNhc2VzIHdoZXJlIHRlbXBsYXRlcyBvciBtYWNyb3Mgd291bGQgaGF2ZSBiZWVuCisgICB1
c2VmdWwgdG8gaGF2ZSBpbiBKYXZhLgorCisgICBUaGlzIGZpbGUgaGFzIGJlZW4gY3JlYXRl
ZCB1c2luZyBzZWFyY2gtcmVwbGFjZS4gTXkgb25seSBmZWFyIGlzCisgICB0aGF0IHRoZXNl
IGNsYXNzZXMgd2lsbCBncm93IG91dC1vZi1zeW5jIGFzIG9mIGEgcmVzdWx0IG9mIGNoYW5n
ZXMKKyAgIHRoYXQgYXJlIG5vdCBwcm9wYWdhdGVkIHRvIHRoZSBvdGhlciBmaWxlcy4gQXMg
YWx3YXlzLCBtaXJyb3JpbmcKKyAgIGNvZGUgaXMgYSBtYWludGVuYW5jZSBuaWdodG1hcmUu
ICAqLworCisvKioKKyAqIEBhdXRob3IgPGEgaHJlZj0ibWFpbHRvOnJvbGZ3ckBpaS51aWIu
bm8iPlJvbGYgVy4gUmFzbXVzc2VuPC9hPgorICogQGF1dGhvciA8YSBocmVmPSJtYWlsdG86
YnJhd2VyQGRhbmRlbGlzLmNoIj5TYXNjaGEgQnJhd2VyPC9hPgorICovCitwdWJsaWMgZmlu
YWwgY2xhc3MgRGF0YUJ1ZmZlckZsb2F0CisgIGV4dGVuZHMgRGF0YUJ1ZmZlcgoreworICBw
cml2YXRlIGZsb2F0W10gZGF0YTsKKyAgcHJpdmF0ZSBmbG9hdFtdW10gYmFua0RhdGE7Cisg
IAorICBwdWJsaWMgRGF0YUJ1ZmZlckZsb2F0KGludCBzaXplKQorICB7CisgICAgc3VwZXIo
VFlQRV9GTE9BVCwgc2l6ZSk7CisgICAgZGF0YSA9IG5ldyBmbG9hdFtzaXplXTsKKyAgfQor
CisgIHB1YmxpYyBEYXRhQnVmZmVyRmxvYXQoaW50IHNpemUsIGludCBudW1CYW5rcykKKyAg
eworICAgIHN1cGVyKFRZUEVfRkxPQVQsIHNpemUsIG51bUJhbmtzKTsKKyAgICBiYW5rRGF0
YSA9IG5ldyBmbG9hdFtudW1CYW5rc11bc2l6ZV07CisgICAgZGF0YSA9IGJhbmtEYXRhWzBd
OworICB9CisKKyAgcHVibGljIERhdGFCdWZmZXJGbG9hdChmbG9hdFtdIGRhdGFBcnJheSwg
aW50IHNpemUpCisgIHsKKyAgICBzdXBlcihUWVBFX0ZMT0FULCBzaXplKTsKKyAgICBkYXRh
ID0gZGF0YUFycmF5OworICB9CisgICAgCisgIHB1YmxpYyBEYXRhQnVmZmVyRmxvYXQoZmxv
YXRbXSBkYXRhQXJyYXksIGludCBzaXplLCBpbnQgb2Zmc2V0KQorICB7CisgICAgc3VwZXIo
VFlQRV9GTE9BVCwgc2l6ZSwgMSwgb2Zmc2V0KTsKKyAgICBkYXRhID0gZGF0YUFycmF5Owor
ICB9CisKKyAgcHVibGljIERhdGFCdWZmZXJGbG9hdChmbG9hdFtdW10gZGF0YUFycmF5LCBp
bnQgc2l6ZSkKKyAgeworICAgIHN1cGVyKFRZUEVfRkxPQVQsIHNpemUsIGRhdGFBcnJheS5s
ZW5ndGgpOworICAgIGJhbmtEYXRhID0gZGF0YUFycmF5OworICAgIGRhdGEgPSBiYW5rRGF0
YVswXTsKKyAgfQorCisgIHB1YmxpYyBEYXRhQnVmZmVyRmxvYXQoZmxvYXRbXVtdIGRhdGFB
cnJheSwgaW50IHNpemUsIGludFtdIG9mZnNldHMpCisgIHsKKyAgICBzdXBlcihUWVBFX0ZM
T0FULCBzaXplLCBkYXRhQXJyYXkubGVuZ3RoLCBvZmZzZXRzKTsKKyAgICBiYW5rRGF0YSA9
IGRhdGFBcnJheTsKKyAgICBkYXRhID0gYmFua0RhdGFbMF07CisgIH0KKworICBwdWJsaWMg
ZmxvYXRbXSBnZXREYXRhKCkKKyAgeworICAgIHJldHVybiBkYXRhOworICB9CisgICAgCisg
IHB1YmxpYyBmbG9hdFtdIGdldERhdGEoaW50IGJhbmspCisgIHsKKyAgICByZXR1cm4gYmFu
a0RhdGFbYmFua107CisgIH0KKyAgICAKKyAgcHVibGljIGZsb2F0W11bXSBnZXRCYW5rRGF0
YSgpCisgIHsKKyAgICByZXR1cm4gYmFua0RhdGE7CisgIH0KKyAgCisgIHB1YmxpYyBpbnQg
Z2V0RWxlbShpbnQgaSkKKyAgeworICAgIHJldHVybiAoaW50KSBkYXRhW2krb2Zmc2V0XTsK
KyAgfQorCisgIHB1YmxpYyBpbnQgZ2V0RWxlbShpbnQgYmFuaywgaW50IGkpCisgIHsKKyAg
ICByZXR1cm4gKGludCkgYmFua0RhdGFbYmFua11baStvZmZzZXRzW2JhbmtdXTsKKyAgfQor
CisgIHB1YmxpYyB2b2lkIHNldEVsZW0oaW50IGksIGludCB2YWwpCisgIHsKKyAgICBkYXRh
W2krb2Zmc2V0XSA9IChmbG9hdCkgdmFsOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0RWxl
bShpbnQgYmFuaywgaW50IGksIGludCB2YWwpCisgIHsKKyAgICBiYW5rRGF0YVtiYW5rXVtp
K29mZnNldHNbYmFua11dID0gKGZsb2F0KSB2YWw7CisgIH0KKworICBwdWJsaWMgZmxvYXQg
Z2V0RWxlbUZsb2F0KGludCBpKQorICB7CisgICAgcmV0dXJuIGRhdGFbaStvZmZzZXRdOwor
ICB9CisgICAgCisgIHB1YmxpYyBmbG9hdCBnZXRFbGVtRmxvYXQoaW50IGJhbmssIGludCBp
KQorICB7CisgICAgcmV0dXJuIGJhbmtEYXRhW2JhbmtdW2krb2Zmc2V0c1tiYW5rXV07Cisg
IH0KKworICBwdWJsaWMgdm9pZCBzZXRFbGVtRmxvYXQoaW50IGksIGZsb2F0IHZhbCkKKyAg
eworICAgIGRhdGFbaStvZmZzZXRdID0gdmFsOworICB9CisKKyAgcHVibGljIHZvaWQgc2V0
RWxlbUZsb2F0KGludCBiYW5rLCBpbnQgaSwgZmxvYXQgdmFsKQorICB7CisgICAgYmFua0Rh
dGFbYmFua11baStvZmZzZXRzW2JhbmtdXSA9IHZhbDsKKyAgfQorCisgIHB1YmxpYyBkb3Vi
bGUgZ2V0RWxlbURvdWJsZShpbnQgaSkKKyAgeworICAgIHJldHVybiBnZXRFbGVtRmxvYXQo
aSk7CisgIH0KKyAgICAKKyAgcHVibGljIGRvdWJsZSBnZXRFbGVtRG91YmxlKGludCBiYW5r
LCBpbnQgaSkKKyAgeworICAgIHJldHVybiBnZXRFbGVtRmxvYXQoYmFuaywgaSk7CisgIH0K
KworICBwdWJsaWMgdm9pZCBzZXRFbGVtRG91YmxlKGludCBpLCBkb3VibGUgdmFsKQorICB7
CisgICAgc2V0RWxlbUZsb2F0KGksIChmbG9hdCkgdmFsKTsKKyAgfQorCisgIHB1YmxpYyB2
b2lkIHNldEVsZW1Eb3VibGUoaW50IGJhbmssIGludCBpLCBkb3VibGUgdmFsKQorICB7Cisg
ICAgc2V0RWxlbUZsb2F0KGJhbmssIGksIChmbG9hdCkgdmFsKTsKKyAgfQorfQpJbmRleDog
amF2YS9hd3QvaW1hZ2UvRGF0YUJ1ZmZlclNob3J0LmphdmEKPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg
ZmlsZTogamF2YS9hd3QvaW1hZ2UvRGF0YUJ1ZmZlclNob3J0LmphdmEKZGlmZiAtTiBqYXZh
L2F3dC9pbWFnZS9EYXRhQnVmZmVyU2hvcnQuamF2YQotLS0gL2Rldi9udWxsCTEgSmFuIDE5
NzAgMDA6MDA6MDAgLTAwMDAKKysrIGphdmEvYXd0L2ltYWdlL0RhdGFCdWZmZXJTaG9ydC5q
YXZhCTE1IEFwciAyMDA0IDA3OjQxOjA1IC0wMDAwCkBAIC0wLDAgKzEsMTMwIEBACisvKiBD
b3B5cmlnaHQgKEMpIDIwMDQgIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbgorCitUaGlzIGZp
bGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLgorCitHTlUgQ2xhc3NwYXRoIGlzIGZyZWUg
c29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkKK2l0IHVu
ZGVyIHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVi
bGlzaGVkIGJ5Cit0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lv
biAyLCBvciAoYXQgeW91ciBvcHRpb24pCithbnkgbGF0ZXIgdmVyc2lvbi4KKworR05VIENs
YXNzcGF0aCBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNl
ZnVsLCBidXQKK1dJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxp
ZWQgd2FycmFudHkgb2YKK01FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJ
Q1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCitHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZv
ciBtb3JlIGRldGFpbHMuCisKK1lvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2Yg
dGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCithbG9uZyB3aXRoIEdOVSBDbGFzc3Bh
dGg7IHNlZSB0aGUgZmlsZSBDT1BZSU5HLiAgSWYgbm90LCB3cml0ZSB0byB0aGUKK0ZyZWUg
U29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTkgVGVtcGxlIFBsYWNlLCBTdWl0ZSAzMzAs
IEJvc3RvbiwgTUEKKzAyMTExLTEzMDcgVVNBLgorCitMaW5raW5nIHRoaXMgbGlicmFyeSBz
dGF0aWNhbGx5IG9yIGR5bmFtaWNhbGx5IHdpdGggb3RoZXIgbW9kdWxlcyBpcworbWFraW5n
IGEgY29tYmluZWQgd29yayBiYXNlZCBvbiB0aGlzIGxpYnJhcnkuICBUaHVzLCB0aGUgdGVy
bXMgYW5kCitjb25kaXRpb25zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBj
b3ZlciB0aGUgd2hvbGUKK2NvbWJpbmF0aW9uLgorCitBcyBhIHNwZWNpYWwgZXhjZXB0aW9u
LCB0aGUgY29weXJpZ2h0IGhvbGRlcnMgb2YgdGhpcyBsaWJyYXJ5IGdpdmUgeW91CitwZXJt
aXNzaW9uIHRvIGxpbmsgdGhpcyBsaWJyYXJ5IHdpdGggaW5kZXBlbmRlbnQgbW9kdWxlcyB0
byBwcm9kdWNlIGFuCitleGVjdXRhYmxlLCByZWdhcmRsZXNzIG9mIHRoZSBsaWNlbnNlIHRl
cm1zIG9mIHRoZXNlIGluZGVwZW5kZW50Cittb2R1bGVzLCBhbmQgdG8gY29weSBhbmQgZGlz
dHJpYnV0ZSB0aGUgcmVzdWx0aW5nIGV4ZWN1dGFibGUgdW5kZXIKK3Rlcm1zIG9mIHlvdXIg
Y2hvaWNlLCBwcm92aWRlZCB0aGF0IHlvdSBhbHNvIG1lZXQsIGZvciBlYWNoIGxpbmtlZAor
aW5kZXBlbmRlbnQgbW9kdWxlLCB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIGxp
Y2Vuc2Ugb2YgdGhhdAorbW9kdWxlLiAgQW4gaW5kZXBlbmRlbnQgbW9kdWxlIGlzIGEgbW9k
dWxlIHdoaWNoIGlzIG5vdCBkZXJpdmVkIGZyb20KK29yIGJhc2VkIG9uIHRoaXMgbGlicmFy
eS4gIElmIHlvdSBtb2RpZnkgdGhpcyBsaWJyYXJ5LCB5b3UgbWF5IGV4dGVuZAordGhpcyBl
eGNlcHRpb24gdG8geW91ciB2ZXJzaW9uIG9mIHRoZSBsaWJyYXJ5LCBidXQgeW91IGFyZSBu
b3QKK29ibGlnYXRlZCB0byBkbyBzby4gIElmIHlvdSBkbyBub3Qgd2lzaCB0byBkbyBzbywg
ZGVsZXRlIHRoaXMKK2V4Y2VwdGlvbiBzdGF0ZW1lbnQgZnJvbSB5b3VyIHZlcnNpb24uICov
CisKK3BhY2thZ2UgamF2YS5hd3QuaW1hZ2U7CisKKy8qIFRoaXMgaXMgb25lIG9mIHNldmVy
YWwgY2xhc3NlcyB0aGF0IGFyZSBuZWFybHkgaWRlbnRpY2FsLiBNYXliZSB3ZQorICAgc2hv
dWxkIGhhdmUgYSBjZW50cmFsIHRlbXBsYXRlIGFuZCBnZW5lcmF0ZSBhbGwgdGhlc2UgZmls
ZXMuIFRoaXMKKyAgIGlzIG9uZSBvZiB0aGUgY2FzZXMgd2hlcmUgdGVtcGxhdGVzIG9yIG1h
Y3JvcyB3b3VsZCBoYXZlIGJlZW4KKyAgIHVzZWZ1bCB0byBoYXZlIGluIEphdmEuCisKKyAg
IFRoaXMgZmlsZSBoYXMgYmVlbiBjcmVhdGVkIHVzaW5nIHNlYXJjaC1yZXBsYWNlLiBNeSBv
bmx5IGZlYXIgaXMKKyAgIHRoYXQgdGhlc2UgY2xhc3NlcyB3aWxsIGdyb3cgb3V0LW9mLXN5
bmMgYXMgb2YgYSByZXN1bHQgb2YgY2hhbmdlcworICAgdGhhdCBhcmUgbm90IHByb3BhZ2F0
ZWQgdG8gdGhlIG90aGVyIGZpbGVzLiBBcyBhbHdheXMsIG1pcnJvcmluZworICAgY29kZSBp
cyBhIG1haW50ZW5hbmNlIG5pZ2h0bWFyZS4gICovCisKKy8qKgorICogQGF1dGhvciBSb2xm
IFcuIFJhc211c3NlbiA8cm9sZndyQGlpLnVpYi5ubz4KKyAqLworcHVibGljIGZpbmFsIGNs
YXNzIERhdGFCdWZmZXJTaG9ydCBleHRlbmRzIERhdGFCdWZmZXIKK3sKKyAgcHJpdmF0ZSBz
aG9ydFtdIGRhdGE7CisgIHByaXZhdGUgc2hvcnRbXVtdIGJhbmtEYXRhOworICAKKyAgcHVi
bGljIERhdGFCdWZmZXJTaG9ydChpbnQgc2l6ZSkKKyAgeworICAgIHN1cGVyKFRZUEVfU0hP
UlQsIHNpemUpOworICAgIGRhdGEgPSBuZXcgc2hvcnRbc2l6ZV07CisgIH0KKworICBwdWJs
aWMgRGF0YUJ1ZmZlclNob3J0KGludCBzaXplLCBpbnQgbnVtQmFua3MpCisgIHsKKyAgICBz
dXBlcihUWVBFX1NIT1JULCBzaXplLCBudW1CYW5rcyk7CisgICAgYmFua0RhdGEgPSBuZXcg
c2hvcnRbbnVtQmFua3NdW3NpemVdOworICAgIGRhdGEgPSBiYW5rRGF0YVswXTsKKyAgfQor
CisgIHB1YmxpYyBEYXRhQnVmZmVyU2hvcnQoc2hvcnRbXSBkYXRhQXJyYXksIGludCBzaXpl
KQorICB7CisgICAgc3VwZXIoVFlQRV9TSE9SVCwgc2l6ZSk7CisgICAgZGF0YSA9IGRhdGFB
cnJheTsKKyAgfQorICAgIAorICBwdWJsaWMgRGF0YUJ1ZmZlclNob3J0KHNob3J0W10gZGF0
YUFycmF5LCBpbnQgc2l6ZSwgaW50IG9mZnNldCkKKyAgeworICAgIHN1cGVyKFRZUEVfU0hP
UlQsIHNpemUsIDEsIG9mZnNldCk7CisgICAgZGF0YSA9IGRhdGFBcnJheTsKKyAgfQorCisg
IHB1YmxpYyBEYXRhQnVmZmVyU2hvcnQoc2hvcnRbXVtdIGRhdGFBcnJheSwgaW50IHNpemUp
CisgIHsKKyAgICBzdXBlcihUWVBFX1NIT1JULCBzaXplLCBkYXRhQXJyYXkubGVuZ3RoKTsK
KyAgICBiYW5rRGF0YSA9IGRhdGFBcnJheTsKKyAgICBkYXRhID0gYmFua0RhdGFbMF07Cisg
IH0KKworICBwdWJsaWMgRGF0YUJ1ZmZlclNob3J0KHNob3J0W11bXSBkYXRhQXJyYXksIGlu
dCBzaXplLCBpbnRbXSBvZmZzZXRzKQorICB7CisgICAgc3VwZXIoVFlQRV9TSE9SVCwgc2l6
ZSwgZGF0YUFycmF5Lmxlbmd0aCwgb2Zmc2V0cyk7CisgICAgYmFua0RhdGEgPSBkYXRhQXJy
YXk7CisgICAgZGF0YSA9IGJhbmtEYXRhWzBdOworICB9CisKKyAgcHVibGljIHNob3J0W10g
Z2V0RGF0YSgpCisgIHsKKyAgICByZXR1cm4gZGF0YTsKKyAgfQorICAgIAorICBwdWJsaWMg
c2hvcnRbXSBnZXREYXRhKGludCBiYW5rKQorICB7CisgICAgcmV0dXJuIGJhbmtEYXRhW2Jh
bmtdOworICB9CisgICAgCisgIHB1YmxpYyBzaG9ydFtdW10gZ2V0QmFua0RhdGEoKQorICB7
CisgICAgcmV0dXJuIGJhbmtEYXRhOworICB9CisgIAorICBwdWJsaWMgaW50IGdldEVsZW0o
aW50IGkpCisgIHsKKyAgICByZXR1cm4gZGF0YVtpK29mZnNldF07CisgIH0KKworICBwdWJs
aWMgaW50IGdldEVsZW0oaW50IGJhbmssIGludCBpKQorICB7CisgICAgcmV0dXJuIGJhbmtE
YXRhW2JhbmtdW2krb2Zmc2V0c1tiYW5rXV07CisgIH0KKworICBwdWJsaWMgdm9pZCBzZXRF
bGVtKGludCBpLCBpbnQgdmFsKQorICB7CisgICAgZGF0YVtpK29mZnNldF0gPSAoc2hvcnQp
IHZhbDsKKyAgfQorCisgIHB1YmxpYyB2b2lkIHNldEVsZW0oaW50IGJhbmssIGludCBpLCBp
bnQgdmFsKQorICB7CisgICAgYmFua0RhdGFbYmFua11baStvZmZzZXRzW2JhbmtdXSA9IChz
aG9ydCkgdmFsOworICB9Cit9CkluZGV4OiBnbnUvamF2YS9hd3QvQnVmZmVycy5qYXZhCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvZ251
L2phdmEvYXd0L0J1ZmZlcnMuamF2YSx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4yCmRpZmYg
LXUgLXIxLjIgQnVmZmVycy5qYXZhCi0tLSBnbnUvamF2YS9hd3QvQnVmZmVycy5qYXZhCTIy
IEphbiAyMDAyIDIyOjI2OjU2IC0wMDAwCTEuMgorKysgZ251L2phdmEvYXd0L0J1ZmZlcnMu
amF2YQkxNSBBcHIgMjAwNCAwNzo0MTowNSAtMDAwMApAQCAtMSw0ICsxLDQgQEAKLS8qIENv
cHlyaWdodCAoQykgMjAwMCwgMjAwMiAgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uCisvKiBD
b3B5cmlnaHQgKEMpIDIwMDAsIDIwMDIsIDIwMDQgIEZyZWUgU29mdHdhcmUgRm91bmRhdGlv
bgogCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLgogCkBAIC04MywxMCAr
ODMsMTYgQEAKICAgICAgIHsKICAgICAgIGNhc2UgRGF0YUJ1ZmZlci5UWVBFX0JZVEU6CiAJ
cmV0dXJuIG5ldyBEYXRhQnVmZmVyQnl0ZShzaXplLCBudW1CYW5rcyk7CisgICAgICBjYXNl
IERhdGFCdWZmZXIuVFlQRV9TSE9SVDoKKwlyZXR1cm4gbmV3IERhdGFCdWZmZXJTaG9ydChz
aXplLCBudW1CYW5rcyk7CiAgICAgICBjYXNlIERhdGFCdWZmZXIuVFlQRV9VU0hPUlQ6CiAJ
cmV0dXJuIG5ldyBEYXRhQnVmZmVyVVNob3J0KHNpemUsIG51bUJhbmtzKTsKICAgICAgIGNh
c2UgRGF0YUJ1ZmZlci5UWVBFX0lOVDoKIAlyZXR1cm4gbmV3IERhdGFCdWZmZXJJbnQoc2l6
ZSwgbnVtQmFua3MpOworICAgICAgY2FzZSBEYXRhQnVmZmVyLlRZUEVfRkxPQVQ6CisJcmV0
dXJuIG5ldyBEYXRhQnVmZmVyRmxvYXQoc2l6ZSwgbnVtQmFua3MpOworICAgICAgY2FzZSBE
YXRhQnVmZmVyLlRZUEVfRE9VQkxFOgorCXJldHVybiBuZXcgRGF0YUJ1ZmZlckRvdWJsZShz
aXplLCBudW1CYW5rcyk7CiAgICAgICBkZWZhdWx0OgogCXRocm93IG5ldyBVbnN1cHBvcnRl
ZE9wZXJhdGlvbkV4Y2VwdGlvbigpOwogICAgICAgfQpAQCAtMTA2LDEwICsxMTIsMTYgQEAK
ICAgICAgIHsKICAgICAgIGNhc2UgRGF0YUJ1ZmZlci5UWVBFX0JZVEU6CiAJcmV0dXJuIG5l
dyBEYXRhQnVmZmVyQnl0ZSgoYnl0ZVtdKSBkYXRhLCBzaXplKTsKKyAgICAgIGNhc2UgRGF0
YUJ1ZmZlci5UWVBFX1NIT1JUOgorCXJldHVybiBuZXcgRGF0YUJ1ZmZlclNob3J0KChzaG9y
dFtdKSBkYXRhLCBzaXplKTsKICAgICAgIGNhc2UgRGF0YUJ1ZmZlci5UWVBFX1VTSE9SVDoK
IAlyZXR1cm4gbmV3IERhdGFCdWZmZXJVU2hvcnQoKHNob3J0W10pIGRhdGEsIHNpemUpOwog
ICAgICAgY2FzZSBEYXRhQnVmZmVyLlRZUEVfSU5UOgogCXJldHVybiBuZXcgRGF0YUJ1ZmZl
ckludCgoaW50W10pIGRhdGEsIHNpemUpOworICAgICAgY2FzZSBEYXRhQnVmZmVyLlRZUEVf
RkxPQVQ6CisJcmV0dXJuIG5ldyBEYXRhQnVmZmVyRmxvYXQoKGZsb2F0W10pIGRhdGEsIHNp
emUpOworICAgICAgY2FzZSBEYXRhQnVmZmVyLlRZUEVfRE9VQkxFOgorCXJldHVybiBuZXcg
RGF0YUJ1ZmZlckRvdWJsZSgoZG91YmxlW10pIGRhdGEsIHNpemUpOwogICAgICAgZGVmYXVs
dDoKIAl0aHJvdyBuZXcgVW5zdXBwb3J0ZWRPcGVyYXRpb25FeGNlcHRpb24oKTsKICAgICAg
IH0KQEAgLTEyNiwxMCArMTM4LDIyIEBACiAgIHsKICAgICBpZiAoYnVmZmVyIGluc3RhbmNl
b2YgRGF0YUJ1ZmZlckJ5dGUpCiAgICAgICByZXR1cm4gKChEYXRhQnVmZmVyQnl0ZSkgYnVm
ZmVyKS5nZXREYXRhKCk7CisKKyAgICBpZiAoYnVmZmVyIGluc3RhbmNlb2YgRGF0YUJ1ZmZl
clNob3J0KQorICAgICAgcmV0dXJuICgoRGF0YUJ1ZmZlclNob3J0KSBidWZmZXIpLmdldERh
dGEoKTsKKwogICAgIGlmIChidWZmZXIgaW5zdGFuY2VvZiBEYXRhQnVmZmVyVVNob3J0KQog
ICAgICAgcmV0dXJuICgoRGF0YUJ1ZmZlclVTaG9ydCkgYnVmZmVyKS5nZXREYXRhKCk7CisK
ICAgICBpZiAoYnVmZmVyIGluc3RhbmNlb2YgRGF0YUJ1ZmZlckludCkKICAgICAgIHJldHVy
biAoKERhdGFCdWZmZXJJbnQpIGJ1ZmZlcikuZ2V0RGF0YSgpOworCisgICAgaWYgKGJ1ZmZl
ciBpbnN0YW5jZW9mIERhdGFCdWZmZXJGbG9hdCkKKyAgICAgIHJldHVybiAoKERhdGFCdWZm
ZXJGbG9hdCkgYnVmZmVyKS5nZXREYXRhKCk7CisKKyAgICBpZiAoYnVmZmVyIGluc3RhbmNl
b2YgRGF0YUJ1ZmZlckRvdWJsZSkKKyAgICAgIHJldHVybiAoKERhdGFCdWZmZXJEb3VibGUp
IGJ1ZmZlcikuZ2V0RGF0YSgpOworCiAgICAgdGhyb3cgbmV3IENsYXNzQ2FzdEV4Y2VwdGlv
bigiVW5rbm93biBkYXRhIGJ1ZmZlciB0eXBlIik7CiAgIH0KIApAQCAtMTQ5LDYgKzE3Mywx
MSBAQAogCWZyb20gPSAoKERhdGFCdWZmZXJCeXRlKSBzcmMpLmdldERhdGEoKTsKIAlpZiAo
ZGVzdCA9PSBudWxsKSBkZXN0ID0gbmV3IGJ5dGVbbGVuZ3RoK2Rlc3RPZmZzZXRdOwogICAg
ICAgfQorICAgIGVsc2UgaWYgKHNyYyBpbnN0YW5jZW9mIERhdGFCdWZmZXJTaG9ydCkKKyAg
ICAgIHsKKwlmcm9tID0gKChEYXRhQnVmZmVyU2hvcnQpIHNyYykuZ2V0RGF0YSgpOworCWlm
IChkZXN0ID09IG51bGwpIGRlc3QgPSBuZXcgc2hvcnRbbGVuZ3RoK2Rlc3RPZmZzZXRdOwor
ICAgICAgfQogICAgIGVsc2UgaWYgKHNyYyBpbnN0YW5jZW9mIERhdGFCdWZmZXJVU2hvcnQp
CiAgICAgICB7CiAJZnJvbSA9ICgoRGF0YUJ1ZmZlclVTaG9ydCkgc3JjKS5nZXREYXRhKCk7
CkBAIC0xNTgsNiArMTg3LDE2IEBACiAgICAgICB7CiAJZnJvbSA9ICgoRGF0YUJ1ZmZlcklu
dCkgc3JjKS5nZXREYXRhKCk7CiAJaWYgKGRlc3QgPT0gbnVsbCkgZGVzdCA9IG5ldyBpbnRb
bGVuZ3RoK2Rlc3RPZmZzZXRdOworICAgICAgfQorICAgIGVsc2UgaWYgKHNyYyBpbnN0YW5j
ZW9mIERhdGFCdWZmZXJGbG9hdCkKKyAgICAgIHsKKwlmcm9tID0gKChEYXRhQnVmZmVyRmxv
YXQpIHNyYykuZ2V0RGF0YSgpOworCWlmIChkZXN0ID09IG51bGwpIGRlc3QgPSBuZXcgZmxv
YXRbbGVuZ3RoK2Rlc3RPZmZzZXRdOworICAgICAgfQorICAgIGVsc2UgaWYgKHNyYyBpbnN0
YW5jZW9mIERhdGFCdWZmZXJEb3VibGUpCisgICAgICB7CisJZnJvbSA9ICgoRGF0YUJ1ZmZl
ckRvdWJsZSkgc3JjKS5nZXREYXRhKCk7CisJaWYgKGRlc3QgPT0gbnVsbCkgZGVzdCA9IG5l
dyBkb3VibGVbbGVuZ3RoK2Rlc3RPZmZzZXRdOwogICAgICAgfQogICAgIGVsc2UKICAgICAg
IHsK
--==_20040415074821.24817-1_==--




From MAILER-DAEMON Thu Apr 15 05:07:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BE2py-00020s-Be
	for mharc-commit-classpath@gnu.org; Thu, 15 Apr 2004 05:07:10 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BE2pv-00020R-VB
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:07:07 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BE2pP-0001vi-58
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:07:07 -0400
Received: from [217.8.192.20] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BE2pO-0001ve-Kf
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:06:34 -0400
Received: from [217.8.199.55] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 1757589; Thu, 15 Apr 2004 11:06:35 +0200
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Thu, 15 Apr 2004 11:06:31 +0200
Message-Id: <20040415090631.11976@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="==_20040415090631.26997-1_=="
Cc: graydon hoare <graydon@redhat.com>
Subject: Patch:
 java.awt.image.ComponentColorModel.createCompatibleSampleModel
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 15 Apr 2004 09:07:08 -0000

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

FYI, I've committed the attached patch.

2004-04-15  Sascha Brawer  <brawer@dandelis.ch>

    * java/awt/image/ComponentColorModel.java
    (createCompatibleSampleModel): Return PixelInterleavedSampleModel
    for TYPE_BYTE and TYPE_USHORT transferTypes, in order to pass the
    Mauve tests on this method. Improved documentation.

BTW, I'm sorry about the verbose ChangeLog entry. Next time, I'll omit
the rationale ("in order to..."). I had already committed this when I
noticed, and didn't want to change the ChangeLog (thus causing another
ChangeLog entry) to make it easier to read :-)

-- Sascha

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

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

SW5kZXg6IGphdmEvYXd0L2ltYWdlL0NvbXBvbmVudENvbG9yTW9kZWwuamF2YQo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmEvYXd0
L2ltYWdlL0NvbXBvbmVudENvbG9yTW9kZWwuamF2YSx2CnJldHJpZXZpbmcgcmV2aXNpb24g
MS4zCmRpZmYgLXUgLXIxLjMgQ29tcG9uZW50Q29sb3JNb2RlbC5qYXZhCi0tLSBqYXZhL2F3
dC9pbWFnZS9Db21wb25lbnRDb2xvck1vZGVsLmphdmEJMyBKdW4gMjAwMyAxNjo0MDozNyAt
MDAwMAkxLjMKKysrIGphdmEvYXd0L2ltYWdlL0NvbXBvbmVudENvbG9yTW9kZWwuamF2YQkx
NSBBcHIgMjAwNCAwODo1NTozMiAtMDAwMApAQCAtMSw0ICsxLDQgQEAKLS8qIENvcHlyaWdo
dCAoQykgMjAwMCwgMjAwMiAgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uCisvKiBDb3B5cmln
aHQgKEMpIDIwMDAsIDIwMDIsIDIwMDQgIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbgogCiBU
aGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLgogCkBAIC0yOTIsMTggKzI5Miw1
NSBAQAogICAgIHJldHVybiBSYXN0ZXIuY3JlYXRlV3JpdGFibGVSYXN0ZXIoc20sIG9yaWdp
bik7CiAgIH0KIAorCisgIC8qKgorICAgKiBDcmVhdGVzIGEgPGNvZGU+U2FtcGxlTW9kZWw8
L2NvZGU+IHdob3NlIGFycmFuZ2VtZW50IG9mIHBpeGVsCisgICAqIGRhdGEgaXMgY29tcGF0
aWJsZSB0byB0aGlzIDxjb2RlPkNvbG9yTW9kZWw8L2NvZGU+LgorICAgKgorICAgKiBAcGFy
YW0gdyB0aGUgbnVtYmVyIG9mIHBpeGVscyBpbiB0aGUgaG9yaXpvbnRhbCBkaXJlY3Rpb24u
CisgICAqIEBwYXJhbSBoIHRoZSBudW1iZXIgb2YgcGl4ZWxzIGluIHRoZSB2ZXJ0aWNhbCBk
aXJlY3Rpb24uCisgICAqLwogICBwdWJsaWMgU2FtcGxlTW9kZWwgY3JlYXRlQ29tcGF0aWJs
ZVNhbXBsZU1vZGVsKGludCB3LCBpbnQgaCkKICAgewotICAgIGludCBwaXhlbFN0cmlkZSA9
IGdldE51bUNvbXBvbmVudHMoKTsKLSAgICAKLSAgICAvKiBUT0RPOiBNYXliZSB3ZSBkb24n
dCBuZWVkIHRvIGNyZWF0ZSBhIG5ldyBvZmZzZXQgYXJyYXkgZWFjaAotICAgICAgIHRpbWUs
IGJ1dCByYXRoZXIgdXNlIHRoZSBzYW1lIGFycmF5IGV2ZXJ5IHRpbWUuICovCi0gICAgaW50
W10gYmFuZE9mZnNldHMgPSBuZXcgaW50W3BpeGVsU3RyaWRlXTsKLSAgICBmb3IgKGludCBp
PTA7IGk8cGl4ZWxTdHJpZGU7IGkrKykgYmFuZE9mZnNldHNbaV0gPSBpOwotICAgIHJldHVy
biBuZXcgQ29tcG9uZW50U2FtcGxlTW9kZWwodHJhbnNmZXJUeXBlLCB3LCBoLAotCQkJCSAg
ICBwaXhlbFN0cmlkZSwgcGl4ZWxTdHJpZGUqdywKLQkJCQkgICAgYmFuZE9mZnNldHMpOwor
ICAgIGludCBwaXhlbFN0cmlkZSwgc2NhbmxpbmVTdHJpZGU7CisgICAgaW50W10gYmFuZE9m
ZnNldHM7CisKKyAgICBwaXhlbFN0cmlkZSA9IGdldE51bUNvbXBvbmVudHMoKTsKKyAgICBz
Y2FubGluZVN0cmlkZSA9IHBpeGVsU3RyaWRlICogdzsKKworICAgIC8qIFdlIG1pZ2h0IGJl
IGFibGUgdG8gcmUtdXNlIHRoZSBzYW1lIGJhbmRPZmZzZXRzIGFycmF5IGFtb25nCisgICAg
ICogbXVsdGlwbGUgY2FsbHMgdG8gdGhpcyBtZXRob2QuIEhvd2V2ZXIsIHRoaXMgb3B0aW1p
emF0aW9uIGRvZXMKKyAgICAgKiBub3Qgc2VlbSB3b3J0aHdpbGUgYmVjYXVzZSBzZXR0aW5n
IHVwIGRlc2NyaXB0aXZlIGRhdGEKKyAgICAgKiBzdHJ1Y3R1cmVzIChzdWNoIGFzIFNhbXBs
ZU1vZGVscykgaXMgbmVnbGVjdGlibGUgaW4gY29tcGFyaXNpb24KKyAgICAgKiB0byBzaHVm
ZmxpbmcgYXJvdW5kIG1hc3NlcyBvZiBwaXhlbCBkYXRhLgorICAgICAqLworICAgIGJhbmRP
ZmZzZXRzID0gbmV3IGludFtwaXhlbFN0cmlkZV07CisgICAgZm9yIChpbnQgaSA9IDA7IGkg
PCBwaXhlbFN0cmlkZTsgaSsrKQorICAgICAgYmFuZE9mZnNldHNbaV0gPSBpOworCisgICAg
LyogRklYTUU6IFRoaW5rIGFib3V0IHdoZXRoZXIgaXQgd291bGQgbWFrZSBzZW5zZSB0byBy
ZXR1cm4gdGhlCisgICAgICogcG9zc2libHkgbW9yZSBlZmZpY2llbnQgUGl4ZWxJbnRlcmxl
YXZlZFNhbXBsZU1vZGVsIGZvciBvdGhlcgorICAgICAqIHRyYW5zZmVyVHlwZXMgYXMgd2Vs
bC4gSXQgc2VlbXMgdW5saWtlbHkgdGhhdCB0aGlzIHdvdWxkIGJyZWFrCisgICAgICogYW55
IHVzZXIgYXBwbGljYXRpb25zLCBzbyB0aGUgTWF1dmUgdGVzdHMgb24gdGhpcyBtZXRob2QK
KyAgICAgKiBtaWdodCBiZSB0b28gcmVzdHJpY3RpdmUuCisgICAgICovCisgICAgc3dpdGNo
ICh0cmFuc2ZlclR5cGUpCisgICAgICB7CisgICAgICBjYXNlIERhdGFCdWZmZXIuVFlQRV9C
WVRFOgorICAgICAgY2FzZSBEYXRhQnVmZmVyLlRZUEVfVVNIT1JUOgorICAgICAgICByZXR1
cm4gbmV3IFBpeGVsSW50ZXJsZWF2ZWRTYW1wbGVNb2RlbCh0cmFuc2ZlclR5cGUsIHcsIGgs
CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBpeGVs
U3RyaWRlLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBzY2FubGluZVN0cmlkZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgYmFuZE9mZnNldHMpOworCisgICAgICBkZWZhdWx0OgorICAgICAgICBy
ZXR1cm4gbmV3IENvbXBvbmVudFNhbXBsZU1vZGVsKHRyYW5zZmVyVHlwZSwgdywgaCwKKyAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwaXhlbFN0cmlkZSwKKyAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzY2FubGluZVN0cmlkZSwK
KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBiYW5kT2Zmc2V0cyk7
CisgICAgICB9CiAgIH0KKwogCiAgIHB1YmxpYyBib29sZWFuIGlzQ29tcGF0aWJsZVNhbXBs
ZU1vZGVsKFNhbXBsZU1vZGVsIHNtKQogICB7CkluZGV4OiBDaGFuZ2VMb2cKPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9DaGFuZ2VMb2cs
dgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjAzMgpkaWZmIC11IC1yMS4yMDMyIENoYW5nZUxv
ZwotLS0gQ2hhbmdlTG9nCTE1IEFwciAyMDA0IDA3OjQ0OjA4IC0wMDAwCTEuMjAzMgorKysg
Q2hhbmdlTG9nCTE1IEFwciAyMDA0IDA4OjU1OjQyIC0wMDAwCkBAIC0xLDMgKzEsMTAgQEAK
KzIwMDQtMDQtMTUgIFNhc2NoYSBCcmF3ZXIgIDxicmF3ZXJAZGFuZGVsaXMuY2g+CisKKwkq
IGphdmEvYXd0L2ltYWdlL0NvbXBvbmVudENvbG9yTW9kZWwuamF2YQorCShjcmVhdGVDb21w
YXRpYmxlU2FtcGxlTW9kZWwpOiBSZXR1cm4gUGl4ZWxJbnRlcmxlYXZlZFNhbXBsZU1vZGVs
CisJZm9yIFRZUEVfQllURSBhbmQgVFlQRV9VU0hPUlQgdHJhbnNmZXJUeXBlcywgaW4gb3Jk
ZXIgdG8gcGFzcyB0aGUKKwlNYXV2ZSB0ZXN0cyBvbiB0aGlzIG1ldGhvZC4gSW1wcm92ZWQg
ZG9jdW1lbnRhdGlvbi4KKwogMjAwNC0wNC0xNCAgU2FzY2hhIEJyYXdlciAgPGJyYXdlckBk
YW5kZWxpcy5jaD4KIAogCSogamF2YS9hd3QvaW1hZ2UvRGF0YUJ1ZmZlclNob3J0LmphdmEs
Cg==
--==_20040415090631.26997-1_==--




From MAILER-DAEMON Thu Apr 15 05:30:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BE3Ci-0007fZ-4s
	for mharc-commit-classpath@gnu.org; Thu, 15 Apr 2004 05:30:40 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BE3Cf-0007fF-Vk
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:30:37 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BE3Ce-0007ew-QG
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:30:37 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BE3Ce-0007ep-AI
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:30:36 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BE3Cc-0003jF-00; Thu, 15 Apr 2004 11:30:34 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-tigozkbRfOvq3FBI7ybK"
Message-Id: <1082021427.8648.26.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Thu, 15 Apr 2004 11:30:27 +0200
Cc: java-patches@gcc.gnu.org
Subject: JFrame DefaultCloseOperation CLOSE_ON_EXIT fixlet
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 15 Apr 2004 09:30:38 -0000


--=-tigozkbRfOvq3FBI7ybK
Content-Type: multipart/mixed; boundary="=-UtafMZxV1QbHxC56R56X"


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

Hi,

Noticed that JFrame get/setDefaultCloseOperation weren't public and
didn't do the right default thing. So I fixed them and added the correct
argument checking to setDefaultCloseOperation.

2004-04-15  Mark Wielaard  <mark@klomp.org>

        * javax/awt/JFrame.java (close_action): Default to HIDE_ON_CLOSE.
        (getDefaultCloseOperation): Make public.
        (processWindowEvent): Call System.exit(0) when HIDE_ON_CLOSE set.
        (setDefaultCloseOperation): Make public. Check argument. Add API do=
c.

Committed to classpath CVS.
Could someone with a recent gcj-gui-branch checkout add it there?

Thanks,

Mark

--=-UtafMZxV1QbHxC56R56X
Content-Disposition: inline; filename=JFrame.patch
Content-Type: text/x-patch; name=JFrame.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IGphdmF4L3N3aW5nL0pGcmFtZS5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2
c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZheC9zd2luZy9KRnJhbWUuamF2YSx2DQpyZXRy
aWV2aW5nIHJldmlzaW9uIDEuOA0KZGlmZiAtdSAtcjEuOCBKRnJhbWUuamF2YQ0KLS0tIGphdmF4
L3N3aW5nL0pGcmFtZS5qYXZhCTE0IEZlYiAyMDA0IDIxOjQyOjU2IC0wMDAwCTEuOA0KKysrIGph
dmF4L3N3aW5nL0pGcmFtZS5qYXZhCTE1IEFwciAyMDA0IDA5OjI0OjMwIC0wMDAwDQpAQCAtNjYs
NyArNjYsNyBAQA0KIA0KICAgICBwcm90ZWN0ZWQgIEFjY2Vzc2libGVDb250ZXh0IGFjY2Vzc2li
bGVDb250ZXh0Ow0KIA0KLSAgICBwcml2YXRlIGludCBjbG9zZV9hY3Rpb24gPSBFWElUX09OX0NM
T1NFOyAgICANCisgICAgcHJpdmF0ZSBpbnQgY2xvc2VfYWN0aW9uID0gSElERV9PTl9DTE9TRTsg
ICAgDQogICAgIA0KIA0KICAgICAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqDQpAQCAtMTkyLDcgKzE5Miw3IEBADQogICAgIHJldHVybiBhY2Nlc3Np
YmxlQ29udGV4dDsNCiAgIH0NCiAgIA0KLSAgICBpbnQgZ2V0RGVmYXVsdENsb3NlT3BlcmF0aW9u
KCkNCisgICAgcHVibGljIGludCBnZXREZWZhdWx0Q2xvc2VPcGVyYXRpb24oKQ0KICAgICB7ICAg
IHJldHVybiBjbG9zZV9hY3Rpb247ICAgfQ0KIA0KICAgICANCkBAIC0yMTIsNyArMjEyLDcgQEAN
CiAJCQl7DQogCQkJY2FzZSBFWElUX09OX0NMT1NFOg0KIAkJCSAgICB7DQotCQkJCVN5c3RlbS5l
eGl0KDEpOw0KKwkJCQlTeXN0ZW0uZXhpdCgwKTsNCiAJCQkJYnJlYWs7DQogCQkJICAgIH0NCiAJ
CQljYXNlIERJU1BPU0VfT05fQ0xPU0U6DQpAQCAtMjQxLDggKzI0MSwzMCBAQA0KIAkgICAgfQ0K
ICAgICB9ICAgDQogIA0KLQ0KLSAgICB2b2lkIHNldERlZmF1bHRDbG9zZU9wZXJhdGlvbihpbnQg
b3BlcmF0aW9uKQ0KLSAgICB7ICBjbG9zZV9hY3Rpb24gPSBvcGVyYXRpb247ICAgfQ0KKyAgICAv
KioNCisgICAgICogRGVmaW5lcyB3aGF0IGhhcHBlbnMgd2hlbiB0aGlzIGZyYW1lIGlzIGNsb3Nl
ZC4gQ2FuIGJlIG9uZSBvZmYNCisgICAgICogPGNvZGU+RVhJVF9PTl9DTE9TRTwvY29kZT4sDQor
ICAgICAqIDxjb2RlPkRJU1BPU0VfT05fQ0xPU0U8L2NvZGU+LA0KKyAgICAgKiA8Y29kZT5ISURF
X09OX0NMT1NFPC9jb2RlPiBvcg0KKyAgICAgKiA8Y29kZT5ET19OT1RISU5HX09OX0NMT1NFPC9j
b2RlPi4NCisgICAgICogVGhlIGRlZmF1bHQgaXMgPGNvZGU+SElERV9PTl9DTE9TRTwvY29kZT4u
DQorICAgICAqIFdoZW4gPGNvZGU+RVhJVF9PTl9DTE9TRTwvY29kZT4gaXMgc3BlY2lmaWVkIHRo
aXMgbWV0aG9kIGNhbGxzDQorICAgICAqIDxjb2RlPlNlY3VyaXR5TWFuYWdlci5jaGVja0V4aXQo
MCk8L2NvZGU+IHdoaWNoIG1pZ2h0IHRocm93IGENCisgICAgICogPGNvZGU+U2VjdXJpdHlFeGNl
cHRpb248L2NvZGU+LiBXaGVuIHRoZSBzcGVjaWZpZWQgb3BlcmF0aW9uIGlzDQorICAgICAqIG5v
dCBvbmUgb2YgdGhlIGFib3ZlIGEgPGNvZGU+SWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uPC9jb2Rl
PiBpcw0KKyAgICAgKiB0aHJvd24uDQorICAgICAqLw0KKyAgICBwdWJsaWMgdm9pZCBzZXREZWZh
dWx0Q2xvc2VPcGVyYXRpb24oaW50IG9wZXJhdGlvbikNCisgICAgew0KKyAgICAgIFNlY3VyaXR5
TWFuYWdlciBzbSA9IFN5c3RlbS5nZXRTZWN1cml0eU1hbmFnZXIoKTsNCisgICAgICBpZiAoc20g
IT0gbnVsbCAmJiBvcGVyYXRpb24gPT0gRVhJVF9PTl9DTE9TRSkNCisJc20uY2hlY2tFeGl0KDAp
Ow0KKw0KKyAgICAgIGlmIChvcGVyYXRpb24gIT0gRVhJVF9PTl9DTE9TRSAmJiBvcGVyYXRpb24g
IT0gRElTUE9TRV9PTl9DTE9TRQ0KKwkgICYmIG9wZXJhdGlvbiAhPSBISURFX09OX0NMT1NFICYm
IG9wZXJhdGlvbiAhPSBET19OT1RISU5HX09OX0NMT1NFKQ0KKwl0aHJvdyBuZXcgSWxsZWdhbEFy
Z3VtZW50RXhjZXB0aW9uKCJvcGVyYXRpb24gPSAiICsgb3BlcmF0aW9uKTsNCisJICANCisgICAg
ICBjbG9zZV9hY3Rpb24gPSBvcGVyYXRpb247DQorICAgIH0NCiANCiB9DQo=

--=-UtafMZxV1QbHxC56R56X--

--=-tigozkbRfOvq3FBI7ybK
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)

iD8DBQBAflYzxVhZCJWr9QwRAqL+AJ9JV7gri8A78YqdPfye1cGcpT4tvQCdFDwv
s+E0t7f8szsWvC6rGrk2vgQ=
=VCJ1
-----END PGP SIGNATURE-----

--=-tigozkbRfOvq3FBI7ybK--




From MAILER-DAEMON Thu Apr 15 05:35:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BE3He-00045L-3U
	for mharc-commit-classpath@gnu.org; Thu, 15 Apr 2004 05:35:46 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BE3GI-0002Je-Al
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:34:22 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BE3FQ-00013e-WF
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:34:01 -0400
Received: from [217.8.192.20] (helo=interway.li)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BE3FP-0000z5-AF
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 05:33:27 -0400
Received: from [217.8.199.55] (HELO [192.168.1.33])
	by interway.li (CommuniGate Pro SMTP 4.1.8)
	with ESMTP id 1758251 for commit-classpath@gnu.org;
	Thu, 15 Apr 2004 11:33:28 +0200
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Thu, 15 Apr 2004 11:33:24 +0200
Message-Id: <20040415093324.9678@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="==_20040415093324.8769-1_=="
Subject: FYI: Various Makefile.am and package.html
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 15 Apr 2004 09:35:41 -0000

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

In javax.imgeio and gnu.classpath, I had forgotten to add some
Makefile.am and package.html files.

-- Sascha

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


2004-04-15  Sascha Brawer  <brawer@dandelis.ch>
 
    * javax/imageio/package.html, javax/imageio/spi/package.html,
    javax/imageio/stream/package.html: Added boilerplate docs.

    * javax/imageio/Makefile.am, javax/imageio/spi/Makefile.am,
    javax/imageio/stream/Makefile.am: New files.

    * gnu/classpath/Makefile.am (EXTRA_DIST): Include
    ServiceFactory.java and ServiceProviderLoadingAction.java.

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

SW5kZXg6IGphdmF4L2ltYWdlaW8vTWFrZWZpbGUuYW0KPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls
ZTogamF2YXgvaW1hZ2Vpby9NYWtlZmlsZS5hbQpkaWZmIC1OIGphdmF4L2ltYWdlaW8vTWFr
ZWZpbGUuYW0KLS0tIC9kZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBq
YXZheC9pbWFnZWlvL01ha2VmaWxlLmFtCTE1IEFwciAyMDA0IDA5OjI3OjQ1IC0wMDAwCkBA
IC0wLDAgKzEsOSBAQAorIyMgSW5wdXQgZmlsZSBmb3IgYXV0b21ha2UgdG8gZ2VuZXJhdGUg
dGhlIE1ha2VmaWxlLmluIHVzZWQgYnkgY29uZmlndXJlCisKK1NVQkRJUlMgPSBzdHJlYW0g
c3BpCisKK0VYVFJBX0RJU1QgPSBcCitJbWFnZVJlYWRlci5qYXZhIFwKK0ltYWdlVHJhbnNj
b2Rlci5qYXZhIFwKK0ltYWdlV3JpdGVyLmphdmEgXAorcGFja2FnZS5odG1sCkluZGV4OiBq
YXZheC9pbWFnZWlvL3BhY2thZ2UuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiBqYXZh
eC9pbWFnZWlvL3BhY2thZ2UuaHRtbApkaWZmIC1OIGphdmF4L2ltYWdlaW8vcGFja2FnZS5o
dG1sCi0tLSAvZGV2L251bGwJMSBKYW4gMTk3MCAwMDowMDowMCAtMDAwMAorKysgamF2YXgv
aW1hZ2Vpby9wYWNrYWdlLmh0bWwJMTUgQXByIDIwMDQgMDk6Mjc6NDUgLTAwMDAKQEAgLTAs
MCArMSw0NiBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDMu
MiBGaW5hbC8vRU4iPgorPCEtLSBwYWNrYWdlLmh0bWwgLSBkZXNjcmliZXMgY2xhc3NlcyBp
biBqYXZheC5pbWFnZWlvIHBhY2thZ2UuCisgICBDb3B5cmlnaHQgKEMpIDIwMDQgRnJlZSBT
b2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCisKK1RoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBD
bGFzc3BhdGguCisKK0dOVSBDbGFzc3BhdGggaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiBy
ZWRpc3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQoraXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRo
ZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkKK3RoZSBGcmVl
IFNvZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDIsIG9yIChhdCB5b3VyIG9w
dGlvbikKK2FueSBsYXRlciB2ZXJzaW9uLgorCitHTlUgQ2xhc3NwYXRoIGlzIGRpc3RyaWJ1
dGVkIGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1dAorV0lUSE9VVCBB
TlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorTUVS
Q0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2Vl
IHRoZSBHTlUKK0dlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKwor
WW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVi
bGljIExpY2Vuc2UKK2Fsb25nIHdpdGggR05VIENsYXNzcGF0aDsgc2VlIHRoZSBmaWxlIENP
UFlJTkcuICBJZiBub3QsIHdyaXRlIHRvIHRoZQorRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9u
LCBJbmMuLCA1OSBUZW1wbGUgUGxhY2UsIFN1aXRlIDMzMCwgQm9zdG9uLCBNQQorMDIxMTEt
MTMwNyBVU0EuCisKK0xpbmtpbmcgdGhpcyBsaWJyYXJ5IHN0YXRpY2FsbHkgb3IgZHluYW1p
Y2FsbHkgd2l0aCBvdGhlciBtb2R1bGVzIGlzCittYWtpbmcgYSBjb21iaW5lZCB3b3JrIGJh
c2VkIG9uIHRoaXMgbGlicmFyeS4gIFRodXMsIHRoZSB0ZXJtcyBhbmQKK2NvbmRpdGlvbnMg
b2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGNvdmVyIHRoZSB3aG9sZQorY29t
YmluYXRpb24uCisKK0FzIGEgc3BlY2lhbCBleGNlcHRpb24sIHRoZSBjb3B5cmlnaHQgaG9s
ZGVycyBvZiB0aGlzIGxpYnJhcnkgZ2l2ZSB5b3UKK3Blcm1pc3Npb24gdG8gbGluayB0aGlz
IGxpYnJhcnkgd2l0aCBpbmRlcGVuZGVudCBtb2R1bGVzIHRvIHByb2R1Y2UgYW4KK2V4ZWN1
dGFibGUsIHJlZ2FyZGxlc3Mgb2YgdGhlIGxpY2Vuc2UgdGVybXMgb2YgdGhlc2UgaW5kZXBl
bmRlbnQKK21vZHVsZXMsIGFuZCB0byBjb3B5IGFuZCBkaXN0cmlidXRlIHRoZSByZXN1bHRp
bmcgZXhlY3V0YWJsZSB1bmRlcgordGVybXMgb2YgeW91ciBjaG9pY2UsIHByb3ZpZGVkIHRo
YXQgeW91IGFsc28gbWVldCwgZm9yIGVhY2ggbGlua2VkCitpbmRlcGVuZGVudCBtb2R1bGUs
IHRoZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgbGljZW5zZSBvZiB0aGF0Cittb2R1
bGUuICBBbiBpbmRlcGVuZGVudCBtb2R1bGUgaXMgYSBtb2R1bGUgd2hpY2ggaXMgbm90IGRl
cml2ZWQgZnJvbQorb3IgYmFzZWQgb24gdGhpcyBsaWJyYXJ5LiAgSWYgeW91IG1vZGlmeSB0
aGlzIGxpYnJhcnksIHlvdSBtYXkgZXh0ZW5kCit0aGlzIGV4Y2VwdGlvbiB0byB5b3VyIHZl
cnNpb24gb2YgdGhlIGxpYnJhcnksIGJ1dCB5b3UgYXJlIG5vdAorb2JsaWdhdGVkIHRvIGRv
IHNvLiAgSWYgeW91IGRvIG5vdCB3aXNoIHRvIGRvIHNvLCBkZWxldGUgdGhpcworZXhjZXB0
aW9uIHN0YXRlbWVudCBmcm9tIHlvdXIgdmVyc2lvbi4gLS0+CisKKzxodG1sPgorPGhlYWQ+
PHRpdGxlPkdOVSBDbGFzc3BhdGggLSBqYXZheC5pbWFnZWlvPC90aXRsZT48L2hlYWQ+CisK
Kzxib2R5PgorPHA+PC9wPgorCis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBqYXZheC9pbWFn
ZWlvL3NwaS9NYWtlZmlsZS5hbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiBqYXZheC9pbWFn
ZWlvL3NwaS9NYWtlZmlsZS5hbQpkaWZmIC1OIGphdmF4L2ltYWdlaW8vc3BpL01ha2VmaWxl
LmFtCi0tLSAvZGV2L251bGwJMSBKYW4gMTk3MCAwMDowMDowMCAtMDAwMAorKysgamF2YXgv
aW1hZ2Vpby9zcGkvTWFrZWZpbGUuYW0JMTUgQXByIDIwMDQgMDk6Mjc6NDUgLTAwMDAKQEAg
LTAsMCArMSwxMSBAQAorIyMgSW5wdXQgZmlsZSBmb3IgYXV0b21ha2UgdG8gZ2VuZXJhdGUg
dGhlIE1ha2VmaWxlLmluIHVzZWQgYnkgY29uZmlndXJlCisKK0VYVFJBX0RJU1QgPSBcCitJ
SU9TZXJ2aWNlUHJvdmlkZXIuamF2YSBcCitJbWFnZUlucHV0U3RyZWFtU3BpLmphdmEgXAor
SW1hZ2VPdXRwdXRTdHJlYW1TcGkuamF2YSBcCitJbWFnZVJlYWRlcldyaXRlclNwaS5qYXZh
IFwKK0ltYWdlVHJhbnNjb2RlclNwaS5qYXZhIFwKK1JlZ2lzdGVyYWJsZVNlcnZpY2UuamF2
YSBcCitTZXJ2aWNlUmVnaXN0cnkuamF2YSBcCitwYWNrYWdlLmh0bWwKSW5kZXg6IGphdmF4
L2ltYWdlaW8vc3BpL3BhY2thZ2UuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiBqYXZh
eC9pbWFnZWlvL3NwaS9wYWNrYWdlLmh0bWwKZGlmZiAtTiBqYXZheC9pbWFnZWlvL3NwaS9w
YWNrYWdlLmh0bWwKLS0tIC9kZXYvbnVsbAkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisr
KyBqYXZheC9pbWFnZWlvL3NwaS9wYWNrYWdlLmh0bWwJMTUgQXByIDIwMDQgMDk6Mjc6NDUg
LTAwMDAKQEAgLTAsMCArMSw0NiBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0Mv
L0RURCBIVE1MIDMuMiBGaW5hbC8vRU4iPgorPCEtLSBwYWNrYWdlLmh0bWwgLSBkZXNjcmli
ZXMgY2xhc3NlcyBpbiBqYXZheC5pbWFnZWlvLnNwaSBwYWNrYWdlLgorICAgQ29weXJpZ2h0
IChDKSAyMDA0IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLgorCitUaGlzIGZpbGUg
aXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLgorCitHTlUgQ2xhc3NwYXRoIGlzIGZyZWUgc29m
dHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkKK2l0IHVuZGVy
IHRoZSB0ZXJtcyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgYXMgcHVibGlz
aGVkIGJ5Cit0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAy
LCBvciAoYXQgeW91ciBvcHRpb24pCithbnkgbGF0ZXIgdmVyc2lvbi4KKworR05VIENsYXNz
cGF0aCBpcyBkaXN0cmlidXRlZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVs
LCBidXQKK1dJVEhPVVQgQU5ZIFdBUlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQg
d2FycmFudHkgb2YKK01FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VM
QVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCitHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBt
b3JlIGRldGFpbHMuCisKK1lvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhl
IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlCithbG9uZyB3aXRoIEdOVSBDbGFzc3BhdGg7
IHNlZSB0aGUgZmlsZSBDT1BZSU5HLiAgSWYgbm90LCB3cml0ZSB0byB0aGUKK0ZyZWUgU29m
dHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTkgVGVtcGxlIFBsYWNlLCBTdWl0ZSAzMzAsIEJv
c3RvbiwgTUEKKzAyMTExLTEzMDcgVVNBLgorCitMaW5raW5nIHRoaXMgbGlicmFyeSBzdGF0
aWNhbGx5IG9yIGR5bmFtaWNhbGx5IHdpdGggb3RoZXIgbW9kdWxlcyBpcworbWFraW5nIGEg
Y29tYmluZWQgd29yayBiYXNlZCBvbiB0aGlzIGxpYnJhcnkuICBUaHVzLCB0aGUgdGVybXMg
YW5kCitjb25kaXRpb25zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBjb3Zl
ciB0aGUgd2hvbGUKK2NvbWJpbmF0aW9uLgorCitBcyBhIHNwZWNpYWwgZXhjZXB0aW9uLCB0
aGUgY29weXJpZ2h0IGhvbGRlcnMgb2YgdGhpcyBsaWJyYXJ5IGdpdmUgeW91CitwZXJtaXNz
aW9uIHRvIGxpbmsgdGhpcyBsaWJyYXJ5IHdpdGggaW5kZXBlbmRlbnQgbW9kdWxlcyB0byBw
cm9kdWNlIGFuCitleGVjdXRhYmxlLCByZWdhcmRsZXNzIG9mIHRoZSBsaWNlbnNlIHRlcm1z
IG9mIHRoZXNlIGluZGVwZW5kZW50Cittb2R1bGVzLCBhbmQgdG8gY29weSBhbmQgZGlzdHJp
YnV0ZSB0aGUgcmVzdWx0aW5nIGV4ZWN1dGFibGUgdW5kZXIKK3Rlcm1zIG9mIHlvdXIgY2hv
aWNlLCBwcm92aWRlZCB0aGF0IHlvdSBhbHNvIG1lZXQsIGZvciBlYWNoIGxpbmtlZAoraW5k
ZXBlbmRlbnQgbW9kdWxlLCB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIGxpY2Vu
c2Ugb2YgdGhhdAorbW9kdWxlLiAgQW4gaW5kZXBlbmRlbnQgbW9kdWxlIGlzIGEgbW9kdWxl
IHdoaWNoIGlzIG5vdCBkZXJpdmVkIGZyb20KK29yIGJhc2VkIG9uIHRoaXMgbGlicmFyeS4g
IElmIHlvdSBtb2RpZnkgdGhpcyBsaWJyYXJ5LCB5b3UgbWF5IGV4dGVuZAordGhpcyBleGNl
cHRpb24gdG8geW91ciB2ZXJzaW9uIG9mIHRoZSBsaWJyYXJ5LCBidXQgeW91IGFyZSBub3QK
K29ibGlnYXRlZCB0byBkbyBzby4gIElmIHlvdSBkbyBub3Qgd2lzaCB0byBkbyBzbywgZGVs
ZXRlIHRoaXMKK2V4Y2VwdGlvbiBzdGF0ZW1lbnQgZnJvbSB5b3VyIHZlcnNpb24uIC0tPgor
Cis8aHRtbD4KKzxoZWFkPjx0aXRsZT5HTlUgQ2xhc3NwYXRoIC0gamF2YXguaW1hZ2Vpby5z
cGk8L3RpdGxlPjwvaGVhZD4KKworPGJvZHk+Cis8cD48L3A+CisKKzwvYm9keT4KKzwvaHRt
bD4KSW5kZXg6IGphdmF4L2ltYWdlaW8vc3RyZWFtL01ha2VmaWxlLmFtCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0KUkNTIGZpbGU6IGphdmF4L2ltYWdlaW8vc3RyZWFtL01ha2VmaWxlLmFtCmRpZmYgLU4g
amF2YXgvaW1hZ2Vpby9zdHJlYW0vTWFrZWZpbGUuYW0KLS0tIC9kZXYvbnVsbAkxIEphbiAx
OTcwIDAwOjAwOjAwIC0wMDAwCisrKyBqYXZheC9pbWFnZWlvL3N0cmVhbS9NYWtlZmlsZS5h
bQkxNSBBcHIgMjAwNCAwOToyNzo0NSAtMDAwMApAQCAtMCwwICsxLDcgQEAKKyMjIElucHV0
IGZpbGUgZm9yIGF1dG9tYWtlIHRvIGdlbmVyYXRlIHRoZSBNYWtlZmlsZS5pbiB1c2VkIGJ5
IGNvbmZpZ3VyZQorCitFWFRSQV9ESVNUID0gXAorSUlPQnl0ZUJ1ZmZlci5qYXZhIFwKK0lt
YWdlSW5wdXRTdHJlYW0uamF2YSBcCitJbWFnZU91dHB1dFN0cmVhbS5qYXZhIFwKK3BhY2th
Z2UuaHRtbApJbmRleDogamF2YXgvaW1hZ2Vpby9zdHJlYW0vcGFja2FnZS5odG1sCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0KUkNTIGZpbGU6IGphdmF4L2ltYWdlaW8vc3RyZWFtL3BhY2thZ2UuaHRtbApk
aWZmIC1OIGphdmF4L2ltYWdlaW8vc3RyZWFtL3BhY2thZ2UuaHRtbAotLS0gL2Rldi9udWxs
CTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDAKKysrIGphdmF4L2ltYWdlaW8vc3RyZWFtL3Bh
Y2thZ2UuaHRtbAkxNSBBcHIgMjAwNCAwOToyNzo0NSAtMDAwMApAQCAtMCwwICsxLDQ2IEBA
Cis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgMy4yIEZpbmFsLy9F
TiI+Cis8IS0tIHBhY2thZ2UuaHRtbCAtIGRlc2NyaWJlcyBjbGFzc2VzIGluIGphdmF4Lmlt
YWdlaW8uc3RyZWFtIHBhY2thZ2UuCisgICBDb3B5cmlnaHQgKEMpIDIwMDQgRnJlZSBTb2Z0
d2FyZSBGb3VuZGF0aW9uLCBJbmMuCisKK1RoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBDbGFz
c3BhdGguCisKK0dOVSBDbGFzc3BhdGggaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRp
c3RyaWJ1dGUgaXQgYW5kL29yIG1vZGlmeQoraXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBH
TlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkKK3RoZSBGcmVlIFNv
ZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDIsIG9yIChhdCB5b3VyIG9wdGlv
bikKK2FueSBsYXRlciB2ZXJzaW9uLgorCitHTlUgQ2xhc3NwYXRoIGlzIGRpc3RyaWJ1dGVk
IGluIHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1dAorV0lUSE9VVCBBTlkg
V0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorTUVSQ0hB
TlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRo
ZSBHTlUKK0dlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4KKworWW91
IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGlj
IExpY2Vuc2UKK2Fsb25nIHdpdGggR05VIENsYXNzcGF0aDsgc2VlIHRoZSBmaWxlIENPUFlJ
TkcuICBJZiBub3QsIHdyaXRlIHRvIHRoZQorRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJ
bmMuLCA1OSBUZW1wbGUgUGxhY2UsIFN1aXRlIDMzMCwgQm9zdG9uLCBNQQorMDIxMTEtMTMw
NyBVU0EuCisKK0xpbmtpbmcgdGhpcyBsaWJyYXJ5IHN0YXRpY2FsbHkgb3IgZHluYW1pY2Fs
bHkgd2l0aCBvdGhlciBtb2R1bGVzIGlzCittYWtpbmcgYSBjb21iaW5lZCB3b3JrIGJhc2Vk
IG9uIHRoaXMgbGlicmFyeS4gIFRodXMsIHRoZSB0ZXJtcyBhbmQKK2NvbmRpdGlvbnMgb2Yg
dGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGNvdmVyIHRoZSB3aG9sZQorY29tYmlu
YXRpb24uCisKK0FzIGEgc3BlY2lhbCBleGNlcHRpb24sIHRoZSBjb3B5cmlnaHQgaG9sZGVy
cyBvZiB0aGlzIGxpYnJhcnkgZ2l2ZSB5b3UKK3Blcm1pc3Npb24gdG8gbGluayB0aGlzIGxp
YnJhcnkgd2l0aCBpbmRlcGVuZGVudCBtb2R1bGVzIHRvIHByb2R1Y2UgYW4KK2V4ZWN1dGFi
bGUsIHJlZ2FyZGxlc3Mgb2YgdGhlIGxpY2Vuc2UgdGVybXMgb2YgdGhlc2UgaW5kZXBlbmRl
bnQKK21vZHVsZXMsIGFuZCB0byBjb3B5IGFuZCBkaXN0cmlidXRlIHRoZSByZXN1bHRpbmcg
ZXhlY3V0YWJsZSB1bmRlcgordGVybXMgb2YgeW91ciBjaG9pY2UsIHByb3ZpZGVkIHRoYXQg
eW91IGFsc28gbWVldCwgZm9yIGVhY2ggbGlua2VkCitpbmRlcGVuZGVudCBtb2R1bGUsIHRo
ZSB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB0aGUgbGljZW5zZSBvZiB0aGF0Cittb2R1bGUu
ICBBbiBpbmRlcGVuZGVudCBtb2R1bGUgaXMgYSBtb2R1bGUgd2hpY2ggaXMgbm90IGRlcml2
ZWQgZnJvbQorb3IgYmFzZWQgb24gdGhpcyBsaWJyYXJ5LiAgSWYgeW91IG1vZGlmeSB0aGlz
IGxpYnJhcnksIHlvdSBtYXkgZXh0ZW5kCit0aGlzIGV4Y2VwdGlvbiB0byB5b3VyIHZlcnNp
b24gb2YgdGhlIGxpYnJhcnksIGJ1dCB5b3UgYXJlIG5vdAorb2JsaWdhdGVkIHRvIGRvIHNv
LiAgSWYgeW91IGRvIG5vdCB3aXNoIHRvIGRvIHNvLCBkZWxldGUgdGhpcworZXhjZXB0aW9u
IHN0YXRlbWVudCBmcm9tIHlvdXIgdmVyc2lvbi4gLS0+CisKKzxodG1sPgorPGhlYWQ+PHRp
dGxlPkdOVSBDbGFzc3BhdGggLSBqYXZheC5pbWFnZWlvLnN0cmVhbTwvdGl0bGU+PC9oZWFk
PgorCis8Ym9keT4KKzxwPjwvcD4KKworPC9ib2R5PgorPC9odG1sPgpJbmRleDogZ251L2Ns
YXNzcGF0aC9NYWtlZmlsZS5hbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3Zzcm9vdC9j
bGFzc3BhdGgvY2xhc3NwYXRoL2dudS9jbGFzc3BhdGgvTWFrZWZpbGUuYW0sdgpyZXRyaWV2
aW5nIHJldmlzaW9uIDEuNQpkaWZmIC11IC1yMS41IE1ha2VmaWxlLmFtCi0tLSBnbnUvY2xh
c3NwYXRoL01ha2VmaWxlLmFtCTEwIEF1ZyAyMDAzIDE0OjExOjQ1IC0wMDAwCTEuNQorKysg
Z251L2NsYXNzcGF0aC9NYWtlZmlsZS5hbQkxNSBBcHIgMjAwNCAwOToyNzo0NSAtMDAwMApA
QCAtMiw1ICsyLDYgQEAKIAogRVhUUkFfRElTVCA9IFwKIENvbmZpZ3VyYXRpb24uamF2YS5p
biBcCi1SYXdEYXRhLmphdmEKLQorUmF3RGF0YS5qYXZhIFwKK1NlcnZpY2VGYWN0b3J5Lmph
dmEgXAorU2VydmljZVByb3ZpZGVyTG9hZGluZ0FjdGlvbi5qYXZhCkluZGV4OiBDaGFuZ2VM
b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0
aC9DaGFuZ2VMb2csdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjAzMwpkaWZmIC11IC1yMS4y
MDMzIENoYW5nZUxvZwotLS0gQ2hhbmdlTG9nCTE1IEFwciAyMDA0IDA4OjU2OjMxIC0wMDAw
CTEuMjAzMworKysgQ2hhbmdlTG9nCTE1IEFwciAyMDA0IDA5OjI3OjU0IC0wMDAwCkBAIC0x
LDUgKzEsMTYgQEAKIDIwMDQtMDQtMTUgIFNhc2NoYSBCcmF3ZXIgIDxicmF3ZXJAZGFuZGVs
aXMuY2g+CiAKKwkqIGphdmF4L2ltYWdlaW8vcGFja2FnZS5odG1sLCBqYXZheC9pbWFnZWlv
L3NwaS9wYWNrYWdlLmh0bWwsCisJamF2YXgvaW1hZ2Vpby9zdHJlYW0vcGFja2FnZS5odG1s
OiBBZGRlZCBib2lsZXJwbGF0ZSBkb2NzLgorCisJKiBqYXZheC9pbWFnZWlvL01ha2VmaWxl
LmFtLCBqYXZheC9pbWFnZWlvL3NwaS9NYWtlZmlsZS5hbSwKKwlqYXZheC9pbWFnZWlvL3N0
cmVhbS9NYWtlZmlsZS5hbTogTmV3IGZpbGVzLgorCisJKiBnbnUvY2xhc3NwYXRoL01ha2Vm
aWxlLmFtIChFWFRSQV9ESVNUKTogSW5jbHVkZQorCVNlcnZpY2VGYWN0b3J5LmphdmEgYW5k
IFNlcnZpY2VQcm92aWRlckxvYWRpbmdBY3Rpb24uamF2YS4KKworMjAwNC0wNC0xNSAgU2Fz
Y2hhIEJyYXdlciAgPGJyYXdlckBkYW5kZWxpcy5jaD4KKwogCSogamF2YS9hd3QvaW1hZ2Uv
Q29tcG9uZW50Q29sb3JNb2RlbC5qYXZhCiAJKGNyZWF0ZUNvbXBhdGlibGVTYW1wbGVNb2Rl
bCk6IFJldHVybiBQaXhlbEludGVybGVhdmVkU2FtcGxlTW9kZWwKIAlmb3IgVFlQRV9CWVRF
IGFuZCBUWVBFX1VTSE9SVCB0cmFuc2ZlclR5cGVzLCBpbiBvcmRlciB0byBwYXNzIHRoZQo=

--==_20040415093324.8769-1_==--




From MAILER-DAEMON Thu Apr 15 07:57:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BE5Ur-0007p0-T4
	for mharc-commit-classpath@gnu.org; Thu, 15 Apr 2004 07:57:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BE5QM-0006jl-Sd
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 07:52:54 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BE5O2-0006E9-Je
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 07:50:31 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BE56d-0003ge-EE
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 07:32:32 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BE56W-00043i-00; Thu, 15 Apr 2004 13:32:24 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
In-Reply-To: <1082021427.8648.26.camel@elsschot.wildebeest.org>
References: <1082021427.8648.26.camel@elsschot.wildebeest.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-87LjYfQIBpaIL/ux9udn"
Message-Id: <1082028737.8648.44.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Thu, 15 Apr 2004 13:32:17 +0200
Cc: java-patches@gcc.gnu.org
Subject: Re: JFrame DefaultCloseOperation CLOSE_ON_EXIT fixlet
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 15 Apr 2004 11:57:27 -0000


--=-87LjYfQIBpaIL/ux9udn
Content-Type: multipart/mixed; boundary="=-9jHhrRs/H3fTdVWrIzvY"


--=-9jHhrRs/H3fTdVWrIzvY
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Thu, 2004-04-15 at 11:30, Mark Wielaard wrote:
> Noticed that JFrame get/setDefaultCloseOperation weren't public and
> didn't do the right default thing. So I fixed them and added the correct
> argument checking to setDefaultCloseOperation.

Here is a similar patch for JDialog. But I also had to make the
constructors public to even use this class. There is clearly still much
to do. I stopped playing with it as soon as I saw my first JDialog pop
up. Both JFrame and JDialog should get their constants through the
WindowConstants interface which they now both implement.

2004-04-15  Mark Wielaard  <mark@klomp.org>
                                                                           =
    =20
        * javax/awt/JFrame.java: Implement WindowConstants. Remove final
        static fields defined in interface.
        * javax/awt/JDialog.java: Likewise.
        (JDialog): Make constructors public.
        (getDefaultCloseOperation): Make public.
        (processWindowEvent): Call System.exit(0) when HIDE_ON_CLOSE set.
        (setDefaultCloseOperation): Make public. Check argument. Add API do=
c.

> Committed to classpath CVS.
> Could someone with a recent gcj-gui-branch checkout add it there?

Same again.

Thanks,

Mark

--=-9jHhrRs/H3fTdVWrIzvY
Content-Disposition: inline; filename=JDialog.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=JDialog.patch; charset=iso-8859-1

SW5kZXg6IGphdmF4L3N3aW5nL0pEaWFsb2cuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9j
dnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvamF2YXgvc3dpbmcvSkRpYWxvZy5qYXZhLHYNCnJl
dHJpZXZpbmcgcmV2aXNpb24gMS41DQpkaWZmIC11IC1yMS41IEpEaWFsb2cuamF2YQ0KLS0tIGph
dmF4L3N3aW5nL0pEaWFsb2cuamF2YQk4IEp1biAyMDAzIDExOjIwOjA3IC0wMDAwCTEuNQ0KKysr
IGphdmF4L3N3aW5nL0pEaWFsb2cuamF2YQkxNSBBcHIgMjAwNCAxMTozMDo1OCAtMDAwMA0KQEAg
LTEsNSArMSw1IEBADQogLyogSkRpYWxvZy5qYXZhIC0tDQotICAgQ29weXJpZ2h0IChDKSAyMDAy
IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykgMjAwMiwg
MjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFy
dCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTU3LDEyICs1Nyw4IEBADQogICoNCiAgKiBAYXV0
aG9yIFJvbmFsZCBWZWxkZW1hIChydmVsZGVtYUBjcy52dS5ubCkNCiAgKi8NCi1wdWJsaWMgY2xh
c3MgSkRpYWxvZyBleHRlbmRzIERpYWxvZyBpbXBsZW1lbnRzIEFjY2Vzc2libGUNCitwdWJsaWMg
Y2xhc3MgSkRpYWxvZyBleHRlbmRzIERpYWxvZyBpbXBsZW1lbnRzIEFjY2Vzc2libGUsIFdpbmRv
d0NvbnN0YW50cw0KIHsNCi0gICAgcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgSElERV9PTl9DTE9T
RSAgICAgICAgPSAwOw0KLSAgICBwdWJsaWMgZmluYWwgc3RhdGljIGludCBESVNQT1NFX09OX0NM
T1NFICAgICA9IDE7DQotICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgaW50IERPX05PVEhJTkdfT05f
Q0xPU0UgID0gMjsNCi0NCiAgICAgcHJvdGVjdGVkICBBY2Nlc3NpYmxlQ29udGV4dCBhY2Nlc3Np
YmxlQ29udGV4dDsNCiANCiAgICAgcHJpdmF0ZSBpbnQgY2xvc2VfYWN0aW9uID0gSElERV9PTl9D
TE9TRTsgICAgDQpAQCAtNzUsNDIgKzcxLDQyIEBADQogICAgICAqDQogICAgICAqKioqKioqKioq
KioqLw0KIA0KLSAgICBKRGlhbG9nKEZyYW1lIG93bmVyKQ0KKyAgICBwdWJsaWMgSkRpYWxvZyhG
cmFtZSBvd25lcikNCiAgICAgew0KIAl0aGlzKG93bmVyLCAiZGlhbG9nIik7DQogICAgIH0NCiAg
ICAgDQotICAgIEpEaWFsb2coRnJhbWUgb3duZXIsDQorICAgIHB1YmxpYyBKRGlhbG9nKEZyYW1l
IG93bmVyLA0KIAkgICAgU3RyaW5nIHMpDQogICAgIHsNCiAJdGhpcyhvd25lciwgcywgdHJ1ZSk7
DQogICAgIH0NCiAgICAgDQotICBKRGlhbG9nKEZyYW1lIG93bmVyLA0KKyAgcHVibGljIEpEaWFs
b2coRnJhbWUgb3duZXIsDQogCSAgU3RyaW5nIHMsDQogCSAgYm9vbGVhbiBtb2RlbGQpDQogICAg
IHsNCiAJc3VwZXIob3duZXIsIHMsIG1vZGVsZCk7DQogICAgIH0NCiANCi0gIEpEaWFsb2coRnJh
bWUgb3duZXIsDQorICBwdWJsaWMgSkRpYWxvZyhGcmFtZSBvd25lciwNCiAJICAvLyAgU3RyaW5n
IHMsDQogCSAgYm9vbGVhbiBtb2RlbGQpDQogICAgIHsNCiAJc3VwZXIob3duZXIsICJKRGlhbG9n
IiwgbW9kZWxkKTsNCiAgICAgfQ0KLSAgSkRpYWxvZyhEaWFsb2cgb3duZXIpDQorICBwdWJsaWMg
SkRpYWxvZyhEaWFsb2cgb3duZXIpDQogICB7DQogICAgICAgdGhpcyhvd25lciwgImRpYWxvZyIp
Ow0KICAgfQ0KICAgICANCi0gICAgSkRpYWxvZyhEaWFsb2cgb3duZXIsDQorICAgIHB1YmxpYyBK
RGlhbG9nKERpYWxvZyBvd25lciwNCiAJICAgIFN0cmluZyBzKQ0KICAgICB7DQogCXRoaXMob3du
ZXIsIHMsIHRydWUpOw0KICAgICB9DQogICAgIA0KLSAgSkRpYWxvZyhEaWFsb2cgb3duZXIsDQor
ICBwdWJsaWMgSkRpYWxvZyhEaWFsb2cgb3duZXIsDQogCSAgU3RyaW5nIHMsDQogCSAgYm9vbGVh
biBtb2RlbGQpDQogICAgIHsNCkBAIC0yMjEsMTggKzIxNywyMCBAQA0KIA0KICAgICBwcm90ZWN0
ZWQgIHZvaWQgcHJvY2Vzc1dpbmRvd0V2ZW50KFdpbmRvd0V2ZW50IGUpDQogICAgIHsNCi0JLy8J
U3lzdGVtLm91dC5wcmludGxuKCJQUk9DRVNTX1dJTl9FVi0xOiAiICsgZSk7DQogCXN1cGVyLnBy
b2Nlc3NXaW5kb3dFdmVudChlKTsgDQotCS8vCVN5c3RlbS5vdXQucHJpbnRsbigiUFJPQ0VTU19X
SU5fRVYtMjogIiArIGUpOw0KIAlzd2l0Y2ggKGUuZ2V0SUQoKSkNCiAJICAgIHsNCiAJICAgIGNh
c2UgV2luZG93RXZlbnQuV0lORE9XX0NMT1NJTkc6DQogCQl7DQogCQkgICAgc3dpdGNoKGNsb3Nl
X2FjdGlvbikNCiAJCQl7DQorCQkJY2FzZSBFWElUX09OX0NMT1NFOg0KKwkJCSAgew0KKwkJCSAg
ICBTeXN0ZW0uZXhpdCgwKTsNCisJCQkgICAgYnJlYWs7DQorCQkJICB9DQogCQkJY2FzZSBESVNQ
T1NFX09OX0NMT1NFOg0KIAkJCSAgICB7DQotCQkJCVN5c3RlbS5vdXQucHJpbnRsbigidXNlciBy
ZXF1ZXN0ZWQgZGlzcG9zZSBvbiBjbG9zZSIpOw0KIAkJCQlkaXNwb3NlKCk7DQogCQkJCWJyZWFr
Ow0KIAkJCSAgICB9DQpAQCAtMjU4LDggKzI1NiwzNCBAQA0KICAgICB9ICAgDQogIA0KIA0KLSAg
ICB2b2lkIHNldERlZmF1bHRDbG9zZU9wZXJhdGlvbihpbnQgb3BlcmF0aW9uKQ0KLSAgICB7ICBj
bG9zZV9hY3Rpb24gPSBvcGVyYXRpb247ICAgfQ0KKyAgLyoqDQorICAgKiBEZWZpbmVzIHdoYXQg
aGFwcGVucyB3aGVuIHRoaXMgZnJhbWUgaXMgY2xvc2VkLiBDYW4gYmUgb25lIG9mZg0KKyAgICog
PGNvZGU+RVhJVF9PTl9DTE9TRTwvY29kZT4sDQorICAgKiA8Y29kZT5ESVNQT1NFX09OX0NMT1NF
PC9jb2RlPiwNCisgICAqIDxjb2RlPkhJREVfT05fQ0xPU0U8L2NvZGU+IG9yDQorICAgKiA8Y29k
ZT5ET19OT1RISU5HX09OX0NMT1NFPC9jb2RlPi4NCisgICAqIFRoZSBkZWZhdWx0IGlzIDxjb2Rl
PkhJREVfT05fQ0xPU0U8L2NvZGU+Lg0KKyAgICogV2hlbiA8Y29kZT5FWElUX09OX0NMT1NFPC9j
b2RlPiBpcyBzcGVjaWZpZWQgdGhpcyBtZXRob2QgY2FsbHMNCisgICAqIDxjb2RlPlNlY3VyaXR5
TWFuYWdlci5jaGVja0V4aXQoMCk8L2NvZGU+IHdoaWNoIG1pZ2h0IHRocm93IGENCisgICAqIDxj
b2RlPlNlY3VyaXR5RXhjZXB0aW9uPC9jb2RlPi4gV2hlbiB0aGUgc3BlY2lmaWVkIG9wZXJhdGlv
biBpcw0KKyAgICogbm90IG9uZSBvZiB0aGUgYWJvdmUgYSA8Y29kZT5JbGxlZ2FsQXJndW1lbnRF
eGNlcHRpb248L2NvZGU+IGlzDQorICAgKiB0aHJvd24uDQorICAgKi8NCisgIHB1YmxpYyB2b2lk
IHNldERlZmF1bHRDbG9zZU9wZXJhdGlvbihpbnQgb3BlcmF0aW9uKQ0KKyAgew0KKyAgICBTZWN1
cml0eU1hbmFnZXIgc20gPSBTeXN0ZW0uZ2V0U2VjdXJpdHlNYW5hZ2VyKCk7DQorICAgIGlmIChz
bSAhPSBudWxsICYmIG9wZXJhdGlvbiA9PSBFWElUX09OX0NMT1NFKQ0KKyAgICAgIHNtLmNoZWNr
RXhpdCgwKTsNCisgICAgDQorICAgIGlmIChvcGVyYXRpb24gIT0gRVhJVF9PTl9DTE9TRSAmJiBv
cGVyYXRpb24gIT0gRElTUE9TRV9PTl9DTE9TRQ0KKwkmJiBvcGVyYXRpb24gIT0gSElERV9PTl9D
TE9TRSAmJiBvcGVyYXRpb24gIT0gRE9fTk9USElOR19PTl9DTE9TRSkNCisgICAgICB0aHJvdyBu
ZXcgSWxsZWdhbEFyZ3VtZW50RXhjZXB0aW9uKCJvcGVyYXRpb24gPSAiICsgb3BlcmF0aW9uKTsN
CisgICAgDQorICAgIGNsb3NlX2FjdGlvbiA9IG9wZXJhdGlvbjsNCisgIH0NCisgIA0KKyAgcHVi
bGljIGludCBnZXREZWZhdWx0Q2xvc2VPcGVyYXRpb24oKQ0KKyAgeyAgICByZXR1cm4gY2xvc2Vf
YWN0aW9uOyAgIH0NCiANCiAgICAgcHJvdGVjdGVkICBTdHJpbmcgcGFyYW1TdHJpbmcoKQ0KICAg
ICB7ICAgcmV0dXJuICJKRGlhbG9nIjsgICAgIH0NCkluZGV4OiBqYXZheC9zd2luZy9KRnJhbWUu
amF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgv
amF2YXgvc3dpbmcvSkZyYW1lLmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjkNCmRpZmYg
LXUgLXIxLjkgSkZyYW1lLmphdmENCi0tLSBqYXZheC9zd2luZy9KRnJhbWUuamF2YQkxNSBBcHIg
MjAwNCAwOTozNTo1MiAtMDAwMAkxLjkNCisrKyBqYXZheC9zd2luZy9KRnJhbWUuamF2YQkxNSBB
cHIgMjAwNCAxMTozMDo1OCAtMDAwMA0KQEAgLTEsNSArMSw1IEBADQogLyogSkZyYW1lLmphdmEg
LS0NCi0gICBDb3B5cmlnaHQgKEMpIDIwMDIgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMu
DQorICAgQ29weXJpZ2h0IChDKSAyMDAyLCAyMDA0IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwg
SW5jLg0KIA0KIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBDbGFzc3BhdGguDQogDQpAQCAtNTcs
MTMgKzU3LDggQEANCiAgKg0KICAqIEBhdXRob3IgUm9uYWxkIFZlbGRlbWEgKHJ2ZWxkZW1hQGNz
LnZ1Lm5sKQ0KICAqLw0KLXB1YmxpYyBjbGFzcyBKRnJhbWUgZXh0ZW5kcyBGcmFtZQ0KK3B1Ymxp
YyBjbGFzcyBKRnJhbWUgZXh0ZW5kcyBGcmFtZSBpbXBsZW1lbnRzIFdpbmRvd0NvbnN0YW50cw0K
IHsNCi0gICAgcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgSElERV9PTl9DTE9TRSAgICAgICAgPSAw
Ow0KLSAgICBwdWJsaWMgZmluYWwgc3RhdGljIGludCBFWElUX09OX0NMT1NFICAgICAgICA9IDE7
DQotICAgIHB1YmxpYyBmaW5hbCBzdGF0aWMgaW50IERJU1BPU0VfT05fQ0xPU0UgICAgID0gMjsN
Ci0gICAgcHVibGljIGZpbmFsIHN0YXRpYyBpbnQgRE9fTk9USElOR19PTl9DTE9TRSAgPSAzOw0K
LQ0KICAgICBwcm90ZWN0ZWQgIEFjY2Vzc2libGVDb250ZXh0IGFjY2Vzc2libGVDb250ZXh0Ow0K
IA0KICAgICBwcml2YXRlIGludCBjbG9zZV9hY3Rpb24gPSBISURFX09OX0NMT1NFOyAgICANCj==

--=-9jHhrRs/H3fTdVWrIzvY--

--=-87LjYfQIBpaIL/ux9udn
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)

iD8DBQBAfnLAxVhZCJWr9QwRAny9AJ0VrjiCLrJkbouLMjXI0n4oNnB2CwCggbSn
SLNwxYg0EswVfaQOv5HvVpQ=
=PZgo
-----END PGP SIGNATURE-----

--=-87LjYfQIBpaIL/ux9udn--




From MAILER-DAEMON Thu Apr 15 17:01:23 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEDz9-0003x3-EI
	for mharc-commit-classpath@gnu.org; Thu, 15 Apr 2004 17:01:23 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEDz6-0003w4-PD
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 17:01:20 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEDyM-0003Qz-8f
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 17:00:35 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEDvn-0002Sd-Et
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 16:57:55 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BEDvl-0005i9-00; Thu, 15 Apr 2004 22:57:53 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
In-Reply-To: <1082028737.8648.44.camel@elsschot.wildebeest.org>
References: <1082021427.8648.26.camel@elsschot.wildebeest.org>
	<1082028737.8648.44.camel@elsschot.wildebeest.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-8PKZtInLE9Ej+Tt+0uJR"
Message-Id: <1082062673.1986.2.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Thu, 15 Apr 2004 22:57:54 +0200
Cc: java-patches@gcc.gnu.org
Subject: Re: JFrame DefaultCloseOperation CLOSE_ON_EXIT fixlet
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 15 Apr 2004 21:01:21 -0000


--=-8PKZtInLE9Ej+Tt+0uJR
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Thu, 2004-04-15 at 13:32, Mark Wielaard wrote:
> 2004-04-15  Mark Wielaard  <mark@klomp.org>
>                                                                          =
      =20
>         (processWindowEvent): Call System.exit(0) when HIDE_ON_CLOSE set.

Laurent Bardet correctly pointed out that the code does the correct
thing and that this should read:
	(processWindowEvent): Call System.exit(0) when EXIT_ON_CLOSE set.

Fixed.

--=-8PKZtInLE9Ej+Tt+0uJR
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)

iD8DBQBAfvdQxVhZCJWr9QwRAtbhAJ9Huv3rwS7+mhNfgKDiXetmvbwx3QCeI3hF
HCtH+HAH5ZXCMe0glyfu2/c=
=ZWwV
-----END PGP SIGNATURE-----

--=-8PKZtInLE9Ej+Tt+0uJR--




From MAILER-DAEMON Thu Apr 15 17:12:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEE4T-0000nm-To
	for mharc-commit-classpath@gnu.org; Thu, 15 Apr 2004 17:06:53 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEE2L-0007M9-9y
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 17:04:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEE1e-00063z-Lb
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 17:04:05 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEE1b-0005xu-Rl
	for commit-classpath@gnu.org; Thu, 15 Apr 2004 17:03:56 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BEE1Y-0005nZ-00; Thu, 15 Apr 2004 23:03:52 +0200
From: Mark Wielaard <mark@klomp.org>
To: Archie Cobbs <archie@dellroad.org>
In-Reply-To: <200404061346.i36DkRdh019920@arch20m.dellroad.org>
References: <200404061346.i36DkRdh019920@arch20m.dellroad.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-klJW0xPzmg9EhotYadQP"
Message-Id: <1082063032.1986.7.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Thu, 15 Apr 2004 23:03:52 +0200
Cc: commit-classpath@gnu.org, mauve-discuss@sources.redhat.com
Subject: Re: Mauve patch
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 15 Apr 2004 21:06:47 -0000


--=-klJW0xPzmg9EhotYadQP
Content-Type: multipart/mixed; boundary="=-rDHGVCNHLr2352Tkvwh4"


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

Hi,

On Tue, 2004-04-06 at 15:46, Archie Cobbs wrote:
> This patch doesn't guarantee anything, and in general it's impossible
> to make this test "correct" because the spec allows finalization and
> reference enqueuing to happen after arbitrarily long delays.
>=20
> For example, a JVM that *never* finalizes is still within the spec
> (it would probably throw OutOfMemoryError's more readily though).
>=20
> This patch simply makes the test "correct" for JC (and possibly
> some other VM(s) out there). Since there's no way to *ensure* the
> finalizer and reference enqueing thread(s) have run, we just try
> to give them every opportunity to do so before declaring that their
> work should be done.

I committed it to mauve as follows since it doesn't break things for
others and might actually help.

2004-04-15  Archie Cobbs  <archie@dellroad.org>

       * gnu/testlet/java/lang/ref/PhantomReference/phantom.java: Give the
       runtime some more hints (Thread.yield/System.gc) that it should
       really garbage collect.

But a "non-portable" section in Mauve is also a good idea. It is just
more work :)

Cheers,

Mark


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

SW5kZXg6IGdudS90ZXN0bGV0L2phdmEvbGFuZy9yZWYvUGhhbnRvbVJlZmVyZW5jZS9waGFudG9t
LmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL21hdXZlL21hdXZlL2dudS90ZXN0bGV0
L2phdmEvbGFuZy9yZWYvUGhhbnRvbVJlZmVyZW5jZS9waGFudG9tLmphdmEsdg0KcmV0cmlldmlu
ZyByZXZpc2lvbiAxLjENCmRpZmYgLXUgLXIxLjEgcGhhbnRvbS5qYXZhDQotLS0gZ251L3Rlc3Rs
ZXQvamF2YS9sYW5nL3JlZi9QaGFudG9tUmVmZXJlbmNlL3BoYW50b20uamF2YQkyNyBTZXAgMjAw
MSAxNTo0NDowOSAtMDAwMAkxLjENCisrKyBnbnUvdGVzdGxldC9qYXZhL2xhbmcvcmVmL1BoYW50
b21SZWZlcmVuY2UvcGhhbnRvbS5qYXZhCTE1IEFwciAyMDA0IDIwOjE4OjM0IC0wMDAwDQpAQCAt
NTQsNiArNTQsOSBAQA0KICAgICBwaGFudG9tIHR3dCA9IG5ldyBwaGFudG9tICgpOw0KICAgICBQ
aGFudG9tUmVmZXJlbmNlIHdyID0gZ2VuUmVmIChxLCB0d3QpOw0KIA0KKyAgICAvLyBHaXZlIHRo
ZSBydW50aW1lIHNvbWUgaGludHMgdGhhdCBpdCBzaG91bGQgcmVhbGx5IGdhcmJhZ2UgY29sbGVj
dC4NCisgICAgU3lzdGVtLmdjICgpOw0KKyAgICBTeXN0ZW0ueWllbGQgKCk7DQogICAgIFN5c3Rl
bS5nYyAoKTsNCiANCiAgICAgUmVmZXJlbmNlIHIgPSBxLnBvbGwgKCk7DQo=

--=-rDHGVCNHLr2352Tkvwh4--

--=-klJW0xPzmg9EhotYadQP
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)

iD8DBQBAfvi3xVhZCJWr9QwRAoPvAJ9fgGDhNEbsMs/+DTZulgS/6yu0lgCeIevi
PVKeC9SJdLYdUQMMUTzSo3s=
=WyyJ
-----END PGP SIGNATURE-----

--=-klJW0xPzmg9EhotYadQP--




From MAILER-DAEMON Fri Apr 16 00:05:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEKaM-0000Bt-Tx
	for mharc-commit-classpath@gnu.org; Fri, 16 Apr 2004 00:04:14 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEKZM-0007nD-Pj
	for commit-classpath@gnu.org; Fri, 16 Apr 2004 00:03:12 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEKYC-00069l-OZ
	for commit-classpath@gnu.org; Fri, 16 Apr 2004 00:02:33 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEKYB-00068T-R3
	for commit-classpath@gnu.org; Fri, 16 Apr 2004 00:01:59 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 96ECC62345
	for <commit-classpath@gnu.org>; Fri, 16 Apr 2004 04:01:58 +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 12944-02 for <commit-classpath@gnu.org>;
	Fri, 16 Apr 2004 04:01:57 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-72-176.adsl.solnet.ch
	[212.41.72.176])
	by mail01.solnet.ch (Postfix) with ESMTP id 8192F62338
	for <commit-classpath@gnu.org>; Fri, 16 Apr 2004 04:01:57 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 4D6AEB9D29; Fri, 16 Apr 2004 05:59:57 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040416035957.4D6AEB9D29@reali.dnsalias.net>
Date: Fri, 16 Apr 2004 05:59:57 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040416 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 16 Apr 2004 04:04:12 -0000




From MAILER-DAEMON Fri Apr 16 10:39:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEUUy-0003kY-Mv
	for mharc-commit-classpath@gnu.org; Fri, 16 Apr 2004 10:39:20 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEUUm-0003eP-OT
	for commit-classpath@gnu.org; Fri, 16 Apr 2004 10:39:08 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEUUD-0003Lr-7o
	for commit-classpath@gnu.org; Fri, 16 Apr 2004 10:39:04 -0400
Received: from [213.228.0.44] (helo=postfix3-1.free.fr)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEUKJ-0007jv-KZ
	for commit-classpath@gnu.org; Fri, 16 Apr 2004 10:28:19 -0400
Received: from kaffe.org (cachan-3-82-66-125-112.fbx.proxad.net
	[82.66.125.112])
	by postfix3-1.free.fr (Postfix) with ESMTP id DA19AC4143
	for <commit-classpath@gnu.org>; Fri, 16 Apr 2004 16:28:10 +0200 (CEST)
Message-ID: <407FED5A.2090805@kaffe.org>
Date: Fri, 16 Apr 2004 16:27:38 +0200
From: Guilhem Lavaux <guilhem@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030630
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath@gnu.org
X-Enigmail-Version: 0.76.1.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="------------enig749F65E959F391DC820D86E9"
Subject: FYI: java.io.FileOutputStream
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 16 Apr 2004 14:39:12 -0000

This is an OpenPGP/MIME signed message (RFC 2440 and 3156)
--------------enig749F65E959F391DC820D86E9
Content-Type: multipart/mixed; boundary="------------040201070309020906030103"

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

Hi,

We have been reported by Nektarios Papadopoulos 
<npapadop@inaccessnetworks.com> a misbehaviour in 
java.io.FileOutputStream. It should also check whether the given is 
directory.

I've slightly reorganized the constructor to fix that.

ChangeLog entry:

2004-04-16  Guilhem Lavaux <guilhem@kaffe.org>

	* java/io/FileOutputStream.java
	(FileOutputStream) Reorganized constructors. Constructors now
	check whether the given path is directory.

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

Index: java/io/FileOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/FileOutputStream.java,v
retrieving revision 1.29
diff -u -r1.29 FileOutputStream.java
--- java/io/FileOutputStream.java	8 Apr 2004 20:04:12 -0000	1.29
+++ java/io/FileOutputStream.java	16 Apr 2004 14:27:02 -0000
@@ -81,13 +81,7 @@
   public FileOutputStream (String path, boolean append)
     throws SecurityException, FileNotFoundException
   {
-    SecurityManager s = System.getSecurityManager();
-    if (s != null)
-      s.checkWrite(path);
-    ch = new FileChannelImpl (path, (append
-				     ? FileChannelImpl.WRITE
-				     | FileChannelImpl.APPEND
-				     : FileChannelImpl.WRITE));
+    this (new File(path), append);
   }
 
   /**
@@ -130,7 +124,7 @@
   public FileOutputStream (File file)
     throws SecurityException, FileNotFoundException
   {
-    this (file.getPath(), false);
+    this (file, false);
   }
 
   /**
@@ -156,7 +150,17 @@
   public FileOutputStream (File file, boolean append)
     throws FileNotFoundException
   {
-    this (file.getPath(), append);
+    SecurityManager s = System.getSecurityManager();
+    if (s != null)
+      s.checkWrite(path);
+
+    if (file.isDirectory())
+      throw new FileNotFoundException(file.getPath() + " is a directory");
+
+   ch = new FileChannelImpl (file.getPath(), (append
+				     ? FileChannelImpl.WRITE
+				     | FileChannelImpl.APPEND
+				     : FileChannelImpl.WRITE));
   }
 
   /**

--------------040201070309020906030103--

--------------enig749F65E959F391DC820D86E9
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFAf+16WRk4qbNiTwgRAjb2AJ461e8O67I9fK/+gCUKCikF1FYLRwCfdEuD
EbP5/iMYhcpYAHR2/A1Jhbw=
=j0/f
-----END PGP SIGNATURE-----

--------------enig749F65E959F391DC820D86E9--




From MAILER-DAEMON Sat Apr 17 00:02:25 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEh29-0007t9-9M
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 00:02:25 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEh26-0007oS-FI
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 00:02:22 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEh1Z-00078M-IJ
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 00:02:20 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEh1Z-00076r-36
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 00:01:49 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 377D3622BE
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 04:01: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 01770-05 for <commit-classpath@gnu.org>;
	Sat, 17 Apr 2004 04:01:46 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-72-176.adsl.solnet.ch
	[212.41.72.176])
	by mail01.solnet.ch (Postfix) with ESMTP id B1A73622E9
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 04:01:45 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 8BD53BA034; Sat, 17 Apr 2004 05:59:44 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040417035944.8BD53BA034@reali.dnsalias.net>
Date: Sat, 17 Apr 2004 05:59:44 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040417 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 04:02:23 -0000




From MAILER-DAEMON Sat Apr 17 11:51:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEs69-0003En-B1
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 11:51:17 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEs63-00038s-Gk
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 11:51:11 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEs5R-0002fR-58
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 11:51:05 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEs5Q-0002ee-DE
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 11:50:32 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-130.ewetel.net
	[80.228.94.130])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3HFoNnV016742;
	Sat, 17 Apr 2004 17:50:23 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BEs5I-0001VR-00; Sat, 17 Apr 2004 17:50:24 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 17 Apr 2004 17:50:02 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_qIVgAZEc7sBJXdB"
Message-Id: <200404171750.02879.konqueror@gmx.de>
X-CheckCompat: OK
Cc: graydon@redhat.com
Subject: Patch: AWT javadoc fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 15:51:14 -0000


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

Hi list,


I commited the attached patch to fix HTML tags in javadocs in java.awt 
and java.beans.


Michael


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

	* java/awt/AWTPermission.java,
	java/awt/Component.java,
	java/awt/ComponentOrientation.java,
	java/awt/Dialog.java,
	java/awt/FontMetrics.java,
	java/awt/datatransfer/DataFlavor.java,
	java/beans/Introspector.java,
	java/beans/PropertyEditor.java,
	java/beans/PropertyEditorManager.java,
	java/beans/beancontext/BeanContextServiceProvider.java:
	Fixed HTML tags in javadocs.


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

Index: java/awt/AWTPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/AWTPermission.java,v
retrieving revision 1.3
diff -u -r1.3 AWTPermission.java
--- java/awt/AWTPermission.java	18 Mar 2002 22:40:25 -0000	1.3
+++ java/awt/AWTPermission.java	17 Apr 2004 15:46:23 -0000
@@ -79,7 +79,7 @@
  * <tr>
  *   <td><code>fullScreenExclusive</code></td>
  *   <td>enter full-screen exclusive mode</td>
- *   <td>malicious code could masquerade as a trusted program</td><tr>
+ *   <td>malicious code could masquerade as a trusted program</td></tr>
  * </table>
  *
  * @author Tom Tromey <tromey@redhat.com>
Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.30
diff -u -r1.30 Component.java
--- java/awt/Component.java	19 Mar 2004 21:22:24 -0000	1.30
+++ java/awt/Component.java	17 Apr 2004 15:46:24 -0000
@@ -105,7 +105,7 @@
  * in inner classes, rather than using this object itself as the listener, if
  * external objects do not need to save the state of this object.
  *
- * <p><pre>
+ * <pre>
  * import java.awt.*;
  * import java.awt.event.*;
  * import java.io.Serializable;
@@ -127,6 +127,7 @@
  *     aButton.addActionListener(new MyActionListener());
  *   }
  * }
+ * </pre>
  *
  * <p>Status: Incomplete. The event dispatch mechanism is implemented. All
  * other methods defined in the J2SE 1.3 API javadoc exist, but are mostly
Index: java/awt/ComponentOrientation.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/ComponentOrientation.java,v
retrieving revision 1.3
diff -u -r1.3 ComponentOrientation.java
--- java/awt/ComponentOrientation.java	6 May 2002 02:43:17 -0000	1.3
+++ java/awt/ComponentOrientation.java	17 Apr 2004 15:46:24 -0000
@@ -171,13 +171,15 @@
   }
 
   /**
-   * Gets an orientation from a resource bundle. This tries the following:<ol>
+   * Gets an orientation from a resource bundle. This tries the following:
+   *
+   * <ul>
    * <li>Use the key "Orientation" to find an instance of ComponentOrientation
    * in the bundle.</li>
    * <li>Get the locale of the resource bundle, and get the orientation of
    * that locale.</li>
-   * <li>Give up and get the orientation of the default locale.<li>
-   * <ol>
+   * <li>Give up and get the orientation of the default locale.</li>
+   * </ul>
    *
    * @param bdl the bundle to use
    * @return the orientation
Index: java/awt/Dialog.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Dialog.java,v
retrieving revision 1.17
diff -u -r1.17 Dialog.java
--- java/awt/Dialog.java	26 Jan 2004 15:43:41 -0000	1.17
+++ java/awt/Dialog.java	17 Apr 2004 15:46:24 -0000
@@ -123,8 +123,8 @@
   * parent and modality, that is resizable and which has no title.
   *
   * @param parent The parent frame of this dialog box.
-  * @param modal <true> if this dialog box is modal, <code>false</code>
-  * otherwise.
+  * @param modal <code>true</code> if this dialog box is modal,
+  * <code>false</code> otherwise.
   *
   * @exception IllegalArgumentException If the owner's GraphicsConfiguration
   * is not from a screen device, or if owner is null. This exception is always
@@ -164,8 +164,8 @@
   *
   * @param parent The parent frame of this dialog box.
   * @param title The title string for this dialog box.
-  * @param modal <true> if this dialog box is modal, <code>false</code>
-  * otherwise.
+  * @param modal <code>true</code> if this dialog box is modal,
+  * <code>false</code> otherwise.
   *
   * @exception IllegalArgumentException If owner is null or
   * GraphicsEnvironment.isHeadless() returns true.
@@ -183,8 +183,8 @@
  *
  * @param parent The parent frame of this dialog box.
  * @param title The title string for this dialog box.
- * @param modal <true> if this dialog box is modal, <code>false</code>
- * otherwise.
+ * @param modal <code>true</code> if this dialog box is modal,
+ * <code>false</code> otherwise.
  * @param gc The <code>GraphicsConfiguration</code> object to use.
  *
  * @exception IllegalArgumentException If owner is null, the
Index: java/awt/FontMetrics.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/FontMetrics.java,v
retrieving revision 1.7
diff -u -r1.7 FontMetrics.java
--- java/awt/FontMetrics.java	22 Mar 2004 13:07:12 -0000	1.7
+++ java/awt/FontMetrics.java	17 Apr 2004 15:46:25 -0000
@@ -47,12 +47,12 @@
   * least the following methods:
   * <p>
   * <ul>
-  * <li>getAscent
-  * <li>getDescent
-  * <li>getLeading()
-  * <li>getMaxAdvance()
-  * <li>charWidth(char)
-  * <li>charsWidth(char[], int, int)
+  * <li>getAscent()</li>
+  * <li>getDescent()</li>
+  * <li>getLeading()</li>
+  * <li>getMaxAdvance()</li>
+  * <li>charWidth(char)</li>
+  * <li>charsWidth(char[], int, int)</li>
   * </ul>
   *
   * @author Aaron M. Renn (arenn@urbanophile.com)
Index: java/awt/datatransfer/DataFlavor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/DataFlavor.java,v
retrieving revision 1.19
diff -u -r1.19 DataFlavor.java
--- java/awt/datatransfer/DataFlavor.java	6 Feb 2004 08:59:01 -0000	1.19
+++ java/awt/datatransfer/DataFlavor.java	17 Apr 2004 15:46:25 -0000
@@ -270,7 +270,7 @@
 /**
  * Initializes a new instance of <code>DataFlavor</code> with the
  * specified MIME type and description.  If the MIME type has a
- * "class=<rep class>" parameter then the representation class will
+ * "class=&lt;rep class&gt;" parameter then the representation class will
  * be the class name specified. Otherwise the class defaults to
  * <code>java.io.InputStream</code>. If the human readable name
  * is not specified (<code>null</code>) then the human readable name
@@ -319,7 +319,7 @@
 /**
  * Initializes a new instance of <code>DataFlavor</code> with the
  * specified MIME type and description.  If the MIME type has a
- * "class=<rep class>" parameter then the representation class will
+ * "class=&lt;rep class&gt;" parameter then the representation class will
  * be the class name specified. Otherwise the class defaults to
  * <code>java.io.InputStream</code>. If the human readable name
  * is not specified (<code>null</code>) then the human readable name
@@ -709,10 +709,10 @@
  * are met:
  * <p>
  * <ul>
- * <li>The object is not <code>null</code>.
- * <li>The object is an instance of <code>DataFlavor</code>.
+ * <li>The object is not <code>null</code>.</li>
+ * <li>The object is an instance of <code>DataFlavor</code>.</li>
  * <li>The object's MIME type and representation class are equal to
- * this object's.
+ * this object's.</li>
  * </ul>
  *
  * @param obj The <code>Object</code> to test against.
Index: java/beans/Introspector.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/Introspector.java,v
retrieving revision 1.16
diff -u -r1.16 Introspector.java
--- java/beans/Introspector.java	26 Dec 2003 19:39:54 -0000	1.16
+++ java/beans/Introspector.java	17 Apr 2004 15:46:25 -0000
@@ -65,7 +65,7 @@
  * When you call getBeanInfo(class c), the Introspector
  * first searches for BeanInfo class to see if you
  * provided any explicit information.  It searches for a
- * class named <bean class name>BeanInfo in different
+ * class named &lt;bean class name&gt;BeanInfo in different
  * packages, first searching the bean class's package
  * and then moving on to search the beanInfoSearchPath.<P>
  *
@@ -113,14 +113,14 @@
  *     type &lt;type&gt;.  There may also be a
  *     <CODE>public &lt;type&gt;[] getXXX()</CODE> and a
  *     <CODE>public void setXXX(&lt;type&gt;)</CODE>
- *     method as well.</CODE></LI>
+ *     method as well.</LI>
  * <LI>If there is a
  *     <CODE>public void setXXX(int,&lt;type&gt;)</CODE>
  *     method, then it is a write-only indexed property of
  *     type &lt;type&gt;.  There may also be a
  *     <CODE>public &lt;type&gt;[] getXXX()</CODE> and a
  *     <CODE>public void setXXX(&lt;type&gt;)</CODE>
- *     method as well.</CODE></LI>
+ *     method as well.</LI>
  * <LI>If there is a
  *     <CODE>public &lt;type&gt; getXXX()</CODE> method,
  *     then XXX is a read-only property of type
Index: java/beans/PropertyEditor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/PropertyEditor.java,v
retrieving revision 1.5
diff -u -r1.5 PropertyEditor.java
--- java/beans/PropertyEditor.java	12 Oct 2003 15:29:25 -0000	1.5
+++ java/beans/PropertyEditor.java	17 Apr 2004 15:46:25 -0000
@@ -77,7 +77,7 @@
  **       have isPaintable() return true and implement the paintValue() method.
  **       This method does not determine in any way how the value is edited;
  **       merely how it is displayed.</LI>
- **   <LU>Let the caller of the PropertyEditor give the user a text input.  Do
+ **   <LI>Let the caller of the PropertyEditor give the user a text input.  Do
  **       this by returning a non-null String from getAsText().  If you support
  **       text input, you *must* support setAsText().</LI>
  **   <LI>Give the caller a set of possible values, such as "true"/"false", that
Index: java/beans/PropertyEditorManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/PropertyEditorManager.java,v
retrieving revision 1.8
diff -u -r1.8 PropertyEditorManager.java
--- java/beans/PropertyEditorManager.java	13 Jul 2003 23:34:19 -0000	1.8
+++ java/beans/PropertyEditorManager.java	17 Apr 2004 15:46:25 -0000
@@ -60,19 +60,20 @@
  * already registered; if it is, that property editor is
  * used.  Next it takes the type's classname and appends
  * "Editor" to it, and searches first in the class's
- * package and then in the property editor search path.<P>
+ * package and then in the property editor search path.
  *
- * Default property editors are provided for:<P>
- * <OL>
- * <LI>boolean, byte, short, int, long, float, and double</LI>
- * <LI>java.lang.String</LI>
- * <LI>java.awt.Color</LI>
- * <LI>java.awt.Font</LI>
- * <OL>
+ * <p>Default property editors are provided for:</p>
+ * 
+ * <ol>
+ * <li>boolean, byte, short, int, long, float, and double</li>
+ * <li>java.lang.String</li>
+ * <li>java.awt.Color</li>
+ * <li>java.awt.Font</li>
+ * </ol>
  *
- * <STRONG>Spec Suggestion:</STRONG> Perhaps an editor for
+ * <p><strong>Spec Suggestion:</strong> Perhaps an editor for
  * Filename or something like it should be provided.  As well
- * as char.
+ * as char.</p>
  *
  * @author John Keiser
  * @since 1.1
Index: java/beans/beancontext/BeanContextServiceProvider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/beans/beancontext/BeanContextServiceProvider.java,v
retrieving revision 1.4
diff -u -r1.4 BeanContextServiceProvider.java
--- java/beans/beancontext/BeanContextServiceProvider.java	12 Oct 2003 15:29:25 -0000	1.4
+++ java/beans/beancontext/BeanContextServiceProvider.java	17 Apr 2004 15:46:25 -0000
@@ -62,14 +62,12 @@
 public interface BeanContextServiceProvider {
 	/**
 	 * Get a service.
-	 * Called from <code>BeanContextServices.getService().
-	 * <P>
+	 * Called from <code>BeanContextServices.getService()</code>.
 	 *
-	 * If the requested service class is not available, or if this
+	 * <p>If the requested service class is not available, or if this
 	 * <code>BeanContextServiceProvider</code> chooses not honor the
 	 * request for some reason, then this method will return
-	 * <code>null</code>.
-	 * <P>
+	 * <code>null</code>.</p>
 	 *
 	 * This method may throw unchecked exceptions, so watch out.
 	 *

--Boundary-00=_qIVgAZEc7sBJXdB--




From MAILER-DAEMON Sat Apr 17 13:17:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEtQj-00048B-Gm
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 13:16:37 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEtQJ-0003lJ-8d
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 13:16:11 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEtOn-0002RY-Bn
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 13:15:09 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEtLz-0001LG-9F
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 13:11:43 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-130.ewetel.net
	[80.228.94.130])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i3HHBYMo006209
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 19:11:34 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BEtLr-0001kW-00
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 19:11:35 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 17 Apr 2004 19:11:13 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_xUWgAjC9zW+uF3i"
Message-Id: <200404171911.13680.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.lang: javadoc fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 17:16:21 -0000


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

Hi list,


I just commited the attached patch to fix javadocs all over java.lang.


Michael


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

	* java/lang/Byte.java
	(parseByte): Fixed <code> tag in javadoc.
	* java/lang/CharSequence.java
	(subSequence): Likewise.
	* java/lang/Class.java
	(forName): Added @return tag.
	(getConstructor): Fixed argument name.
	(getDeclaredConstructor): Likewise.
	(getDeclaredMethod): Fixed argument name and HTML tag in javadoc.
	(getMethod): Likewise.
	(getName): Added missing </pre> tag.
	* java/lang/ClassLoader.java
	(getParent): Added @return tag.
	* java/lang/Double.java
	(parseDouble): Fixed argument name.
	* java/lang/Float.java
	(parseFloat): Likewise.
	* java/lang/Integer.java
	(parseInt): Fixed javadoc.
	(getInteger): Likewise.
	(decode): Likewise.
	* java/lang/Long.java
	(parseLong): Likewise.
	(decode): Likewise.
	(getLong): Likewise.
	* java/lang/Number.java
	(digits): Added comma to array definition.
	* java/lang/Object.java
	(equals): Fixed HTML tag.
	* java/lang/Package.java
	(isCompatibleWith): Added @return tag.
	* java/lang/Runtime.java
	(loadLibrary): Fixed @param tag.
	* java/lang/SecurityManager.java:
	Fixed javadocs all over.
	* java/lang/String.java
	(regionMatches): Fixed @param tag.
	(startsWith): Likewise.
	(substring): Likewise.
	* java/lang/StringBuffer.java
	(append): Likewise.
	* java/lang/ThreadGroup.java
	(parentOf): Use group as argument name.
	(uncaughtException): Fixed @param tag.
	* java/lang/Throwable.java
	(printStackTrace): Likewise.


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

Index: java/lang/Byte.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Byte.java,v
retrieving revision 1.21
diff -u -r1.21 Byte.java
--- java/lang/Byte.java	25 Feb 2002 20:02:58 -0000	1.21
+++ java/lang/Byte.java	17 Apr 2004 17:07:31 -0000
@@ -147,7 +147,7 @@
    *
    * @param s the <code>String</code> to convert
    * @param radix the radix (base) to use in the conversion
-   * @return the <code>String</code> argument converted to </code>byte</code>
+   * @return the <code>String</code> argument converted to <code>byte</code>
    * @throws NumberFormatException if <code>s</code> cannot be parsed as a
    *         <code>byte</code>
    */
Index: java/lang/CharSequence.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/CharSequence.java,v
retrieving revision 1.4
diff -u -r1.4 CharSequence.java
--- java/lang/CharSequence.java	9 Mar 2002 04:01:12 -0000	1.4
+++ java/lang/CharSequence.java	17 Apr 2004 17:07:31 -0000
@@ -78,7 +78,7 @@
   int length();
 
   /**
-   * Returns a new <code>CharSequence</char> of the indicated range.
+   * Returns a new <code>CharSequence</code> of the indicated range.
    *
    * @param begin the start index (inclusive)
    * @param end the end index (exclusive)
Index: java/lang/Class.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v
retrieving revision 1.17
diff -u -r1.17 Class.java
--- java/lang/Class.java	14 Mar 2004 14:17:55 -0000	1.17
+++ java/lang/Class.java	17 Apr 2004 17:07:32 -0000
@@ -154,6 +154,9 @@
    * @param initialize whether or not to initialize the class at this time
    * @param classloader the classloader to use to find the class; null means
    *        to use the bootstrap class loader
+   *
+   * @return the class object for the given class
+   *
    * @throws ClassNotFoundException if the class was not found by the
    *         classloader
    * @throws LinkageError if linking the class fails
@@ -296,14 +299,14 @@
    * @see #getConstructors()
    * @since 1.1
    */
-  public Constructor getConstructor(Class[] args) throws NoSuchMethodException
+  public Constructor getConstructor(Class[] types) throws NoSuchMethodException
   {
     memberAccessCheck(Member.PUBLIC);
     Constructor[] constructors = getDeclaredConstructors(true);
     for (int i = 0; i < constructors.length; i++)
       {
 	Constructor constructor = constructors[i];
-	if (matchParameters(args, constructor.getParameterTypes()))
+	if (matchParameters(types, constructor.getParameterTypes()))
 	  return constructor;
       }
     throw new NoSuchMethodException();
@@ -341,7 +344,7 @@
    * @see #getDeclaredConstructors()
    * @since 1.1
    */
-  public Constructor getDeclaredConstructor(Class[] args)
+  public Constructor getDeclaredConstructor(Class[] types)
     throws NoSuchMethodException
   {
     memberAccessCheck(Member.DECLARED);
@@ -349,7 +352,7 @@
     for (int i = 0; i < constructors.length; i++)
       {
 	Constructor constructor = constructors[i];
-	if (matchParameters(args, constructor.getParameterTypes()))
+	if (matchParameters(types, constructor.getParameterTypes()))
 	  return constructor;
       }
     throw new NoSuchMethodException();
@@ -452,8 +455,8 @@
   /**
    * Get a method declared in this class, where name is its simple name. The
    * implicit methods of Object are not available from arrays or interfaces.
-   * Constructors (named "<init>" in the class file) and class initializers
-   * (name "<clinit>") are not available.  The Virtual Machine allows
+   * Constructors (named "&lt;init&gt;" in the class file) and class initializers
+   * (name "&lt;clinit&gt;") are not available.  The Virtual Machine allows
    * multiple methods with the same signature but differing return types; in
    * such a case the most specific return types are favored, then the final
    * choice is arbitrary. If the method takes no argument, an array of zero
@@ -470,11 +473,11 @@
    * @see #getDeclaredMethods()
    * @since 1.1
    */
-  public Method getDeclaredMethod(String methodName, Class[] args)
+  public Method getDeclaredMethod(String methodName, Class[] types)
     throws NoSuchMethodException
   {
     memberAccessCheck(Member.DECLARED);
-    Method match = matchMethod(getDeclaredMethods(false), methodName, args);
+    Method match = matchMethod(getDeclaredMethods(false), methodName, types);
     if (match == null)
       throw new NoSuchMethodException(methodName);
     return match;
@@ -656,8 +659,8 @@
   /**
    * Get a public method declared or inherited in this class, where name is
    * its simple name. The implicit methods of Object are not available from
-   * interfaces.  Constructors (named "<init>" in the class file) and class
-   * initializers (name "<clinit>") are not available.  The Virtual
+   * interfaces.  Constructors (named "&lt;init&gt;" in the class file) and class
+   * initializers (name "&lt;clinit&gt;") are not available.  The Virtual
    * Machine allows multiple methods with the same signature but differing
    * return types, and the class can inherit multiple methods of the same
    * return type; in such a case the most specific return types are favored,
@@ -675,11 +678,11 @@
    * @see #getMethods()
    * @since 1.1
    */
-  public Method getMethod(String methodName, Class[] args)
+  public Method getMethod(String methodName, Class[] types)
     throws NoSuchMethodException
   {
     memberAccessCheck(Member.PUBLIC);
-    Method method = internalGetMethod(methodName, args);
+    Method method = internalGetMethod(methodName, types);
     if (method == null)
       throw new NoSuchMethodException(methodName);
     return method;
@@ -853,6 +856,7 @@
    * array type          [<em>element type</em>
    * class or interface, alone: &lt;dotted name&gt;
    * class or interface, as element type: L&lt;dotted name&gt;;
+   * </pre>
    *
    * @return the name of this class
    */
Index: java/lang/ClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/ClassLoader.java,v
retrieving revision 1.29
diff -u -r1.29 ClassLoader.java
--- java/lang/ClassLoader.java	12 Apr 2004 14:32:59 -0000	1.29
+++ java/lang/ClassLoader.java	17 Apr 2004 17:07:32 -0000
@@ -475,6 +475,7 @@
    * <code>null</code>. A security check may be performed on
    * <code>RuntimePermission("getClassLoader")</code>.
    *
+   * @return the parent <code>ClassLoader</code>
    * @throws SecurityException if the security check fails
    * @since 1.2
    */
Index: java/lang/Double.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Double.java,v
retrieving revision 1.33
diff -u -r1.33 Double.java
--- java/lang/Double.java	12 Apr 2004 14:32:59 -0000	1.33
+++ java/lang/Double.java	17 Apr 2004 17:07:33 -0000
@@ -243,7 +243,7 @@
    * @see #NEGATIVE_INFINITY
    * @since 1.2
    */
-  public static native double parseDouble(String s);
+  public static native double parseDouble(String str);
 
   /**
    * Return <code>true</code> if the <code>double</code> has the same
Index: java/lang/Float.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Float.java,v
retrieving revision 1.27
diff -u -r1.27 Float.java
--- java/lang/Float.java	12 Apr 2004 14:32:59 -0000	1.27
+++ java/lang/Float.java	17 Apr 2004 17:07:33 -0000
@@ -240,11 +240,11 @@
    * @see #NEGATIVE_INFINITY
    * @since 1.2
    */
-  public static float parseFloat(String s)
+  public static float parseFloat(String str)
   {
     // XXX Rounding parseDouble() causes some errors greater than 1 ulp from
     // the infinitely precise decimal.
-    return (float) Double.parseDouble(s);
+    return (float) Double.parseDouble(str);
   }
 
   /**
Index: java/lang/Integer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Integer.java,v
retrieving revision 1.28
diff -u -r1.28 Integer.java
--- java/lang/Integer.java	13 Jun 2002 17:28:54 -0000	1.28
+++ java/lang/Integer.java	17 Apr 2004 17:07:33 -0000
@@ -220,9 +220,9 @@
    * within <code>MIN_VALUE</code> to <code>MAX_VALUE</code>, inclusive.
    * Unlike Double.parseDouble, you may not have a leading '+'.
    *
-   * @param s the <code>String</code> to convert
+   * @param str the <code>String</code> to convert
    * @param radix the radix (base) to use in the conversion
-   * @return the <code>String</code> argument converted to </code>int</code>
+   * @return the <code>String</code> argument converted to <code>int</code>
    * @throws NumberFormatException if <code>s</code> cannot be parsed as an
    *         <code>int</code>
    */
@@ -414,7 +414,7 @@
    * interpret the value of the property.
    *
    * @param nm the name of the system property
-   * @param val the default value
+   * @param def the default value
    * @return the value of the system property, or the default
    * @throws SecurityException if accessing the system property is forbidden
    * @see System#getProperty(String)
@@ -461,7 +461,7 @@
    * Finally, the value must be in the range <code>MIN_VALUE</code> to
    * <code>MAX_VALUE</code>, or an exception is thrown.
    *
-   * @param s the <code>String</code> to interpret
+   * @param str the <code>String</code> to interpret
    * @return the value of the String as an <code>Integer</code>
    * @throws NumberFormatException if <code>s</code> cannot be parsed as a
    *         <code>int</code>
Index: java/lang/Long.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Long.java,v
retrieving revision 1.18
diff -u -r1.18 Long.java
--- java/lang/Long.java	12 Apr 2004 14:32:59 -0000	1.18
+++ java/lang/Long.java	17 Apr 2004 17:07:33 -0000
@@ -223,7 +223,7 @@
    * 'L' as the last character is only valid in radices 22 or greater, where
    * it is a digit and not a type indicator.
    *
-   * @param s the <code>String</code> to convert
+   * @param str the <code>String</code> to convert
    * @param radix the radix (base) to use in the conversion
    * @return the <code>String</code> argument converted to <code>long</code>
    * @throws NumberFormatException if <code>s</code> cannot be parsed as a
@@ -306,7 +306,7 @@
    * <code>MAX_VALUE</code>, or an exception is thrown. Note that you cannot
    * use a trailing 'l' or 'L', unlike in Java source code.
    *
-   * @param s the <code>String</code> to interpret
+   * @param str the <code>String</code> to interpret
    * @return the value of the String as a <code>Long</code>
    * @throws NumberFormatException if <code>s</code> cannot be parsed as a
    *         <code>long</code>
@@ -455,7 +455,7 @@
    * interpret the value of the property.
    *
    * @param nm the name of the system property
-   * @param val the default value
+   * @param def the default value
    * @return the value of the system property, or the default
    * @throws SecurityException if accessing the system property is forbidden
    * @see System#getProperty(String)
Index: java/lang/Number.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Number.java,v
retrieving revision 1.8
diff -u -r1.8 Number.java
--- java/lang/Number.java	25 Feb 2002 20:02:58 -0000	1.8
+++ java/lang/Number.java	17 Apr 2004 17:07:33 -0000
@@ -69,7 +69,7 @@
     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
     'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
     'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't',
-    'u', 'v', 'w', 'x', 'y', 'z'
+    'u', 'v', 'w', 'x', 'y', 'z',
   };
 
   /**
Index: java/lang/Object.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Object.java,v
retrieving revision 1.16
diff -u -r1.16 Object.java
--- java/lang/Object.java	29 Mar 2004 07:07:26 -0000	1.16
+++ java/lang/Object.java	17 Apr 2004 17:07:33 -0000
@@ -113,7 +113,7 @@
    *     returned on all later invocations.</li>
    * <li><code>a.equals(null)</code> must be false.</li>
    * <li>It must be consistent with hashCode().  That is,
-   *     <code>a.equals(b)<code> must imply
+   *     <code>a.equals(b)</code> must imply
    *     <code>a.hashCode() == b.hashCode()</code>.
    *     The reverse is not true; two objects that are not
    *     equal may have the same hashcode, but that has
Index: java/lang/Package.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Package.java,v
retrieving revision 1.10
diff -u -r1.10 Package.java
--- java/lang/Package.java	16 Aug 2003 08:58:52 -0000	1.10
+++ java/lang/Package.java	17 Apr 2004 17:07:33 -0000
@@ -227,7 +227,10 @@
    * <code>getSpecificationVersion</code>.
    *
    * @param version the (minimal) desired version of the specification
-   * @throws NumberFormatException if either version string is invalid
+   *
+   * @return true if the version is compatible, false otherwise
+   *
+   * @Throws NumberFormatException if either version string is invalid
    * @throws NullPointerException if either version string is null
    */
   public boolean isCompatibleWith(String version)
Index: java/lang/Runtime.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Runtime.java,v
retrieving revision 1.5
diff -u -r1.5 Runtime.java
--- java/lang/Runtime.java	12 Apr 2004 14:32:59 -0000	1.5
+++ java/lang/Runtime.java	17 Apr 2004 17:07:34 -0000
@@ -689,9 +689,11 @@
    * <code>System.mapLibraryName(libname)</code>. There may be a security
    * check, of <code>checkLink</code>.
    *
-   * @param filename the file to load
+   * @param libname the library to load
+   *
    * @throws SecurityException if permission is denied
    * @throws UnsatisfiedLinkError if the library is not found
+   *
    * @see System#mapLibraryName(String)
    * @see ClassLoader#findLibrary(String)
    */
Index: java/lang/SecurityManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/SecurityManager.java,v
retrieving revision 1.17
diff -u -r1.17 SecurityManager.java
--- java/lang/SecurityManager.java	9 Apr 2004 15:02:21 -0000	1.17
+++ java/lang/SecurityManager.java	17 Apr 2004 17:07:34 -0000
@@ -86,7 +86,7 @@
  * // now, in worker thread
  * if (sm != null)
  *   sm.checkPermission(permission, context);
- * <pre>
+ * </pre>
  *
  * <p>Permissions fall into these categories: File, Socket, Net, Security,
  * Runtime, Property, AWT, Reflect, and Serializable. Each of these
@@ -174,13 +174,15 @@
    * Find the ClassLoader of the first non-system class on the execution
    * stack. A non-system class is one whose ClassLoader is not equal to
    * {@link ClassLoader#getSystemClassLoader()} or its ancestors. This
-   * will return null in three cases:<br><nl>
+   * will return null in three cases:
+   *
+   * <ul>
    * <li>All methods on the stack are from system classes</li>
    * <li>All methods on the stack up to the first "privileged" caller, as
    *  created by {@link AccessController.doPrivileged(PrivilegedAction)},
    *  are from system classes</li>
    * <li>A check of <code>java.security.AllPermission</code> succeeds.</li>
-   * </nl>
+   * </ul>
    * 
    * @return the most recent non-system ClassLoader on the execution stack
    * @deprecated use {@link #checkPermission(Permission)} instead
@@ -194,13 +196,15 @@
    * Find the first non-system class on the execution stack. A non-system
    * class is one whose ClassLoader is not equal to
    * {@link ClassLoader#getSystemClassLoader()} or its ancestors. This
-   * will return null in three cases:<br><nl>
+   * will return null in three cases:
+   *
+   * <ul>
    * <li>All methods on the stack are from system classes</li>
    * <li>All methods on the stack up to the first "privileged" caller, as
    *  created by {@link AccessController.doPrivileged(PrivilegedAction)},
    *  are from system classes</li>
    * <li>A check of <code>java.security.AllPermission</code> succeeds.</li>
-   * </nl>
+   * </ul>
    * 
    * @return the most recent non-system Class on the execution stack
    * @deprecated use {@link #checkPermission(Permission)} instead
@@ -231,13 +235,15 @@
    * Get the depth on the execution stack of the most recent non-system class.
    * A non-system class is one whose ClassLoader is not equal to
    * {@link ClassLoader#getSystemClassLoader()} or its ancestors. This
-   * will return -1 in three cases:<br><nl>
+   * will return -1 in three cases:
+   *
+   * <ul>
    * <li>All methods on the stack are from system classes</li>
    * <li>All methods on the stack up to the first "privileged" caller, as
    *  created by {@link AccessController.doPrivileged(PrivilegedAction)},
    *  are from system classes</li>
    * <li>A check of <code>java.security.AllPermission</code> succeeds.</li>
-   * </nl>
+   * </ul>
    * 
    * @return the index of the most recent non-system Class on the stack
    * @deprecated use {@link #checkPermission(Permission)} instead
@@ -365,8 +371,8 @@
    * Check if the current thread is allowed to modify another Thread. This is
    * called by Thread.stop(), suspend(), resume(), interrupt(), destroy(),
    * setPriority(), setName(), and setDaemon(). The default implementation
-   * checks <code>RuntimePermission("modifyThread") on system threads (ie.
-   * threads in ThreadGroup with a null parent), and returns silently on
+   * checks <code>RuntimePermission("modifyThread")</code> on system threads
+   * (ie. threads in ThreadGroup with a null parent), and returns silently on
    * other threads.
    *
    * <p>If you override this, you must do two things. First, call
@@ -398,8 +404,8 @@
    * ThreadGroup.ThreadGroup() (to add this ThreadGroup to a parent),
    * ThreadGroup.stop(), suspend(), resume(), interrupt(), destroy(),
    * setDaemon(), and setMaxPriority(). The default implementation
-   * checks <code>RuntimePermission("modifyThread") on the system group (ie.
-   * the one with a null parent), and returns silently on other groups.
+   * checks <code>RuntimePermission("modifyThread")</code> on the system group
+   * (ie. the one with a null parent), and returns silently on other groups.
    *
    * <p>If you override this, you must do two things. First, call
    * <code>super.checkAccess(t)</code>, to make sure you are not relaxing
@@ -651,13 +657,15 @@
    * @param host the host to connect to
    * @param port the port to connect on
    * @param context the context to determine access for
+   *
    * @throws SecurityException if permission is denied, or if context is
    *         not an AccessControlContext
    * @throws NullPointerException if host is null
+   *
    * @see #getSecurityContext()
    * @see AccessControlContext#checkPermission(Permission)
    */
-  public void checkConnect(String host, int port, Object securityContext)
+  public void checkConnect(String host, int port, Object context)
   {
     // XXX Should be:
     // if (! (context instanceof AccessControlContext))
@@ -776,9 +784,12 @@
    * you override this, call <code>super.checkPropertyAccess</code> rather
    * than throwing an exception.
    *
+   * @param key the key of the property to check
+   *
    * @throws SecurityException if permission is denied
    * @throws NullPointerException if key is null
    * @throws IllegalArgumentException if key is ""
+   *
    * @see System#getProperty(String)
    */
   public void checkPropertyAccess(String key)
Index: java/lang/String.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v
retrieving revision 1.54
diff -u -r1.54 String.java
--- java/lang/String.java	15 Jul 2003 20:39:48 -0000	1.54
+++ java/lang/String.java	17 Apr 2004 17:07:35 -0000
@@ -766,7 +766,7 @@
    *
    * @param toffset index to start comparison at for this String
    * @param other String to compare region to this String
-   * @param oofset index to start comparison at for other
+   * @param ooffset index to start comparison at for other
    * @param len number of characters to compare
    * @return true if regions match (case sensitive)
    * @throws NullPointerException if other is null
@@ -788,7 +788,7 @@
    * @param ignoreCase true if case should be ignored in comparision
    * @param toffset index to start comparison at for this String
    * @param other String to compare region to this String
-   * @param oofset index to start comparison at for other
+   * @param ooffset index to start comparison at for other
    * @param len number of characters to compare
    * @return true if regions match, false otherwise
    * @throws NullPointerException if other is null
@@ -838,7 +838,7 @@
    * Predicate which determines if this String starts with a given prefix.
    * If the prefix is an empty String, true is returned.
    *
-   * @param prefex String to compare
+   * @param prefix String to compare
    * @return true if this String starts with the prefix
    * @throws NullPointerException if prefix is null
    * @see #startsWith(String, int)
@@ -1034,8 +1034,8 @@
    * Creates a substring of this String, starting at a specified index
    * and ending at one character before a specified index.
    *
-   * @param begin index to start substring (inclusive, base 0)
-   * @param end index to end at (exclusive)
+   * @param beginIndex index to start substring (inclusive, base 0)
+   * @param endIndex index to end at (exclusive)
    * @return new String which is a substring of this String
    * @throws IndexOutOfBoundsException if begin &lt; 0 || end &gt; length()
    *         || begin > end (while unspecified, this is a
Index: java/lang/StringBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/StringBuffer.java,v
retrieving revision 1.26
diff -u -r1.26 StringBuffer.java
--- java/lang/StringBuffer.java	27 Feb 2004 11:30:52 -0000	1.26
+++ java/lang/StringBuffer.java	17 Apr 2004 17:07:35 -0000
@@ -396,7 +396,7 @@
   /**
    * Append the <code>char</code> to this <code>StringBuffer</code>.
    *
-   * @param c the <code>char</code> to append
+   * @param ch the <code>char</code> to append
    * @return this <code>StringBuffer</code>
    */
   public synchronized StringBuffer append(char ch)
Index: java/lang/ThreadGroup.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/ThreadGroup.java,v
retrieving revision 1.15
diff -u -r1.15 ThreadGroup.java
--- java/lang/ThreadGroup.java	14 Mar 2004 14:14:06 -0000	1.15
+++ java/lang/ThreadGroup.java	17 Apr 2004 17:07:35 -0000
@@ -238,16 +238,16 @@
    * Check whether this ThreadGroup is an ancestor of the specified
    * ThreadGroup, or if they are the same.
    *
-   * @param g the group to test on
+   * @param group the group to test on
    * @return whether this ThreadGroup is a parent of the specified group
    */
-  public final boolean parentOf(ThreadGroup tg)
+  public final boolean parentOf(ThreadGroup group)
   {
-    while (tg != null)
+    while (group != null)
       {
-        if (tg == this)
+        if (group == this)
           return true;
-        tg = tg.parent;
+        group = group.parent;
       }
     return false;
   }
@@ -535,7 +535,7 @@
    * manner.
    *
    * @param thread the thread that exited
-   * @param exception the uncaught exception
+   * @param t the uncaught throwable
    * @throws NullPointerException if t is null
    * @see ThreadDeath
    * @see System#err
Index: java/lang/Throwable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Throwable.java,v
retrieving revision 1.20
diff -u -r1.20 Throwable.java
--- java/lang/Throwable.java	29 Mar 2004 07:07:26 -0000	1.20
+++ java/lang/Throwable.java	17 Apr 2004 17:07:36 -0000
@@ -392,7 +392,7 @@
    * then a line starting with three spaces and the string "... X more" is
    * printed, where X is the number of remaining stackframes.
    *
-   * @param w the PrintWriter to write the trace to
+   * @param pw the PrintWriter to write the trace to
    * @since 1.1
    */
   public void printStackTrace (PrintWriter pw)

--Boundary-00=_xUWgAjC9zW+uF3i--




From MAILER-DAEMON Sat Apr 17 13:33:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEthH-0004Nw-6V
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 13:33:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEthB-0004Gk-2W
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 13:33:37 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEtge-00042U-Jj
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 13:33:35 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEtge-00042O-4o
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 13:33:04 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-130.ewetel.net
	[80.228.94.130])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i3HHX2Mo018278
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 19:33:02 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BEtgd-0001lB-00
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 19:33:03 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 17 Apr 2004 19:32:41 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_5oWgAVAt8Ji3/34"
Message-Id: <200404171932.41549.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.io - javadoc fixes.
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 17:33:38 -0000


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

Hi list,


and here another javadoc fixing patch.


Michael


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

	* java/io/DataInput.java,
	java/io/File.java,
	java/io/InputStream.java,
	java/io/InputStreamReader.java,
	java/io/PushbackInputStream.java,
	java/io/RandomAccessFile.java:
	Fixed javadocs all over.


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

Index: java/io/DataInput.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/DataInput.java,v
retrieving revision 1.13
diff -u -r1.13 DataInput.java
--- java/io/DataInput.java	8 Apr 2004 15:04:37 -0000	1.13
+++ java/io/DataInput.java	17 Apr 2004 17:24:46 -0000
@@ -380,7 +380,7 @@
    *
    * Note that all characters are encoded in the method that requires the
    * fewest number of bytes with the exception of the character with the
-   * value of <code>\<llll>u0000</code> which is encoded as two bytes.  
+   * value of <code>\&lt;llll&gt;u0000</code> which is encoded as two bytes.  
    * This is a modification of the UTF standard used to prevent C language 
    * style <code>NUL</code> values from appearing in the byte stream.
    * <p>
Index: java/io/File.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/File.java,v
retrieving revision 1.39
diff -u -r1.39 File.java
--- java/io/File.java	3 Mar 2004 21:20:48 -0000	1.39
+++ java/io/File.java	17 Apr 2004 17:24:46 -0000
@@ -207,7 +207,7 @@
    * the path of this <code>File</code> object if an only if that file
    * does not already exist.
    * <p>
-   * A <code>SecurityManager</code>checkWrite</code> check is done prior
+   * A <code>SecurityManager.checkWrite</code> check is done prior
    * to performing this action.
    *
    * @return <code>true</code> if the file was created, <code>false</code> if
Index: java/io/InputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/InputStream.java,v
retrieving revision 1.7
diff -u -r1.7 InputStream.java
--- java/io/InputStream.java	8 Apr 2004 15:04:37 -0000	1.7
+++ java/io/InputStream.java	17 Apr 2004 17:24:46 -0000
@@ -117,7 +117,7 @@
    * point.
    * <p>
    * This method always returns <code>false</code> in this class, but
-   * subclasses can override this method to return </code>true</code>
+   * subclasses can override this method to return <code>true</code>
    * if they support mark/reset functionality.
    *
    * @return <code>true</code> if mark/reset functionality is
Index: java/io/InputStreamReader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/InputStreamReader.java,v
retrieving revision 1.15
diff -u -r1.15 InputStreamReader.java
--- java/io/InputStreamReader.java	8 Apr 2004 15:04:37 -0000	1.15
+++ java/io/InputStreamReader.java	17 Apr 2004 17:24:46 -0000
@@ -57,18 +57,18 @@
  * Here is a list of standard encoding names that may be available:
  * <p>
  * <ul>
- * <li>8859_1 (ISO-8859-1/Latin-1)
- * <li>8859_2 (ISO-8859-2/Latin-2)
- * <li>8859_3 (ISO-8859-3/Latin-3)
- * <li>8859_4 (ISO-8859-4/Latin-4)
- * <li>8859_5 (ISO-8859-5/Latin-5)
- * <li>8859_6 (ISO-8859-6/Latin-6)
- * <li>8859_7 (ISO-8859-7/Latin-7)
- * <li>8859_8 (ISO-8859-8/Latin-8)
- * <li>8859_9 (ISO-8859-9/Latin-9)
- * <li>ASCII (7-bit ASCII)
- * <li>UTF8 (UCS Transformation Format-8)
- * <li>More later
+ * <li>8859_1 (ISO-8859-1/Latin-1)</li>
+ * <li>8859_2 (ISO-8859-2/Latin-2)</li>
+ * <li>8859_3 (ISO-8859-3/Latin-3)</li>
+ * <li>8859_4 (ISO-8859-4/Latin-4)</li>
+ * <li>8859_5 (ISO-8859-5/Latin-5)</li>
+ * <li>8859_6 (ISO-8859-6/Latin-6)</li>
+ * <li>8859_7 (ISO-8859-7/Latin-7)</li>
+ * <li>8859_8 (ISO-8859-8/Latin-8)</li>
+ * <li>8859_9 (ISO-8859-9/Latin-9)</li>
+ * <li>ASCII (7-bit ASCII)</li>
+ * <li>UTF8 (UCS Transformation Format-8)</li>
+ * <li>More later</li>
  * </ul>
  * <p>
  * It is recommended that applications do not use 
Index: java/io/PushbackInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/PushbackInputStream.java,v
retrieving revision 1.12
diff -u -r1.12 PushbackInputStream.java
--- java/io/PushbackInputStream.java	24 May 2003 03:35:11 -0000	1.12
+++ java/io/PushbackInputStream.java	17 Apr 2004 17:24:47 -0000
@@ -263,7 +263,7 @@
   /**
    * This method pushed back bytes from the passed in array into the
    * pushback buffer.  The bytes from <code>b[offset]</code> to
-   * <cdoe>b[offset + len]</code> are pushed in reverse order so that
+   * <code>b[offset + len]</code> are pushed in reverse order so that
    * the next byte read from the stream after this operation will be
    * <code>b[offset]</code> followed by <code>b[offset + 1]</code>,
    * etc.
Index: java/io/RandomAccessFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/RandomAccessFile.java,v
retrieving revision 1.37
diff -u -r1.37 RandomAccessFile.java
--- java/io/RandomAccessFile.java	8 Apr 2004 20:04:12 -0000	1.37
+++ java/io/RandomAccessFile.java	17 Apr 2004 17:24:47 -0000
@@ -318,12 +318,12 @@
    * significant byte first (i.e., "big endian") regardless of the native
    * host byte ordering. 
    * <p>
-   * As an example, if <code>byte1</code> and code{byte2</code> represent 
+   * As an example, if <code>byte1</code> and <code>byte2</code> represent 
    * the first
    * and second byte read from the stream respectively, they will be
    * transformed to a <code>char</code> in the following manner:
    * <p>
-   * <code>(char)(((byte1 & 0xFF) << 8) | (byte2 & 0xFF)</code>
+   * <code>(char)(((byte1 &amp; 0xFF) &lt;&lt; 8) | (byte2 &amp; 0xFF)</code>
    * <p>
    * This method can read a <code>char</code> written by an object 
    * implementing the
@@ -539,12 +539,12 @@
    * significant byte first (i.e., "big endian") regardless of the native
    * host byte ordering. 
    * <p>
-   * As an example, if <code>byte1</code> and code{byte2</code> 
+   * As an example, if <code>byte1</code> and <code>byte2</code> 
    * represent the first
    * and second byte read from the stream respectively, they will be
    * transformed to a <code>short</code> in the following manner:
    * <p>
-   * <code>(short)(((byte1 & 0xFF) << 8) | (byte2 & 0xFF)</code>
+   * <code>(short)(((byte1 &amp; 0xFF) &lt;&lt; 8) | (byte2 &amp; 0xFF)</code>
    * <p>
    * The value returned is in the range of -32768 to 32767.
    * <p>

--Boundary-00=_5oWgAVAt8Ji3/34--




From MAILER-DAEMON Sat Apr 17 14:39:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEuic-0004kX-K2
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 14:39:10 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEuiX-0004hV-Fn
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:39:05 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEui0-0004Uh-G3
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:39:03 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEuhz-0004Ua-RP
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:38:31 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-130.ewetel.net
	[80.228.94.130])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3HIcTnV028732
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 20:38:29 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BEuhz-0001t7-00
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 20:38:31 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 17 Apr 2004 20:38:08 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_QmXgApm7SqZC63d"
Message-Id: <200404172038.08719.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.text - javadoc html fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 18:39:07 -0000


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

Hi list,


I commited the attached patch to fix HTML tags in javadocs all over 
java.text.


Michael


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

	* java/text/ChoiceFormat.java,
	java/text/CollationElementIterator.java,
	java/text/CollationKey.java,
	java/text/Collator.java,
	java/text/DateFormat.java,
	java/text/DateFormatSymbols.java,
	java/text/DecimalFormatSymbols.java,
	java/text/Format.java,
	java/text/ParsePosition.java,
	java/text/RuleBasedCollator.java,
	java/text/SimpleDateFormat.java,
	java/text/StringCharacterIterator.java:
	Fixed HTML tags in javadocs all over


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

Index: java/text/ChoiceFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/ChoiceFormat.java,v
retrieving revision 1.8
diff -u -r1.8 ChoiceFormat.java
--- java/text/ChoiceFormat.java	2 Jul 2002 19:40:35 -0000	1.8
+++ java/text/ChoiceFormat.java	17 Apr 2004 18:36:57 -0000
@@ -45,7 +45,7 @@
  * To use this class, first specify two lists of formats and range terminators.
  * These lists must be arrays of equal length.  The format of index 
  * <code>i</code> will be selected for value <code>X</code> if 
- * <code>terminator[i] <= X < limit[i + 1]</code>.  If the value X is not
+ * <code>terminator[i] &lt;= X &lt; limit[i + 1]</code>.  If the value X is not
  * included in any range, then either the first or last format will be 
  * used depending on whether the value X falls outside the range.
  * <p>
@@ -196,10 +196,10 @@
    * This method tests this object for equality with the specified 
    * object.  This will be true if and only if:
    * <ul>
-   * <li>The specified object is not <code>null</code>.
-   * <li>The specified object is an instance of <code>ChoiceFormat</code>.
+   * <li>The specified object is not <code>null</code>.</li>
+   * <li>The specified object is an instance of <code>ChoiceFormat</code>.</li>
    * <li>The termination ranges and format strings are identical to
-   *     this object's. 
+   *     this object's. </li>
    * </ul>
    *
    * @param obj The object to test for equality against.
Index: java/text/CollationElementIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationElementIterator.java,v
retrieving revision 1.14
diff -u -r1.14 CollationElementIterator.java
--- java/text/CollationElementIterator.java	8 Jan 2004 08:30:34 -0000	1.14
+++ java/text/CollationElementIterator.java	17 Apr 2004 18:36:57 -0000
@@ -187,7 +187,7 @@
 
   /**
    * This method resets the internal position pointer to read from the
-   * beginning of the <code>String again.
+   * beginning of the <code>String</code> again.
    */
   public void reset()
   {
Index: java/text/CollationKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationKey.java,v
retrieving revision 1.11
diff -u -r1.11 CollationKey.java
--- java/text/CollationKey.java	8 Jan 2004 08:30:34 -0000	1.11
+++ java/text/CollationKey.java	17 Apr 2004 18:36:57 -0000
@@ -129,12 +129,12 @@
    * this object.  This will be true if and only if:
    * <p>
    * <ul>
-   * <li>The specified object must not be <code>null</code>
-   * <li>The specified object is an instance of <code>CollationKey</code>.
+   * <li>The specified object must not be <code>null</code></li>
+   * <li>The specified object is an instance of <code>CollationKey</code>.</li>
    * <li>The specified object was created from the same <code>Collator</code>
-   * as this object.
+   * as this object.</li>
    * <li>The specified object has the same source string and bit key as
-   * this object.
+   * this object.</li>
    * </ul>
    *
    * @param obj The <code>Object</code> to test for equality.
Index: java/text/Collator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/Collator.java,v
retrieving revision 1.7
diff -u -r1.7 Collator.java
--- java/text/Collator.java	30 Apr 2002 13:00:00 -0000	1.7
+++ java/text/Collator.java	17 Apr 2004 18:36:57 -0000
@@ -183,10 +183,10 @@
    * object.  This will be true if and only if the following conditions are
    * met:
    * <ul>
-   * <li>The specified object is not <code>null</code>.
-   * <li>The specified object is an instance of <code>Collator</code>.
+   * <li>The specified object is not <code>null</code>.</li>
+   * <li>The specified object is an instance of <code>Collator</code>.</li>
    * <li>The specified object has the same strength and decomposition
-   * settings as this object.
+   * settings as this object.</li>
    * </ul>
    *
    * @param obj The <code>Object</code> to test for equality against
Index: java/text/DateFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/DateFormat.java,v
retrieving revision 1.10
diff -u -r1.10 DateFormat.java
--- java/text/DateFormat.java	2 Dec 2003 09:39:39 -0000	1.10
+++ java/text/DateFormat.java	17 Apr 2004 18:36:57 -0000
@@ -196,9 +196,9 @@
    * object:
    * <P>
    * <ul>
-   * <li>Is not <code>null</code>.
-   * <li>Is an instance of <code>DateFormat</code>.
-   * <li>Has the same numberFormat field value as this object.
+   * <li>Is not <code>null</code>.</li>
+   * <li>Is an instance of <code>DateFormat</code>.</li>
+   * <li>Has the same numberFormat field value as this object.</li>
    * </ul>
    *
    * @param obj The object to test for equality against.
Index: java/text/DateFormatSymbols.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/DateFormatSymbols.java,v
retrieving revision 1.10
diff -u -r1.10 DateFormatSymbols.java
--- java/text/DateFormatSymbols.java	8 Mar 2004 23:23:04 -0000	1.10
+++ java/text/DateFormatSymbols.java	17 Apr 2004 18:36:58 -0000
@@ -1,4 +1,4 @@
-/* DateFormatSymbols.java -- Format over a range of numbers
+/* ChoiceFormat.java -- Format over a range of numbers
    Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -245,11 +245,12 @@
    * the array contains five values:
    * <P>
    * <ul>
-   * <li>0 - The non-localized time zone id string.
-   * <li>1 - The long name of the time zone (standard time).
-   * <li>2 - The short name of the time zone (standard time).
-   * <li>3 - The long name of the time zone (daylight savings time).
-   * <li>4 - the short name of the time zone (daylight savings time).
+   * <li>0 - The non-localized time zone id string.</li>
+   * <li>1 - The long name of the time zone (standard time).</li>
+   * <li>2 - The short name of the time zone (standard time).</li>
+   * <li>3 - The long name of the time zone (daylight savings time).</li>
+   * <li>4 - the short name of the time zone (daylight savings time).</li>
+   * </ul>
    *
    * @return The list of time zone display strings.
    */
@@ -386,11 +387,12 @@
    * the array contains five values:
    * <P>
    * <ul>
-   * <li>0 - The non-localized time zone id string.
-   * <li>1 - The long name of the time zone (standard time).
-   * <li>2 - The short name of the time zone (standard time).
-   * <li>3 - The long name of the time zone (daylight savings time).
-   * <li>4 - the short name of the time zone (daylight savings time).
+   * <li>0 - The non-localized time zone id string.</li>
+   * <li>1 - The long name of the time zone (standard time).</li>
+   * <li>2 - The short name of the time zone (standard time).</li>
+   * <li>3 - The long name of the time zone (daylight savings time).</li>
+   * <li>4 - the short name of the time zone (daylight savings time).</li>
+   * </ul>
    *
    * @return The list of time zone display strings.
    */
@@ -438,15 +440,15 @@
    * This will be true if and only if the specified object:
    * <p>
    * <ul>
-   * <li> Is not <code>null</code>.
-   * <li> Is an instance of <code>DateFormatSymbols</code>.
-   * <li> Contains identical formatting symbols to this object.
+   * <li> Is not <code>null</code>.</li>
+   * <li> Is an instance of <code>DateFormatSymbols</code>.</li>
+   * <li> Contains identical formatting symbols to this object.</li>
    * </ul>
    * 
    * @param obj The <code>Object</code> to test for equality against.
    *
    * @return <code>true</code> if the specified object is equal to this one,
-   * </code>false</code> otherwise.
+   * <code>false</code> otherwise.
    */
   public boolean equals (Object obj)
   {
Index: java/text/DecimalFormatSymbols.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/DecimalFormatSymbols.java,v
retrieving revision 1.8
diff -u -r1.8 DecimalFormatSymbols.java
--- java/text/DecimalFormatSymbols.java	22 Nov 2003 14:55:15 -0000	1.8
+++ java/text/DecimalFormatSymbols.java	17 Apr 2004 18:36:58 -0000
@@ -167,9 +167,9 @@
    * regard to the specified object:
    * <p>
    * <ul>
-   * <li>It is not <code>null</code>.
-   * <li>It is an instance of <code>DecimalFormatSymbols</code>
-   * <li>All of its symbols are identical to the symbols in this object.
+   * <li>It is not <code>null</code>.</li>
+   * <li>It is an instance of <code>DecimalFormatSymbols</code>.</li>
+   * <li>All of its symbols are identical to the symbols in this object.</li>
    * </ul>
    *
    * @return <code>true</code> if the specified object is equal to this
Index: java/text/Format.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/Format.java,v
retrieving revision 1.8
diff -u -r1.8 Format.java
--- java/text/Format.java	26 Dec 2003 22:33:20 -0000	1.8
+++ java/text/Format.java	17 Apr 2004 18:36:58 -0000
@@ -123,7 +123,7 @@
    * This method parses a <code>String</code> and converts the parsed 
    * contents into an <code>Object</code>.
    *
-   * @param str The <code>String to parse.
+   * @param str The <code>String</code> to parse.
    *
    * @return The resulting <code>Object</code>.
    *
Index: java/text/ParsePosition.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/ParsePosition.java,v
retrieving revision 1.5
diff -u -r1.5 ParsePosition.java
--- java/text/ParsePosition.java	22 Jan 2002 22:27:01 -0000	1.5
+++ java/text/ParsePosition.java	17 Apr 2004 18:36:58 -0000
@@ -116,10 +116,10 @@
    * all of the following conditions are met.
    * <p>
    * <ul>
-   * <li>The specified object is not <code>null</code>.
-   * <li>The specified object is an instance of <code>ParsePosition</code>.
+   * <li>The specified object is not <code>null</code>.</li>
+   * <li>The specified object is an instance of <code>ParsePosition</code>.</li>
    * <li>The specified object has the same index and error index as
-   *     this object.  
+   *     this object.</li>
    * </ul>
    *
    * @param obj The <code>Object</code> to test for equality against
Index: java/text/RuleBasedCollator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/RuleBasedCollator.java,v
retrieving revision 1.20
diff -u -r1.20 RuleBasedCollator.java
--- java/text/RuleBasedCollator.java	7 Jan 2004 09:26:34 -0000	1.20
+++ java/text/RuleBasedCollator.java	17 Apr 2004 18:36:58 -0000
@@ -57,9 +57,9 @@
  * <p>
  * Rules take the form of a <code>String</code> with the following syntax
  * <ul>
- * <li> Modifier: '@' 
- * <li> Relation: '&lt;' | ';' | ',' | '=' : <text>
- * <li> Reset: '&amp;' : <text>
+ * <li> Modifier: '@'</li>
+ * <li> Relation: '&lt;' | ';' | ',' | '=' : &lt;text&gt;</li>
+ * <li> Reset: '&amp;' : &lt;text&gt;</li>
  * </ul>
  * The modifier character indicates that accents sort backward as is the
  * case with French.  The modifier applies to all rules <b>after</b>
@@ -70,12 +70,12 @@
  * the following meanings:
  * <ul>
  * <li>'&lt;' - The text argument is greater than the prior term at the primary
- * difference level.
+ * difference level.</li>
  * <li>';' - The text argument is greater than the prior term at the secondary
- * difference level.
+ * difference level.</li>
  * <li>',' - The text argument is greater than the prior term at the tertiary
- * difference level.
- * <li>'=' - The text argument is equal to the prior term
+ * difference level.</li>
+ * <li>'=' - The text argument is equal to the prior term</li>
  * </ul>
  * <p>
  * As for the text argument itself, this is any sequence of Unicode
@@ -132,15 +132,15 @@
  * A <code>ParseException</code> will be thrown for any of the following
  * conditions:
  * <ul>
- * <li>Unquoted punctuation characters in a text argument.
- * <li>A relational or reset operator not followed by a text argument
+ * <li>Unquoted punctuation characters in a text argument.</li>
+ * <li>A relational or reset operator not followed by a text argument</li>
  * <li>A reset operator where the text argument is not present in
- * the previous rule string section.
+ * the previous rule string section.</li>
  * </ul>
  *
- * @author Aaron M. Renn <arenn@urbanophile.com>
- * @author Tom Tromey <tromey@cygnus.com>
- * @author Guilhem Lavaux <guilhem@kaffe.org>
+ * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @author Tom Tromey (tromey@cygnus.com)
+ * @author Guilhem Lavaux (guilhem@kaffe.org)
  */
 public class RuleBasedCollator extends Collator
 {
Index: java/text/SimpleDateFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/SimpleDateFormat.java,v
retrieving revision 1.25
diff -u -r1.25 SimpleDateFormat.java
--- java/text/SimpleDateFormat.java	28 Nov 2003 23:33:06 -0000	1.25
+++ java/text/SimpleDateFormat.java	17 Apr 2004 18:36:58 -0000
@@ -358,13 +358,13 @@
    * object.  This will be true if and only if the specified object:
    * <p>
    * <ul>
-   * <li>Is not <code>null</code>.
-   * <li>Is an instance of <code>SimpleDateFormat</code>.
+   * <li>Is not <code>null</code>.</li>
+   * <li>Is an instance of <code>SimpleDateFormat</code>.</li>
    * <li>Is equal to this object at the superclass (i.e., <code>DateFormat</code>)
-   *     level.
-   * <li>Has the same formatting pattern.
-   * <li>Is using the same formatting symbols.
-   * <li>Is using the same century for two digit years.
+   *     level.</li>
+   * <li>Has the same formatting pattern.</li>
+   * <li>Is using the same formatting symbols.</li>
+   * <li>Is using the same century for two digit years.</li>
    * </ul>
    *
    * @param obj The object to compare for equality against.
Index: java/text/StringCharacterIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/StringCharacterIterator.java,v
retrieving revision 1.6
diff -u -r1.6 StringCharacterIterator.java
--- java/text/StringCharacterIterator.java	22 Jan 2002 22:27:01 -0000	1.6
+++ java/text/StringCharacterIterator.java	17 Apr 2004 18:36:58 -0000
@@ -314,10 +314,10 @@
    * object.  This will be true if and only if the specified object:
    * <p>
    * <ul>
-   * <li>is not <code>null</code>.
-   * <li>is an instance of <code>StringCharacterIterator</code>
-   * <li>has the same text as this object
-   * <li>has the same beginning, ending, and current index as this object.
+   * <li>is not <code>null</code>.</li>
+   * <li>is an instance of <code>StringCharacterIterator</code></li>
+   * <li>has the same text as this object</li>
+   * <li>has the same beginning, ending, and current index as this object.</li>
    * </ul>
    *
    * @param obj The object to test for equality against.

--Boundary-00=_QmXgApm7SqZC63d--




From MAILER-DAEMON Sat Apr 17 14:43:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEun3-0006xm-6q
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 14:43:45 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEumz-0006wX-HR
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:43:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEumP-0006fv-VF
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:43:37 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEumP-0006fJ-1L
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:43:05 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-130.ewetel.net
	[80.228.94.130])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3HIh2GS028370
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 20:43:03 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BEumO-0001tD-00
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 20:43:04 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 17 Apr 2004 20:42:42 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_iqXgAyLg+1B1R5u"
Message-Id: <200404172042.42253.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.net - javadoc fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 18:43:42 -0000


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

Hi list,


I commited another patch to fix some javadoc comments.


Michael


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

	* java/net/JarURLConnection.java,
	java/net/NetPermission.java,
	java/net/SocketPermission.java,
	java/net/URLConnection.java:
	Fixed HTML tags in javadocs all over.


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

Index: java/net/JarURLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/JarURLConnection.java,v
retrieving revision 1.19
diff -u -r1.19 JarURLConnection.java
--- java/net/JarURLConnection.java	8 Apr 2004 17:25:02 -0000	1.19
+++ java/net/JarURLConnection.java	17 Apr 2004 18:40:29 -0000
@@ -50,7 +50,7 @@
  * of jar URL's.  A jar URL is a special type of URL that allows JAR
  * files on remote systems to be accessed.  It has the form:
  * <p>
- * jar:<standard URL pointing to jar file>!/file/within/jarfile
+ * jar:&lt;standard URL pointing to jar filei&gt;!/file/within/jarfile
  * <p> for example:
  * <p>
  * jar:http://www.urbanophile.com/java/foo.jar!/com/urbanophile/bar.class
Index: java/net/NetPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/NetPermission.java,v
retrieving revision 1.10
diff -u -r1.10 NetPermission.java
--- java/net/NetPermission.java	8 Apr 2004 16:26:04 -0000	1.10
+++ java/net/NetPermission.java	17 Apr 2004 18:40:29 -0000
@@ -51,11 +51,11 @@
  * <ul>
  * <li>setDefaultAuthenticator - Grants the ability to install a facility
  * to collect username and password information when requested by a
- * web site or proxy server.
+ * web site or proxy server.</li>
  * <li>requestPasswordAuthentication - Grants the ability to ask the
- * authentication facility for the user's password.
+ * authentication facility for the user's password.</li>
  * <li>specifyStreamHandler - Grants the permission to specify the
- * stream handler class used when loading from a URL.
+ * stream handler class used when loading from a URL.</li>
  * </ul>
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
Index: java/net/SocketPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/SocketPermission.java,v
retrieving revision 1.13
diff -u -r1.13 SocketPermission.java
--- java/net/SocketPermission.java	12 Apr 2004 11:09:20 -0000	1.13
+++ java/net/SocketPermission.java	17 Apr 2004 18:40:30 -0000
@@ -65,18 +65,20 @@
  * value for a port (respectively) is used by default.  Here are some
  * examples:
  * <p><ul>
- * <li>8080 - Represents port 8080 only
- * <li>2000-3000 - Represents ports 2000 through 3000 inclusive
- * <li>-4000 - Represents ports 0 through 4000 inclusive
- * <li>1024- - Represents ports 1024 through 65535 inclusive
+ * <li>8080 - Represents port 8080 only</li>
+ * <li>2000-3000 - Represents ports 2000 through 3000 inclusive</li>
+ * <li>-4000 - Represents ports 0 through 4000 inclusive</li>
+ * <li>1024- - Represents ports 1024 through 65535 inclusive</li>
  * </ul><p>
  * The permission list is a comma separated list of individual permissions.
  * These individual permissions are:
  * <p>
- * accept<br>
- * connect<br>
- * listen<br>
- * resolve<br>
+ * <pre>
+ * accept
+ * connect
+ * listen
+ * resolve
+ * </pre>
  * <p>
  * The "listen" permission is only relevant if the host is localhost.  If
  * any permission at all is specified, then resolve permission is implied to
@@ -232,20 +234,22 @@
 
   /**
    * Returns true if the permission object passed it is implied by the
-   * this permission.  This will be true if
-   * <p><ul>
-   * <li>The argument is of type <code>SocketPermission</code>
-   * <li>The actions list of the argument are in this object's actions
-   * <li>The port range of the argument is within this objects port range
-   * <li>The hostname is equal to or a subset of this objects hostname
+   * this permission.  This will be true if:
+   * 
+   * <ul>
+   * <li>The argument is of type <code>SocketPermission</code></li>
+   * <li>The actions list of the argument are in this object's actions</li>
+   * <li>The port range of the argument is within this objects port range</li>
+   * <li>The hostname is equal to or a subset of this objects hostname</li>
    * </ul>
-   * <p>
-   * The argument's hostname will be a subset of this object's hostname if:
-   * <p><ul>
-   * <li>The argument's hostname or IP address is equal to this object's.
-   * <li>The argument's canonical hostname is equal to this object's.
+   *
+   * <p>The argument's hostname will be a subset of this object's hostname if:</p>
+   * 
+   * <ul>
+   * <li>The argument's hostname or IP address is equal to this object's.</li>
+   * <li>The argument's canonical hostname is equal to this object's.</li>
    * <li>The argument's canonical name matches this domains hostname with
-   * wildcards
+   * wildcards</li>
    * </ul>
    *
    * @param perm The <code>Permission</code> to check against
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLConnection.java,v
retrieving revision 1.25
diff -u -r1.25 URLConnection.java
--- java/net/URLConnection.java	9 Apr 2004 14:52:12 -0000	1.25
+++ java/net/URLConnection.java	17 Apr 2004 18:40:30 -0000
@@ -408,7 +408,7 @@
    * This class first determines the MIME type of the content, then creates
    * a ContentHandler object to process the input.  If the ContentHandlerFactory
    * is set, then that object is called to load a content handler, otherwise
-   * a class called gnu.java.net.content.<content_type> is tried.
+   * a class called gnu.java.net.content.&lt;content_type&gt; is tried.
    * The default class will also be used if the content handler factory returns
    * a null content handler.
    *

--Boundary-00=_iqXgAyLg+1B1R5u--




From MAILER-DAEMON Sat Apr 17 14:50:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEutM-0001Mo-ED
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 14:50:16 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEut7-0001Eb-6r
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:50:01 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEusS-0000rO-Ur
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:49:54 -0400
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 1BEusR-0000lC-QJ
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:49:19 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BEuqo-0004KC-Jn
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 14:47:38 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-130.ewetel.net
	[80.228.94.130])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3HIlYD2027901
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 20:47:35 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BEuqm-0001tQ-00
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 20:47:36 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 17 Apr 2004 20:47:14 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_yuXgAfgW6y06/1N"
Message-Id: <200404172047.14278.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.security - javadoc fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 18:50:10 -0000


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

Hi list,


here another patch I commited to fix HTML in javadoc comments in 
java.security.


Michael


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

	* java/security/AlgorithmParameterGenerator.java,
	java/security/AlgorithmParameters.java,
	java/security/CodeSource.java,
	java/security/Identity.java,
	java/security/IdentityScope.java,
	java/security/KeyPairGenerator.java,
	java/security/KeyStore.java,
	java/security/Signature.java,
	java/security/SignatureSpi.java,
	java/security/SignedObject.java:
	Fixed HTML tags in javadoc comments all over.


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

Index: java/security/AlgorithmParameterGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/AlgorithmParameterGenerator.java,v
retrieving revision 1.8
diff -u -r1.8 AlgorithmParameterGenerator.java
--- java/security/AlgorithmParameterGenerator.java	23 Apr 2003 23:15:47 -0000	1.8
+++ java/security/AlgorithmParameterGenerator.java	17 Apr 2004 18:45:50 -0000
@@ -67,7 +67,7 @@
  *  system parameters, for example, the parameter generation values usually
  *  consist of the size of the prime modulus and the size of the random
  *  exponent, both specified in number of bits.</li>
- * <ul>
+ * </ul>
  *
  * <p>In case the client does not explicitly initialize the
  * <code>AlgorithmParameterGenerator</code> (via a call to an <code>init()</code>
Index: java/security/AlgorithmParameters.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/AlgorithmParameters.java,v
retrieving revision 1.8
diff -u -r1.8 AlgorithmParameters.java
--- java/security/AlgorithmParameters.java	23 Apr 2003 23:15:47 -0000	1.8
+++ java/security/AlgorithmParameters.java	17 Apr 2004 18:45:50 -0000
@@ -71,7 +71,7 @@
  * parameter specification or parameter encoding.</p>
  *
  * <p>A transparent parameter specification is obtained from an
- * <ocde>AlgorithmParameters</code> object via a call to
+ * <code>AlgorithmParameters</code> object via a call to
  * <code>getParameterSpec()</code>, and a byte encoding of the parameters is
  * obtained via a call to <code>getEncoded()</code>.</p>
  *
Index: java/security/CodeSource.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/CodeSource.java,v
retrieving revision 1.5
diff -u -r1.5 CodeSource.java
--- java/security/CodeSource.java	29 Mar 2002 08:30:51 -0000	1.5
+++ java/security/CodeSource.java	17 Apr 2004 18:45:50 -0000
@@ -159,17 +159,22 @@
    * object must have all the certifcates this object has (but may have more),
    * and must have a location that is a subset of this object's.  In order
    * for this object to imply the specified object, the following must be
-   * true:<ol>
+   * true:
+   *
+   * <ol>
    * <li><em>codesource</em> must not be <code>null</code>.</li>
    * <li>If <em>codesource</em> has a certificate list, all of it's
    *     certificates must be present in the certificate list of this
    *     code source.</li>
    * <li>If this object does not have a <code>null</code> location, then
-   *     the following addtional tests must be passed.<ol>
+   *     the following addtional tests must be passed.
+   *
+   *     <ol>
    *     <li><em>codesource</em> must not have a <code>null</code>
    *         location.</li>
    *     <li><em>codesource</em>'s location must be equal to this object's
-   *         location, or<br><ul>
+   *         location, or
+   *         <ul>
    *         <li><em>codesource</em>'s location protocol, port, and ref (aka,
    *             anchor) must equal this objects</li>
    *         <li><em>codesource</em>'s location host must imply this object's
@@ -183,19 +188,21 @@
    *             location file must start with this object's location file
    *             with the '/' character appended to it.</li>
    *         </ul></li>
-   *     </ol>
+   *     </ol></li>
    * </ol>
    *
    * <p>For example, each of these locations imply the location
-   * "http://java.sun.com/classes/foo.jar":<ul>
+   * "http://java.sun.com/classes/foo.jar":</p>
+   * 
    * <pre>
    * http:
    * http://*.sun.com/classes/*
    * http://java.sun.com/classes/-
    * http://java.sun.com/classes/foo.jar
    * </pre>
-   * Note that the code source with null location and null certificates implies
-   * all other code sources.
+   * 
+   * <p>Note that the code source with null location and null certificates implies
+   * all other code sources.</p>
    *
    * @param cs the <code>CodeSource</code> to test against this object
    * @return true if this specified <code>CodeSource</code> is implied
@@ -245,7 +252,7 @@
   /**
    * This method returns a <code>String</code> that represents this object.
    * The result is in the format <code>"(" + getLocation()</code> followed
-   * by a space separated list of certificates (or "<no certificates>"),
+   * by a space separated list of certificates (or "&lt;no certificates&gt;"),
    * followed by <code>")"</code>.
    *
    * @return a <code>String</code> for this object
Index: java/security/Identity.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/Identity.java,v
retrieving revision 1.7
diff -u -r1.7 Identity.java
--- java/security/Identity.java	10 May 2003 05:58:28 -0000	1.7
+++ java/security/Identity.java	17 Apr 2004 18:45:50 -0000
@@ -151,7 +151,7 @@
    * @throws KeyManagementException if another identity in the identity's scope
    * has the same public key, or if another exception occurs.
    * @throws SecurityException if a security manager exists and its
-   * <code>checkSecurityAccess()<code> method doesn't allow setting the public
+   * <code>checkSecurityAccess()</code> method doesn't allow setting the public
    * key.
    * @see #getPublicKey()
    * @see SecurityManager#checkSecurityAccess(String)
Index: java/security/IdentityScope.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/IdentityScope.java,v
retrieving revision 1.7
diff -u -r1.7 IdentityScope.java
--- java/security/IdentityScope.java	10 May 2003 05:58:28 -0000	1.7
+++ java/security/IdentityScope.java	17 Apr 2004 18:45:50 -0000
@@ -123,7 +123,7 @@
   }
 
   /**
-   * <p>Sets the system's identity scope.</p>
+   * Sets the system's identity scope.
    *
    * <p>First, if there is a security manager, its <code>checkSecurityAccess()
    * </code> method is called with <code>"setSystemScope"</code> as its argument
@@ -131,7 +131,7 @@
    *
    * @param scope the scope to set.
    * @throws SecurityException if a security manager exists and its
-   * <code>checkSecurityAccess()<code> method doesn't allow setting the
+   * <code>checkSecurityAccess()</code> method doesn't allow setting the
    * identity scope.
    * @see #getSystemScope()
    * @see SecurityManager#checkSecurityAccess(String)
Index: java/security/KeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/KeyPairGenerator.java,v
retrieving revision 1.10
diff -u -r1.10 KeyPairGenerator.java
--- java/security/KeyPairGenerator.java	23 Apr 2003 23:15:47 -0000	1.10
+++ java/security/KeyPairGenerator.java	17 Apr 2004 18:45:51 -0000
@@ -56,43 +56,42 @@
  * two is the initialization of the object:</p>
  *
  * <ul>
- *    <li><b>Algorithm-Independent Initialization</b><br/>
- *    All key pair generators share the concepts of a <i>keysize</i> and a
- *    <i>source of randomness</i>. The <i>keysize</i> is interpreted differently
- *    for different algorithms (e.g., in the case of the <i>DSA</i> algorithm,
- *    the <i>keysize</i> corresponds to the length of the modulus). There is an
- *    <code>initialize()</code> method in this <code>KeyPairGenerator</code>
- *    class that takes these two universally shared types of arguments. There
- *    is also one that takes just a <i>keysize</i> argument, and uses the
- *    {@link SecureRandom} implementation of the highest-priority installed
- *    provider as the <i>source of randomness</i>. (If none of the installed
- *    providers supply an implementation of {@link SecureRandom}, a
- *    system-provided source of randomness is used.)<br/><br/>
+ * <li><b>Algorithm-Independent Initialization</b><br/>
+ *     All key pair generators share the concepts of a <i>keysize</i> and a
+ *     <i>source of randomness</i>. The <i>keysize</i> is interpreted differently
+ *     for different algorithms (e.g., in the case of the <i>DSA</i> algorithm,
+ *     the <i>keysize</i> corresponds to the length of the modulus). There is an
+ *     <code>initialize()</code> method in this <code>KeyPairGenerator</code>
+ *     class that takes these two universally shared types of arguments. There
+ *     is also one that takes just a <i>keysize</i> argument, and uses the
+ *     {@link SecureRandom} implementation of the highest-priority installed
+ *     provider as the <i>source of randomness</i>. (If none of the installed
+ *     providers supply an implementation of {@link SecureRandom}, a
+ *     system-provided source of randomness is used.)
  *
- *    Since no other parameters are specified when you call the above
- *    algorithm-independent initialize methods, it is up to the provider what
- *    to do about the algorithm-specific parameters (if any) to be associated
- *    with each of the keys.<br/><br/>
+ *     <p>Since no other parameters are specified when you call the above
+ *     algorithm-independent initialize methods, it is up to the provider what
+ *     to do about the algorithm-specific parameters (if any) to be associated
+ *     with each of the keys.</p>
  *
- *    If the algorithm is the <i>DSA</i> algorithm, and the <i>keysize</i>
- *    (modulus size) is <code>512</code>, <code>768</code>, or <code>1024</code>,
- *    then the <b>GNU</b> provider uses a set of precomputed values for the
- *    <code>p</code>, <code>q</code>, and <code>g</code> parameters. If the
- *    <i>modulus size</i> is not one of the above values, the <b>GNU</b>
- *    provider creates a new set of parameters. Other providers might have
- *    precomputed parameter sets for more than just the three modulus sizes
- *    mentioned above. Still others might not have a list of precomputed
- *    parameters at all and instead always create new parameter sets.<br/></li>
- *
- *    <li><b>Algorithm-Specific Initialization</b><br/>
- *    For situations where a set of algorithm-specific parameters already
- *    exists (e.g., so-called <i>community parameters</i> in <i>DSA</i>), there
- *    are two initialize methods that have an {@link AlgorithmParameterSpec}
- *    argument. One also has a {@link SecureRandom} argument, while the the
- *    other uses the {@link SecureRandom} implementation of the highest-priority
- *    installed provider as the source of randomness. (If none of the installed
- *    providers supply an implementation of {@link SecureRandom}, a
- *    system-provided source of randomness is used.)</li>
+ *     <p>If the algorithm is the <i>DSA</i> algorithm, and the <i>keysize</i>
+ *     (modulus size) is <code>512</code>, <code>768</code>, or <code>1024</code>,
+ *     then the <b>GNU</b> provider uses a set of precomputed values for the
+ *     <code>p</code>, <code>q</code>, and <code>g</code> parameters. If the
+ *     <i>modulus size</i> is not one of the above values, the <b>GNU</b>
+ *     provider creates a new set of parameters. Other providers might have
+ *     precomputed parameter sets for more than just the three modulus sizes
+ *     mentioned above. Still others might not have a list of precomputed
+ *     parameters at all and instead always create new parameter sets.</p></li>
+ * <li><b>Algorithm-Specific Initialization</b><br/>
+ *     For situations where a set of algorithm-specific parameters already
+ *     exists (e.g., so-called <i>community parameters</i> in <i>DSA</i>), there
+ *     are two initialize methods that have an {@link AlgorithmParameterSpec}
+ *     argument. One also has a {@link SecureRandom} argument, while the the
+ *     other uses the {@link SecureRandom} implementation of the highest-priority
+ *     installed provider as the source of randomness. (If none of the installed
+ *     providers supply an implementation of {@link SecureRandom}, a
+ *     system-provided source of randomness is used.)</li>
  * </ul>
  *
  * <p>In case the client does not explicitly initialize the
Index: java/security/KeyStore.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/KeyStore.java,v
retrieving revision 1.7
diff -u -r1.7 KeyStore.java
--- java/security/KeyStore.java	23 Apr 2003 23:15:47 -0000	1.7
+++ java/security/KeyStore.java	17 Apr 2004 18:45:51 -0000
@@ -208,7 +208,7 @@
 
   /**
    * Returns the default KeyStore type. This method looks up the
-   * type in <JAVA_HOME>/lib/security/java.security with the 
+   * type in &lt;JAVA_HOME&gt;/lib/security/java.security with the 
    * property "keystore.type" or if that fails then "jks" .
    */
   public static final String getDefaultType()
Index: java/security/Signature.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/Signature.java,v
retrieving revision 1.13
diff -u -r1.13 Signature.java
--- java/security/Signature.java	25 Apr 2003 07:04:30 -0000	1.13
+++ java/security/Signature.java	17 Apr 2004 18:45:51 -0000
@@ -83,20 +83,20 @@
  * either signing data or verifying a signature:</p>
  *
  * <ol>
- *    <li>Initialization, with either
- *      <ul>
- *        <li>a public key, which initializes the signature for verification
- *        (see <code>initVerify()</code>), or</li>
- *        <li>a private key (and optionally a Secure Random Number Generator),
- *        which initializes the signature for signing (see
- *        {@link #initSign(PrivateKey)} and {@link #initSign(PrivateKey, SecureRandom)}
- *        ).</li>
- *      </ul></li>
- *    <li>Updating<br/>
- *      Depending on the type of initialization, this will update the bytes to
- *      be signed or verified. See the update methods.<br/></li>
- *    <li>Signing or Verifying a signature on all updated bytes. See the
- *    <code>sign()</code> methods and the <code>verify()</code> method.</li>
+ * <li>Initialization, with either
+ *     <ul>
+ *     <li>a public key, which initializes the signature for verification
+ *         (see <code>initVerify()</code>), or</li>
+ *     <li>a private key (and optionally a Secure Random Number Generator),
+ *         which initializes the signature for signing (see
+ *         {@link #initSign(PrivateKey)} and {@link #initSign(PrivateKey, SecureRandom)}
+ *         ).</li>
+ *     </ul></li>
+ * <li>Updating<br/>
+ *     Depending on the type of initialization, this will update the bytes to
+ *     be signed or verified. See the update methods.<br/></li>
+ * <li>Signing or Verifying a signature on all updated bytes. See the
+ *     <code>sign()</code> methods and the <code>verify()</code> method.</li>
  *  </ol>
  *
  * <p>Note that this class is abstract and extends from {@link SignatureSpi} for
@@ -105,7 +105,7 @@
  * superclass are intended for cryptographic service providers who wish to
  * supply their own implementations of digital signature algorithms.
  *
- * @author Mark Benvenuto <ivymccough@worldnet.att.net>
+ * @author Mark Benvenuto  (ivymccough@worldnet.att.net)
  */
 public abstract class Signature extends SignatureSpi
 {
Index: java/security/SignatureSpi.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/SignatureSpi.java,v
retrieving revision 1.6
diff -u -r1.6 SignatureSpi.java
--- java/security/SignatureSpi.java	9 Mar 2003 07:24:26 -0000	1.6
+++ java/security/SignatureSpi.java	17 Apr 2004 18:45:51 -0000
@@ -279,7 +279,7 @@
    * @param param the string name of the parameter.
    * @return the object that represents the parameter value, or <code>null</code>
    * if there is none.
-   * @throws InvalidParameterException if <code>param<?code> is an invalid
+   * @throws InvalidParameterException if <code>param</code> is an invalid
    * parameter for this engine, or another exception occurs while trying to get
    * this parameter.
    * @deprecated
Index: java/security/SignedObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/SignedObject.java,v
retrieving revision 1.9
diff -u -r1.9 SignedObject.java
--- java/security/SignedObject.java	10 May 2003 05:58:28 -0000	1.9
+++ java/security/SignedObject.java	17 Apr 2004 18:45:51 -0000
@@ -98,7 +98,7 @@
  * <p>The signature algorithm can be, among others, the NIST standard <i>DSS</i>,
  * using <i>DSA</i> and <i>SHA-1</i>. The algorithm is specified using the same
  * convention as that for signatures. The <i>DSA</i> algorithm using the
- * </i>SHA-1</i> message digest algorithm can be specified, for example, as
+ * <i>SHA-1</i> message digest algorithm can be specified, for example, as
  * <code>"SHA/DSA"</code> or <code>"SHA-1/DSA"</code> (they are equivalent). In
  * the case of <i>RSA</i>, there are multiple choices for the message digest
  * algorithm, so the signing algorithm could be specified as, for example,

--Boundary-00=_yuXgAfgW6y06/1N--




From MAILER-DAEMON Sat Apr 17 15:25:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEvRH-0001RZ-HR
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 15:25:19 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEvR9-0001Q9-0M
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 15:25:11 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEvQb-0001DK-4Y
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 15:25:08 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEvQa-0001CS-8N
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 15:24:36 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-130.ewetel.net
	[80.228.94.130])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3HJOXD2015957
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 21:24:34 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BEvQZ-000212-00
	for <commit-classpath@gnu.org>; Sat, 17 Apr 2004 21:24:35 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 17 Apr 2004 21:24:12 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_cRYgAI46MgWCrxu"
Message-Id: <200404172124.12918.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.util - javadoc HTML fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 19:25:12 -0000


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

Hi list,


here another patch I commited to fix various HTML tags in javadocs all 
over java.util.


Michael


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

	* java/util/Collections.java,
	java/util/PropertyResourceBundle.java,
	java/util/ResourceBundle.java,
	java/util/StringTokenizer.java,
	java/util/jar/Attributes.java,
	java/util/logging/ConsoleHandler.java,
	java/util/logging/LogManager.java,
	java/util/logging/MemoryHandler.java,
	java/util/logging/SocketHandler.java:
	Fixed HTML tags in javadocs all over.


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

Index: java/util/Collections.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Collections.java,v
retrieving revision 1.27
diff -u -r1.27 Collections.java
--- java/util/Collections.java	20 Feb 2002 23:56:46 -0000	1.27
+++ java/util/Collections.java	17 Apr 2004 19:22:36 -0000
@@ -54,7 +54,7 @@
  * are not required, to throw the {@link UnsupportedOperationException} that
  * the underlying collection would throw during an attempt at modification.
  * For example,
- * <code>Collections.singleton("").addAll(Collections.EMPTY_SET)<code>
+ * <code>Collections.singleton("").addAll(Collections.EMPTY_SET)</code>
  * does not throw a exception, even though addAll is an unsupported operation
  * on a singleton; the reason for this is that addAll did not attempt to
  * modify the set.
Index: java/util/PropertyResourceBundle.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/PropertyResourceBundle.java,v
retrieving revision 1.13
diff -u -r1.13 PropertyResourceBundle.java
--- java/util/PropertyResourceBundle.java	16 Aug 2003 23:44:44 -0000	1.13
+++ java/util/PropertyResourceBundle.java	17 Apr 2004 19:22:36 -0000
@@ -54,7 +54,7 @@
  *
  * If there is also a class for this resource and the same locale, the
  * class will be chosen. The properties file should have the name of the
- * resource bundle, appended with the locale (e.g. <code>_de</code) and the
+ * resource bundle, appended with the locale (e.g. <code>_de</code> and the
  * extension <code>.properties</code>. The file should have the same format
  * as for <code>Properties.load()</code>
  *
Index: java/util/ResourceBundle.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/ResourceBundle.java,v
retrieving revision 1.21
diff -u -r1.21 ResourceBundle.java
--- java/util/ResourceBundle.java	10 Jan 2003 22:35:17 -0000	1.21
+++ java/util/ResourceBundle.java	17 Apr 2004 19:22:37 -0000
@@ -53,7 +53,7 @@
  * <code>getObject</code> or <code>getString</code> on that bundle.
  *
  * <p>When a bundle is demanded for a specific locale, the ResourceBundle
- * is searched in following order (<i>def. language<i> stands for the
+ * is searched in following order (<i>def. language</i> stands for the
  * two letter ISO language code of the default locale (see
  * <code>Locale.getDefault()</code>).
  *
@@ -308,18 +308,22 @@
    *
    * <p>A sequence of candidate bundle names are generated, and tested in
    * this order, where the suffix 1 means the string from the specified
-   * locale, and the suffix 2 means the string from the default locale:<ul>
+   * locale, and the suffix 2 means the string from the default locale:</p>
+   *
+   * <ul>
    * <li>baseName + "_" + language1 + "_" + country1 + "_" + variant1</li>
    * <li>baseName + "_" + language1 + "_" + country1</li>
    * <li>baseName + "_" + language1</li>
    * <li>baseName + "_" + language2 + "_" + country2 + "_" + variant2</li>
    * <li>baseName + "_" + language2 + "_" + country2</li>
-   * <li>baseName + "_" + language2<li>
+   * <li>baseName + "_" + language2</li>
    * <li>baseName</li>
    * </ul>
    *
    * <p>In the sequence, entries with an empty string are ignored. Next,
-   * <code>getBundle</code> tries to instantiate the resource bundle:<ul>
+   * <code>getBundle</code> tries to instantiate the resource bundle:</p>
+   *
+   * <ul>
    * <li>First, an attempt is made to load a class in the specified classloader
    * which is a subclass of ResourceBundle, and which has a public constructor
    * with no arguments, via reflection.</li>
@@ -334,7 +338,7 @@
    * in the above sequence are tested in a similar manner, and if any results
    * in a resource bundle, it is assigned as the parent of the first bundle
    * using the <code>setParent</code> method (unless the first bundle already
-   * has a parent).
+   * has a parent).</p>
    *
    * <p>For example, suppose the following class and property files are
    * provided: MyResources.class, MyResources_fr_CH.properties,
@@ -343,10 +347,12 @@
    * all files are valid (that is, public non-abstract subclasses of
    * ResourceBundle with public nullary constructors for the ".class" files,
    * syntactically correct ".properties" files). The default locale is
-   * Locale("en", "UK").
+   * Locale("en", "UK").</p>
    *
    * <p>Calling getBundle with the shown locale argument values instantiates
-   * resource bundles from the following sources:<ul>
+   * resource bundles from the following sources:</p>
+   *
+   * <ul>
    * <li>Locale("fr", "CH"): result MyResources_fr_CH.class, parent
    *   MyResources_fr.properties, parent MyResources.class</li>
    * <li>Locale("fr", "FR"): result MyResources_fr.properties, parent
@@ -358,8 +364,9 @@
    * <li>Locale("es", "ES"): result MyResources_es_ES.class, parent
    *   MyResources.class</li>
    * </ul>
-   * The file MyResources_fr_CH.properties is never used because it is hidden
-   * by MyResources_fr_CH.class.
+   * 
+   * <p>The file MyResources_fr_CH.properties is never used because it is hidden
+   * by MyResources_fr_CH.class.</p>
    *
    * @param baseName the name of the ResourceBundle
    * @param locale A locale
Index: java/util/StringTokenizer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/StringTokenizer.java,v
retrieving revision 1.11
diff -u -r1.11 StringTokenizer.java
--- java/util/StringTokenizer.java	25 Mar 2002 07:54:38 -0000	1.11
+++ java/util/StringTokenizer.java	17 Apr 2004 19:22:37 -0000
@@ -196,7 +196,7 @@
 
   /**
    * This does the same as hasMoreTokens. This is the
-   * <code>Enumeration</code interface method.
+   * <code>Enumeration</code> interface method.
    *
    * @return true, if the next call of nextElement() will succeed
    * @see #hasMoreTokens()
@@ -208,7 +208,7 @@
 
   /**
    * This does the same as nextTokens. This is the
-   * <code>Enumeration</code interface method.
+   * <code>Enumeration</code> interface method.
    *
    * @return the next token with respect to the current delimiter characters
    * @throws NoSuchElementException if there are no more tokens
Index: java/util/jar/Attributes.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/jar/Attributes.java,v
retrieving revision 1.8
diff -u -r1.8 Attributes.java
--- java/util/jar/Attributes.java	5 Nov 2002 03:14:30 -0000	1.8
+++ java/util/jar/Attributes.java	17 Apr 2004 19:22:37 -0000
@@ -85,17 +85,18 @@
    * attributes, applet attributes, extension identification attributes,
    * package versioning and sealing attributes, file contents attributes,
    * bean objects attribute and signing attributes. See the 
-   * <p>
-   * The characters of a Name must obey the following restrictions:
+   * 
+   * <p>The characters of a Name must obey the following restrictions:</p>
+   * 
    * <ul>
-   * <li> Must contain at least one character
-   * <li> The first character must be alphanumeric (a-z, A-Z, 0-9)
-   * <li> All other characters must be alphanumeric, a '-' or a '_'
+   * <li>Must contain at least one character</li>
+   * <li>The first character must be alphanumeric (a-z, A-Z, 0-9)</li>
+   * <li>All other characters must be alphanumeric, a '-' or a '_'</li>
    * </ul>
-   * <p>
-   * When comparing Names (with <code>equals</code>) all characters are
+   * 
+   * <p>When comparing Names (with <code>equals</code>) all characters are
    * converted to lowercase. But you can get the original case sensitive
-   * string with the <code>toString()</code> method.
+   * string with the <code>toString()</code> method.</p>
    *
    * @since 1.2
    * @author Mark Wielaard (mark@klomp.org)
@@ -145,15 +146,15 @@
      * Manifest manifest file with the following Names:
      * <ul>
      * <li> &lt;extension&gt;-Extension-Name:
-     * unique name of the extension
+     * unique name of the extension</li>
      * <li> &lt;extension&gt;-Specification-Version:
-     * minimum specification version
+     * minimum specification version</li>
      * <li> &lt;extension&gt;-Implementation-Version:
-     * minimum implementation version
+     * minimum implementation version</li>
      * <li> &lt;extension&gt;-Implementation-Vendor-Id:
-     * unique id of implementation vendor
+     * unique id of implementation vendor</li>
      * <li> &lt;extension&gt;-Implementation-URL:
-     * where the latest version of the extension library can be found
+     * where the latest version of the extension library can be found</li>
      * </ul>
      */
     public static final Name EXTENSION_LIST = new Name("Extension-List");
Index: java/util/logging/ConsoleHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/ConsoleHandler.java,v
retrieving revision 1.2
diff -u -r1.2 ConsoleHandler.java
--- java/util/logging/ConsoleHandler.java	30 Oct 2002 19:04:20 -0000	1.2
+++ java/util/logging/ConsoleHandler.java	17 Apr 2004 19:22:37 -0000
@@ -67,7 +67,7 @@
  *
  * <li><code>java.util.logging.ConsoleHandler.encoding</code> - specifies
  *     the name of the character encoding. Default value:
- *     the default platform encoding.
+ *     the default platform encoding.</li>
  *
  * </ul>
  *
Index: java/util/logging/LogManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/LogManager.java,v
retrieving revision 1.8
diff -u -r1.8 LogManager.java
--- java/util/logging/LogManager.java	9 Jan 2004 08:59:30 -0000	1.8
+++ java/util/logging/LogManager.java	17 Apr 2004 19:22:37 -0000
@@ -67,13 +67,12 @@
  * <code>java.util.logging.LogManager</code> is initialized.
  * The configuration process includes the subsequent steps:
  *
- * <ol>
+ * <ul>
  * <li>If the system property <code>java.util.logging.manager</code>
  *     is set to the name of a subclass of
  *     <code>java.util.logging.LogManager</code>, an instance of
  *     that subclass is created and becomes the global LogManager.
  *     Otherwise, a new instance of LogManager is created.</li>
- *     
  * <li>The <code>LogManager</code> constructor tries to create
  *     a new instance of the class specified by the system
  *     property <code>java.util.logging.config.class</code>.
@@ -91,14 +90,13 @@
  *     {@link #readConfiguration(java.io.InputStream)}.
  *     The name and location of this file are specified by the system
  *     property <code>java.util.logging.config.file</code>.</li>
- *
  * <li>If the system property <code>java.util.logging.config.file</code>
  *     is not set, however, the contents of the URL
  *     "{gnu.classpath.home.url}/logging.properties" are passed to
  *     {@link #readConfiguration(java.io.InputStream)}.
  *     Here, "{gnu.classpath.home.url}" stands for the value of
  *     the system property <code>gnu.classpath.home.url</code>.</li>
- * </ol>
+ * </ul>
  *
  * @author Sascha Brawer (brawer@acm.org)
  */
@@ -259,10 +257,10 @@
    *
    * @param logger the logger to be added.
    *
-   * @return <code>true<code>if <code>logger</code> was added,
+   * @return <code>true</code>if <code>logger</code> was added,
    *         <code>false</code> otherwise.
    *
-   * @throws NullPointerException if <code>name<code> is
+   * @throws NullPointerException if <code>name</code> is
    *         <code>null</code>.
    */
   public synchronized boolean addLogger(Logger logger)
Index: java/util/logging/MemoryHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/MemoryHandler.java,v
retrieving revision 1.3
diff -u -r1.3 MemoryHandler.java
--- java/util/logging/MemoryHandler.java	30 Sep 2002 13:29:03 -0000	1.3
+++ java/util/logging/MemoryHandler.java	17 Apr 2004 19:22:37 -0000
@@ -35,10 +35,7 @@
 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.
-
-*/
-
+exception statement from your version. */
 
 package java.util.logging;
 
@@ -53,28 +50,22 @@
  * value, a default is taken without an exception being thrown.
  *
  * <ul>
- *
  * <li><code>java.util.MemoryHandler.level</code> - specifies
  *     the initial severity level threshold. Default value:
  *     <code>Level.ALL</code>.</li>
- *
  * <li><code>java.util.MemoryHandler.filter</code> - specifies
  *     the name of a Filter class. Default value: No Filter.</li>
- *
  * <li><code>java.util.MemoryHandler.size</code> - specifies the
  *     maximum number of log records that are kept in the circular
  *     buffer.  Default value: 1000.</li>
- *
  * <li><code>java.util.MemoryHandler.push</code> - specifies the
  *     <code>pushLevel</code>. Default value:
  *     <code>Level.SEVERE</code>.</li>
- *
  * <li><code>java.util.MemoryHandler.target</code> - specifies the
  *     name of a subclass of {@link Handler} that will be used as the
  *     target handler.  There is no default value for this property;
  *     if it is not set, the no-argument MemoryHandler constructor
  *     will throw an exception.</li>
- *
  * </ul>
  *
  * @author Sascha Brawer (brawer@acm.org)
Index: java/util/logging/SocketHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/SocketHandler.java,v
retrieving revision 1.2
diff -u -r1.2 SocketHandler.java
--- java/util/logging/SocketHandler.java	17 Sep 2002 12:25:14 -0000	1.2
+++ java/util/logging/SocketHandler.java	17 Apr 2004 19:22:37 -0000
@@ -68,7 +68,7 @@
  *
  * <li><code>java.util.SocketHandler.encoding</code> - specifies
  *     the name of the character encoding. Default value:
- *     the default platform encoding.
+ *     the default platform encoding.</li>
  *
  * <li><code>java.util.SocketHandler.host</code> - specifies
  *     the name of the host to which records are published.

--Boundary-00=_cRYgAI46MgWCrxu--




From MAILER-DAEMON Sat Apr 17 19:25:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BEzC2-0007aG-Kp
	for mharc-commit-classpath@gnu.org; Sat, 17 Apr 2004 19:25:50 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BEzBp-0007Ix-4u
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 19:25:37 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BEzBe-00079T-Vx
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 19:25:29 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BEzBc-00072b-5R
	for commit-classpath@gnu.org; Sat, 17 Apr 2004 19:25:24 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BEzBZ-0005nM-00
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 01:25:21 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-BiiCchc74SuyDlQQL20g"
Message-Id: <1082244321.1971.111.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Sun, 18 Apr 2004 01:25:21 +0200
Subject: FYI: gui-branch-merge with libgcj
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 17 Apr 2004 23:25:40 -0000


--=-BiiCchc74SuyDlQQL20g
Content-Type: multipart/mixed; boundary="=-yJ1sWWqqRC6/YBNTAUbc"


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

Hi,

This adds all the new stuff discussed on the libgcj list and added by
Graydon last week. Some small fixes and build structure changes have
been added by me (also pushed to the libgcj hackers).

With this AWT menu (bars) work nicely. And there are some nice Swing
improvements.

Cheers,

Mark

2004-04-17  Mark Wielaard  <mark@klomp.org>

	* javax/swing/plaf/basic/Makefile.am: Add BasicArrowButton.java,
	BasicCheckBoxMenuItemUI.java, BasicMenuItemUI.java and
	BasicRadioButtonMenuItemUI.java.

	* javax/swing/JToggleButton.java (ToggleButtonModel):
	Make public static inner class.
	* javax/swing/JTabbedPane.java (setComponentAt):
	Call Page.setComponent().
	(SCROLL_TAB_LAYOUT): Make public, value is 1.
	(WRAP_TAB_LAYOUT): Make public, value is 0.
	* javax/swing/plaf/basic/BasicTabbedPaneUI.java (ScrollingButton):
	Make private static inner class.

	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:
	Changed C++ comments into C comments.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c:
	Likewise.

2004-04-17  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkPanelPeer.java (connectSignals):
	Remove method.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c: Remove
	unused code.

2004-04-17  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/ImageIcon.java:=20
	(ImageIcon(file)): set description of the icon=20
	to the file name
	* javax/swing/JCheckBoxMenuItem.java:
	Mostly Implemented. Work in progress.
	* javax/swing/JRadioButtonMenuItem.java:
 	Reimplement constructors to use JToggleButtonModel.
	* javax/swing/plaf/basic/BasicIconFactory.java:
	(getCheckBoxMenuItemIcon): return check box
	icon.
	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	paint menu item selected only when it is armed and=20
	pressed.=20
=20
2004-04-17  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
	(GtkMenuItemPeer): Only connect signals if this isn't a Menu peer.
	* java/awt/Component.java
	(add): Set the parent of the popup as this component.
	* java/awt/PopupMenu.java
	(addNotify): Create popup menu when peer is null.
	(show): Call addNotify() if peer is null.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show): Set the button
	argument for gtk_menu_popup() as zero. This causes the popup menu to
	respond to any mouse button.

2004-04-17  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/JRadioButtonMenuItem.java:
	Implemented.
	* javax/swing/plaf/basic/BasicIconFactory.java:
	(getRadioButtonMenuItemIcon): Return
	radio button icon.
	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	(getPreferredSize): Add size of checkIcon if it
	exists.
	(installDefaults): Don't initialize checkIcon.
	It's value will be set in subclasses.=20
	(uninstallDefaults): remove uninstallation of=20
	checkIcon.
	(paint): Moved code to paintMenuItem().
	(paintMenuItem): Implemented.
	* javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java:
	UI delegate for JRadioButtonMenuItem.
=09
2004-04-17  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	Corrected position of the accelerator.

2004-04-17  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/JMenuItem.java: Partly=20
	implemented. Work in progress
	* javax/swing/plaf/basic/BasicLookAndFeel.java:
	Changed default value of acceleratorDelimiter.
	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	New class. Partly implemented.
	=09
2004-04-17  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkMenuPeer.java
	(addSeparator): Remove.
	* java/awt/Menu.java
	(separator): Remove static final MenuItem field.
	(separatorLabel): New static final String field.
	(addSeparator): Do not use peer method; use add(MenuItem) instead.
	Use separatorLabel to denote that it is a separator.
	(insertSeparator): Create a new MenuItem with separatorLabel, instead
	of reusing the static separator instance, because a MenuItem instance
	can't be added more than once without being cloned.
	* java/awt/peer/MenuPeer.java
	(addSeparator): Remove from interface.

2004-04-17  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
	(connectSignals): New native method declaration.
	(GtkMenuItemPeer): Connect signals if the parent is a Menu.
	* java/awt/MenuItem.java
	(getActionCommand): Return the label if the action command is not set.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu): Use
	gtk_menu_shell_append().
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c
	(item_activate): Fix argument type.
	(Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_create): Do not connect
	signal here.
	(Java_gnu_java_awt_peer_gtk_GtkMenuItemPeer_connectSignals): New
	method.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create): Check if a label is
	given. Add the menu widget's top-level GtkWindow to the global window
	group, so it can grab the pointer.
	(Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem): Use
	gtk_menu_shell_append().

2004-04-17  Kim Ho  <kho@redhat.com>

	* javax/swing/plaf/basic/BasicTabbedPaneUI.java:
	(calculateSizes): Return real width and height.

2004-04-17  Kim Ho  <kho@redhat.com>

	* javax/swing/plaf/basic/BasicTabbedPaneUI.java
	(calculateTabRects): Set the selectedRun before
	trying to rotate tabs.

2004-04-17  Kim Ho  <kho@redhat.com>

	* javax/swing/DefaultSingleSelectionModel.java
	(isSelected): Return true if the selected index
	is not -1.
	* javax/swing/JLabel.java: Do not change mnemonic
	index if text is null.
	* javax/swing/JProgressBar.java: Use JComponent's
	EventListenerList.
	* javax/swing/JScrollBar.java: Ditto.
	* javax/swing/JSlider.java: Ditto.
	* javax/swing/JTabbedPane.java: Reimplement.
	* javax/swing/plaf/basic/BasicLookAndFeel.java:
	Add defaults for TabbedPane.
	* javax/swing/plaf/basic/BasicArrowButton.java:
	Implement
	* javax/swing/plaf/basic/BasicProgressBarUI.java:
	(paintDeterminate): Don't paint String if it's
	empty.
	(paintIndeterminate): ditto.
	* javax/swing/plaf/basic/BasicTabbedPaneUI.java:
	Reimplement.

2004-04-17  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/JComponent.java: Turn off double buffer by default.
	* javax/swing/plaf/basic/BasicViewportUI.java: Clear rects before
	painting.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
	(Java_gnu_java_awt_peer_gtk_GdkGraphics2D_gdkDrawDrawable):=20
	Use cairo to copy areas.
	(Java_gnu_java_awt_peer_gtk_GdkGraphics2D_cairoClip):
	Initialize and set clip region.

2004-04-17  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/applet/Applet.java (preferredSize): Override deprecated
	variant of getPreferredSize.
	(minimumSize): Override deprecated variant of getMinimumSize.

2004-04-17  Olga Rodimina  <rodimina@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(drawImage(img,xform,bgcolor,obs)): New Method.
	Helper function that every drawImage method will
	use.
	(drawRaster): Added new parameter, bgcolor. All
	transparent pixels are changed to bgcolor before=20
	image is drawn.
	(drawRenderedImage): Fixed to use changed drawRaster().
	(drawImage(image,xform,obs): Fixed to use new helper function=20
	(drawImage(image,op,x,y)): Ditto.
	(drawImage (img,x,y,observer)): Ditto.
	((PainterThread) bgcolor): New Field.
	((PainterThread) (setPixels)): Changed all transparent pixels=20
	to bgcolor.=09
	(drawImage(img,x,y,width,height,bgcolor,observer)):=20
	Fixed FIXME - all the transparent pixels are=20
	changed to the specified bgcolor.=20
	(drawImage(img, x, y, width, height, observer): Changed to=20
	use function above.
	(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,bgcolor,observer)):=20
	Fixed FIXME- changed all transparent pixels to bgcolor.
	(drawImage (img, dx1, dy1, dx2, dy2, sx1, sy1, sx2, sy2, observer)):
	Changed to use function above.=20

2004-04-17  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/applet/Applet.java (dimensions): New field.
	(getDimensions): New method.
	(getPreferredSize): Call getDimensions.
	(getMinimumSize): Likewise.

2004-04-17  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* java/applet/Applet.java (getPreferredSize): New method.
	(getMinimumSize): New method.


--=-yJ1sWWqqRC6/YBNTAUbc
Content-Disposition: attachment; filename=gui-branch-merge.patch.gz
Content-Type: application/x-gzip; name=gui-branch-merge.patch.gz
Content-Transfer-Encoding: base64

H4sICDK8gUAAA2d1aS1icmFuY2gtbWVyZ2UucGF0Y2gA7b1td9s20jD82fkVbJ5zb+VaVizbeXXd
u07itO4mcY7tbNuzd48PLdE2G1nUkpRfrl797w9mBi8DECApWU7SbrTdWCKBwWAwGMwMBoO98TC5
fhadjacPfo8v4wfxVflgkiT5g7Pyw4Mfhh9+yOPJeToo1l/24P297dt/7h28OIxO01HyLHowuCzy
LCsfDEZxUUzi8px9a4tT9/JenpR5mlym47MoF3+KNBtH/d7Te8P09DRanUarufgVebqzurrauu9L
/afRmziP1tfWNqP1/rP19Wfrm9HqmvgsQWMrKyszwHoc7UwUrI1n/cfP1tYI1r3vv49W19f63cfR
Cv35/vt7EXwePIiGeXwVDaZ5nozL6GR6eprkyTBKL+KzJCqzqDxPokl6fRFPIkHFbJDGpXita1+l
5XmUlj16cG8V/gWIe1i/c4JwutE4uYp2Tk/TcXKUx+PiNMsvok6/uyb+h/8uiyLT0Wh5697K/BBO
zjQUAePPewJL7Pnm5lr3UbSCf57KrtNb0dgkTy9Fl6KTLBsl8dg03SEE0gsBlbAKfVy0ruHfbn2d
F9koywXGA/jbXVpaQvLVVkF89k+KJL9M8ig7KZah/B9UKT2NOgLVKB0XZTweJNlp9EP5Yf/09HCQ
J8mY+vKPf5gWROHeWVIqJoo6y1Zdzl6iHsfDwOhgT6PtbSQ7R/9//5eoAE0c3UwSAC+KOZTqHf36
bvd47+Xu26O9o1/nrX90sPP28PXO0d7+22UDYlmD+8M8BIZNojgXw53AzI6LD4KZBZefjqbFeRRH
w2x6MkrkNIhO8+wCSGEA2HQ5W4+2o471bNlD2C1T/2z44aVgMPh/DA11zta7YuDG5bLpLvRuJFjy
l85y8N2vnWUOlg0r8EHxXE5jHHaGybLFYtPJUICyygpkEdwSKygk4TQfR2U+TXSTf9KXZFQkFTJb
5N4TFc/TIhrEhZjExC/ip5ho7qwpz+NSNCJ/FmJCTsdDMUgWuJPsOhLsCUKpmCSD9DTVsgoHi74K
YT9A4TUVk4V+9aIfs6tETBybGc6TMXDERIg2wrM0+GQC6TTPuvRHSDrB4gKgU86CJ+qAoLyP7Q6y
LBcdECQu7sOb+0KMJqP7/HlXYJAOzoEi0CULViae5NFVfCP4FUjRi47Eg0S0iV0T3IB1qK3V7yIJ
3XTAxgyoKzsSj8uCyHWf6CVqAxReGcsLysiFYXRjQTuPL8VoitdIlHFCkygdC/oSVhpQXMLCKf7k
6XVP8JUB444/1U6Gv5BM8Ql8nEoGQpnfcHb+I+If4GGaEQ5cmkxCKooB2IN3RWJNUTONbHFqzZPl
iqj+wyu81foq+J1ITeN9HospMCin8Wh0I0SRYMJRFg9hXQ0AEVJAsFZykeU30amQtTfegqLP1GkL
1+gEpJSNPkgpt8/0kbMdsD6Ii1LwVucERA8uWG+yYTKKQC7VL1Xmg3VfxmU8Uy1rzBpWUtYWraaV
wdTiSn+43NKf4AieJGfpWCgK2VmeFEV6meBowfohHsdRkUziHFSI8lww1dALBZj5XSxGMcmPsFTU
ATHSJfXC7m5NP+AjB+g0Fn3w9FRyvUVq1v1BXAr+67zNxtRoKlYhPb92rwfJBCeszeAVyoieZlfY
KWAnQYn9ia7buf9+jGsbkwh6kt9vzQL4WZGztcwOhQAZn9mrnuhYtGT3Fnsq/rmHGuqDmT+mlujZ
ZJRcCNlHIgyUIrPyv0nK82xYyLKoZT599BD06/7a+pPuE65l+nVMNbnYvBqIsZeP867UpcOfivyE
iX2UvReCvCqd2tdtnqSW6roM/fuDtH8QmrnSBpfvyeI2vwKl+mv9dVDI+2uPH3X7T7QxAh9cxQoh
sOjL+pZ69ec9NtBieAbn8VjINiFBib3EHAQDRtZPx7gMWVaMrmo0B9kJu8dGoZavo69kl3wqpaAf
KmlRKpBe2xJ/vpVI9EbJ+Kw8F49WVmzFy5lP0NQA9bud0eRcSEqq/+/0N1R615YrQ6ILiDYlklD9
4IfnoG5WbAk9//+MYGrARyxrZXIolnHUT/FRqZRLodd3oxv1GJj1HVFVItaNsLWf06Gw/UCs488f
k/TsvDS/zet0fbqsRn79EU4S8UVboROhcqeD6DJLhzQzkvHQKKTWLxrQrmGX0Mdrkkle1TaqmoII
1F7jEG31GJYveEBAmIk6FwCQ79pCjaIwBUCIchro34oKRNGNp91Ha0DS/kNm2M9Cl3p6esxOQ8a2
ZqeWZbcwOzUM1+w0gnI+s3O++pbZqUEsa3B/mIfzmp0awJxmp66/WLNTg2XD2mR2ssUsbHauLrGC
ltkpn/5JX1B9c8lskXsBZicHtwCz02KGBZidHN5tzU4O6/Zmp4XZrc1ODm1es3N1yYCZ0+xcNRDA
7GTs7Jidq7OZnbaS12x2ukrhH141cWazMwCkanb6Cra0Nn1V21qbDbqw+jjWZsta1lBVxkRLHf3h
4kd/ggMxo/XogzKD9ehBHz62El7poDYa2RvW6/ZGI58XbjO3MRpbjiR+vEYj75g2GvWqssJoZDYA
kLpaZ+ui7rMVcbvO0duomj0duK4mDJ9ufwN0tfVN+FKnrIFJccOtKwJ3mo5K3KDZjrJJj3511BYJ
7X3YezAdVcO7hdLpn3bX8D/x5bp7E9qHmRmKZy9G06uy1RLxvRbo+DX9uelG9ap+RTfFL1xB9Q9q
uz5oeFvILTVM0p4mDsyI71P1+xtr3X4f+OPhRre/qfmDcZI0yph8HCan8XRU4g/51qvlyyG1rHdR
nsgkR8YRMo7a2dWIdD1NSKfDzJDq3A3VVrq6A9LB8IfiEFrotsVf7TO41muv9hopkx7sZl0OhGnv
LPdo1WdyxTZWMkljLoaXe2KxzktT5E85mk820cux3l9zvRy4grB+SmeHdnts3bO99/M6O2T1Vg4P
pGGd04OobdUMOz/Ww94PDxzV9gUwccURsl7jCdG0a+0MoRGynIjKKQIfMsX+/ZtgGqkNyiePftsy
pbRp9AZVTGGR0oTGxnSps7xX9Z4Iy+uqG513o2IgRjL9H7RPlH9kY/NxdxOs+Y0nD7vrjea8s41c
Lw8RN5ztgiVe7f3yZveZxVhKf65lLg1AUVppxq5gjOTy2QUpfgW+INFpdBFxIQh1/yQQcywO8EeC
hq8KfL22EKLRKq4Z9xgTwAiNkl8EG1Ar0YOoQ2+0uS2dXLZUt/iAg/oVQBGWHljKgcaoI2EEaBti
Dd9qRF3pRmI9wv8TPjQ+y8EdFsVYoZZcVP+k9aT1UA6v+/LLjfpyva6erDeNJBQrFIRCQSgUhKIZ
Qsvps7JQ7pwtyMPRaOomcPPK4M5eTZ3aOYyjhCOEo1M7MjgeOBY4DjgGhkuW1PbtLNLCVptIVs+q
UDYyWt2YLIDRAsPawAwzSneuLBbTE/wiSI4Ly+b6WveJWFc2Nx/aysifISHTUSD86q0WKPDfTPaZ
/CgJpLhrBoOdfzhnzF7bi8U8cLSknKey3Yc/aZIsjrdrUWrF2/OIrEhGp9VOeK9oCbTmEy22bFiK
6qzz/ct41Gkhopfv7dVGsJYf3iTj6V6ZXLwTzz6XGFYPVu2jWH1dqolj9RRfehLtD0oIPt2I+o+e
ra09e/ioXSCrD1hDKOtDjOcU/yoFOVV79UXEgd0juTiOS3C7ISMoc45cQ9EoPkmkt0Oyi1U4G4+T
QXmYno3jEW2pcM5yUI866leUin+kXEZ8HyO+T7pPteBVeEBJUP5eAyIRuqqI2ZNyFz1iQ1kmLfRv
XugdrfdYxkRHoR9ZQqYS9j4bIArba19RMffVsg4gsCnQsbw5SCKGgtP7NpPo85tAzZPnkTV5HkWV
rjROHMPnT6OfpiM5adaerT98tmGivx81T5rWE+apWPSFVSn+PNQcGA+HOFrIAd3oQyLkYXGenoIn
CZwFuRnsVVuYipqH5LUG819ZThZM0Bg0P3Tur95fNraemZGWhE5GEh1wJwDvQPt/NrLRu3icjD4v
PrJRCjJSf9PipP5mVO1OLS/ZZZceRz8JPQFZYG39meCCjceamURbtdzkgGpgp00M4hD/PkJuCgpZ
4iCPRP1p/+R38UdtUs8mczWuUQe/RhMpaiWrUAcnYkUoH+zgn4/OGgEUWssUjjawQADe0qPoTXwD
w7QOQ74JI+XIj1BNzwj32Qg/fgIrlvi331dROjKGDa3MFAQ+gTsspydRIf6R4/Tgm29w8fgG9o2j
YSpWZehkgZvdtGGLO9mEE24KTc/gCEkR/Xj05nVUxmc9AvCAH88wzb5UIBlwufBB25FuOx4MYMPt
JB2l5Q3wVZlcl+iyZAjQwRVV7XuhSaYx+cJU9VHywqlKc+DhQzxU8mitu9nXQhUWXuU/3h1fpnk2
BrVErN4/JvFwJACK1du4ndWGmHpp9sP0Et+T/v0DUYRmTcc2EySBDFlgC9SQveOeEmFDokP1TFjb
klaJo+1oT/T7TMgEIeuLRPzowDhLnSK+SGDr6T6WRfFOdaV7q11lKky1RX2OGtJF96Nj+QSW+TkE
277gLKFfG548wGIYCKJ0Hgjs+OP7UTr+YJr7U8Cb5Ekhhg5mqmAHWZ+Y5utCkigeD1WHJ6pXhWRf
WeN7FccCLKVqC9inSQ7beOAA5uxOUs4Mpi55KApaYynhuqP9Wff7Ih2nF9OLxl7Lcu37bLRS6LO1
EIiV7kV2McnGMA8/zUJQQSG4EGz0rZVgox85uJvVoALUkun9h882nzx7aJYDAdmsB/V1PevBxpM+
2jD4t79uybtJNplOikrcr3qME/lfQm5luZZq9K4n1EWqbVsu+KgnPZlfOTKKv+zlyUV2mRgYbgHR
OgjsLQYb9AY/TIHN26xMT2+aGQpU20/HS7r1GVRLg7HFQfrx0kb0KjmRvPMYxn/9qas9emo1sM0T
iPJdeaJifcFtDfFfGEeHK236PxSpBTuUvUg5ta8gCqw4z6ajoVAMopPk/97T6xysMWLqTw9l/WQI
8T7/EvJHwMH9bAhtFtLkNBUKpDFCCm2xEEeqF2icCAaxaknvgK5D1vl2JMqimiN4YkGfB3Lvf13Y
Zk+iFfhDtGK20T3L4hICkcytKjujDdbpKNNwOYLXyz27Nk4GmHkWFeyuLpPtteCeoiDpbwJLbPQ3
fP0Ua1OSlwZZYwuqPmMBg21Xm4or+mVdv7rctFxw93xCAnD4tIJCYxAWFhu2sNiIbMwrAkO/qhca
G1WhYWo2rTf9NWKTNXBcMD6hmXkPVICdAYgOsY5dCHVEzwpSEToxfynZQ8wX67Gj/0rlAl2CWMGc
EpOvrNofg4XewcL0aRcbG4UwE9mKizAbHdwtLrLfCTb6aTrWvuPNNctz4egtTtUGPuqvyUNZIbGq
VvygTF1hD20Vhx4BJx5l2ehDCu4MGS6kkZQRQqhPFNOJMId0m6S3ylih9Q0KFdqQR8csNMVKeNXR
+pqwZOU3e8MZuyCxBStLYEenFxiLY6CTq+doZNGnMrmYQByU9XBZw8MKSA9R7CuLHH9UuBcdTJ/M
zVuDRpiL12wuXouqrt0auEtCMza7IBvPHm4IZjacvGZzsq9+PTdvbqDfbUP63SSTYKDdKRw90IOY
XJfJeOjdDFEeXHK22j57dMb5XLxbumbITRvx0b9+UFwJyj54Sa6LQ/F9lBwmowTlJ0YqfhJ2aItX
2DyzrbOosYOKYdq2vCQWUMkBG9HaU/Di9vvGhtMM1Bqeh6PWuXzsk3zkZ8e+eeAJrUgLgo77T9X4
2g6yAkib1b4yxOxXX8lXQcNKdQm3h/cG2fiTsoiNRZAhbDtrM3KQd4fffr30hK17/Wfra8/WzJ7p
ZmWsncoNI/sQffTiX6k/sTHVgNQuaKFF+OoSLBGdohvdv6/GcQkOgpyKmV8M8pQi/dMiGmeliSvt
gkk3RhpH4/gCzrmJVSop7q1AZagpK2rvayqax3QQusHChM/WIguNdH2M89OL82Tw4Xl2/UkV73ps
WkuWQGdchvIXg31FtRXUX3vWf/qs/6hGiASANDDYxtPu+hq4hJ52+xsPJY+lQjXJS4TeS7Pe3r72
aG9VXpI3e39aTqalGNskvsDgLlbqumf58Hs72iW/1bKcdN23LX6QIeh7qyCbVqNvqsOAT7+Pp+V5
li/tjIe5MDaFZPyQ5h/o1SV5IgSh1+DBg3urkpGRTaoA9Vr9k1mLTTTDIQyQ6AS4bEsxSQyq91Yh
WnVVzK/V23wQQvQCcEuKaG4It8QBYADFlwQFTRc9xF9Cii5N8qykxYioWlNH05eV0e+IhAugIRDx
X3GeQoTGPGRcCBaL7MzeOC2Zf24OELfEAoEgTwBT4BTIp+BEbmAQKP09bkoYQyk62n+5T++Aexj7
1MDqVFlJA1zGpXJpCU26jnm8hU8F+VSDf4LPs66R5cUOm8pLMj+IW2JhDxt6abhwVQOUy/0o31sa
IhKa9vsqvI4aCals2m97L37cffHP4+f7v2zpwfCAkEPQNFay2EIE7i1lxUIF7jRF8b/3kolX8rX7
fOK6NLjDXRK937u/tUgy3VIKLZRMXATVrEzEt56JToxqZAOyW0AgzNKqknagUSvYDbiAOo3l7xwp
jJtoh5TkL6hx52iRI7clYuRnlnU+MsXmGFxGx270qUZaPcU0Q/MgrvwOCOCzIPqtu6TH4ja9W5Rk
vaWisFDJepWnZULWoENpMAr5CCQ61wCzLJ2xkGsXeisZ5E7V3JQNLFMgVmHB9A0Jh+awmtAq3u/x
ZdSoOHLHyuEVyRm8nloipCqjF9ot1b5duILAITCT07hkNLd1xX+qltM0pYmInO6bwnbThd100ywp
bsYDQe8xbN3rGHIC3GJaFAEkADnpoKQRKhxK0NN//+aio557IDhUgb0OL1HcWjZmefKfaVKUr7LB
tHAbx+7zAgE1wS5iw0d6MyYLc562eiTzsZptumoVr1C/4nNxkPG/Z7SoFPBCVYjSZq5bQ+12SaPA
U4DOstUYZHK/TpkL6SkjSwUen5oeVCHY/d7KAv0/c50u0x/mPFrBrcLbSnEEcTtbZjFY3M5gYQAs
CWS90XKisKe7Cj1eCClvZe8siJRBA4bFYaLPHmYaTxcTVFtWauEaFdXfAL66TQPcsHCbIM3s1n2w
TQS3EbWRUqiYFRmGsqhecTXf30HSOnFZX1yj9modpmxXllh8b2twIM+c6T0bA8rPCevAT0fZ2dko
eT4ty2zc4z9kDk9VC+MmSKXZZrKhvjOLEQm3UtQXK11vp1KzwVGKhSKhrVhzTvCqydWAcKYrK5hu
Fc+RaqbQViA6g8yLMkitdVlndoR4qfA3U6ujenCvrFCsF9XqrCGPPlozbG5B4pU6JbOK6/3K9Llv
8HXqMkTbKovO2ZewxsiOwCh16RbaY+B0ikd/ZEPjRX9xguRWe3yLEiQL2bazWPLWSC1Eh10YJgsB
cms9ckGY3H6fjeDoSVndb9PXgTDhJKdU/bbbymIpfttlelEUb7tt5hC2cfvMkDUArHH3LKAt+SN5
PumBrQAaMwTQux1YrYTtOKev6q6B6/sidhpPb1lRfmtrFAVtMmY8z/JhkgtVCP5g4NVPEMV8lE6i
Uvwt0wk+VHq3eHQsnh1Lp0ekdahpkRxTHrNjyl7ejbJJ/B95VVSwlFhK0RoxpSOVuYjKURJVCjeG
RDbs4c/ydOpq3/v6R3UAFd77mAtPgnxaxjIozBCKzBGvMJR518BMa1Vm4nXrGWn9yVO8QxD/ACMt
SQbJRsMj0pDw+MQRxVwt6R9wEE8+O03z5F2eCUFe3rzA7GWdo91fjo5f/Ljz9ofdl8fvDvbf7R4c
/dpVQLsGJjrmQJHTT2Sayc5y9O12NIVrEkbpOBkKwJC3zS6rAtYh80k7AJApuIDDpsVkFN8kwzfj
5EJo+wNkKx8Sq1HfJAr9k4JdfTz4eYQotgtNXLcYcT1ykK+woh1FWI1xNWc71qu8OFMI4mYfj+Cr
Cy15fGF8Vfa0kNyqvksuQXj+M7nZvawr8CYToksWWeFFToRYK3o2H/tA+cq9Tguh26J0mz1ecm/M
wiWRCJiqYfNplQifKHxyxSqL49p7v/cmHgvpnrug6DURO0hFXzE/Ee2SwEwv8/iMj6KMjd7sP8GM
TOsPn1bJ5sIQbFLfnJAOpz3jU7ZDSBcWOlq1jU6KMo8HJfms+L6BGZMuHgLZpRfR3z9mdJZY0Rpj
0yEtbicx+to8+CWONITJXySOdMb4UU/Nzk8e63XeKNH/kuhQdH7STBralEfRW4naZT5KXrXD1g2q
qQjvktiqtfy5Bau+2X37/njvaPfNPMGqX4JUg3u+bnCqAQp6zCjBQ44VsGLNF8CyDwkv9d8R3BoM
am0KZm0ViDdj8GrroNX5Gw8Hqc4QnDp/83XBqDMFoS6KAjMMykzBpovG70Ja47PgiOljZL1WaC5q
tn9OAZe5ziVn0XPmeEteAAXu26x8BZfGtYnNNEh0Kpat3kbG5bK6l9wNNecPnjOZ8/52gaepWETm
m8raLEKEAc5MsxkrVCNB3+9Z7U5T7+RUW+Xv9zpmdRaFZVOUKYPei4dbnubppdM+3SwpUXCbUy/V
4kUQWPvLkfZSQJpC2sulxtPxpVioh7gzr2P+DMDPLBY4LXbyC1SpZwgFlpVaRQLrspXh5w3L1Q2e
1DIBwVJ4YPlg7G+oXZkb22o5kfmy69qW9XTrsk6wfVXeH//KdUlDeK1JukgYFdOu3zLu2KpRHYkK
PkSVD8lNQY3WjgmDbdDUdcPjE8ZJSJLT9Gyqnf9pUkAyOFJsmhUiW1zVAmujLNUDcFHHpD70zu/K
rcXfsEJNZbuT/oItEPH2vY6RWoB0A87zDMxO41S1Zx033c1j2HzwaHAkbsOsWGmrY75SU5Z/89+/
YUNdVBvguUmJIluSLfqZotqav+tq2+DuO65a6qgvd9Zp3VJgtCuu9LrOh4axAqRTfWS5cAIDVIUT
xrrNYNXgq+nCf7TEMURT2AK1+zDGyzUbUbSFYAjMjEQNgmnE+lqopbdHGqHcGmeC0oQyfDm7Pc4S
zG2RVmCasD4QEzoubo+2gnNbvDWcAOKC79/BZcdzY2wAtJ52nqph7G5JUAZhHvxakO/oZnIb7LD6
PKhRRQevC76mGH892yihZ2F56oOgdW5Z24+bt6bn7N/0RK6G7rk/a6F0kbNXURtO29N/vEYFLx2C
4GBlP2cYmTSPvHZLXFh5x9E9HFoT2Ku2jpSWGRzGEJiO96kG6B/ZILDK+UnI8b0I9GsgzdWDOnj+
AWCBBPORngHoOL/bkZsDCBJ6fjS9MGbE1A/jy6nXBZ56dc8rLOq066p72nW+kJVbHHNlEv2/9pCr
teHJKga2NP+e51d5qH+bc6vu0YCa/cd251QbAc5+LrURZPAcqhRqS0vz4Rc4Yeo/ZDkPeGtbLtCC
oQYd45TFO7peTet/z7OYbbbQvLK0/Y5a7fE/tq+2UkHuYx0Ubb+PVQNY7mZVzkL69qhc9uQbVewg
J24MVQCyTSMDhsG/SCH7enhXStRU+1JqIohHF6n6be9UKXR4qx/rdK3ZJKoAPFOHsJd7upSBzSp6
hsO3W8RaYKB1YSpkDU5dC6E9IT7uppR6a4E320S8gfB+T5VE9gptH71i1XwEati6cZaaHmtJsJ4u
Z5PL0+r8GzKVCVRf2SRL4Ad5EaB7etdBla8Y5jKPSjFDpmUFGabav+LRNJGo93ZevNh9vXuwc7R/
cPzP3V+X5QTURGraT3Jotqj9nSrjoBFj0Gqzu1Phonl3XRrV9trdiRrx7NuYCWE905ZJA8a3xJf5
/4M0nmFLRDfYuBdS11rdhkaLIbC3NXyiYPZtiZpmazYn2rXdsLswU9Nqj6FVy417BLM0bXYKWrXd
7OifpXHmr65rvd5p36JBy3Xf0FKd/71dU+17FfSmt2tI+dQrk7KVV7ymjYBvnLdT7+AOrB6Vhqr1
WBMhj/UMwK1aLpXmdTrXEK7G9ezJhjK309iW1/Xe4lC3W7lR7Ya8nt6afs3RRMhFO2cKGGXt/JVS
v7guVFn3S8oXG8QiTt/JQQydvrMm+q0R/pIO5s4waXtsjkrfOumL6wP8uyZ7aXMgziFplW7O0bgV
q4UFpZNhB9xMwy3TyajBVGlk9G9fdgVh6Z6BIvk8/jTXDgYRaX2PWLULq26aBbdEfd6P6nViHgAN
WWSePOw+jVbgzyOZRebBN99Er1K4xz4VS53j1SD+u4KLweDC5/twD5yw3S7SsWC1+7AyYGGp6RY9
++I53y7X3tuXu0e7B2/23u4c7VYShsDWl90GnsMnLHdQlYE77+3FoxCjcAbfoRNXaXlO15Nx2uB+
rXFui4VpXKTQNeygAgR/ZVf4IzgxKAn187kQG0mOxGDw4TI1hrQmQ6U57VjlfVSJdLbUPdKPMNXP
+sPHepCkny/LAQqtANsR+yXzldi4iyLkO3K9RbL0BV4xKFRN570NhW6UdGEjqUihqpBQN2Bc1vrO
QOzfY7ywcP1x3+0fYiTA4t/Pvk/wk/frYb+P9/WtPQpcxKiMAgc3x4Fo9PVIX9FYRRT66NTsoQTr
GgBSRo9mrhZZFzxi39apb/3avpFNsZDuEah5eti2ZiSz+1jd3MDb7h+uPw5004ZK9rgjjTq+uzXd
esu+PgtYLs+t1AMZBaoX3u7LTkOXrU5vUqc3qp2u+lMObSXD9FQnOB04wnl7lq7WQAn11ZqeYCYO
2NJlX/esOE2+w6nOFjp20XOE11zSDbmVHhQyWVS0Gq1vifffbUdr8Hd1O1pf9mozB/EwzWRa4uRz
SBsVQqj95ZbBLlW0nFDJJUiIpu64FNrO2pNnD2vvuAwDarzmsv9EXnPZf/J3vebSQ53Z0xWt6Cup
ZfSXB2r9dQfshoL/glRFXqJXwhYrfpM6qt75JZd/jXw+fsryiPWZrob0gOt4h+H2qX98Tf29swB9
6rQ7Bzsv9/aPn78/Otp/O0/mHS+vfUnC48Skeqj0X3NZZK2cl2GR3nnvz08SFBEzNt+c5sXXUlOS
l0VjF07O42upOU/PovGry97ja6tNIp+7peF84z5Tpp+P0wF1z8WcndA3dEgwn2S6zd8X3y04H7cn
M92aebuxWmBnF7XcfE4Jnf4GiYw+edacL/c0fs4n1nzTefGH1/4bT4uFNPO/57Ew/7KwYoXEB06I
Bao2QZ/13Niczcx+mmzOhm5/1+Htezj3jYeLaLqigITJ3TWFFshILVAwrLVQFFrrZAyf6iFBOjYx
+12MS1SNtmkLc5ddZ8Ye/j0PA/4NLmb8FNcPevjkrxSGWqMXmYhU1uEv8aiL2le5g7DTzyROc1F7
IAuK46yR5H/XkM4FBVzaWxszx1z6/D/h1dUbu3A4yLPR6JPHYdpotI/CdNBfdaMT7PczR2C61Rvi
Lx8/6vbXoxX4ywMwf8yuoovp4BwDC8vz6cVJBEFMBYVeiq/QS4zPnAr50quE50CcCrzZGw9yuiVo
O+p7Qyfj0agSPhmXZTw4F2DKDBEosE/RySICJ70I7Ax/nxblBYOwKCTiCmQngvNIgHYi0srzuJTR
RYVqnRTUYByne+bXvc6K4hzXn3SfRCvr6+sszrHVZyW6DyGl40x0KBolZ8LsZ8Ge91WI0mJjQueI
iMQqfpI3BlK2jtTE0pVQUgxce/IIA9ceP6kGrjGt+kvYWpuwNSDoo7UNJOjTh3+/CNZHfezbo7Xa
vv0FI1itTq5vYieDYbp/h/hVp8sb1OX1pqjr6qLTqT7yDq5fwiEjViG05uFWVT393aT+brSIxF54
lyVnztnrWWp7Ov4Qjw082gzFZlfhEn97tA0vj/vqL4co0cTrfmBhfg8RxU+Kx3hC5NGj9RYR2wYy
ZkNRiyCuEUNK21XeTBL6dglFvOtjlQ6wus1InQZordZK0x9aD2Pnt/Sv2E9xjexGM+hg1ZZ6Oy9/
en949Gb37dHxv3Zev9fHl7r3oiX4+OocHey8+GfXb1iN0mHyqa0qg8MMJhVDvGpPmZezG1O8bsM1
1g834CQb/Hnk1/2Mtv4yxf2LOL+Rd0bHJzJ4uo11RExJV6jTybKC0FzUobIjZW/AHeto/wwTYf2k
JwkZQqY1a4I/hyRvyfAAIKN/XZZ8Iw9PUeg7ne3Y2Hhq2SDoQcZ5sjdC+2InP5si0yqPcofbFX8V
ewQbYFS4nXmx8RBvSt94+JDRDnNQSSqyluY9tPbJO7n5ENXizc2qDfWXV/k3H1HfHtb27S+u8m8+
pk4+8hjBX05vzWUGbz7Fw46bT/47rCifbiKWyJNk+C4eJ59WP3HwCOoojy0d5XFU6UBFT3EKLPU3
o1fJidZVNtf5YbTHVV2lUr/B89t9GK3AP4KfVh98U0EwEvghs7zIJjd5enZeipFeBnDr0as8SaLD
7LS8ivMkwuSuMSV83RsPevdW/OCQa6rQuoRiA0zBHEeg6sB4wdI/iXNUkH54+562AGGoekrJeNh9
+gQWym5frCM4YzIxT87iUqozWVRkvSjaO41usin8BE3iKi3O9duu0HlGCWhRotV7kQlxxKQW6NE+
zbMLqJ9H8tQaqUSgR03iwYf4LJFH5nCAQAFa4cf44quy9yIbQS7OqPpcbmhtVeu8y1Lv8wMh6cTk
AkWy8g4TdvRMwjanSJr1DpOcdgkrJwR70zId9f6VDEoX1QWeMVyZ4Yxhu7I6iVnrCjCwh0lrZNB4
dTuKQy3JzZaC5mJKJLqt85IV7csPdjKKT3tm+r3f88PEYu/3DpJCsPAgwQOk91btw5YGijljaXKz
+RPtR4cAHoO+Y7g6ZQVE+kr0TfTt5Dv8i/NY/BdDgtMyTkGfgeVR7+IWvWhftGjO00E2i7QQCN+I
+RuDzl+mF0kPob0vYD0fQKDQVVoOzqOTpLxKkjEDF53ciA6lgw8go8UULuOTgip/+0DiZCMo3iNE
YfCQvUDJSAoxDLkwNa7iG4GisJJuVKn4RChLXfFtlF0J9Sg5FTiOhwiMhJ2QVGA6aZx6ppEkxQwe
V3k8ieIc5F7UAYRBQQeEL6ajMhWEJmgQZwPARO1lgRxA1VjQDpXAtXMlIArcx6MbQatielIkGgWs
irBULSCWIGo2HiTLvehNJmqWjAJC1xUgASNhjKLVeU64iBcPxP9FRx6kYzEKpfgWXdCet03eB+4V
Dq35ioul+a9wWMQ1EA5Xa6UbOyT6g7EkyOlCN4te7r94D36Z6M3uV/ToQUOkSC1JmNgxD2UAkG8S
auHXrclrJpEFdF+gNQhT0gkFYlhlqEv3VB1dV51+rfZZ9doTgsAAd3gjg0CAh9I5dSo8jr2vYRe9
pAV6DUmvbNTmwEQqzLPQabZQDZ2n+W7RS8duYNp5OhrmyfiFkF5lCLm12w5hunjyerpBRtqnJbBn
ItuY6sd3wwnyltG7pvdO2UFlNpp8ZvxsEuD+tRnasMndMfWCu8JuerDnpQ7MruuKTFt2F33xLBWw
h9uO1nePi9xfXTA6noYGYnjyZkl0myYo9H5nNGrVjG7LaF870XkymkAcFGpZVjwVWhqUHdCOraK6
XjUN3dra9xpMGtu11FUA5FG10PohLRnsGlCqIUvguQBwKRP50d4LviU9JKh0JSx8jLQU7Cv6RyDn
OfkonD7eTu/ByFZIyhif4SZTFoEHZKR9mapU1bu7VT9katuKjdl5NhJqMOyBQRfSsRi7C9rIwWFM
YghQjE/soeNQ3sVnzjggwUohZIRNBecXwBI29JCV1ZGUdLLF2BirGqNUwM8GKbqUZI5HtJuq0Ixh
M2BuHRssHGi6TOicc2vAZoNPH5upABZ2M14bczvQCsqerwkB4OtC3WiDfDQt6iA6d+BE2+LdNKmA
LdRhixTt72zcBls9cuWoCvEkHnw4Iwt7AI43ZRI3wEQnXXRyVoEneDCZG95pFZ66dGyeYeKXnf0z
uanAhgSf1wpB2KfNhS0PAu48hqTYINaIwKE5YTdlIIjpDfuJq/0tn8S3DcthXMaigSwH3+gpeS/M
BPbINxxHzg3GDcT4obJoYrYAZ1a1qslSOLWa61V8J5aAaaqnaazv8BGU6XAmto7EeSRJlwkruS0F
55+ZQFhdkiXG8UXSpa18eGqACYwwMnpJGOIdXhiOaYuPwUA+sKqqh7Iiwl8Wz/6Qz3ETHsDBDpn4
s8Wf49Bsa0z1cwE3AsGAmJnHCFw81534Uy03VAvZZVtPf/bKaoi/MIO8bclnC+wEgU7qNEu+rqtz
7+VMTFTRlmfjQXtNr7tBo6o3ux1v7GGRlPN3TzmMbtM/dTOZ6RqbHG4vqwM9z0g6WkPtsAXK2n0w
5x2P0kloaGZgOz0ojZj6pVUtsorggCoXOR5K32q+uIt0PZ2Dpd3ZAEuuIPRzXT5Eb1znZyN3C5SJ
4KzgDMgryjPcpUqiH7h9OTkTA2BezzMOrnJTPw7B0oFxeKXLh8bhdPZxaIEyjQMrOAPyahwY7lKV
0w/cvpzCOJjXc0kdXNPmWjuoKlNKm8VQGXYuy0U1oh5EPLLRygcyygSwAg3hf9G++HtMCtJ/1N/c
eNJfe7yxvr7W31h7uvH0tYw3o38VNNpqpj0oCqqhJxiVI4vKfAJsF2G5rWwMEaUiHTETVXsyGgEJ
RLRSZ0QWPbWWok5KwwcijejFVxRjFP3jH1RSRgd1lqNvtx29W5/vxrwHL5WGq24xxjiajgNkNepT
pvgoMmO56vaD9vVcZZDpjBNB89Hy0lJ7RmbKeD3b+grapEaFVPAr/O0wrVdiTYoupatAPO17njVH
kzIoidCWBJYy7CVIS0asp0fYkmlgP6QJy2TiJw7ZE17iVNXlRVIIn9mmwgzC0PJm1HORv6ifj14y
9wbnJwwUEL2Ut9RhTpEADakvy9Z85l4TFToI0xqJm+JO8iARcmXvQlh9e5R3Zqlw0DGpfBjn2v4Y
7zSWmxoCXWsTo5Etm0hMjGl1rS25FYta/av4lxj91coDw1Ck/5N0HC61CeynCqeJ3yjaKbWPvB0n
XrFLV8BQTbX3K8ySPzfXCW2EmIufNWEg0gLsmI74skz0SYhHoTOYv0zRroc2tM0+smWbRhal/KlY
sMQfCvR9HmN0f0sxYTObzUQ/6eiWvkJDRlGpFR3b3MDtGjDGM6kpteKbY+w6d04LuNBdxYfAx3ej
ezt5pzx69aKuUsq7vam0gpB+B5Ng2fYhBtnD6i3dIG/1WIHk5ZanqddF6JVCuksQo2nUNjjrkkDO
J4jWFMKUThDIiCQCd8GVnyA/fUhu2pBODbCmHdBS1K1EqbAiEDCeL2OpGgoiZHMA4rMhTIz+3HlI
A92m6kZQ6RmALGKzw/s9efl1jxgIo+WNgGeMCMf6AG5YWTYLZ1gDRg/4/mmHAV6uG6H2yZhmn8+h
MfBMaruod2YHul1dSNlOv8mmZVkUHnoY53Qg/9WMnFvPf7RPESaAKa+SjgXOi8H8IGCjhPYTx9Fq
P/rf/5VPz3BnItfw1Af2Ff8zFXYsbA4z06lZp/GNASoW8I2ZajWfhj5VBvQ+s4DvW9ODOvmt7HLF
sqTX3207JibMoxZH8XiaJTMXlYar2uuBREDlCvoPrfOpJ1oiJKy9o6i6s4SlNF+u8L3j9vcE4vZ3
4H7Aldr7Ad/sv9x97b0XkGBuuTvZrXES6su7UTxAtc2DGoFrQu9o5/nxu9c7L3bxFLAPTauZW2H7
Or7JpuW7TOByYxCWgGZH+/XOr/vvj47f7b/ee/FrCHWrTYM97R0wRNVJVQg74PEdJjChEtvB+zng
sfpWIwpAQ1YeD2QdMOJm47HgU7AHAlenbAtSb/kRmkoThykc9dBhMXTmU5741PCFDEoHuP+K8AFj
FmsLUfhjGTSOgeaitn9CgBQ7fHGw//r1sRk4yug0U1sY417fzM8HO+/sRtbcUZ/mudx61HytvHN1
FEvdOttOTHfvaP9duC3OiHXN+XbLR6yuh71UQL/Xy1ttw8Cu85Q689zeiK/GdcsGARLsj2cTOMAg
ZhUwBg5bSSHuAhT1xjPRK+5YqR9j9tgqrbvuYMtUqzOjbmMp8YuwA0DBs1RMawmLM4DsgXyjvL6c
Q37GYxTSTC1Isz5JogkUGDYQwGW3akZf9nJhpNBsg522e0MnUiQVODsvhhCsojVXgMuv4puamqp+
C42uMhFzp495IqGpD5zsu4xH6azj1VUCg7fnZl612hYKjuBq9Ns7j5/vHx3tv/G9Odj74ccjoxp6
SrzefXWklccWupm13qskCUSA+8q6kqhblBRNVUS8i5hbwWXaGdG0wPkxVcEgXGrzn+roOoe07aKq
tctWx7VZyRb5EiRkdVEwwHyZnMbTUelbobUDs3WyOQmfp0rwCYaQwQnOKJXDgywUfMxVC3sOMgu0
dV0+pXyeITZpvI6hCD1DDb3SduTMXSKxNE3n71SNn4/1zefmaxgoiIVLdLekUjkk/imkDD+5ke+V
uySAH3cmGZw8jpeo1vOSjnEKClCz8FqsAvTSoZhK6WmqFGaY1yaLDF0xLtaD83RwLsGJjqtVAQvi
EtaOS3c8raqwwvd7HkK1zDDueLYbqTDQy7IvkyejgLQfLPNBwsOA5ks8/Rroqws780Hzh7G7BolX
mFXpANLMin1vwxJCqPkokbWapSNvPtQMgIb4vjkVDO9Z2zQurXifUuIuuq8EN9TdVtlhgj2uT+vS
otNgX5suyzMHmY7RZ33+2j0eUfh5M5QLxvTgFllctLrjzeIi1ZX2asHcWVxkS3+A10tjo6v+O/0N
kPImRxE1oqjjjJibp0VAiFai/m/LPesYB+uYk7u/nVD3JB/LkzP4nnMTtZU2MR8gzv7tktxUdY1q
fhpaqdskpplF12Ip02YjjT1pqmJcrl0+j8+Zuu7E03HlDWpavJSzTHdBuyKlm6NJkFEt6AnMHenQ
yoASbYdWbyZhX8K+Ldf+oraEJYJ2gimi5poXUjYaqhRpptoWer7Vr55XylaVc1bFJFyzALVR8ZdA
+tne147f7dzVyHd5l+eY29KWDzlDeBQht76auJsPqolA0fV9bFox51pzq4XZrExrVa70k9h3Lv9E
xfjOxhg9CB4vCUl9yC/QRRu/C74MdAfUzA+LlnUepr++c8Jqp+IGsFdUcACPhpaPwK2gp2W9M8E3
Feu3WLpW011criufKv7zT9kaz509az0F/dOTF/TNUMd9PdsMtZw8c0zSii/RfXaLqepzQNFsdSZq
dfNDTFbH+1U/bS0at/Ms/gXccwFMR27H3JmqHHUOZy01+vFC87N+L7FrGg1MUAvjOeemdcQSNiKU
9S93kUY3+i678Ly1gOgLjkvnkLM1g1VmBBX14VcEe9WSbeZyMvjAeuedpCZkg76JCYn1fMeyKYUA
vHXiI8jdLqyXXHrek/HQnRMqpgFLmUiO77Z1YYe7MeJnWu6fYmrigrH3ngR1X5hNBA5SCguQewok
vAGwM3gm9XARrXghWQ0dXefpkPZSBFPy829jAepcoF5KRdokC2tJdcjylQpAvr05JYpsFrDDUySp
reHBoVntd3kQLp/91LiY81X2qli91SJQcbVPNi57y84r9oBayKpLVnOslh3IC53pAR07zjz2XPLI
OjmjrceGrfSNfXB+t6tomb08aNlDoep8d2jiGZkZmHq2nrY/2tnYb5djwyc9mYgYgJh7F+dIGfCp
oPdG8YF/6PdPDeiBZm7Mq23q1RO0Gw1a0JSy5BW0EyqmXmaHeFBexPFgNB0mhawuzEeZco+Rs+pf
ROEhZgr6wgMb2/oovf88U/XMSYl5HUw8/+1OyQdPnVbyANSJOCKhXmHDok5nJJztNL1RqdyPOfNK
61NFbMLR/WgiHYh4jl82Sa2xE/twblbtb4JUJVx3dQA/tiBlEhV78CD6Ua0aht5FFl0l0TAbf11C
FkcY+ehlBkvASQKHDuHtBOeCeKYB8VqiT2dnSR7FQnRgog0Z5WiWHi1+cR6g3wy85taNi+ru3YCM
35bSOjAH10w3SQubYZMBtax23vbZ+R+/hLnTngWM991122V8VlTOgZqtjZk5OHIOZyvhqOdDDVd6
Vvm/zSgsgrizEZQOIH42FF0wpWYlD1HjI5DHSwsww+CrxlqsbHCKT9WRhylYDlrRjjmkB5BMqmQ8
ZjHMkkKIULNOm0VpjMtPmcRD/dwQfygM2AHYgtQBWb9plFsPnkflZNlawCC9igvK6duTcjugbeLm
aMMgg8ZlSGZONBpaGbkfWjtsVcvwjemZWFPeirECNastFwUym9yeuT53Rlm8OJiFoxg/+RlqNhly
l+w1o1j6r2WomdWcGbT2OVmrragKKOqfjdRijof/CvZSyAwgCjwHc6NQccsSK1ShUtW2FRYW6x0F
ZZSGwcn6qYlL64LNQycjiwSdZCwbyGL4nqNx5EWrRr/ysy8FvnBInI8truzyUneiVn3hpM+Okxbh
KJmB+T6ePNVxUqznDDBpEeQANqJXKhfLNspNsneJ2l1qEuLOvlEINcxgEf3fqENfeKln1LQDqH5V
CO9BsYkExoyPreA0hIwXFMr+zqk67vqNM9/OBQufwC0gsqzJGszmXBfbkfVhpwGuuoKM44LZknEx
xfMhMW5AsItFWm1d8C0zJ/xRVVT7uaEdHTWDCaDcrExFj2CHsD6UUnRRZQBp3glZ86qGbP5E2/4t
CcuDJqMw9a0WA3vDAluQZdpvTlAwqj2yvoFcECdEC2EFWzYy5a9dGGyTgfrgARGpgJzdN34i9ZTD
QjKAOnJsbQu4wsoeR/etgW2Na+FhDJ59qfUAq5nfMNBq4S5V/yHZeBFg+9vO1NAIeSeWjcJsHI6h
xnhacjz0ij0lpGpoEkB2Z2QHUlrhvmzeQxI1FuO7uqrXN6tjM+wpwr7vRTyWp+RAbst0zK0CSMfT
i5Mk18dIg1X94T8sP1QlMs/Ku9R6d9Tgk0/H8vSDkjcZZfSep3MArLYnB9NxsDPuIZhputxzaplI
71nisaSjRR64nClSouKc8XSfoFcd4P5jLZh88LbLmaYY7GJV00shWCIe5YucjWQ8KfddEY23UU86
nkrwo9GN8szNRjY7kf9dEc5upR3peDq3j0ZCO2XfjJPWynfs6eUCZm1TE4HpK6odpZOj5Lr8iJN4
MisBKxcf3AUJWzRiewMrqYU/Ggl5NuPZKFm5kuIuKNmiES8lTcLpj0ZJnp977ois2jCU25OzbUvB
IK5K5sk7JysLF2tP1aumXIvfREoKk94pjD0wu0+SUJzrfDRvSp1pEbqSNvPj0Jhl6Zzx0Ji686Vp
4ovne3Mwaw18jw6tkpft6NMlezV0U6/nI50GjhxqslPOST8iyV1TMdSKh5b+jHAfn7Kh7IAzLlTo
b+MOACutzkIV0Z0oV3eZq5xYKgiygoaH/voidFzDsMLChEDIhqRm0IK0PLjtYmwDW/UzUrEaAgCR
iHxfwns2xbUYu9YlWvNQq0FW6hz51MAMdEKjZFFk0hFmQCUW5eojkmvasECxuyGQk/q7HXls421R
dKqk+sabvKrpvr2EC9mG3eq9cndDSMtOtJqbZX5Kaw6zwC5smhpbzzIZoZG6+eo3Ec2sNe/vau5O
OryRGehYdwHfrWjZcLFO/XpRvV/HJqz3sp2Fk5VZPqypGYhbdxvhrYjbcFtOO+L6rXJFXOcGnYUT
lxnorKmWxG1KVz8vXas57VvYN046e5uYvtz2C6elMnRUI/OdJVqkjX67cyk+6not9MZ4xcXROLjz
2FoRkHddOoZLg0hoYx3ppB/cmvAYSfVKQbNlRMEmVitzGkvNVlI4f7fd/gxDsFC73qW5Re4aQgfM
eZu0d0lVbdXrxppJeJqChVdyasTG4GyItXLDnzEO4SSBO8kwaXNcb+e79Kf657FlpuWQVD09xRCT
U1hIAj4ABLZ/euQcnbBPSZigA8yCDg+tXWfMIfWttRUbpSsrlbO1IZlibdT1MLN9IQ0vip/6Q8Yj
KTQgFSM+OMmT+AP90Les/mmZw1hlIQPKrIiAkYZfFjqaZCTNMZhe0+9jjSTtd8GZOonB5zKE9afV
zWK8U7Mw32I8Ic2ChjvrqHqPFvtPNX2cUWb+ehhqjstHGW+T1hMVUmyHhlpol53r7s1yNMoGMUTe
9XBosjw9S5U3UI4QlZvEaa7jb+Gxne0MMo2PktMymmRFauBJSNA64YIsYoAIatDoi0lQxql0Uk4y
OMJqn7nWgWrDBHKd0KlLLK0zhNqsSivxtYCc5cN0DFkrZIcIvF2actLcNJRuzcye7tRw7k75Wo4C
8p9c2G9aRr+IRoVd9EIjLr2XAsrNnBvqdEsO8Ul0kUGANKY09dIZ35AmEyzp7KhHuhGVWqWq2gOG
FXiNu+2dN1CHUkBixdCsd+lOrQhgv8BBD/3r17vfiNcpd/NkkieFAIcYEUu510fssUj2C8FgoxuK
ygLZNUxOpmdneLHPNBfTMAlmoG3fICe7ubPCe31QJflu5U6bCjle7r94D8m4oje7X3lRrRbgHND+
Zicrxj2uVHMTiXpKoLfUwOYZ53liUYl3BYDsv/gPtepn0e/xZXz9oIDLFB78dJSdnY2S59OyFHIT
3tzbvv3n3sGLQ7Hgj5Jn0YPBZZFnWfkA02FO4vKcfavHpHt5T/QpT5NL4hgIERa80u89uTdMT0+j
1Wm0motfkacTq6urDf1c6m9Gr5KTaH1tbTNa7z/bXH/28FG0uiY+S9DEyspKI4TH0c4klxA2nvUf
P1tbJwj3vv8eMt48jFbgn++/vyc4z4NmJLDEC7JeZJMbsfydl1HnxTIAXI9e5UkSHWan5RWEcr4C
DQTnSjfaG0uDrVqrS8g01I3ukTSAEYLZPIHkRWIK/vD2ffRCDQ4Ug15sPuw+jlbwX+iH5H8cQ7tH
keC1BHS8nRM4rzAo5WOIG0ZRVTAmvidmBXbdgsfBUX5NBVMmxGev2GSUd7/MAQO1KZx3jtn7Tkin
gl31eLKs7jr+wzeNhN1/+uAkLtLBg+fw706eZ1d3N6lmaprmytvZKsH8eTBMLh+AcFrqRz8JGvSf
Pl6L1tae4X+Sz91Z0gS4ac6sdddgzmw82gBuWxGzxo+fl/0bGV+sAW0YXxSznkDRU4BcSMhb0U02
xYMJeTJMYUk7mZZ0kms8fCDWw4tMUP3m3op4gpeRkYqT5Bd63xka+AGyt8aj6B3x3ut0kIwLON5F
3FiciwXvRECB8qGebUVJiq7fS7ooPVrHLKAdodsIHPMow7MtYnmByPARXFenSvr7abozVEHg59nE
nMZgx+BOp6NuJEreW/l57+hHyGi48/bX6Oedg4Odt0e/bqE2BbfoJNpEF5IgBTUrzvN4jCkc7628
2T2AXHtHO8/3Xu8d/QrIv9o7ert7eBi92j8QGsO7nYOjvRfvX+8cRO/eH7zbP9ztRdFhkigyik74
6XiKA5FDAIBQiEcFdvhXMXCFQGs0FFbfJZxtGiQpHFOJheI8uWkeHkFJvJ4edUWLfFuYQQf3UYC/
Xuy/+3Xv7Q8C2T20IrvRVZ6WiT6RWM+r3ejh0+goAdkZYcrPbnQ4heobG2vd6HlWlFDyzc69lbX1
fr+/2t9Yexy9P9zBTr5Oxx8o3EGM6Cg9yeP8RkrJeDTCK2+GN+P4Qv7ErmTIRYJxp6OkEJxwb+Ui
RiBAmIuTFM2nLP8QidktvqIrxUAXvTw6n8KpUc3oeFeQMEaGaJO1YfxBdimnytW5ELtQGxomGxH6
tYMq6yQR6jqIdXlwqyudB0oaiLpDSA+ulEpFALAqYFLcW5nAHRIFThe8AmH8wS6JBAG1eiIWDtDn
FVng6EEuvg8gXda9leQ6GUxL2MPoQjLyOB/iRZGypyPZLT7vi4TDFTQmwF26aSojHoTvTKwALLEc
iaULhsO0SaJFiAcFHyf84DxLgVsEnpfpEEzVc5IFUTwqMmEBwB2veFNEPDjHvidinKqddYYyqo6k
6h/+jHVnBCvsjD3UoxOw8jve3qEO2YlepOqk2L0V3Cj1s9ge9lFKV+tll17EN3K1B6EJm2D6cJ+g
LZJHiUndB1ldUJqIJOaiwEmgIVhT2/rDTMh+g4D4CXhfCRGt33bRO4DDBZPHtIzp9C/0CSuOBV3H
JvgxHnyA1F+4kvZwJe3BStrDlXQLigjZmYnFCkr04quyh5ueW77n5vC/++5lKtCAdj3vfsjjiRiT
wvPqXTa6OfNW0mFS9jvVBbpE3ffmJ1rL/S/ta96w96AJgIEmzVjS9IZ5fCXP5YnpCBoCjGIJHKp2
TFB5iF5n2Qfk4VcJpcUHqluKp6tkaJ3xp6oSa6N3b+UP27Dc0YlKz5PRBG5KwRbodkbEGLyuzkUW
VIFKYk/IQWwahd/MllRX/01oaKLK3Y/SH26umpVNyLGkRrbYxbsIDryNamb462OGVSi1HfXXeH1p
v7r3y5nOWBftQQPSyYPjJvvRU1A0NHWlNJZq6DEW0iDsO3Y1Hh2LAt6r26mxbU0j6QKtdvWA+a/O
E1x7OPGqnWG+qJry3guaAfcfsU7o8nUYlrbYXqVDWPLbIhsuHsT1Z6gyL6qHOh2uy5AhBsGCXhb2
Y6ozg4J/XTG1lxskt7dGeVaG9pf3Y4sSapEc/I7SCjSSd1A9W01HMIWg7bmFz7CwWlDUxId1Uog/
1K0qVchh/gt3gavyKu1ExWH+a0NpDwkRZ5QCbJOma1A9I++35QRntKVAIySqWn7pBaWNZQH8sMli
yomRGMb5h8PzeKiHQyWrsIsVqogqpDHeE2tB54xc612Gw3Ld8HKfL2RSIQYdlHA3OULGS0+FUh8c
+OBY0vDXDOa1MzxUITiaN22LM3pRiA58s44EE/dbqNXxAlI2xALdyqC7THHWw8t0wbTuqH0Pm2GK
GJTbbVESt+VGWW7dfn5G0Trw2B5WU0DYkyM566lMoD62ZPJ+cNRWIQf3DeMW6xL0I4z4yemKG6Rm
RjsW/juQddEt565jGgw9BuhiERXIlyBmiY75VRfrnmRCvbpg98qSCZcM4foHKcZJqQtfjyypjFNH
kBl/9p6/3nnxz1nRU+F0i8fOzP9aDNWlybidOUcz5wK/EeIYaEX2w1bSKtqvlSFI7YuoUG7FJQ7P
sKVMJrTxbJy5LXUsbqrchMnTXrxUpTqmvH9rp1Xn3GuOkTfI0pVgdDOz0YHNHbtGQ4CxU1qyM6o0
9NVXirEVoiF+1hU37IEqqP7Fy7YfrmpYc9eaizWZsKPKtOi6HFy57NoZ9iiqj3hW6puadAVfffGV
NScrCzQW4fNJf59tY9uwhpzJzEzxH5+vKe89I6bmhWcjlAvqGe7caYWzngfsREdL1E0Up8JdMpaV
DJ2ruZQTifRfUa4rrE9+hYQV1WTtp6qDMJYxKhdRX9qwTkeXWo40WIxEpNb1+mv4SHd7exaCT4zu
zZ0XXiq3VsOqZMYSTL+pXjdMJc5Un8zZN3lSbtscgmOKS61u4+glZlLr6mc90Ndfp+OkQ830MPgc
v93ob+xZtKK+kulsmmkFyFRHY9YU4SgZRQolQS22cFlmGDtI71OVfwFksHAtqJrONsFaNBoVWhnJ
2XJ0XcjhQQphPgszBAd+Qc1Wecco4a0XiUmenCY5XGTK/Rc1YoEtGHZdjxjQbl+Yx+9UafR8BC5s
1jWMYO3Zfp1uVHmjvFOznr5Ox+nF9GKOjvOaTd1+Q2VDna4SZsZOxNfzdoLVbOwElb19JxJnDYrh
Fg+S+Y5ajB2i/Si1yMUqDsyUusYi3IR3479mXcZm8SXM5Elo6zFsVPTDNbQfSB/LSssWJ7IQzyM5
DjUOCeWt7NqmeK22HVWTWrRVtZSujw5SKWaNV5++yRg1V7+ySveUt1UB4mpExaeGF3VZ/jTqRr1T
jStydX41iVFL55pfCuBuprPVQ/G30vyULl3ajIr5fJJgrGk1k5HpUa9r2brG5NgxI2c7oW1Hg+IQ
zRmOJWi50H1cJUdomE1h53ooveod+r2s3Oty8MGRd5XBe/F1WZTC4t9E69EDrvijvw+iKCoFNyoF
T2Hzv1LuYaVcgdEqlYKPKwUTaRY6BZ9YBQsh0gbnUcd2ccBH+w8HcZFEb/cPjn58przB6gIo6fHD
5AJjuLz+DyBLF/vSlQj8GbiNMuK1sFNdIlZXdvHPbrSByYtVxD9D53D//V2iw/GQWNWis7tzePTM
eoLXCrdC0NtUGxyrPQsj+POuiyDcatwGP//ILBC/IQU9PsO7i5vvbN0b4/WsTNag3DLXtbqnQczk
Fs+9IcZuSOALOCD4PLt+k4yne2Vy8X7vY4dIhjBoEykZqruogMkA/JZxk48fW2GTIWRhAOcNHv4S
Q/klhvJLDOWXGMovMZRfYij/4jGUdNTOHNtzCykw9oGWmWMdAyGZ+r1anf2v4a281zVcgK5DFdR4
E48FEXJ/yfd78ghMEXpfWx2pqTvzfk9GZlYDKatqh46nxPfmuYyetM/xsCakMf1+r3MqZNgo+onF
7QR8lwEMbGdY5UAh+s7EGp2XN+BDS6+9rlGh2m3hhRD7L/e90NS9waVYExStO9Udl0oJbfqaIVKa
O+y/6IEBXytEs+6MhxDLagFA2wOTbwxoK0q+1Ef+77tU6eni9y3qkDsqz+CwlpkdHc2oQodJLsTC
yc67il+GT4WBAmt5nUfKx7RwewH8NfRqa1JAF16JCZoJCfcpzzA24RU80bhpnWjcjPy9cg81NjVX
f8Rxs9EWqcJrOPD49FG33xd2CP2F44J48tSd4Crru8uPtJ9Ah/JWnWn9cnpxccMytVs31Us46nV9
qwfxMM3kIcBbNsxAtWibZNnuxaS8eZXHFwlvtQWTs3n/WTG5i1eQyR9ZTP4o8veqicndCkv9p9Gb
ONdMvr7+bH1TM/mjRiavwqtn8odrfTgQS3+IxeFzH3jpeZz3RCPD7Oq5+Fe0VtzvIhPRRWjguLmn
ReD9V/018fp+GX9IXmWDaXFfvfuzS1wooaKohmPdI6Hwi8n4MhmlF0IE51B75b4Ws82FV0XhqKbw
q2xcSozhq7l8rXP/pTAXsjPxEl703r3e2Xvbjfrry00AVaY8CRbd6gwuBamdCOPsQwMovVq0hCm0
4zIRMGHMHq9tdJ9GK/THjJloaVDmo+j9OyBOnvxnmhQlDUXXLfPPd8eeYnrEls2QsRQGJiapFlUM
jfghj2+WzVjODuWHg51fGQ0ZAMgIIpbl51kurIS9MSQYk5DoBwMFTqButAG+RG+PzJZLqwH19KYl
BCgmSeLp0SkN0gws5VbeG0+m5Zt4IoEYvav3Ov6fG/W2E5y84OAVdaP74/gSbZzXyamYO8Ru6w+7
TwS7iT/9NS4jGBI45j+quJhWnOyBopLki0fv4mGboRX/9QOwmgfljAbEwxfCmN4Ry1s9BhvY/Jr4
NwikHoCoutmFIJVNP2+V+utRe3z6hE8TuHpQ/daYvWg/GWfCr3H8+wiqHxz/Eq+x2hdm9Si+0UDK
RGjknfVAFWHWgRbzg55HqsKmXWGU9OByy0LI8fkmXgv96NPtJ8yzj3BX+wfz7Rs82rQ3Dr5sGHzZ
MPiyYfBlw+DLhsGXDYMvGwZ6w2Dn56N/JjeHZZ59cFIe4GtcOoNvQxkb6rIygLEdePwGfCzefA01
qRzUq/WXnpekMXpeBNI84Ltgd2lzBc3knWE8Kd1dBbeQ2oGpKfJaTE8QYsFSqD3WAxLjV18AvdpN
GIf3jHonSTwuemoz4QWeqvG16CvHOjj3RhRLb7bwnSrXYTvXhtZPHgesv2Rgrt3Bzhjm9HhfpiMh
bJPg7titds+IcYL84Cvm53e7JPTxZR6fWRzZrnRb8P4p4y3XCiS0jTO1vrRnuzFUypgrwT1Jz15k
ZRsSTuGCaIXlhbTtIdzcMVaXIYAmILhtivtfXxcR805Wz0kjIMe3umVO+75Q59bnaCiK7KZkDLXP
7bqAFmXAMJbWRUCLcG5ofNCElceDizsqdnD1ns7SToaRvIUiPi21RXeNIwQe9gHpClCa0vYK/CQc
nQa5mJ7AY38+WRbEPpCH9lqhc5LAJTAaH5kwGvPBi7+ZTo6rE1pXZCfYA1IUsh3ZMJJ6r5YN6Vt9
r7mwhQZCVT5JyqskodTypN0iclWWwfBtEmdHxokTbUebnAZyDFWGaSB8lQ3UmX4Xa3nCV771j7k8
iyKggVSSWZdHUizIL3QjFR2zUe1Wp5tXsmEFn7zzIEDdKQVTn7qwzcb3hVmvDAh4GwnhNz/iTHJi
UVuSmpaIPinIzkBjdQ1V5C7Bc0WxaW5PzrACjmOcoMNSmfFChqjUCZWG1FETYRGSl/MdlazIIuAr
nonbSCWvnKk0JI+gKrFiDoOHeZidum/Zai8g2AqvNFONqts6oI0igaMZQEbKVzXhZzjQrEoTmXoA
nnxIbsx8pdMXEppvW8/qalAesJrYDhf1o/gkGbmJJZh82DF1X0NRIyew2QcR5kLLpxAnEB1OLy6E
aQdvnGXXCoOpMp4ASfvjVTbtqFmnNuC9s9oA8L31wuDTjtdmz516f+pOv6EDdKy/TbKoDrsWcU1W
xR/FII50foxKGJIrU/xda9moqNLUXHU0g2PZplFdy99uc7BY2zCx5vAwDIUaZi9Eix86/qCl4oI3
4YkOazjJGUJWQoKv1Si0JvjsuGsD/Daw7dguiJWLVXK3WYBpqvpPJKvRqGDddTSghqOOno+t5s1e
368uzUnNmvPYobFyUqqfwLkz+9lyNJCSzYCHxAzI58rtAxYuxgPqVqkytn0yO1msj4c+EiNNIaFG
mDUWLt3h61IJSzAEw/CnXxd0kFEMQAbPxTJbanC4aA/i0WA6itFN6zsKL1vXvgSrTUFGE9YoSIiH
2dmCp2O+TFIMOBeljgHKGx0UtK+c3CN/GIJCLXmw1lQAoBxAqwE46clrRz6kJR2+Z97AjmNwLptj
W4oQknbxcGjSOtoEB53MlB3K5BDb+tsK9kb/CKsJOqpVt/n7tCh1ukyTUtJJfwC3LiUQfCpXVvoA
tYcqGcW3hINMw8Dppots8yL89JoZPBMuWzN0PgLoik5aBEMONg227D5U6qrECdF3GvlQj4J13dN5
zpoxvEXw82yinUdAa2FWdKomVMOi2T6k+hYh00YVROPbTijF46cps4eJS2MhWctco9Rg0O6xQMhH
DAY+8NeHuWvVxgem7ikE6gVq6mtq6zpgrrD1g3kT52fp2AJB2wMMxgWWMfUd2eOEoDs9cKMOvUD0
LcE2KLcz/oBDD0SPB6o9aF8AYjUhgi/u3kBTxXRFj/HagJGnRhVa6/55avgIp81NB5y8gqkh8rRO
t5YzWyzPJ1mcD3cQmSIkgGphKBvDrq25Wqx4jklYsU4qMwHqBM3JytNQddeeZL99lg3vU40xYx0l
EeUGbvOg3XDlRmktnsMn7DmjYgg3N6VYN3guB0sqFCDDhtDljRrPNPJogDLSSN/lLtNXzGdAokTL
uOVuUO/08wpixNqxelFZpHSKwzOT+/UPV82WuSwqyrzrcnDvKW9Mm6Za1W8guRUqjWsYRolKrsxq
hd/dZFgaUuDGch9t9GiFxnd2a8yxvqppIxshuKTrtrDIZrGZjHpf5jJbg34E128KEYSeylw9dKul
oWroiQ9WuwxVu0zFw2C1k1A16aQNVoxDFbkZE6w9CNU2erRTV0mWEoIvyp1RegYrJJow/xIPIBQK
H17gPaVbpvh5llulf8zy9H9gRydQHsADH7zLCrcB+TilHJl2G04V00qlElVDveYUFHGt0lizDZ+c
qkfMMItOL9R05+aaKGrIZG9C95RhK5YoIY4hmlmY6GLoFfRwccxVCcXzLvVLanNCWF7m1KJp1RWI
YrZbq4ZHNNt2PV5FS81A0IGwSdNiJ7+AtE3RP/4ROW/UxWrLyz5bi661dWfpCVSUcdPQsVfpyM4K
5UDRwyHFqIs/Hi4AtyK3jqkSZNpGCXuSY8rCHPME5jp3YO7IWPq4N+XyPFQfvXd31Sl3zFsZzw6T
juKbbEpXEwtc0U/QERx2KhZagGApB1pizOaXUpKjy2VCl0322cBdijk0EP8v87CmQR9jm5trBkTf
QOlBsot/reTwqNj+DJlzKdxNT2B9j7HeIwKfGa4/sHfD3lqghCKaS/cabkNj3TyJkmuh0RV43XGe
gKPsUoXDEsoqhd2SgHGYRVcGI+mvsdeiqOiVPdgoBQ98Tm43SnhdYGrAJb4euE4iRrpeBFmO4P+X
gjy4/4KZOAd5TSW/G8dYXzWcKNB6tffLm91nRBkZLGDCBGIVKNDlJKBLJShbPDRgwUPyxoUoPxpZ
iGm7RV5KoIauOkRpKceHEj55JXvNpCFnIN40K3/QodL2PG5mWWDmtIbEZhjOmpRmTev6/tnFFins
Z3V5KnOLDri+cVmlhyGVdyhxXpDb2VQAzm2IIZVFo5g/oTyeFFf6tcxuifpdLzG3GmA19ErL4iw8
oteLknJg+aQffKO+0XVPSg2xThtjJsQ6xqb0kHCvtJhAW87zG3p+Yz2vCChzXzd8pLxXl2Z4KMm1
Rf22ukl9RNcX37/PutLkb6/raRW0XRsZoKkBLrL9SpnrQ2cV4lw7g08venSXNbl+HdycSjA8asGN
VjWYLU5d+FyGiwpJOc+y6uAl19lZlsDFSYjILyTiGYRE5JcTkUUdZFI+6FWhEecV0ixzEv9p2iMZ
VGMxI9s1+RGYhSmKw6/6TqsAEkCMGbXaANE+pkXZIRWfgd2C8bgYqezZW4T1UjoFBSFK5Li1ru6z
0INaDLUuDQm3TxGBnWKAJl+d+2I6Xvi+gwbp3XkI+N1RfPk2BYySHixCmwSh19KOu7sGkG/CLxu7
6EGwuiugN4/C3n5/Eb/7npdlbnj22O9k9xVogQR3hTdsg2nuuZV3W0Np8G/nyUV2mczs4pbVbuHl
NhDmcXTr7tW4un0k2HJeVfzZzA0eCMSg9idDuB+rjTfbN1RWgJ5HHfHGHXCgGrRgW1hVIf6voBoY
9EBKBvg+L2TmdVvf0gGEFW2LDoHJ6MJtK4icXDL0iiWPinNo/cU5ugmd8v+kF5YHDQpnw8RfWLxg
njPQ/Qw2Qslb0xqe2wN13kACesNfGxjLEbOk7U8gTtIgovFmjf3rn8fv377cfbX3dvelRk1ud9sY
rigibVW9PYEKTpewJxIJZ0UjfjLagidixMtSXWeVJxYz3EL59b2qq4drOa9aLlMViECrshN9wMLr
jIeYtiqkq4n7mZwuG32Ka27t1arYplIr7crVANm0NGpUwBxoVqoCFfl9f77lT5Vr1K4qqv1a16VC
O33LrdRa7aLzNZV4TX5xcTUElBHZF0KqYz6piCyp/T1cdOPqhqGZybDDs9G1rQtr29mcdXfHQqrU
1iVZk+A+OaXgWKZN1vEgyU6d/Snm7bV8ve4uFv3xbGVZ7ViOXHYiEAST+HdbXUtiXPOWY5Iwl2XS
4iAbjeCUePU6Bg/C8MFWgM1VzU6ZTxMbK0Zb0yRVZLsE0T/+4QLvEEnZ+hX9IzInP3vP3x8d7b/t
H7/ZOfznMq00rfGlfYsAsuYHl/jtQJ7GokoNzD8b2e1arGJfuK2W1JrbQtTmD5oGqHFE3oim5hMd
irv/voM5+xRtGGOhH+/hFgMdAY3HpTr1B9kd6BpUypNwHk8mcAJO5jFAe7fXMDt9E54VUuPVIBca
OeZArLJxeOC/DP1HHXo1ql5hcQsBHtaTPCd4LFXJZ21zbYnzEy+r1ZjKWfCqXGGnSuBTx7IWNKXt
3GETcoW7uxbM/LtFG7XDa85KuQPLXCE1QypK6cUhMSfvb0sBAcfq+wLhHt1MZgHaTEY7I4akZoBk
E6tsx5N0I0ouy5lGtlW+adHQGQzT8zi/m2xzcyfjrWIWTMfbt9Lx9qNQz5oS8lar1Kfk7TfmsPNB
bEjK+3gDk/LiH0i4uSTTMNPQRpRtEpaniYEtdE0ypuX5ZK1pNpaDuKaveAkTCr3cS/4zFWtF5/79
5WWFAbo1jOFOLpFMB+Bkub4JNb6AE06vMBYmxYB7yintvWEU+wbdf7T2ELpPf1S+UVahEjVrgEJs
0MZLig7Kruma1mu6HPXa3Jh6rRGUOtBfhqImZav5gGND07lDZPbWXuaD0EYweFLbfPx0lDVItMlM
WVN9UUkqw020vefqiZWusgZlYL8vmSu/ZK78krnyS+bKL5krv2Su/C/NXOlJW/i5XXR1y/x6LEdF
uIAnG+Dtrrryah61t12hzUtwwhA67vYtHvbTHro7vSXKg1DooqjZUrGc1KViCZDBv+8486Vd9KQa
v/GXu+nKJN//zBwPFcRmu+uq2q8mt0OlxtJ69NN0BIr9RrT28Nl6/9nD9Rkuu6rC85giG/y2q+5D
MEUeosGtLBFPP7wGSKPpcQuzJboXtTFbIuzF+pPuk/VoRfzZWOtvYF9uraZEC1BTogWoKasLUVNm
BPLYCyVaiLITLUbZiW6p7ES3U3ai9spOdG/1XtSk7kTBXNtR9blXQ5Hv8CRQ4qt3hzm6K20F03C/
xih/rxKE79/BMSzvc7x33tNUXWJv0hgpYrU+YzaVaUzO/XFTgc+exrumSKC1BaX65kVH4l1vV82P
mTVwpbhH86jnsGqNAnXNuhao/K80uYKn/tcNmbwPU2BCoyVR8nIfInjwBRNOxuOQofC5J/P29WuG
ZNc4TFAiCIcrITWAzN1QNYXUuNZCQkHcqwYs+qtgTmKAC1aVkPBVq4p3QBtT/CFoVWyD1eYK8AtD
+uZvZFLmAlczBByBWYRrNhhGXxfCZsKlCRYzVB8Yo4MSBvb2HOjV4KZuGJ3vymMnOfVOdJ6MJpBu
E5FDnegcd0yF9gdi0p9PmkqjHFW71aoXXEgzW0o1GSmiXlD6U/ENfIIqgS451hS6Z3iuluEhamso
30NO3IsowQTMRurrgg+qu70I6QdYoocdU8O73SxPd+6pYeg5G9lz9WeUFcnC+/M6K8r5e2My0oZ4
Aph6mICummKOaEjBiFmkJxhnIDTWwUAoXWKkhFodCQ1cemIRFigi5IoHyzSKJ7DhnqeCPUdC5dwb
R4cvDvZfvz4+2nl+/Gb/5W6XNEtqGRRzCUfxJCU8htYHELVbkBqbRMUgz0YjQI8ijGr51gqf0bn8
2XI/H9/K3NqFJMywhyNJHR/EY3TySUgDFOh4Qh4opjNJo+KbUNhiA4cYzaOOQ9pHC8ojwBh79QuL
5FJngPHFr84LgfsL2AYV70u4QHCMpY7kUyu6CzZw7TKkjQrdMh3cdJbhKAWXnYwxXu/8uv/+yI5U
W/JFuQkQ6XiQ68i2JVNYobCyIpgVzmMfIse8zgZo+EbfbevOQMUlfylTKFqN+lsW5EANuwrCNjjC
BruKUtXxYRImhAgj4K/E9NMV0oJHtS4tsVcMloozlKAU3emUb8fzJk8oJRd7Rd4v9ftP/KtxqtDd
4OGn++qqnz7fYvhemN5rLYm8VkONGsqyoXAp6x+lO6Gs4msWYIzpBlB0IAO9yvIXWZYPYXMqUfPI
HLtnop7nA8HkHIXoSCIzecT0f8g4gb9RWpNsik4SBkWMb09tx2IAA1br8clM2H21Ha32IfZC9VeT
caekIkhN9VZAOpRp8dFXKYts1a1HR2ZFUMuAx2ICb1Uu3RyItqOIhRYDb7QYV7/8VtfMS0QCW42Q
QkVnrEWwaaL9RgxhZ6Fo0hY85KhbFNoEvQWjyVXpt/FFYiJrOLGNyD5+t/9678Wvx7Df/sPuy+N3
B/vvdg+Ofl2uyPIR90zoVPqWv0KuJktmaglmohIdq7onBt+VXO068e71zovdN7tvj6odqLjr2QxY
0OqmxY8mx94Y/hYJPVYSxcg8XfBlUilYIYhHcoUFV3hy7kTWIIFDVii7RQp+WNAchXU3wE390Yh8
nlI/xB/g0T+Rmd6+YXqy0iWdWcwlgXVHzqm+Y+jng513jKp1E98Aph7wOW/1aXZtMOZ9KSBTNglk
r1jyzOqxYEuc2PhFigcNsucWhzdY3LR6kiDRoeE6SSAKvDaZP6BmR+6MQcvdiFmO4pvHsHiJvtpz
MMrnN5B0ZqhCL10niclmJRTpPaM6o7f+NL2WxgCmzpQUkuzkoZSn6xo8EWBvfJp13A7qMmLMwNNZ
OBosxslQJsGuXwGu0YDtdXCZVtKKGDAjoHqHOWv+RT/MsElhQK5fGXNIRT3XhYe7IcHItijfw1SY
R50BQaEjodGKbKE3Sk7hoOxS5PnwKjemSplN2tRQ6WtYQ+ZXTpGZzVDkceNV1rj5cZIJ8XjhkY6N
TKwZo8qEbef4BV2wEf18nmAglFOP4t7K/EbOBqGyFRcgRMWX1MwG1eV47GlI7l+DZBgmRaqz41f1
jcpE8Vy0oftMdz3IK5pkN3zmZMk4q2IgMp6zLEp1wnzNeqpPja9t2Sqynuo/8hKe9z9X4DLZpp+x
my/Si0I/hoWsgxo5QhB/vg3Yu1G6slKZwwO797ph0JDlhEPbBpQEmblqSTFyOp4mVATof0CXQFA+
TZqYSgsQ+Ko3dhJh1gIW+spuxJhpVVq+gW3ei/i647zqYnMs56MLQVG7CuBnCpDG+jjWunr1KFRV
nDEqSknmE7CG6bYd52nvaP8dV93+93+jhgrP94+O9t9UhlSxqZ4Ub+JrwQaUDoGDXBYTMeQasQeV
lXoX5zgzqsN85RJWBpzb9NWaspyGkBRUD6q+KuOIv7CQltkWZJt68tmQVlyGCandLu3MXRQ28TyI
LJh65xXGVocSnK74CKh42qVfdcx5lgo2ZhacFWfIbOKpHyzGSYumjicTBl+y8JIccCpONFuLhev1
7qujaP8gOtj74ccjDD+4iYpz8AcguF5tZTFroC7NBasyIaErvzvYjQ6Pdt89ExoaOFVLXHpwmwyX
HvImY2gApJgrVO5L+Cuepnk0kj4dliBx5+1L5a6AhlVAOGI4xNBZ6ajIp+OouCn0LZhQud9DdRNC
IXKxfgocxLBFB1PewLoqI1Y92MaB/udWiY1eNIllf6pvN9lbfdWgKNZrrwtb2Vt1K1ovxmhnXU/D
QlLY9XCBd5K8ovHFtWzBrRhpDemBjGJNdyPJ4BHBmQW7qjEdy+ey98ugk1P7ouvQ8oX2+gMwTW16
BeOrL+QJqkSWKD6yNRS4VYizZcUI0l7WI8kJaDORu9Ck58JTwOOwumObBlrtd9WZruX99vlKjGdc
+ia104/KCAt0micI/QXa7ENdhS9p1RwxdoYYozw15/7WXkMlNk1luc5KCbXHrIcj/siWzW7thlVa
0gYiluLriqIGM6ryEPMDazzEpN3DkCdH2PYZ9I+nAciO/DjDYqYWFUV/ZeNs24QnW2fFeZjLJVbU
J/o5UNzyEggzn6gy0XQl0GaluKuTL+nhUushAlRdC2jKyNdKOXbUzooq5dWjxIyDdKSahmq0NSIr
EtB3QJ5lZhpCS+IHw7ip51SBfVYaOHBlBdgXl/slErTFv9PfKlcdKBS6lQbsD7NV3VGVxnNdbake
aN7UaGlKbUc6IeySpmIhKFdiF4EI4zM0vmm/CqAm1xMh34kGxU6exzcdBVjW+jcAgU6nW4z6f1q7
Lp5h+QsRy+0T/YVur6xsKc80tM+mpSUN1R1vdV6NKiBzGx2M0jeArBYwAReI+KzKUYVBJC1aDNL+
ZZKP4ptwLQ8JK8/IbSI18IrHZrtKhGpRblIo4uhL7Lizpq5/lhdH/K7SrNowZrl2ZRyv6C3QYlnR
q0TFqOZOsG3WNWurULcPZVzHWZVy1V3ZSsMuUF/DLnJ2nZUgRf3Gus/Wk6vkz66MD5rLtmGn/Xeu
0G7iS2eJPFcmqw+KRRmNteVyCq+bHhBmidTKgbVGwku4fk+/raRCnHcprVrWfk2EFtOMW7v2kqpN
fAmxZlH9kU3lGrpU5fCCFtW0RmdS3um6FUB3oasZ1bLfrV6K4Tfz4PNdOz8dTVzUnSUyuEhaS9vP
0vU/xwIW0IKDqrR3nV3YolRtwyeJA2voLEpDEKPVWVfjxhXU14MW6yP4n6oCq3HlhY+7ftuVVkI9
rF0dG3UCH3buHlhl4OpWR8HLKlQO2JrZ+EoGrP1mGcDcYQXvHfGoloIuLS44U40hrNxQoiLZz+LL
qywXoDqmImMyZzPStqjJDXSAzjEfMhjhkwdfdzk2TrTSW7nfK51IJAfAfQUJwcl3pG4aynK8Als5
CHUskm+dVMT278fgApzmBYzFKC5gEdobC9wYaWgX5TLNpgV1qZMuw93MfcPwEoIdN4gISdDMXIZW
wo3xTSCi9btYLhfusr2sGpkESmDjXWxJswRWwc36cQIVh2JmdgV/XentdqR2Ck61drMZHML/+Icg
9Xfk3LInlx6R30G5AYS2xNdvqf/iK6kuS7R8/f4bqJrbKOxVmGS6XDVzllaqRaw1gU2+2yrtlv7H
ZonaTahsK5O490vh1Ro1VTVG92TJk+dMFUtNaKMpEqkFV4DmRDJVpcgL1LHICDzto7bThUbS32Lw
tz3dn2EQcWdjccx4XcOMuBRD6RYEmbUbuDHjZ0WPUqA50QmTCGsDLhvmNsvMw4WqbUacBh68Yppd
gAU1jS3sW0z+W4x4gANV4/qrkJ1qoZQrqb0gN6ym88RG8ZAQOJAbp8MIg9XGGoIb8wY7M7Sf5Ylx
AmmPm3MUhCo3iQoNTO4Wwe18eoMyHH46wa1W3HLRh18xw018A1jWxV+pG6dkrY6pT0CDsVg8Xqst
YWnzRR4fkYE3hABtmKldScjYM1Y3+pnUr3X9Hph+y0McFHsHcH1nOFhQjsIEb172k8oEpMjC1HsM
7GiimGzJjtuxstDyTeM9ddsjUA2SWFECsongb9j9i8cwR2JI5o+7a7Apq/Yp2fYrpCg7TUv1SEPn
dbta3XCZH8LQJ0l+CrcvQO4vfJknoxtsHs4OXacXXPsjvOHQ+ARYLqaLdzCb0uF0/HXBpw8eYv9a
8DYlzRJjZfa8y2iYJQUdNb/Ak01lCQmscjqmA/GNBYGldAaYmAmwFT3BvFcQ1arBIXCzdwq9HfbM
a7WrBQS6Nvu0eouboMlt7jM10UVFcmohD8fXyDl8k9epDyNxhtO94zeJz+XWvw5cEyMJQf7LTZMJ
UnIgAe5jojXBjvcRwHh6cQIx7qeEgGABTKUAbKFSDmh4tNmP7Yeli7Vi3mo/2EatUpZG5KjleFSq
w7gcsVEJAaEEfrA1nTXsQFdsv/oN6K7ZLW15EZ70y7oi43b7wEEtx2xLt9x9NRUCu6900EXOMQwE
H2Z0dBBEOVMV+rDdDefyrhIkP5YtztNTmQP8AtIUlkLKgtwur5JkrODLGA/XE9v3W5iO2sauPJ/m
OVnhpHAEbcDftjy1x3CRXXNtMUBvRUljqv5ma3YoxvfGLwQu4McglMiHIb87m1ys0lu6U0ligpXU
d1XJqga5ed4K23LbanWVg9uqVHgd031oHbuOhd2yV6+Fz6qu95ZuS7LrmeauziGjTQfDv8Sk7uim
l8WQWk9FDyrtCSOjphkBwe8kV/6d9LfVVek9tcBsVwfBFCFC+IvMxlpLUduhkSXbjokzKK0Hw5hH
8IFTyuk1isoTNG56FpM0+GtS5pxRVeqdLpUpY1cGpH/xxgpszWhoONxgmR3YChvNX4AbdIm6jWf2
iL74dt/+roLrhnGVu/cQllw3THLpWncuuuS2yeyyqxJdfUfCS/qFbi+9rJ2xgPiyynxa+WUGpq0A
q4yILcE+lZj61bf5uigpdSOn3a9szH61pFTt5h97pMkFX0K2hRVlS1e0mJBaOnF8coNPrUhbqKfh
yTjETpHpJNKjLPsAzpMcjoe2tzdMELSxkTzWA/f2YD0b4wZd33Eq+TV9qw2Zw/6Pe6tLbhLMI5ZD
hkVdeo6FsTbfxcNavZ6G2kIBlq9Vd9uspvQNK03cWVP4SkVe2fvYTpRUDYBzvTNtRYc5e7OSMTGZ
jpVSB4fF3Cnrz6LjOE7ISMyMJ2SYjb8GeSDPvVqmtjBxhtkV7M98wCTu4DEZZ1fGqaFcBPiXIrWB
t2R1AV6XTPCiYZQhwTLSb+DzAhBaHUh7+J9pehmPjB8JvDZFAffJEjZCYojGGmPaoU8FWf6Ob4im
X6SmJU5ipBrFRxjfQGbIhvuBiOQDOagdynwIRAFqc4Zd+MTWbgGLtCTjS4zvtyvAYBzh4QZ3OETp
kNeALuyAgtrZpihGRz1QgsOOG+yLkj2sYcmPnwxBeaNWE7+ooe1k+Cr60zWuAi10MJVwz0yQwScL
wGZBvSQIBMa4hcN/MjVaK4cHyUVM6Yy2cSBWNShTcDy9OAL2RL4HLYMiwHD9Vk4C2EQdppeXN9F0
QosVQO/Zje2McNM6GSrFxbT+QLVimlWWh5Rs0Kjo0lZVoaegMlDqEcOAQq+ChGx7w3mnJa6NL4vB
sI2TtGKcQGZkmSsNj+SfJOR20dlHXFLwmpdxnmLmVjgsD9lNyf2L3lzwyl6Ne9FhJgQM+Gm6vOZV
wgWtqCtYKM3F7AHxKiTNVaKF7DDjFYtMSlx3nwvGWujKjGwrLp2+2la68pLzRjOTrj1PwCSPqmN8
fGOzNde76vn6R6dkI2PfgnN/dTn35vaca+mgzjuz1Nex7q8W61ZMxtDY3/Cxly35Bl/HCjijfxMe
/Zm2rPSRwzvYtMrs7SfvRpW3/cYdK11rUXtWkn5Vhc20WTn9HFDbZiI66DFyiInWsb1kceWFn6Zc
8I4GiRioJRQmWtBDrXnHTm3wyL6E1QSYpoFTwn6VQboCpRhbXeKb1hOwwNmDZXbcvpoTTh7vdU7N
WfHMwTPLcIWXdRw8dKyMaQ32i1LFnuILwWNLLCGAjLI153AfrnUfQoOrS+I/I9+217bSbyfOcWUe
htbmTN9iNmRmOz4vVsV92B1J8abOQl7IJE/IlHJxj8VUgWSCoO/oE6XMeFHnuWY41OYeviIwFXuP
oYlHPJO4wA22G7m1I5QAUDiUf/OZVd7aZsY9oNDBWxStubCGBAUYCCVsS5aO6MfsCrJ6SeLwinix
lc7QLtBkkCBDuUrHQfOX52zD0AwQsVfKRpKS5wq2uhiYkyTaewVdP8tKD8y66EjvlPOHSrIZ0fp8
3lLlZJ6G8p0WFUtKVizZOYZEQxNfkgxREP7PVxeMyL2YBDNe4HpinfpzQpT4yS1PtDA/A8YqKwLx
yF4V3W5ECY+na3061JJEVtKGVgIQEGm5/2t9OK7c64Oi18KkbbyNkx/HswaRlGDLqYYz4euqu1Yt
dEGVM8taUYPt1S+p9kLcakWlOeRfULVvWs5EyRifbLkMZNcpGYfzzDyf6wo3+2ky5wwTgal4EhlJ
ag92gUaxNNS2os5CMlT3hip5Js98kNwbGvuC1eCZS3grhja3F/1e8dP6PJl7lswA/M4wuGvz2QfK
3MBmJWojKbFR9VI8oJYOM/D4WtEb3cHal6zUilVDXnwvPcVWlLa9JphjTxxBRbs2q8JMpyGt2cbz
0LiT3Lcm44rAWw2Jd7644W3HS0YMHWenxyX5C9YfbjUYUHgKREp9wKMwQWCpSodOBznwdQSPjOeX
9hojuK7zpqfv3BQsTje8gA4mi8D38+yKHRrJVUoYthGErwnanawg/JjN7fOO2Edo6jeC4CiNZ3mw
zv1sR31wrzrPMMmgm44kxZvIhH0jW5fGDjwurYONv1ksKftJm7isHasQBR+oJ8PMFTSmVTrLqHac
DXAZFGC1Zm+MmldK+ODcq8xKuYfOAyFs57UOHfuODnAy5NbCyCkIJaeerKfBV6/3AruhZx/V6luT
kMsmezI2zMP6hKR5gjGpkU6WrGG0yVzoSTcqAdbFe1MRN9voXAlGFXXMxQYs2DbGPZdJDPmLhACY
mE3SIdLMm1c6HpSFzEHl5LNVdp8Vhz+WEJzLC+xss+klmJRurlmZuZzcaNWbP+gFAPjjc3EPGvM4
1oA/M3chbUjZTkN1zTzxDPkMba+hCVYibUieqbGcVxg3rnOxL7cfk7s7ZTDPiHiwWciBAynFTRyC
uSpzhsGxhwWorTMDkIbqDknDODjWp+P3lOQXtPN6TD4Hn60fYx1GcIeeW4nEmrUmfhSbs/9f4kAJ
8nzp3vLgF0TX9Odmzjlg+13UDPgcvSxelI1DdPHOls92Eny+9qJk5i9pLj9NmsvAsaYvWS2p8meT
1bJvPVTBfY4vNZvYzz73VJZLn0Uiy8XnsQTXJ45FfWZBT1jLXee7bM6VCJh3/UkNJYhQXsM/lc/3
S/7CChGqRb/kL/ySvzCogdmi8c4zGBph5k9ZeLuMhUtt8hW6IjOYeG5uoXn7zIZB4YkiM2/IeKel
ZyjpXVh+WlLvS2q7WdeTmoNzMwrqL6nt/CL7DlPbfZ4JcyqX76GVZ26s0DYlCCowKk0mHLmnONN+
CfhuXDtP3uqksJs3Uc64ck8jeVvdOljSdQ403dwrC7cw+1xDsgLUf9uTvl/1PB0m7A27xdV58zGN
olOdOCU8HWEbEdcVTSEh0n/rXet5tuJ9b6UzMDPX+N6BNi/pRidGprpANxaomui6jJDeurq2fW+u
3Ahp7H14sYDPqu6FTlKmUJPhLvX1rbWlO3/dyipuX+x7N53tOujX13b6FkDfK7y15W3DQA2PP/B3
/zy74kzE2cB6FbijuN3aONt0VHnwVA3/bPRr94HpeNMwHUPBSJ/zfJxl8nhp1Zqfdd5IzWEy9Kw9
BpKtHQAzTcmP3d+upwP1IBwAwRlrDEKHHnzOVrNa3HbS0pfLNLmaZHkZJLMrdn1UaDUKhgqqB6R0
hBQOmIp+pYPSeqo2jF1+xQMizbzWpxkj/uza0xUVKgSmcwiWjxss9n2X4X4T5lYYD/HXqywnRdZ7
Wz3PyHuVRFcxOn+FjnmpcgjKM4x0HFgdlz7B+1sL+gFxZmLw4G7iJZlyjm2Y0YlIYAY4pYGa8VWi
MyprHpDp8ugMJGiII8YVa7hPdSWoOAHaneOXG+9N0pyn/iW+v5Pqc6ctQepvmPZc/25f+z7jhe+i
1KEKy/Nc976Ia95jjiEUsK+mn8l6INOBw0NgdRZDAWGEVGPYqb3VvT5NeHWSttkcbzbrFnb5OA7D
eTISJo+5FjyOfgIQI5oppynt4aj7xIn1/qVYFkFIaDgFvi7EjBsl0e/ZCQDD1OQouiqblRyqmVNF
JqHJ1CNfA++mkwmwHwW+jm7CcWKEndCHqAcqPow6VMeL2G8F6/2eBAf2KxwNosld2R4MtywgqLYx
alE+dLjHYOHOCZBluSCOfQMkUZKKoMmND3SAAoPFqOwPwCM7nXfLTB02ec5w8vyQx5Nz2GvMTn6H
yGM9qJDRs1etNSBr3cQmqgqs7APt4mATj3hWN3fWtbOGqCqwhGFRuQ3ZOXNvDw9dLB6cUG1PFdsD
M50MBQeIwWZjQvk7+LCJ92IQNDg87OYwKnkzBAu6bFQnplTrlWvXxToinnYkiGX017qAO21WDZwV
lnzAWcnYbmIkhXoKO+lcLAymBezP/KRkhk5xwBOZQC2CQKcmDWyZN1QBI1nQ46saW3ze7x0khZix
ct0HoBDXDplm4+FQLjFawKSKowtKM2LCWUUdKi8vTwivjV4ZoLuqBZDpvA/ZdqtkmYipkMf5jVBd
ynRk6yK0EhDqphG2ztFVEWmpM0tgKpaR0HFkUKN4pSLERzeo7RRG+BldxxIVjqA4ayMofKzsTnxP
ILOMVD5IpB6W6stvtVSZS0WGvA1fVOTPVkUOcgC2qaaVjAeHU8OZ0QWj2yrUyh1M7Hk2v8QMiihK
0m3kk2DpWMknQWs6fDBW88mWUtAWF1INMgq0WjHfHFFFlq+trezkeXZFL6jDswgtilsq+Fom2zAR
iMM0J/shKE9ECZQouiTKkowiyQOSxGmvQwkmc6+HvwMv/MOJ7Z4QyjR440Eue2+dTcLmzH06Drkh
93mRQkGXDsYXsRVuFLwSi2zUeDmcRvVUxTVZUHmYFpgMXqf1am5Dr24KmNMGLSFM39eNuvpEywZJ
a0KwTlM649tlWqSQEqm0k6iJr+6pk2Bz7ISWLSBYmztiCZgWmHxJK929iuXMssLKgAQOYkxH7GB6
HxjF/UOSTDA3fh4PPvA8a1+TCObRmzUt/vs3WqQcOsmwPJnxv5RHJPDUuABehSej+WSh57hS0DMH
sJAkeewBb13sHgJfeJIqNiKuFqUgVGuLvxYcnrUEwoIb4qYW1RJyjdoA9UKQwJ6kWAFkaBIApEwd
yfAMCD3K6GCUeH9uujAeKvJKQLQe+30xLxDIMM4/HJ7Hw+zK6Ra1oRLuZUIHB5TE1ElUjsX68Xgh
cRQVGWS5AmOOjRizhZB1mRYhCOei2yOWgEThB+Eu0GEMWGhJFUWPQFPYzI+B9lKId20cj9kbLXzE
V/cYlDrvUbW6e0SjBoRMchKGoA4fcwAmtBkjZdLK5r4foM5u7ZLPTo1pDDcnuSwd0/WCto+3cuhu
Bkd94jnDkJ6JPqWH98lFJzf+BsrKhUamibN4ou4nEHbUNeXGGMUnYhXxghJF9gQH/BBPFKAH0T+F
QC6YOKYQdwobl0l1svwsHqf/E6uIejJTULiTvXIqVpHsqog6o4ysTjjSkcNeVxlLNUeCO03Pprk0
dMTUXZaPicxrYAtMc0GWQnTlSoDXXlxzqBRXiU78IZbSKJdHnjWUPgSujLICgKB5UK2ph7dS+Tus
PkpVniOcJmI+x5haFNHhlaEBjYYiGQ406XTmpDmauudq4YamwELr4KkDvBgIVvgCkhv3FUZq7mLe
UHvB70WdIr5I1OFUXAqpnWXOIXqYPtiDrE8zkGWtzzcgZDhfH58IJvXyo1h4S32CWbX0MhFsjAn2
etpgALw+JDdFmWcfSKLKW3EocaML+p/JzSEVhffi17zgQfbWgYf3twCf+wWfgY8FbtHAdFIHfTqx
QcP0HMldCRJf9Is8pLREJrgjUoX6Ct6qLQ0qq361bkHIOLFehlp4A291Cxf8V+sWBDQhS8qbaIBb
FsG23sly9k6Nrm4/bt16Q6NOY+D5qGunxJzk40QtNClYntJQqAK3AsPI8+PqQ9J+kr6uC+d0unIX
BU0B+1D7iP9yWjJJ3aQdJ0y29MQ5Rvh1YYLkYCXCA8XBxo31wFxEszTLVft5m2YRjRWN19j83kTq
0n1hKbJksntyrjO3AlnqZKb73S3qsGbQ54DEIMeBVoLwIjTRVVFFwjJeBoxYJBM9EbgJKUNGucRd
lufHLGXRxG3a54JxsSO89yQE6bbgFMDMqtpdANE+cEJcuyr5K9vLL2E5sUFv9w+OflRuj+qhTLZr
0hQYKOOQ2tZ1YgTtcJWXivouurs7h0cKW364oGX1w/33prdyxCzfy+24akamIo9OO56SRW/BUy+T
Wp4y3qAKT/FXbXjKovIn5Ck75CvIFD/v+nmqZXVrBqm8KEl7nuJB0nRqEZzU2icWMdnM0xagHizB
wUFdMtrVQim3yMjWx+T6fueXw3DkaU31rRueJP0MTphb+RHiuqoW29KeRtUhb+cKUSw7e3x05dIP
u46zESwr3eaaD7VdtMZ+q8OS9uTgwZtwLYEnptPhbdiQoqWALC95TbOKtLxi2bmxBAVRm+Tb5qEV
y8pBOhek6MOWzi0l1bSySyySSe/X8JnVgPy5F/kbH/J2UF8L7M/tW1M8iQe92Jv9NpB/+Ktz1Y3O
nXk/mWUJ8SpG3gnpi54gOAIMxRL45+JObSNc7ZJbQboJCHjBFoQCVom4+MPqdN1NObWkkNddkPCj
brBkPqbV1jSRABk8T0+dq2hCnQveyAFMNiAA40EiBBzPxM05XMoWb7JumAAEWjdPh9/V45cUKWI/
VJaR/VQYtSdZnA93cHlS6TmXLIsE3Do4nJbVQmCUDBTTgN52rKpWmUp0Wc3Gpxzl6Tg0zvMPtIbZ
Yqh12ZrBdmklky7RSw3AR2irgD0+1itrPK03DgPQW8M7Ov9TK6ni6J0h49ZKjyHBKXsYFARZbZIJ
Kt702H1M9ptIR/RUzn9BBm/YqJZDFBdFNkjx2gt28guVZpWm2wT0UJoLrcPA/r25XMQr5ZxuGi2p
2pkql9iGvHeaOLqyrWlQ2XcIntRS7lN3rpLXEoIJzyMnV13Hp43imsmNO7+lCJPV0tf9yj8U0zuu
jlKvtm6pFG3UbnsixmwoKlQZD8aNLKERD4fMZK28MuhWXing+MK776qOZtvK+u4Ytl+H5mp26gbA
tNxqHcutJoWqBtSiNGu2RWnrqEA8+HCGW4wd3DfqvYZTOsc/HOz8KgW4l0N4ssOZxLAWwmz+qa26
5jhvvmhygcUmxoMH0VtKKyljF3XcTdvlYX7MvML09rhpzGTcpgmdfZ1lH9BX9ipR8bJ1JDPSnyH1
fk89NvC3xVMpdUC6QDM74yE0Yi0g1iIB3ASpfjoKSk/m/uncZ8SDE/z3dRiTVTVPJCNyAMiUDgRV
0AuHMXQ9nBNdkOAQJL0tjIe66urrkvcVFvY+byMAu/h9gwNt3TbWp2K6dbPj3ljTFGWt0kZDU1Us
xWqx/Uin7p4z8qzkfTZuZmO0qT4ve99iP50Ayq6PFrEDQn49UpU0Kr4Ajxkh6nq8f1aCqlmgmYoa
nCfGZRagL6rVGR1V/E8ljYY9WDyBdH/tN7ujtfWZnz5Qpq2EnlsOevRgJgk5BUy6U6dr5oXTH6uG
IhRX4P2jV23J9yrAnXZl97E9r1lZS1TwVjzPKkKNvTuvPq6Tx+jNrZX8wRJCFph37RwbY8eyVxuE
bFV3XBDeNZMZU4xVLKVKq7e24sU64uwxqvL2Y13Bv9+pa/l3SXVtaxNYV7I2ij2Ld7Pa6JR2Wq90
0lMlgLi/u576dh+sfrZgDEpTTowBvDQfV/iMbMYXCltqrBFht8KtKEQgZh0XqtUw9n7OYpIgyLK2
hKp77U6p2TwO5Me0ulHni/QVrA188E5wNvDMSsJC8vzpbHvEUNvimbou+ArWRod4BYG/C1ho7i7Y
o1zXB2/J+vgMv+T0d+OoeiB49t7452Rdr2prtAt5qZf0/t7apWfor14mP0jPItyaAK5Fn6OuecWs
+CdtC1iG6u6pkxsz2ea3xDDsQ70tjv5bGzCZsdx8rGKomCfsYJbxzPZVAN6dTqtJj3ex7UWqVday
nNI9310OcilptQZX71H4aDTiDTZR6A2VnZ0+1bsV5qSODLP+eNRhDTZSh8q2oU6F2wYtCMGO3TT1
ufU58LZnwKs7Ny3Ofged8k42+SgypNkK1ZnPkb/QY+cIzHIX3BJk2+Eu9YkZCrIdD0ZTONOORdBv
yiMK1bYPbuDgbfDTiTmstRh2sQIgjtxNKwoHtXO6V+4Q29OBLPaZhJqFyhpNznr1d4ftufEpJkoy
zYOOGRbF6S+k18V3Iwz+GgtcnyGhkTdgXKSI0uOU4un3LIfgpF6kAVwl0c87b4/s7BsYfX+RFXS0
l4J0YjpCNY6usvwDnvaGswT6hOUMiQ7VWTn7Fi4rD9G3MmDfmpymnHNzGJUzIFVcjS/5rT61Yl3E
SJtopezqNp4OQI8kXHimsOpK2YlHS47MZWhwE9oynDzYkuErEsq2JgiFmSjga1uyNTyDEGxMgYbS
uie/48luAWdLfP2W6oqvKo/vHyzg5ffoq+1QtIviZiVE2LUUEEnTjX4XbAy3LefyXPmfcp8tdCGc
RJSg/8lkVl0jFnK8wXbiCYNvh+llOpzGI0/c2ScQMHRm5EifT4EzVeaYJkpFODVCx6E892pIaPLj
CE6GnxFgpT764qyaOmhvkI3RI+qEfmfsUF6CpdxmxAg3V4RSLcRmg8isHEGtzX4k60u2YRJVdpU/
U73gMrjtnRiwOYJAqQj8NBmbaEbJkoclytwyLUeJI/3g0U5ZqXGSZUJ0w2WVanmmejIAsUUEInOO
W5eqleqWDt6kkbxWqvNrJpJv+Isb9uIqci+OYC/Po0rmdCbQW6S5MmjiLZqWSPYEWVr7MNWLMgox
nwfndvAkF40DWC2P9t894yGFnkg/MUCilQ9bphKk11S1rlitnAcaupUoOFNVu7FjDLc8OLDHLizM
1qlAXTvBllsezPhzBqwaxEgG02s44ujkjT696LKZhuzdxRlh7oDpmmlXnbNq9nUZn1sqLbCt2Y+o
LBSmbfHfTTeC0MpaWJZqPBsc19fwDteHUVrCnD7NRnhYcZDl4A0Csf17fHYmZi2dC5Z5x/QiRCGn
IDq+coLmEVUQJXVYEomNPKv2GNUlEjfUAMQGf0VD1Ev+I1bEonP//rJjjYjh8Dar5iXu6yz7x32W
0a1dvgW74TlV6wy1iXZXCStslRSJIYGhKmrWnYWt3hdyTTjCg/CUP40WCbnY4cMG1WGGpZnGD80Q
Wj9kVivPCk5R9/DFX6aki6Z0uye4FtSpAvp2hyHB9dawdABWA89F+9sw69nP52K8E7mHg8QwWRtq
VAYujaqaAl+75fA0ZUq01QW+VHfNEt8ExDpY5yoZNRIwBERPnaoiwFUV51IulWxeGHKC9kQjRQVL
PDcgYj7OoZUXu2+Pdg/+2tX1CLWGYwStGRcWHWMrUMV5elr+orURHIRDfFa9dEGJ86r4VoB+9QD6
tSUgCUoiD6c4tiV2W86rG/3qVytQKFBPv7LrtfcaMXNiFmtscYbY7DaSkbBtDCmSfcrJ4rGebi8H
jaLQ7G7SHFLL8kbYeY2mekmEfTQ4aSvjrMs4kH2/mdHPCCuKfdDjs7Docck/arP2u9qD+i15hPoE
L1qxapOqEJoyfMG2mZQq3g2bomJZz6awcGP363nUt77XreC1wGZfbyFSHQvjFxLN8lfA9EdFXFVw
lX0wOtVLlRrQLDJosTr3u2ijTKZVOrPdCSY0y+NTQN/jWeWYbhiG9iVQYydOQWOZBRo7qTYWhsEc
1zIhUnyZDI8ppZKgtAlvVU0Qy6h3ZJvIV2c6Cg1Yii2GbPMmLWS4P8feGhqEQm2ensnoesyVNE4u
PCdBX1K6u2T4RrzPxukAyzi0kT5gA0LwxGqffBB4Gk5NE9Dqit4wj6+Iod9DBk1Iu/XiPM53iFFI
o9OwGq5F8H3MKn+byjXXQIY+K2r6AuV2igHuSyHH66u0zljvO7KvDF9LDQlBo8akT8M9F8PG9+Ss
d4KuGojA+NsPNSPdvCSXHbRJCHGqioCfad9hI+ZWrA4AZiEaNuipT3C1PGeEZILPI89miEuAnLoX
08G5zGgFKcp4bjp52Tbq7+ps/y8SnJNXdXFOlIDmfZLUODhmUkJUXRYqIbPCGSpYPT+50Z2vdNuT
0K1q1t1G55afeq0DjyFFcBCPzA/EWzoSZTfX7pQrfv1v5opf5+GKX/8qXMFsLDp4YLbyQilXP7nR
Vb+NWsl2W9lJncfCssz7lh7Ru3SDIl0x7Ffgng7iUiwctRZWS29Xdat1dr6Nopa7rm2h1U8EZi74
DQW2Far9D9Mx5OThplZlHcb5wN/AMg+lO2aDtMv2RLvONmjX3fn0toJ4z+YMoUSyJsPY5xXk0Go6
0dvrSsYf0wNV8gZL3rQoeYUl6T6FYKFzLCSveQuW8s7PZGa3h95xXJSLDj+4TU+1bujPFf05b3Jf
1M4UYyF/xfvv5hT6ypd6K2Q20wE1VJdp+rwWmn1H6sSgCsNdpOIrPLmir/qprKVhmUNwFXiyloQj
f3mU7Dk6J6+U9vauBiOJRxWjdtRhtKihzu17Z1/x6XTPPknoIzrtly+O2J5kVbPiI8ndwsKaUeZq
R9UXuftXkLvGr7gArch2MNfI33bgbqnOYOyIXdXhb19mECjiOsBm9OsuVZy6S40eXdtD5J2Wp+lo
hGqVCb5ZsKYUupvik8/ZasS5lTrRY3YFmd6O/l8Q0wfj1D2hd55sBcH0hhhlaI7jVwMN2btKrCF7
5w03ZO+tiMMqmY6yye7wLKnGPDmhxzZj+mG9Tk7LhQF7jrGGCwN3AFSYC1rr/dlsQqFuknOdOy8+
w4nG51btUjnIRB/SMaRFU34yjxBxl83ZanmW0JrSvrXUU7ydqFBzYBHOg4DgcJbMmYGp5XWmVbJW
cTQSA++AOMNkOJQl1ML8N0syJeNhXUmdaNR5ccUuVSFAw/T01JvQte2hskrePEtnnuuWvyWJ1ER3
2dHlrdnnTcDsKO6Oaq4pvYr9l0o6Lyfpq98H1Hn4wzWZWiNgEVqEuVroi3T7i0k3vSovTrwtVr59
cgF301rA3YQE3Dm/d+qvIOFu5pJwHldQ1RviSDmPl8KRcl4PCvypF3Gs1mIMJbzP7IuQ+ysKOWYt
LFDMLVrQzSnqvqhqC1fV6t2sbX32VX3O8dwH9bpmv//snn8/Nm0wqdk1gD81QWOf2e7G7VYAdo3l
lwXgL7YAGP/OIuX/gsX/3IruZ6HFctH6WYj++XTY2g2/OfYjm9RdU9JVe28r+d0d1jaY+LFYqORv
t3N7211kZ+DnkPw8d1WpT4Q6R2y4SLXFF96o6Ihvdy+P7WeIFWEEKX9rM1rZ51FKvI5K3t9cRYdn
fTKBRVamA36X4wQPI8GESz1Jr+T9QL/NRjb7YuRZyeQhgBcg76iJNDyQeWoqnfT1ztzEPCNT0OAR
8WO2HM7LEtXluHHlDVPLIKivkGYL9igGXkrHASqKykLYvtDlA8yi1jpOVd+dTtfMRynBz5/q6L87
L5E1hWkkfl/ugWok1B7xZNmkKZLM8PvW3DmIJITV/twCUwYJ0xzRUaih+Gh3n1fIRYEoE77OfBjC
hdpQ3EqwU5RZnhgEwlPE1JrERYGhyn69MiBB7bgHUwjQ4lMCfmPucKrWkG9GjYK+9LCYUTSZ68Vx
5kNkyHl2BetD1LTHz4hTA6WdMm6SCp7BHTZ4SaF+5kv6ykSBLkchFvPn4sP9d8BX3ZI4qL8VS+Ps
kACvN4ELJCWcGvuj8PSWJVhU36xM/RopU7lT5tNE8YKiQWFoYIAbkM30EHw+zVUyrWScTc/OeXA4
XL2uLorS1z1JMEqG0XWY2WhobpEfZJOUrpsCUqPgzyoruZ7lJPrtFb00ibp8NCW0YYYVdAXysMPX
ETdpJUXAu4cr5VM7IeC/FQx19YOVSW9bWkm9UTI+K8/9KS+r90mV0LOj7EU2gWiNN7Ew8y9SvgpY
QEE+87jy8mJSi+XS4U1RJhc9JL8g/U1HRqKvdaEu/tXty1Oy1HPx1hbxtbySXE9ilVamlHdA0JCD
XBbcEaVldAGyNs+yC4ctJLwKc9i84RtrapZWpmIHYLnpjC2GHg4hl12GwXD9NblwqKi8QjVr4d+z
RprutnB4pay5HMQz3mLURDmnhoQhhxlUiTX/8MmCNHAEhgbTAoAjaeEF32YYT7VGXJ2ng3PMTRmL
hS8vU8hLk9OqnYyy8RlQbc7JG4y2lLl7a/VV7BnTWQV7VRDyHy4yadK4WLBDxytCQqXBhMRp0T/+
YXD+1nSUP/6umvT2Yyql6V2oo6kOXMRy37EseqLrBOzbbU7DJXPF94LURSumD9Eg2yUS/Bm6TLk9
JwKfo7I3xWNgg/Nk8CHMhbx5prhOa862WZStsp+o68mpDKz+b/HqN18qZdO7Vc1gXOiYUgaMKjmT
kg40yegGqkUdWQxYotWWgqcEza1YlUOCfqXRVJiPAsB/oNbsoZY7JUMgchJTwwk5CQ8yMxdREsMZ
UQkCvWsSkKh+cgP+gCQHm0wepFz0kVCHrcFMoubrnUjyVGdMWNOJzpNEY95ibPawaOD8psPss5++
vZJh7bEhrUZyItb6yonVRROyRj7wkHstF0L4OSRUMe1U+l08VEJ9BjKCQTA7JRmnFwxZgVlcPf+7
qGmvSFXbaC2JDrCo1AJbCYKZqBPL1LTsaLd1Ia+oMUwLzH8ihqSUkGRPVIuirCoEWZ0QQIpCJBnL
qiXk/E5Lu6YyqKA+XdwWTvlVUaQszwjrRnjOux31OIr1IGCSKztbb50OpezS+mQxVfsewHuy4vgX
OZZVRNO6UrndqEeXmKEIlMtBLLNBVhNo4Xn3eUaDwNcOhirRZjAwKVI1h1JoQNTdOa0umnIXQtre
A/EDVxRgyns8o9D17XlIeJh5NBuXVPdOkx5YOqK0J3RGTacioPQj7RxDVUw95kVRDwsdLRf4WMU8
q6BuUvSCmlhEIgOsYbC2DpK0TqLtz/bsOWjiTW0dyrf7B/dNRJf++xRYicC1DKxE4E6GpXAaZTe/
eJdT18pUwzcT3MzhKi3wZa5y5Xtqy1xGdfnDEVl2ZL7M5WH5NK/dInUOu4PHX4+4Hge3kJXaWlh/
bq5tNu19acRnuZ6HSYE7tAXUtTyVxuom25v4OjzfrGssWUErKq1tznp7IsIYXQALyKbNfPGZ+6V3
J8uy/R38yDEYX3c8YsURKV0uHxqFCm/HIC2Hgb9s5hKNmlkqZPaGppVCFJXwSHir1ULnIrvL9cJa
m3UfPFtIbt7Jr4sAfo5BS4FM4XiAhsXjZ6i+iLXDk/Hxy/rxt14/iPO2NZtSZlJiqLoOLFdXGQJl
33lgVplcS4jqImNOls4iPdQyg7U/0irD22peZPzzsrrG/CwHYbYlZgGLh2rYu3YYJrCXjovGJYMB
DywYP8814qW8AK3ZvpCwZDQNualkqA9dWbBw9UTHmmZ5+j8qYigcaaRXDL6IHzUpT86ywWjRbqGA
61pqLQ0L+xmStsNCzNUEvmjMenGMAlhyfEVFm7LfWA2GMV2NOnZFiAqkDWjL1UsQ7DabFGbbZcSr
zs/aTfpQG85eqERUVQWlyln5muTLUYOw9nF1W0ErWalOA+KIt2Zpw9EkxhbI0EroWgT9hrcWRFIw
s1WrDS//3GpZ9rFySyFdDWREwsQTuPc8T8UgjW4W7SFulYcnwF8Sv9bathxvS4Wt17U93FLGOTj1
SNmUQNZwXx7+01FaSCXDRnty7lNtO52EE9lFRWYbLetIxyQefpSh84xKAI+m4VC68BGoO8PAyCxm
LApPU3c2LFoIfqLhcNpvMSuY8Lsb+pe8jTsjvH0I61OR34tF0yD4EgLdzVAMqi3d2YDwuzusi78a
L/1m9PReH1at6ZCWW2Cu8cXoWDHUuO2VZaMPqTC9eg4AVoZuUnBIdXrRTKZxfJmeofp4mmcXVXEu
Bj9j65tJqxztqJuhY9FeMR2JYYtx/Ek/G40oOlXC6qSnEACHUaTLXq7XoJHa5pdoXyEZjIXGGD1V
isnzDp0Ik6CsjUKHqStR/+zqbTsIsyGhilG63NyJrQ71QiOm79UqP+8eHlHAE5GWxWPpMKo6Jw94
b6KmRnZ37EZkVH6bBniSfX1EAGfaaZGYi01Bz8QnVS+e50LRNrn/w2i1qt72EF4zpP+Lu/7Rs+g0
FoRY3pJ1iJI7w99juOlC9F/6O/2dn6ULRNplfaKCnv7ZmmkhR8YsXFs9j9jET2/3D45+vHOuPdx/
b7cyA9t+YdrPh2kbzk6MMG6cwravrbjIUFymPJlLWpH8rhemGotNnpyosJI6AuboQooShUsJc64J
f1f40WKaxqGqfBQqrU6eGOpN5Bz8SBSsTPk5qGjBuANK3oKamhc7eXIW58NRUhTKp+XXdxbHlbdl
yM4iOOhj9pvxwSLYaN7+D7I8x9wZovvSkTpWa4bWplUXS3vn2Qrs09YchOkJHTIS1gXphhisp2Aq
pTrlJ6BujH7bjfDEyVVawFFYt3x0bWnvqKqbw7cSmqpyisl3IWR4iN5jhoW0B1S/9N3O1QTR+piF
OusLTeryrolw5z49PIUJIdEwNk5h2bcj+0AyPW1kR2d9XETwVcQVENduudZ5MhRQnh7JPKOd1AfR
OnMe33jq3njqylgfqkzVi6u0HJzbSgdXA6X8hIvtq2bRs7r3xOuiyBLeTku9BtVA3XEfrooqTi1w
UG8B9HUdaJOPY1zKGA00CO0D56U6F2udHYcwA6yh7ksjkEEJlFYDRO3jY3A+LR6NBJNdQaTuTTYF
USvk6nTyYAjHXSF85GYAcQfnOZ6WLGUsdU9CE5Of+z+GKdBikESdk6S8SugEZVReZVjp6+j6wY19
0Y4AIZrOEzgVR8cRCmvSa3mNB7Zkmu5MRVer0nSOQckqAdNo7ypZNiZLAbV+gO4wkDjknMmvxGIS
nY7is2VZmYmgFGOl45MiG03FNL2MR1OdAQmShAjMRW9n2DaTcDWdwL0zBZNDhUX7Jro8XEhVidww
ZFKsxQwTJYHVAUQmYviASHrJGOxCEGvISKbIrMZAlJbgOuiN4pJSQLGWkeVe9L7wJFWCucEOkeBk
ugM5PM/5PBTVtHFZzRGl+EOsofJr1+E4DwHVyJi1U35Qd6uqvsz3JwfZN3vanBwiozG4LnjOBbZY
JdTRBEkAd5Gw0iqYo4imudKJtTLrDXsApCEoHdWOsBX9iRqE9RjOWvGxfGjaZKcFLXDCUHZr+bfe
TYXQq/VVVYdM/ioeEDVr89fzN6/yCEo2ZUPX2i/umIChxEEnsKqagHefHuWZM0Hg/qlSUcrhObTM
GRt+r64yXkLUvvUeVqzahOzkoiwG1WcjGfM5LJZcXsB+Ulm2W4hMKysumbYDiW1c2q0tlkbct6CM
Hiwh36pthGwq92MEUFHWWDDsZJNeFAx0tRNz+0O5ixi3qiOleQhDh3TdUeWqqcsFWJbJ7bxO8luF
tfa6HTyPDSf/8ApcxSgKi9bHxHOWt4ixVrgXtxBhPn5TpbgFDlpkG57D09efB6/Vd3YW6Tonz1WE
9J3yXYCP2rJhbtQOw281PZgvN4AekxBTQAMH9nneNmPd1EjjOKsBlu27pySdnHRyZcB8mH13Rehv
cfMYkCGdcHVVAmeDqt7yRdnUCLVaWZlllVsMTECrX9ygOA3UCvo7GwyjoK+sVAdDvw1SXkM3gJz1
X75oMRIY3qFGgiJKZBpCazefykGxC7OhHx1RCIlxhZoT2uCEEDQXhkEXLdaudo6SwYpDoyJqtIhH
BLSTEdKvYQoFih+hgJNe9C4uCjIy0WCOC2l9K3wltGEm+gX5fERZqxIa0OQYg55nEzTTITayK7Mz
w2+K9FU9ZdWpH1UAsgIvil21SkpwsChRgxiSCT+pelfdEACPcop0B+CEF65l2cS/jmUTGdiD8yMx
bgwWQ2QWPUPQaGesQoJMXmlKfaf8vzUwbA8DjiewTMNV3gUUG5A/1oowUrFJqjNdO1pJPmw2tCM1
1xwsnQRQh9Px1wVE4xba2XAeTybp6AbddFfgsnr7bhfmJXaaEpvBwaSuhlFk0V50lY2/LinnA+gj
SQp+NZkeyvhgq6jAp4UbdsmaAcBx24ZG8HvLLYN8xQvBg0qpXMbXm2IqKNguJ5mSF9SR8C0cvsqd
W4+hrxtuV1v2wiDX1A3d3+ZeGI93LYrt276TcWvvfp+D0hXs5iB0Q0ckUSqufvhH/LcamOv3UDN8
Fv0eX8bXDwro8QOxLp0+EAtsOnjwHP6F1AeTLC/f7/Wg2L3t23/uHbw4jE7TUfIsejC4LPIsKx8M
hG5bTOLynH2bAa3u5b0cggWFUihWEdANUTj1ew/vYVLy1Wm0motfkbdPq6urs9Bgqf80ehPn0fra
2ma03n+2vv5sfTNaXROfJWhxZWVlNnCPo52JArfxrP/42doGgbv3/ffRan/9cfdRtAJ/Hkfff38v
uoeDJ1P9ZnCk4rKHWT6Tq3dycwNi+bAUO/4pXlPaU6ggfuCFqJQHVZkPpjTgZ0rbRSUC5G8ZfBBd
PISVb+8iPktULj9ZBj7/+78RL0bnK77aZgjRBh51duMJdnbjaXdjHXurmFlCNJcIrAvMKu0DpqqI
PPVntMSBewes78SsQlusUnD5K67nshmV3FZDMKVhIHvxVdkzNwaAFbBevTEAPuJ5oZ5XkHIKqhto
IxloXKGl/cicO/c1BniZI4ZuNy8lY3p7qLoU6FHbDlX6YzitJ89ysSfn1d6EO+NPjc86Ohglcd5y
QAXVsDhe/jsj5QON1pL3rNLcTIQBgwW/4MzG1Dqds3UlBXCuUGoa2Rjk8ccJU53C3aZ14U38IQHx
3YsvPoPlgGHTehXgPagR/qxYReY/fPbwUTuZb0FpEPXdPgi/7voair7dX44Odo5f7h0eieH7f/dW
cPXYyYWO/XwqdIUxLh/iBa1qdMKgcB5iwddpUSZjoVx73slVSMN/Afr48+z6TTKe7pXJhXkfWe/d
50rqvi/TkYMEJj6IB4LDbuwXmDDABQTIVp5l2Yed8fBVkoxsbENY7k9gGQTL330DzyptvsuzM4g8
eB7nLj0O4mGaEalCjbEilVeCm31Y0O0pVnNy0o2FlXeZPPh9nD44Kz+sTpIkf3A2nh5DqWOxwhzD
k2Px6viH4QdF9PWXvcHHnItzIxmcoo+sKfooatdlmLxz47K0zub0mpiKj5+tmzn9COf0/MCbpvrm
Q6HOrdAfpedILecbkM5iyn8jRMkWaO9nww/H4vswuzoWa+uxEO5JPo5Hxyjnxc/TLOpA4W4ENflh
pPlqIhZnx+TaOM4ToTshTrCeAI7QgY3Np9AB+qPUUvTx5avfDZOT6dlyNMlFK+LR/QEYUvl0gHta
sIM7yCG+AGBCVjnwehXp/yRR5/8Mu/9nuPz/xve796KlpSV1vFsvd4IYtNJhK6r6dtQR5H+pfn6z
jP2epNcX8eQYnDGdt+9fv+7a0MQ6B01AK1A6PztBEgmOnMajqLMMvZhgRgYkBlxSINbujtWw0B8B
siiDJHnc7z4VJBF/+qS8/vR2b/eXd/sHR+S2ET9f7Lx+Hf0E3NOCjY7PqFeqZ4BJB2COL6NvkvFl
N/pdup+KZHRqfmGEkvgprwn5Xd4TQuqQaMHo+YNROoFf2EkaIkFa2f4w+qbIBxH1sSvYEpMZww+i
CV5+dayoWRxL8g71o+GxQ3GTuWQQp3l2fBELWXB9XEbf0DeECyR4EX1zNmAFs0mSx2IBEUXLi8kx
2LvIcIRfx4P58tvDneMfdo+OfxB0fHd0EHWQYEgaGlPqzgx1gchqqJ886vZhrJ8IQ2VDTmBgI8Ua
yEvE0wJHwzLd6B+aUP9QxJM85q8u0LSqa6L+Y2hV16lp0rFo0wzGlcwrIqaOzn7mluHqpFvIDCYv
BciW53kSD4tjobgK2wBSpogxQXkFgwIlzgY0/aw+EC5sRg3YPBKgTxLBWUgJIS3kyINNK4CgaFIS
EUpogrlkOht0I4fwot4SHtQg/Zouq3UEjAZ+OpoW55G0cYg5RZ8srqW7GlQZelVM89N4QMMna9H4
yxddCWvZMwnyeFxgoqwOPekKumVTINgq/37ja69obo+6poT6dIxi/WxA0GhS6R7K2Ds97eQIDnKg
kGk8MSVUgW70YmfvYP94/93uwc7R/sHx4cELu9K5WIskdpGpZSPtiv2GJgl71UdYhGjoK6sQXobw
f4bRNfwj1gdhK1IEe3VNgjUojEfzmLGv846Y2xrcRpNnN6otZWom42FotlABPlch03Qu5+qKy+pR
eF4joLukLGkWapcDliy8fkK6wPqkLa1vrHefKGmbh6R3FBD9J79XF3Mmeur0F5oVYrEUyJP8Mo+o
yiDnI5aO09J5yeaA+4K6fltlAWEfEhcdJuWrdCSGeg6zovygr7d5Jx5+tpZFBc+gcbG+aVkX65sh
86La9RktjAqAJW4GrD1bf/Ls4Ya2MQReMxoZVfhNdsbGI5w5+IcmzgSz+Kk54pkfrhzQMgNXkBIs
iiEscGLSnRyfZoNpIfTvo38e/7z3UkCMOqIB6fR78E30yy+/tK8Dm54hIUSzZB52BrtdmNqfOTNb
WN7WTnY7PTMbW9V9lvLj+S1lF3oDCz9CDn5kGPhC1PZyMLyAZtQmRS0TQ+Hjkzg/jicTsYQSO77Z
ffv++PmOAHghXi13I86jUEMytgZQnCejURXE4Y+7QnTXAbkbNgf31F+Azw2aQUZ/bDH643pGZ92e
i9NN/XpWfzwfqzPwDby+2e/2n0Qrm+gJBm7//yizXRLdb7kinN9nahQqEqlo/TgeCJxRUWU4Rd/A
u+j4OC7FEJxMy+T4uNOZjuEaluXlbnDjGD7K1/ANokJrR12IiSrPis+n89gklVZY2DMi/ogflKeV
LhdARwj4GcoPP+OiBI62ISbbieA6wHEBUSmCB74RtVBc6L6eCaNJyhaxtNFteNHZKDuJRyx8CIKP
cLsspfCj02k5zRM8aEXrG0iuQ9BPX+8/33l9fLD7ylqCQUCBdWZEXKBgJL02oAhDr5dXv/shKQ+x
r++PXr0QnShkBex5V6u6JFg3uv01IVn73UdSsuLeGQ4XUQTMeCXpkI2ENX8MNx8fIzxUv5XZBQTJ
xmOgk2a2c7hYWfQZLc8iPQPX40AW6vxwvP/8p90XQiZSY0JQ3lc174O5viTTKoD4PNz74a2gwKv3
b19EHYujRTUcFyAcSlWjbICtqaF71gQjdIEcjx/B1vPjte662nlW42TpSN3IAARRveLnYfF8BiYm
mhwihTB6O8jMy/dW0I2HbX1Tr8utOKzbzFErtnWEVF0xpmJ1MVUva0YXVDtraP1y4odjINvznRf/
DA9wxZw1I7iCW6C3lyfCLsdtqZklCmrba5vgAe734Q/w0J+OML63Orc09kjceyu3h2aAiT6Iedr5
BuhLwuRFPBr9S2D9hgJfO/JN16CAY9mqiqmBjn38TLKiBHx3MOxx91Kw1d7L26pAfwH1p0H1eWqp
Pk/rVZ/bqD1SJ3lqVJL+5rO1zWebT7TG83Q+jaelcbr2EFcg+Lvel0KXafh67UEnsjROV+n1cQk5
1lsuUMp3VRp/DwmheSCZAJP62hR/FEXOG3D8FdMT7KIxGPaOdt+QcUAAl8ma0X5bd1GTL8nG3hmN
sis63YNg4UqkHBNSQCQXbvr1ZDwxU3rKbDJKLkXXti0DXfxfv2HNAP0A271DYcq8fbn/c9RRxVRw
vY62IXC065hn08lxPBzKB0IioLp07JZpF6BMlhQ0z1qXiuefhtoVUkmiSh0gsK5bBcnv+LT7BDZp
16TXMWxUar4U1FSDWhlesRL2l8HTeyLpyk1RZUPCD9tkFNXWZS/diYEcdWY4ym6RGpzBYqXx9reu
N3g/JLCXSAM+j5DGCIzPXEozHINi+oklpp+ExTTv8MxymlWut02fzC6pOewGUf3wSbe/Ga08fKJt
hVbK8Wp5M0mGQvOUfnpo9TVeFvLiPB0NyQpjD0CHXw2URfXEY7Styq3oa/P1Rnz9E+2BgEJ4r0El
1JRRCu1P+6gu1WqFy0ipJ2vdh0IHfLze3fDKDMvTI3obwnB1RgyV8bBai+EqUrGN8eDavc3Gw6rH
eFhVG6pNzmTxdoT73R5P8qq0L1/t/fJm9xkcdr1KoiEeHxknkMD1nDKxjMX0vMguE7UUggqKC9/q
A0yC0cJKgT13gct/pklR3u9WTc8CSimISo8lq1oZut6xXnVMZDzlPZ0kOQqoiPAqepEEUj/2lsfH
GX97RJDDDOUovy9oCyDL4LQX0LBIEjgLBefHwDrood9nDw+CRcNEIAhHymK4wZGkS3Q6HdMpt3Qc
WWIEQ9mIOgLINxhoKbPlTqAQgIbXt+b5M/njbXJFXqo6U01ZOjHtaZtpwIQJ3WC0xSYHlmYDN5ez
Z7XZ2QNlqDHvZGRY188meEW9kAoC/eDxT9L7s0paNCiisuEOlSV+f7H/9mhn7+2uwIBe6ynom65U
U5WQvIgjh84ftjL0Cby80llVXP3uJB1LTVBBKSgOC3IoG9T6vv47EyywJhkccT7Mp7Vkk+nkL2Bf
OnguQHtxOj67BmMD8JibT2+lxDjgGxQZsS4/xtX5MbM3Azo905on0IpRl32qPdPslffSTDtpXUyy
QkzpbrTRjcr0ghLQ1pVb0+XCWgSFNJzmifgNQTD/PxIoqp2B3gMA

--=-yJ1sWWqqRC6/YBNTAUbc--

--=-BiiCchc74SuyDlQQL20g
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)

iD8DBQBAgbzhxVhZCJWr9QwRAn+1AJ99Kvgw+kWN8pMr/n4miKBwaRh6KwCeOR7M
LCHoohn/LaibfjMl690xYiw=
=CDn7
-----END PGP SIGNATURE-----

--=-BiiCchc74SuyDlQQL20g--




From MAILER-DAEMON Sun Apr 18 00:02:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BF3Vz-0003JG-Uo
	for mharc-commit-classpath@gnu.org; Sun, 18 Apr 2004 00:02:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BF3Vx-0003FR-3D
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 00:02:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BF3VQ-0002kG-9Y
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 00:02:40 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BF3VQ-0002kB-2D
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 00:02:08 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 4748A6229D
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 04:02:07 +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 54126-10 for <commit-classpath@gnu.org>;
	Sun, 18 Apr 2004 04:02:06 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-72-176.adsl.solnet.ch
	[212.41.72.176])
	by mail01.solnet.ch (Postfix) with ESMTP id 2D2CC62225
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 04:02:06 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id C6A5DBA6E9; Sun, 18 Apr 2004 06:00:00 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040418040000.C6A5DBA6E9@reali.dnsalias.net>
Date: Sun, 18 Apr 2004 06:00:00 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040418 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 18 Apr 2004 04:02:41 -0000




From MAILER-DAEMON Sun Apr 18 06:49:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BF9ri-000794-J5
	for mharc-commit-classpath@gnu.org; Sun, 18 Apr 2004 06:49:34 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BF9rV-000754-Cy
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 06:49:21 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BF9qv-0006y5-MY
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 06:49:17 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BF9qu-0006xz-78
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 06:48:44 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-147.ewetel.net
	[80.228.94.147])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3IAmeGS005762
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 12:48:41 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BF9qv-0000dA-00
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 12:48:45 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 18 Apr 2004 12:48:17 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_xzlgAS/w3bXWbJ9"
Message-Id: <200404181248.18410.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.sql - more HTML fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 18 Apr 2004 10:49:30 -0000


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

Hi list,


more HTML fixes in javadocs.


Michael


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

	* java/sql/Array.java,
	java/sql/DatabaseMetaData.java,
	java/sql/ResultSet.java:
	Fixed HTML tags in javadocs.


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

Index: java/sql/Array.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/sql/Array.java,v
retrieving revision 1.6
diff -u -r1.6 Array.java
--- java/sql/Array.java	12 Oct 2003 16:00:32 -0000	1.6
+++ java/sql/Array.java	18 Apr 2004 10:36:08 -0000
@@ -165,13 +165,13 @@
   /**
    * This method returns a portion of the array as a <code>ResultSet</code>.
    * The returned portion will start at <code>index</code> into the
-   * array and up to <cod>count</code> elements will be returned.
-   * <p>
-   * Each row of the result set will have two columns.  The first will be
+   * array and up to <code>count</code> elements will be returned.
+   *
+   * <p> Each row of the result set will have two columns.  The first will be
    * the index into the array of that row's contents.  The second will be
    * the actual value of that array element.  The specified <code>Map</code>
    * will be used to override selected default mappings of SQL types to
-   * Java classes.
+   * Java classes.</p>
    *
    * @param offset The index into the array to start returning elements from.
    * @param length The requested number of elements to return.
Index: java/sql/DatabaseMetaData.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/sql/DatabaseMetaData.java,v
retrieving revision 1.12
diff -u -r1.12 DatabaseMetaData.java
--- java/sql/DatabaseMetaData.java	13 Oct 2003 06:29:48 -0000	1.12
+++ java/sql/DatabaseMetaData.java	18 Apr 2004 10:36:08 -0000
@@ -412,7 +412,7 @@
    * each table.
    *
    * @return <code>true</code> if the database uses a separate file for each
-   * table </code>false</code> otherwise.
+   * table <code>false</code> otherwise.
    *
    * @exception SQLException If an error occurs.
    */
@@ -433,8 +433,8 @@
    * This method tests whether or not the database treats mixed case
    * identifiers as all upper case.
    *
-   * @exception <code>true</code> if the database treats all identifiers as
-   *            upper case, <code>false</code> otherwise.
+   * @return <code>true</code> if the database treats all identifiers as
+   *         upper case, <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
   boolean storesUpperCaseIdentifiers() throws SQLException;
@@ -443,8 +443,8 @@
    * This method tests whether or not the database treats mixed case
    * identifiers as all lower case.
    *
-   * @exception <code>true</code> if the database treats all identifiers as
-   *            lower case, <code>false</code> otherwise.
+   * @return <code>true</code> if the database treats all identifiers as
+   *         lower case, <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
   boolean storesLowerCaseIdentifiers() throws SQLException;
@@ -473,8 +473,8 @@
    * This method tests whether or not the database treats mixed case
    * quoted identifiers as all upper case.
    *
-   * @exception <code>true</code> if the database treats all quoted identifiers 
-   *            as upper case, <code>false</code> otherwise.
+   * @return <code>true</code> if the database treats all quoted identifiers 
+   *         as upper case, <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
   boolean storesUpperCaseQuotedIdentifiers() throws SQLException;
@@ -483,8 +483,8 @@
    * This method tests whether or not the database treats mixed case
    * quoted identifiers as all lower case.
    *
-   * @exception <code>true</code> if the database treats all quoted identifiers 
-   *            as lower case, <code>false</code> otherwise.
+   * @return <code>true</code> if the database treats all quoted identifiers 
+   *         as lower case, <code>false</code> otherwise.
    * @exception SQLException If an error occurs.
    */
   boolean storesLowerCaseQuotedIdentifiers() throws SQLException;
@@ -1377,18 +1377,18 @@
    * <p>
    * <ol>
    * <li>PROCEDURE_CAT - The catalog the procedure is in, which may be 
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * <li>PROCEDURE_SCHEM - The schema the procedures is in, which may be
-   * <code>null</code>.
-   * <li>PROCEDURE_NAME - The name of the procedure.
-   * <li>Unused
-   * <li>Unused
-   * <li>Unused
-   * <li>REMARKS - A description of the procedure
+   * <code>null</code>.</li>
+   * <li>PROCEDURE_NAME - The name of the procedure.</li>
+   * <li>Unused</li>
+   * <li>Unused</li>
+   * <li>Unused</li>
+   * <li>REMARKS - A description of the procedure</li>
    * <li>PROCEDURE_TYPE - Indicates the return type of the procedure, which 
    * is one of the contstants defined in this class 
    * (<code>procedureResultUnknown</code>, <code>procedureNoResult</code>, or
-   * <code>procedureReturnsResult</code>).
+   * <code>procedureReturnsResult</code>).</li>
    * </ol>
    *
    * @param catalog The name of the catalog to return stored procedured from,
@@ -1409,27 +1409,27 @@
    * <p>
    * <ol>
    * <li>PROCEDURE_CAT - The catalog the procedure is in, which may be 
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * <li>PROCEDURE_SCHEM - The schema the procedures is in, which may be
-   * <code>null</code>.
-   * <li>PROCEDURE_NAME - The name of the procedure.
-   * <li>COLUMN_NAME - The name of the column
+   * <code>null</code>.</li>
+   * <li>PROCEDURE_NAME - The name of the procedure.</li>
+   * <li>COLUMN_NAME - The name of the column</li>
    * <li>COLUMN_TYPE - The type of the column, which will be one of the
    * contants defined in this class (<code>procedureColumnUnknown</code>,
    * <code>procedureColumnIn</code>, <code>procedureColumnInOut</code>,
    * <code>procedureColumnOut</code>, <code>procedureColumnReturn</code>,
-   * or <code>procedureColumnResult</code>).
+   * or <code>procedureColumnResult</code>).</li>
    * <li>DATA_TYPE - The SQL type of the column. This is one of the constants
-   * defined in <code>Types</code>.
-   * <li>TYPE_NAME - The string name of the data type for this column.
-   * <li>PRECISION - The precision of the column.
-   * <li>LENGTH - The length of the column in bytes
-   * <li>SCALE - The scale of the column.
-   * <li>RADIX - The radix of the column.
+   * defined in <code>Types</code>.</li>
+   * <li>TYPE_NAME - The string name of the data type for this column.</li>
+   * <li>PRECISION - The precision of the column.</li>
+   * <li>LENGTH - The length of the column in bytes</li>
+   * <li>SCALE - The scale of the column.</li>
+   * <li>RADIX - The radix of the column.</li>
    * <li>NULLABLE - Whether or not the column is NULLABLE.  This is one of
    * the constants defined in this class (<code>procedureNoNulls</code>,
-   * <code>procedureNullable</code>, or <code>procedureNullableUnknown</code>)
-   * <li>REMARKS - A description of the column.
+   * <code>procedureNullable</code>, or <code>procedureNullableUnknown</code>)</li>
+   * <li>REMARKS - A description of the column.</li>
    * </ol>
    *
    * @param catalog The name of the catalog to return stored procedured from,
@@ -1448,14 +1448,14 @@
   /**
    * This method returns a list of the requested table as a   
    * <code>ResultSet</code> with the following columns:
-   * <p>
+   *
    * <ol>
-   * <li>TABLE_CAT - The catalog the table is in, which may be <code>null</code>.
-   * <li>TABLE_SCHEM - The schema the table is in, which may be <code>null</code>.
-   * <li>TABLE_NAME - The name of the table.
+   * <li>TABLE_CAT - The catalog the table is in, which may be <code>null</code>.</li>
+   * <li>TABLE_SCHEM - The schema the table is in, which may be <code>null</code>.</li>
+   * <li>TABLE_NAME - The name of the table.</li>
    * <li>TABLE_TYPE - A string describing the table type.  This will be one
-   * of the values returned by the <code>getTableTypes()</code> method.
-   * <li>REMARKS - Comments about the table.
+   * of the values returned by the <code>getTableTypes()</code> method.</li>
+   * <li>REMARKS - Comments about the table.</li>
    * </ol>
    * 
    * @param catalog The name of the catalog to return tables from,
@@ -1507,29 +1507,29 @@
    * <p>
    * <ol>
    * <li>TABLE_CAT - The catalog the table is in, which may be 
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * <li>TABLE_SCHEM - The schema the tables is in, which may be
-   * <code>null</code>.
-   * <li>TABLE_NAME - The name of the table.
-   * <li>COLUMN_NAME - The name of the column
+   * <code>null</code>.</li>
+   * <li>TABLE_NAME - The name of the table.</li>
+   * <li>COLUMN_NAME - The name of the column</li>
    * <li>DATA_TYPE - The SQL type of the column. This is one of the constants
-   * defined in <code>Types</code>.
-   * <li>TYPE_NAME - The string name of the data type for this column.
-   * <li>COLUMN_SIZE - The size of the column.
-   * <li>Unused
-   * <li>NUM_PREC_RADIX - The radix of the column.
+   * defined in <code>Types</code>.</li>
+   * <li>TYPE_NAME - The string name of the data type for this column.</li>
+   * <li>COLUMN_SIZE - The size of the column.</li>
+   * <li>Unused</li>
+   * <li>NUM_PREC_RADIX - The radix of the column.</li>
    * <li>NULLABLE - Whether or not the column is NULLABLE.  This is one of
    * the constants defined in this class (<code>tableNoNulls</code>,
-   * <code>tableNullable</code>, or <code>tableNullableUnknown</code>)
-   * <li>REMARKS - A description of the column.
-   * <li>COLUMN_DEF - The default value for the column, may be <code>null</code>.
-   * <li>SQL_DATA_TYPE - Unused
-   * <li>SQL_DATETIME_SUB - Unused
+   * <code>tableNullable</code>, or <code>tableNullableUnknown</code>)</li>
+   * <li>REMARKS - A description of the column.</li>
+   * <li>COLUMN_DEF - The default value for the column, may be <code>null</code>.</li>
+   * <li>SQL_DATA_TYPE - Unused</li>
+   * <li>SQL_DATETIME_SUB - Unused</li>
    * <li>CHAR_OCTET_LENGTH - For character columns, the maximum number of bytes
-   * in the column.
-   * <li>ORDINAL_POSITION - The index of the column in the table.
+   * in the column.</li>
+   * <li>ORDINAL_POSITION - The index of the column in the table.</li>
    * <li>IS_NULLABLE - "NO" means no, "YES" means maybe, and an empty string
-   * means unknown.
+   * means unknown.</li>
    * </ol>
    *
    * @param catalog The name of the catalog to return table from,
@@ -1548,19 +1548,19 @@
    * This method returns the access rights that have been granted to the
    * requested columns.  This information is returned as a <code>ResultSet</code>
    * with the following columns:
-   * <p>
+   *
    * <ol>
    * <li>TABLE_CAT - The catalog the table is in, which may be 
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * <li>TABLE_SCHEM - The schema the tables is in, which may be
-   * <code>null</code>.
-   * <li>TABLE_NAME - The name of the table.
-   * <li>COLUMN_NAME - The name of the column.
-   * <li>GRANTOR - The entity that granted the access.
-   * <li>GRANTEE - The entity granted the access.
-   * <li>PRIVILEGE - The name of the privilege granted.
+   * <code>null</code>.</li>
+   * <li>TABLE_NAME - The name of the table.</li>
+   * <li>COLUMN_NAME - The name of the column.</li>
+   * <li>GRANTOR - The entity that granted the access.</li>
+   * <li>GRANTEE - The entity granted the access.</li>
+   * <li>PRIVILEGE - The name of the privilege granted.</li>
    * <li>IS_GRANTABLE - "YES" if the grantee can grant the privilege to
-   * others, "NO" if not, and <code>null</code> if unknown.
+   * others, "NO" if not, and <code>null</code> if unknown.</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
@@ -1580,18 +1580,18 @@
    * This method returns the access rights that have been granted to the
    * requested tables.  This information is returned as a <code>ResultSet</code>
    * with the following columns:
-   * <p>
+   *
    * <ol>
    * <li>TABLE_CAT - The catalog the table is in, which may be 
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * <li>TABLE_SCHEM - The schema the tables is in, which may be
-   * <code>null</code>.
-   * <li>TABLE_NAME - The name of the table.
-   * <li>GRANTOR - The entity that granted the access.
-   * <li>GRANTEE - The entity granted the access.
-   * <li>PRIVILEGE - The name of the privilege granted.
+   * <code>null</code>.</li>
+   * <li>TABLE_NAME - The name of the table.</li>
+   * <li>GRANTOR - The entity that granted the access.</li>
+   * <li>GRANTEE - The entity granted the access.</li>
+   * <li>PRIVILEGE - The name of the privilege granted.</li>
    * <li>IS_GRANTABLE - "YES" if the grantee can grant the privilege to
-   * others, "NO" if not, and <code>null</code> if unknown.
+   * others, "NO" if not, and <code>null</code> if unknown.</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
@@ -1611,22 +1611,22 @@
    * This method returns the best set of columns for uniquely identifying
    * a row.  It returns this information as a <code>ResultSet</code> with
    * the following columns:
-   * <p>
+   *
    * <ol>
    * <li>SCOPE - The scope of the results returned.  This is one of the 
    * constants defined in this class (<code>bestRowTemporary</code>,
-   * <code>bestRowTransaction</code>, or <code>bestRowSession</code>).
-   * <li>COLUMN_NAME - The name of the column.
+   * <code>bestRowTransaction</code>, or <code>bestRowSession</code>).</li>
+   * <li>COLUMN_NAME - The name of the column.</li>
    * <li>DATA_TYPE - The SQL type of the column. This is one of the constants
-   * defined in <code>Types</code>.
-   * <li>TYPE_NAME - The string name of the data type for this column.
-   * <li>COLUMN_SIZE - The precision of the columns
-   * <li>BUFFER_LENGTH - Unused
-   * <li>DECIMAL_DIGITS - The scale of the column.
+   * defined in <code>Types</code>.</li>
+   * <li>TYPE_NAME - The string name of the data type for this column.</li>
+   * <li>COLUMN_SIZE - The precision of the columns</li>
+   * <li>BUFFER_LENGTH - Unused</li>
+   * <li>DECIMAL_DIGITS - The scale of the column.</li>
    * <li>PSEUDO_COLUMN - Whether or not the best row identifier is a
    * pseudo_column.  This is one of the constants defined in this class 
    * (<code>bestRowUnknown</code>, <code>bestRowNotPseudo</code>, or
-   * <code>bestRowPseudo</code>).
+   * <code>bestRowPseudo</code>).</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
@@ -1649,20 +1649,20 @@
    * This method returns the set of columns that are automatically updated
    * when the row is update. It returns this information as a 
    * <code>ResultSet</code> with the following columns:
-   * <p>
+   *
    * <ol>
-   * <li>SCOPE - Unused
-   * <li>COLUMN_NAME - The name of the column.
+   * <li>SCOPE - Unused</li>
+   * <li>COLUMN_NAME - The name of the column.</li>
    * <li>DATA_TYPE - The SQL type of the column. This is one of the constants
-   * defined in <code>Types</code>.
-   * <li>TYPE_NAME - The string name of the data type for this column.
-   * <li>COLUMN_SIZE - The precision of the columns
-   * <li>BUFFER_LENGTH - Unused
-   * <li>DECIMAL_DIGITS - The scale of the column.
+   * defined in <code>Types</code>.</li>
+   * <li>TYPE_NAME - The string name of the data type for this column.</li>
+   * <li>COLUMN_SIZE - The precision of the columns</li>
+   * <li>BUFFER_LENGTH - Unused</li>
+   * <li>DECIMAL_DIGITS - The scale of the column.</li>
    * <li>PSEUDO_COLUMN - Whether or not the best row identifier is a
    * pseudo_column.  This is one of the constants defined in this class 
    * (<code>versionRowUnknown</code>, <code>versionRowNotPseudo</code>, or
-   * <code>versionRowPseudo</code>).
+   * <code>versionRowPseudo</code>).</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
@@ -1681,14 +1681,14 @@
   /**
    * This method returns a list of a table's primary key columns.  These
    * are returned as a <code>ResultSet</code> with the following columns.
-   * <p>
+   *
    * <ol>
-   * <li>TABLE_CAT - The catalog of the table, which may be <code>null</code>.
-   * <li>TABLE_SCHEM - The schema of the table, which may be <code>null</code>.
-   * <li>TABLE_NAME - The name of the table.
-   * <li>COLUMN_NAME - The name of the column.
-   * <li>KEY_SEQ - The sequence number of the column within the primary key.
-   * <li>PK_NAME - The name of the primary key, which may be <code>null</code>.
+   * <li>TABLE_CAT - The catalog of the table, which may be <code>null</code>.</li>
+   * <li>TABLE_SCHEM - The schema of the table, which may be <code>null</code>.</li>
+   * <li>TABLE_NAME - The name of the table.</li>
+   * <li>COLUMN_NAME - The name of the column.</li>
+   * <li>KEY_SEQ - The sequence number of the column within the primary key.</li>
+   * <li>PK_NAME - The name of the primary key, which may be <code>null</code>.</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
@@ -1707,32 +1707,32 @@
   /**
    * This method returns a list of the table's foreign keys.  These are
    * returned as a <code>ResultSet</code> with the following columns:
-   * <p>
+   *
    * <ol>
-   * <li>PKTABLE_CAT - The catalog of the table the key was imported from.
-   * <li>PKTABLE_SCHEM - The schema of the table the key was imported from.
-   * <li>PKTABLE_NAME - The name of the table the key was imported from.
-   * <li>PKCOLUMN_NAME - The name of the column that was imported.
-   * <li>FKTABLE_CAT - The foreign key catalog name.
-   * <li>FKTABLE_SCHEM - The foreign key schema name.
-   * <li>FKTABLE_NAME - The foreign key table name.
-   * <li>FKCOLUMN_NAME - The foreign key column name.
-   * <li>KEY_SEQ - The sequence number of the column within the foreign key.
+   * <li>PKTABLE_CAT - The catalog of the table the key was imported from.</li>
+   * <li>PKTABLE_SCHEM - The schema of the table the key was imported from.</li>
+   * <li>PKTABLE_NAME - The name of the table the key was imported from.</li>
+   * <li>PKCOLUMN_NAME - The name of the column that was imported.</li>
+   * <li>FKTABLE_CAT - The foreign key catalog name.</li>
+   * <li>FKTABLE_SCHEM - The foreign key schema name.</li>
+   * <li>FKTABLE_NAME - The foreign key table name.</li>
+   * <li>FKCOLUMN_NAME - The foreign key column name.</li>
+   * <li>KEY_SEQ - The sequence number of the column within the foreign key.</li>
    * <li>UPDATE_RULE - How the foreign key behaves when the primary key is
    * updated.  This is one of the constants defined in this class 
    * (<code>importedNoAction</code>, <code>importedKeyCascade</code>,
    * <code>importedKeySetNull</code>, <code>importedKeySetDefault</code>, or
-   * <code>importedKeyRestrict</code>).
+   * <code>importedKeyRestrict</code>).</li>
    * <li>DELETE_RULE - How the foreign key behaves when the primary key is
    * deleted.  This is one of the constants defined in this class 
    * (<code>importedNoAction</code>, <code>importedKeyCascade</code>,
-   * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)
-   * <li>FK_NAME - The name of the foreign key.
-   * <li>PK_NAME - The name of the primary key.
+   * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)</li>
+   * <li>FK_NAME - The name of the foreign key.</li>
+   * <li>PK_NAME - The name of the primary key.</li>
    * <li>DEFERRABILITY - The deferrability value.  This is one of the
    * constants defined in this table (<code>importedKeyInitiallyDeferred</code>,
    * <code>importedKeyInitiallyImmediate</code>, or
-   * <code>importedKeyNotDeferrable</code>).
+   * <code>importedKeyNotDeferrable</code>).</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
@@ -1753,32 +1753,32 @@
    * This method returns a list of the table's which use this table's
    * primary key as a foreign key.  The information is
    * returned as a <code>ResultSet</code> with the following columns:
-   * <p>
+   *
    * <ol>
-   * <li>PKTABLE_CAT - The catalog of the table the key was imported from.
-   * <li>PKTABLE_SCHEM - The schema of the table the key was imported from.
-   * <li>PKTABLE_NAME - The name of the table the key was imported from.
-   * <li>PKCOLUMN_NAME - The name of the column that was imported.
-   * <li>FKTABLE_CAT - The foreign key catalog name.
-   * <li>FKTABLE_SCHEM - The foreign key schema name.
-   * <li>FKTABLE_NAME - The foreign key table name.
-   * <li>FKCOLUMN_NAME - The foreign key column name.
-   * <li>KEY_SEQ - The sequence number of the column within the foreign key.
+   * <li>PKTABLE_CAT - The catalog of the table the key was imported from.</li>
+   * <li>PKTABLE_SCHEM - The schema of the table the key was imported from.</li>
+   * <li>PKTABLE_NAME - The name of the table the key was imported from.</li>
+   * <li>PKCOLUMN_NAME - The name of the column that was imported.</li>
+   * <li>FKTABLE_CAT - The foreign key catalog name.</li>
+   * <li>FKTABLE_SCHEM - The foreign key schema name.</li>
+   * <li>FKTABLE_NAME - The foreign key table name.</li>
+   * <li>FKCOLUMN_NAME - The foreign key column name.</li>
+   * <li>KEY_SEQ - The sequence number of the column within the foreign key.</li>
    * <li>UPDATE_RULE - How the foreign key behaves when the primary key is
    * updated.  This is one of the constants defined in this class 
    * (<code>importedNoAction</code>, <code>importedKeyCascade</code>,
    * <code>importedKeySetNull</code>, <code>importedKeySetDefault</code>, or
-   * <code>importedKeyRestrict</code>).
+   * <code>importedKeyRestrict</code>).</li>
    * <li>DELETE_RULE - How the foreign key behaves when the primary key is
    * deleted.  This is one of the constants defined in this class 
    * (<code>importedNoAction</code>, <code>importedKeyCascade</code>,
-   * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)
-   * <li>FK_NAME - The name of the foreign key.
-   * <li>PK_NAME - The name of the primary key.
+   * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)</li>
+   * <li>FK_NAME - The name of the foreign key.</li>
+   * <li>PK_NAME - The name of the primary key.</li>
    * <li>DEFERRABILITY - The deferrability value.  This is one of the
    * constants defined in this table (<code>importedKeyInitiallyDeferred</code>,
    * <code>importedKeyInitiallyImmediate</code>, or
-   * <code>importedKeyNotDeferrable</code>).
+   * <code>importedKeyNotDeferrable</code>).</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
@@ -1797,32 +1797,32 @@
    * This method returns a description of how one table imports another
    * table's primary key as a foreign key.  The information is
    * returned as a <code>ResultSet</code> with the following columns:
-   * <p>
+   *
    * <ol>
-   * <li>PKTABLE_CAT - The catalog of the table the key was imported from.
-   * <li>PKTABLE_SCHEM - The schema of the table the key was imported from.
-   * <li>PKTABLE_NAME - The name of the table the key was imported from.
-   * <li>PKCOLUMN_NAME - The name of the column that was imported.
-   * <li>FKTABLE_CAT - The foreign key catalog name.
-   * <li>FKTABLE_SCHEM - The foreign key schema name.
-   * <li>FKTABLE_NAME - The foreign key table name.
-   * <li>FKCOLUMN_NAME - The foreign key column name.
-   * <li>KEY_SEQ - The sequence number of the column within the foreign key.
+   * <li>PKTABLE_CAT - The catalog of the table the key was imported from.</li>
+   * <li>PKTABLE_SCHEM - The schema of the table the key was imported from.</li>
+   * <li>PKTABLE_NAME - The name of the table the key was imported from.</li>
+   * <li>PKCOLUMN_NAME - The name of the column that was imported.</li>
+   * <li>FKTABLE_CAT - The foreign key catalog name.</li>
+   * <li>FKTABLE_SCHEM - The foreign key schema name.</li>
+   * <li>FKTABLE_NAME - The foreign key table name.</li>
+   * <li>FKCOLUMN_NAME - The foreign key column name.</li>
+   * <li>KEY_SEQ - The sequence number of the column within the foreign key.</li>
    * <li>UPDATE_RULE - How the foreign key behaves when the primary key is
    * updated.  This is one of the constants defined in this class 
    * (<code>importedNoAction</code>, <code>importedKeyCascade</code>,
    * <code>importedKeySetNull</code>, <code>importedKeySetDefault</code>, or
-   * <code>importedKeyRestrict</code>).
+   * <code>importedKeyRestrict</code>).</li>
    * <li>DELETE_RULE - How the foreign key behaves when the primary key is
    * deleted.  This is one of the constants defined in this class 
    * (<code>importedNoAction</code>, <code>importedKeyCascade</code>,
-   * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)
-   * <li>FK_NAME - The name of the foreign key.
-   * <li>PK_NAME - The name of the primary key.
+   * <code>importedKeySetNull</code>, or <code>importedKeySetDefault</code>)</li>
+   * <li>FK_NAME - The name of the foreign key.</li>
+   * <li>PK_NAME - The name of the primary key.</li>
    * <li>DEFERRABILITY - The deferrability value.  This is one of the
    * constants defined in this table (<code>importedKeyInitiallyDeferred</code>,
    * <code>importedKeyInitiallyImmediate</code>, or
-   * <code>importedKeyNotDeferrable</code>).
+   * <code>importedKeyNotDeferrable</code>).</li>
    * </ol>
    *
    * @param primCatalog The catalog to retrieve information from, or the empty string
@@ -1850,36 +1850,36 @@
    * This method returns a list of the SQL types supported by this
    * database.  The information is returned as a <code>ResultSet</code>
    * with the following columns:
-   * <p>
+   *
    * <ol>
-   * <li>TYPE_NAME - The name of the data type.
+   * <li>TYPE_NAME - The name of the data type.</li>
    * <li>DATA_TYPE - A data type constant from <code>Types</code> for this
-   * type.
-   * <li>PRECISION - The maximum precision of this type.
+   * type.</li>
+   * <li>PRECISION - The maximum precision of this type.</li>
    * <li>LITERAL_PREFIX - Prefix value used to quote a literal, which may be
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * <li>LITERAL_SUFFIX - Suffix value used to quote a literal, which may be
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * <li>CREATE_PARAMS - The parameters used to create the type, which may be
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * <li>NULLABLE - Whether or not this type supports NULL values.  This will
    * be one of the constants defined in this interface 
    * (<code>typeNoNulls</code>, <code>typeNullable</code>, or
-   * <code>typeNullableUnknown</code>).
-   * <li>CASE_SENSITIVE - Whether or not the value is case sensitive.
+   * <code>typeNullableUnknown</code>).</li>
+   * <li>CASE_SENSITIVE - Whether or not the value is case sensitive.</li>
    * <li>SEARCHABLE - Whether or not "LIKE" expressions are supported in
    * WHERE clauses for this type.  This will be one of the constants defined
    * in this interface (<code>typePredNone</code>, <code>typePredChar</code>,
-   * <code>typePredBasic</code>, or <code>typeSearchable</code>).
-   * <li>UNSIGNED_ATTRIBUTE - Is the value of this type unsigned.
-   * <li>FIXED_PREC_SCALE - Whether or not this type can be used for money.
-   * <li>AUTO_INCREMENT - Whether or not this type supports auto-incrementing.
-   * <li>LOCAL_TYPE_NAME - A localized name for this data type.
-   * <li>MINIMUM_SCALE - The minimum scale supported by this type.
-   * <li>MAXIMUM_SCALE - The maximum scale supported by this type.
-   * <li>SQL_DATA_TYPE - Unused.
-   * <li>SQL_DATETIME_SUB - Unused.
-   * <li>NUM_PREC_RADIX - The radix of this data type.
+   * <code>typePredBasic</code>, or <code>typeSearchable</code>).</li>
+   * <li>UNSIGNED_ATTRIBUTE - Is the value of this type unsigned.</li>
+   * <li>FIXED_PREC_SCALE - Whether or not this type can be used for money.</li>
+   * <li>AUTO_INCREMENT - Whether or not this type supports auto-incrementing.</li>
+   * <li>LOCAL_TYPE_NAME - A localized name for this data type.</li>
+   * <li>MINIMUM_SCALE - The minimum scale supported by this type.</li>
+   * <li>MAXIMUM_SCALE - The maximum scale supported by this type.</li>
+   * <li>SQL_DATA_TYPE - Unused.</li>
+   * <li>SQL_DATETIME_SUB - Unused.</li>
+   * <li>NUM_PREC_RADIX - The radix of this data type.</li>
    * </ol>
    * 
    * @return A <code>ResultSet</code> with the list of available data types.
@@ -1890,30 +1890,30 @@
   /**
    * This method returns information about a tables indices and statistics.
    * It is returned as a <code>ResultSet</code> with the following columns:
-   * <p>
+   *
    * <ol>
-   * <li>TABLE_CAT - The catalog of the table, which may be <code>null</code>.
-   * <li>TABLE_SCHEM - The schema of the table, which may be <code>null</code>.
-   * <li>TABLE_NAME - The name of the table.
-   * <li>NON_UNIQUE - Are index values non-unique?
-   * <li>INDEX_QUALIFIER The index catalog, which may be <code>null</code>
-   * <li>INDEX_NAME - The name of the index.
+   * <li>TABLE_CAT - The catalog of the table, which may be <code>null</code>.</li>
+   * <li>TABLE_SCHEM - The schema of the table, which may be <code>null</code>.</li>
+   * <li>TABLE_NAME - The name of the table.</li>
+   * <li>NON_UNIQUE - Are index values non-unique?</li>
+   * <li>INDEX_QUALIFIER The index catalog, which may be <code>null</code></li>
+   * <li>INDEX_NAME - The name of the index.</li>
    * <li>TYPE - The type of index, which will be one of the constants defined
    * in this interface (<code>tableIndexStatistic</code>,
    * <code>tableIndexClustered</code>, <code>tableIndexHashed</code>, or
-   * <code>tableIndexOther</code>).
+   * <code>tableIndexOther</code>).</li>
    * <li>ORDINAL_POSITION - The sequence number of this column in the index.
-   * This will be 0 when the index type is <code>tableIndexStatistic</code>.
-   * <li>COLUMN_NAME - The name of this column in the index.
+   * This will be 0 when the index type is <code>tableIndexStatistic</code>.</li>
+   * <li>COLUMN_NAME - The name of this column in the index.</li>
    * <li>ASC_OR_DESC - "A" for an ascending sort sequence, "D" for a
    * descending sort sequence or <code>null</code> if a sort sequence is not
-   * supported.
+   * supported.</li>
    * <li>CARDINALITY - The number of unique rows in the index, or the number
-   * of rows in the table if the index type is <code>tableIndexStatistic</code>.
+   * of rows in the table if the index type is <code>tableIndexStatistic</code>.</li>
    * <li>PAGES - The number of pages used for the index, or the number of pages
-   * in the table if the index type is <code>tableIndexStatistic</code>.
+   * in the table if the index type is <code>tableIndexStatistic</code>.</li>
    * <li>FILTER_CONDITION - The filter condition for this index, which may be
-   * <code>null</code>.
+   * <code>null</code>.</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
@@ -2093,16 +2093,16 @@
   /**
    * This method returns the list of user defined data types in use.  These
    * are returned as a <code>ResultSet</code> with the following columns:
-   * <p>
+   *
    * <ol>
-   * <li>TYPE_CAT - The catalog name, which may be <code>null</code>.
-   * <li>TYPE_SCEHM - The schema name, which may be <code>null</code>.
-   * <li>TYPE_NAME - The user defined data type name.
-   * <li>CLASS_NAME - The Java class name this type maps to.
+   * <li>TYPE_CAT - The catalog name, which may be <code>null</code>.</li>
+   * <li>TYPE_SCEHM - The schema name, which may be <code>null</code>.</li>
+   * <li>TYPE_NAME - The user defined data type name.</li>
+   * <li>CLASS_NAME - The Java class name this type maps to.</li>
    * <li>DATA_TYPE - A type identifier from <code>Types</code> for this type.
    * This will be one of <code>JAVA_OBJECT</code>, <code>STRUCT</code>, or
-   * <code>DISTINCT</code>.
-   * <li>REMARKS - Comments about this data type.
+   * <code>DISTINCT</code>.</li>
+   * <li>REMARKS - Comments about this data type.</li>
    * </ol>
    *
    * @param catalog The catalog to retrieve information from, or the empty string
Index: java/sql/ResultSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/sql/ResultSet.java,v
retrieving revision 1.6
diff -u -r1.6 ResultSet.java
--- java/sql/ResultSet.java	12 Oct 2003 16:38:16 -0000	1.6
+++ java/sql/ResultSet.java	18 Apr 2004 10:36:09 -0000
@@ -48,14 +48,14 @@
 /**
  * This interface provides access to the data set returned by a SQL
  * statement.  An instance of this interface is returned by the various
- * execution methods in the <code>Statement</code.
- * <p>
- * This class models a cursor, which can be stepped through one row at a
+ * execution methods in the <code>Statement</code>.
+ *
+ * <p> This class models a cursor, which can be stepped through one row at a
  * time.  Methods are provided for accessing columns by column name or by
- * index.
- * <p>
- * Note that a result set is invalidated if the statement that returned
- * it is closed.
+ * index.</p>
+ *
+ * <p> Note that a result set is invalidated if the statement that returned
+ * it is closed.</p>
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
  */

--Boundary-00=_xzlgAS/w3bXWbJ9--




From MAILER-DAEMON Sun Apr 18 07:27:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFASF-0000TA-IR
	for mharc-commit-classpath@gnu.org; Sun, 18 Apr 2004 07:27:19 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFASB-0000RF-Ie
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 07:27:15 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFAOJ-0006Ch-L9
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 07:23:48 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFANg-0005iX-SO
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 07:22:37 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-147.ewetel.net
	[80.228.94.147])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i3IBMVMo024268
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 13:22:31 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFANf-0000kH-00
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 13:22:35 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 18 Apr 2004 13:22:07 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_fTmgASnlGnfTNNS"
Message-Id: <200404181322.08094.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.rmi and java.naming - javadoc fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 18 Apr 2004 11:27:17 -0000


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

Hi list,


here is the last javadoc html fixing patch.


Michael


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

	* java/rmi/Naming.java,
	java/rmi/RemoteException.java,
	java/rmi/activation/ActivationException.java,
	java/rmi/server/ServerCloneException.java,
	javax/naming/NamingException.java:
	Fixed HTML tags in javadocs.


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

Index: java/rmi/Naming.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/Naming.java,v
retrieving revision 1.4
diff -u -r1.4 Naming.java
--- java/rmi/Naming.java	26 Dec 2003 14:46:07 -0000	1.4
+++ java/rmi/Naming.java	18 Apr 2004 11:20:16 -0000
@@ -44,14 +44,16 @@
 
 public final class Naming {
 
-/** <pre>
+/**
  * Looks for the remote object that is associated with the named service.
  * Name and location is given in form of a URL without a scheme:
- * 
- *   //host:port/service-name
+ *
+ * <pre>
+ * //host:port/service-name
+ * </pre>
  *  
  * The port is optional.
- * </pre>
+ * 
  * @param name the service name and location
  * @return Remote-object that implements the named service
  * @throws NotBoundException if no object implements the service
Index: java/rmi/RemoteException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/RemoteException.java,v
retrieving revision 1.3
diff -u -r1.3 RemoteException.java
--- java/rmi/RemoteException.java	24 Feb 2002 04:25:16 -0000	1.3
+++ java/rmi/RemoteException.java	18 Apr 2004 11:20:16 -0000
@@ -99,7 +99,7 @@
    * This method returns a message indicating what went wrong, in this
    * format:
    * <code>super.getMessage() + (detail == null ? ""
-   *    : "; nested exception is:\n\t" + detail)<code>.
+   *    : "; nested exception is:\n\t" + detail)</code>.
    *
    * @return the chained message
    */
Index: java/rmi/activation/ActivationException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/activation/ActivationException.java,v
retrieving revision 1.3
diff -u -r1.3 ActivationException.java
--- java/rmi/activation/ActivationException.java	24 Feb 2002 04:25:17 -0000	1.3
+++ java/rmi/activation/ActivationException.java	18 Apr 2004 11:20:16 -0000
@@ -94,7 +94,7 @@
    * This method returns a message indicating what went wrong, in this
    * format:
    * <code>super.getMessage() + (detail == null ? ""
-   *    : "; nested exception is:\n\t" + detail)<code>.
+   *    : "; nested exception is:\n\t" + detail)</code>.
    *
    * @return the chained message
    */
Index: java/rmi/server/ServerCloneException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/rmi/server/ServerCloneException.java,v
retrieving revision 1.3
diff -u -r1.3 ServerCloneException.java
--- java/rmi/server/ServerCloneException.java	24 Feb 2002 04:25:17 -0000	1.3
+++ java/rmi/server/ServerCloneException.java	18 Apr 2004 11:20:16 -0000
@@ -89,7 +89,7 @@
    * This method returns a message indicating what went wrong, in this
    * format:
    * <code>super.getMessage() + (detail == null ? ""
-   *    : "; nested exception is:\n\t" + detail)<code>.
+   *    : "; nested exception is:\n\t" + detail)</code>.
    *
    * @return the chained message
    */
Index: javax/naming/NamingException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/NamingException.java,v
retrieving revision 1.3
diff -u -r1.3 NamingException.java
--- javax/naming/NamingException.java	27 Jun 2003 21:03:53 -0000	1.3
+++ javax/naming/NamingException.java	18 Apr 2004 11:20:16 -0000
@@ -93,7 +93,7 @@
   /**
    * Creates a new NamingException without a message. Does not set any of the
    * <code>rootException</code>, <code>resolvedName</code>,
-   * <code>resolvedObj</code> or <code>remainingObject,<code> fields.
+   * <code>resolvedObj</code> or <code>remainingObject</code> fields.
    * These fields can be set later.
    */
   public NamingException ()
@@ -104,7 +104,7 @@
   /**
    * Creates a new NamingException with a detailed message. Does not set
    * the <code>rootException</code>, <code>resolvedName</code>,
-   * <code>resolvedObj</code> or <code>remainingObject,<code> fields.
+   * <code>resolvedObj</code> or <code>remainingObject,</code> fields.
    * These fields can be set later.
    */
   public NamingException (String msg)

--Boundary-00=_fTmgASnlGnfTNNS--




From MAILER-DAEMON Sun Apr 18 08:47:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFBhH-0007fL-EK
	for mharc-commit-classpath@gnu.org; Sun, 18 Apr 2004 08:46:55 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFBgb-0006k8-G1
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 08:46:13 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFBfw-00064E-Gq
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 08:46:04 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFBfs-0005wo-I3
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 08:45:28 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-147.ewetel.net
	[80.228.94.147])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i3ICjOMo015808
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 14:45:24 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFBft-0000sl-00
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 14:45:29 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 18 Apr 2004 14:45:01 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_NhngAzLMZFdi5du"
Message-Id: <200404181445.02276.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.print.attribute - several fixes.
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 18 Apr 2004 12:46:45 -0000


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

Hi list,


I just commited the attached patch that fixes some obvious bugs in 
javax.print.attribute.


Michael


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

	* javax/print/attribute/EnumSyntax.java
	(getOffset): Has to be protected.
	* javax/print/attribute/HashAttributeSet.java
	(HashAttributeSet): Likewise.
	* javax/print/attribute/ResolutionSyntax.java
	(getFeedResolution): Fixed typo in exception name in javadoc.
	(getCrossFeedResolution): Likewise.
	* javax/print/attribute/TextSyntax.java
	(equals): Fixed typo in @return tag.
	(toString): New method.


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

Index: javax/print/attribute/EnumSyntax.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/EnumSyntax.java,v
retrieving revision 1.2
diff -u -r1.2 EnumSyntax.java
--- javax/print/attribute/EnumSyntax.java	10 Jan 2004 22:16:26 -0000	1.2
+++ javax/print/attribute/EnumSyntax.java	18 Apr 2004 12:42:50 -0000
@@ -139,7 +139,7 @@
     return null;
   }
 
-  public int getOffset()
+  protected int getOffset()
   {
     return 0;
   }
Index: javax/print/attribute/HashAttributeSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/HashAttributeSet.java,v
retrieving revision 1.1
diff -u -r1.1 HashAttributeSet.java
--- javax/print/attribute/HashAttributeSet.java	26 Dec 2003 15:32:30 -0000	1.1
+++ javax/print/attribute/HashAttributeSet.java	18 Apr 2004 12:42:50 -0000
@@ -151,7 +151,7 @@
    * @exception ClassCastException if any element of attributes is not an
    * interface of interfaceName
    */
-  public HashAttributeSet(AttributeSet attributes, Class interfaceName)
+  protected HashAttributeSet(AttributeSet attributes, Class interfaceName)
   {
     this(interfaceName);
     
Index: javax/print/attribute/ResolutionSyntax.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/ResolutionSyntax.java,v
retrieving revision 1.1
diff -u -r1.1 ResolutionSyntax.java
--- javax/print/attribute/ResolutionSyntax.java	26 Dec 2003 15:32:30 -0000	1.1
+++ javax/print/attribute/ResolutionSyntax.java	18 Apr 2004 12:42:50 -0000
@@ -104,7 +104,7 @@
    *
    * @return the resolution
    *
-   * @exception IllegalArgumenException if units < 1
+   * @exception IllegalArgumentException if units < 1
    */
   public int getCrossFeedResolution(int units)
   {
@@ -130,7 +130,7 @@
    *
    * @return the resolution
    *
-   * @exception IllegalArgumenException if units < 1
+   * @exception IllegalArgumentException if units < 1
    */
   public int getFeedResolution(int units)
   {
Index: javax/print/attribute/TextSyntax.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/TextSyntax.java,v
retrieving revision 1.1
diff -u -r1.1 TextSyntax.java
--- javax/print/attribute/TextSyntax.java	26 Dec 2003 15:32:30 -0000	1.1
+++ javax/print/attribute/TextSyntax.java	18 Apr 2004 12:42:50 -0000
@@ -1,5 +1,5 @@
 /* TextSyntax.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -103,7 +103,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
@@ -114,5 +114,13 @@
     
     return (value.equals(tmp.getValue())
             && locale.equals(tmp.getLocale()));
+  }
+
+  /**
+   * Returns a string representing the object.
+   */
+  public String toString()
+  {
+    return getValue();
   }
 }

--Boundary-00=_NhngAzLMZFdi5du--




From MAILER-DAEMON Sun Apr 18 10:23:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFDCt-0004iW-NE
	for mharc-commit-classpath@gnu.org; Sun, 18 Apr 2004 10:23:39 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFDCq-0004hp-Ot
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 10:23:36 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFDCI-0004SI-S2
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 10:23:34 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFDCH-0004R2-P1
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 10:23:01 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-147.ewetel.net
	[80.228.94.147])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3IEMwD2002728;
	Sun, 18 Apr 2004 16:22:59 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFCof-00010t-00; Sun, 18 Apr 2004 15:58:37 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 18 Apr 2004 15:58:09 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_xlogAYI7rBTX3uE"
Message-Id: <200404181558.09903.konqueror@gmx.de>
X-CheckCompat: OK
Cc: graydon@redhat.com
Subject: Patch: javax.swing
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 18 Apr 2004 14:23:37 -0000


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

Hi list,


I just commited another patch to fix HTML in javadoc comments.


Michael
 

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

	* javax/swing/JLayeredPane.java
	* javax/swing/plaf/BorderUIResource.java
	* javax/swing/plaf/ComponentUI.java
	* javax/swing/undo/CompoundEdit.java
	* javax/swing/undo/StateEdit.java


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

Index: javax/swing/JLayeredPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JLayeredPane.java,v
retrieving revision 1.10
diff -u -r1.10 JLayeredPane.java
--- javax/swing/JLayeredPane.java	11 Jan 2004 13:00:52 -0000	1.10
+++ javax/swing/JLayeredPane.java	18 Apr 2004 13:52:14 -0000
@@ -82,16 +82,15 @@
  * <dd>An offset into a layer's "logical drawing order". Layer position 0
  * is drawn last. Layer position -1 is a synonym for the first layer
  * position (the logical "bottom").</dd>
+ * </dl>
  *
  * <p><b>Note:</b> the layer numbering order is the <em>reverse</em> of the
  * component indexing and position order</p>
  *
  * @author Graydon Hoare <graydon@redhat.com>
  */
-
 public class JLayeredPane extends JComponent implements Accessible
 {
-
   public static String LAYER_PROPERTY = "LAYER_PROPERTY";
 
   public static Integer FRAME_CONTENT_LAYER = new Integer (-30000);
Index: javax/swing/plaf/BorderUIResource.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/BorderUIResource.java,v
retrieving revision 1.18
diff -u -r1.18 BorderUIResource.java
--- javax/swing/plaf/BorderUIResource.java	28 Jul 2003 10:40:34 -0000	1.18
+++ javax/swing/plaf/BorderUIResource.java	18 Apr 2004 13:52:14 -0000
@@ -279,7 +279,7 @@
      *
      * <p><img src="../border/doc-files/BevelBorder-1.png"
      * width="500" height="150"
-     * alt="[An illustration showing raised and lowered BevelBorders]" />
+     * alt="[An illustration showing raised and lowered BevelBorders]" /></p>
      *
      * @param bevelType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.BevelBorder#RAISED}
@@ -300,7 +300,7 @@
      *
      * <p><img src="../border/doc-files/BevelBorder-2.png" width="500"
      * height="150" alt="[An illustration showing BevelBorders that were
-     * constructed with this method]" />
+     * constructed with this method]" /></p>
      *
      * @param bevelType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.BevelBorder#RAISED}
@@ -340,7 +340,7 @@
      *
      * <p><img src="../border/doc-files/BevelBorder-3.png" width="500"
      * height="150" alt="[An illustration showing BevelBorders that
-     * were constructed with this method]" />
+     * were constructed with this method]" /></p>
      *
      * @param bevelType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.BevelBorder#RAISED}
@@ -432,7 +432,7 @@
    *
    * <p><img src="../border/doc-files/EmptyBorder-1.png"
    * width="290" height="200"
-   * alt="[An illustration of EmptyBorder]" />
+   * alt="[An illustration of EmptyBorder]" /></p>
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -487,7 +487,7 @@
    *
    * <p><img src="../border/doc-files/EtchedBorder-1.png" width="500"
    * height="200" alt="[An illustration of the two EtchedBorder
-   * variants]" />
+   * variants]" /></p>
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -514,7 +514,7 @@
      *
      * <p><img src="../border/doc-files/EtchedBorder-1.png"
      * width="500" height="200" alt="[An illustration of the two
-     * EtchedBorder variants]" />
+     * EtchedBorder variants]" /></p>
      *
      * @param etchType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.EtchedBorder#RAISED}
@@ -555,7 +555,7 @@
      *
      * <p><img src="../border/doc-files/EtchedBorder-2.png" width="500"
      * height="200" alt="[An illustration that shows which pixels get
-     * painted in what color]" />
+     * painted in what color]" /></p>
      *
      * @param etchType the desired appearance of the border. The value
      *        must be either {@link javax.swing.border.EtchedBorder#RAISED}
@@ -588,7 +588,7 @@
    * such as the borders provided by this class.
    *
    * <p><img src="../border/doc-files/LineBorder-1.png" width="500"
-   * height="200" alt="[An illustration of two LineBorders] />
+   * height="200" alt="[An illustration of two LineBorders]" /></p>
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -643,7 +643,7 @@
    * such as the borders provided by this class.
    *
    * <p><img src="../border/doc-files/MatteBorder-1.png" width="500"
-   * height="150" alt="[An illustration of two MatteBorders] />
+   * height="150" alt="[An illustration of two MatteBorders]" /></p>
    *
    * @author Brian Jones (cbj@gnu.org)
    * @author Sascha Brawer (brawer@dandelis.ch)
@@ -658,7 +658,7 @@
      *
      * <p><img src="../border/doc-files/MatteBorder-2.png" width="500"
      * height="150" alt="[A picture of a MatteBorder made by this
-     * constructor]" />
+     * constructor]" /></p>
      *
      * @param top the width of the border at its top edge.
      * @param left the width of the border at its left edge.
@@ -680,7 +680,7 @@
      *
      * <p><img src="../border/doc-files/MatteBorder-4.png" width="500"
      * height="150" alt="[A picture of a MatteBorder made by this
-     * constructor]" />
+     * constructor]" /></p>
      *
      * @param top the width of the border at its top edge.
      * @param left the width of the border at its left edge.
@@ -704,7 +704,7 @@
      *
      * <p><img src="../border/doc-files/MatteBorder-6.png" width="500"
      * height="150" alt="[A picture of a MatteBorder made by this
-     * constructor]" />
+     * constructor]" /></p>
      *
      * @param tileIcon an icon for tiling the border area. 
      */
Index: javax/swing/plaf/ComponentUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/ComponentUI.java,v
retrieving revision 1.7
diff -u -r1.7 ComponentUI.java
--- javax/swing/plaf/ComponentUI.java	28 Jul 2003 10:40:34 -0000	1.7
+++ javax/swing/plaf/ComponentUI.java	18 Apr 2004 13:52:15 -0000
@@ -52,7 +52,7 @@
  *
  * <p><img src="doc-files/ComponentUI-1.png" width="700" height="550"
  * alt="[UML diagram illustrating the architecture for pluggable
- * look and feels]" />
+ * look and feels]" /></p>
  *
  * <p>Components such as {@link javax.swing.JSlider} do not directly
  * implement operations related to the look and feel of the user
@@ -68,14 +68,14 @@
  * services. Soon before the end of its lifecycle, the
  * <code>ComponentUI</code> will receive an {@link #uninstallUI}
  * message, at which time the <code>ComponentUI</code> is expected to
- * undo any changes.
+ * undo any changes.</p>
  *
  * <p>Note that the <code>ui</code> of a <code>JComponent</code>
  * changes whenever the user switches between look and feels.  For
  * example, the <code>ui</code> property of a <code>JSlider</code>
  * could change from an instance of <code>MetalSliderUI</code> to an
  * instance of <code>FooSliderUI</code>. This switch can happen at any
- * time, but it will always be performed from inside the Swing thread.
+ * time, but it will always be performed from inside the Swing thread.</p>
  *
  * @author Sascha Brawer (brawer@dandelis.ch)
  */
@@ -96,26 +96,24 @@
    * The delegate object then receives an <code>installUI</code>
    * message.
    *
-   * <p>This method should perform the following tasks:
-   *
-   * <ul><li>Set visual properties such as borders, fonts, colors, or
-   * icons. However, no change should be performed for those
-   * properties whose values have been directly set by the client
-   * application. To allow the distinction, LookAndFeels are expected
-   * to use values that implement the {@link UIResource} marker
-   * interface, such as {@link BorderUIResource} or {@link
-   * ColorUIResource}.</li>
+   * <p>This method should perform the following tasks:</p>
    *
+   * <ul>
+   * <li>Set visual properties such as borders, fonts, colors, or
+   *     icons. However, no change should be performed for those
+   *     properties whose values have been directly set by the client
+   *     application. To allow the distinction, LookAndFeels are expected
+   *     to use values that implement the {@link UIResource} marker
+   *     interface, such as {@link BorderUIResource} or {@link
+   *     ColorUIResource}.</li>
    * <li>If necessary, install a {@link java.awt.LayoutManager}.</li>
-   *
    * <li>Embed custom sub-components. For instance, the UI delegate
-   * for a {@link javax.swing.JSplitPane} might install a special
-   * component for the divider.</li>
-   *
+   *     for a {@link javax.swing.JSplitPane} might install a special
+   *     component for the divider.</li>
    * <li>Register event listeners.</li>
-   *
    * <li>Set up properties related to keyborad navigation, such as
-   * mnemonics or focus traversal policies.</li></ul>
+   *     mnemonics or focus traversal policies.</li>
+   * </ul>
    *
    * @param c the component for which this delegate will provide
    *        services.
Index: javax/swing/undo/CompoundEdit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/undo/CompoundEdit.java,v
retrieving revision 1.5
diff -u -r1.5 CompoundEdit.java
--- javax/swing/undo/CompoundEdit.java	9 Jan 2004 10:30:16 -0000	1.5
+++ javax/swing/undo/CompoundEdit.java	18 Apr 2004 13:52:15 -0000
@@ -45,17 +45,18 @@
  * <code>UndoableEdits</code>.
  *
  * <p>The use of a <code>CompoundEdit</code> is divided in two separate
- * phases.
- *
- * <ol><li>In the first phase, the <code>CompoundEdit</code> is
- * initialized.  After a new instance of <code>CompoundEdit</code> has
- * been created, {@link #addEdit(UndoableEdit)} is called for each
- * element of the compound.  To terminate the initialization phase,
- * call {@link #end()}.</li>
+ * phases.</p>
  *
+ * <ol>
+ * <li>In the first phase, the <code>CompoundEdit</code> is
+ *     initialized.  After a new instance of <code>CompoundEdit</code> has
+ *     been created, {@link #addEdit(UndoableEdit)} is called for each
+ *     element of the compound.  To terminate the initialization phase,
+ *     call {@link #end()}.</li>
  * <li>In the second phase, the the <code>CompoundEdit</code> can be
- * used, typically by invoking {@link #undo()} and {@link
- * #redo()}.</li></ol>
+ *     used, typically by invoking {@link #undo()} and
+ *     {@link #redo()}.</li>
+ * </ol>
  *
  * @author Andrew Selkirk (aselkirk@sympatico.ca)
  * @author Sascha Brawer (brawer@dandelis.ch)
Index: javax/swing/undo/StateEdit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/undo/StateEdit.java,v
retrieving revision 1.6
diff -u -r1.6 StateEdit.java
--- javax/swing/undo/StateEdit.java	17 Nov 2003 16:21:05 -0000	1.6
+++ javax/swing/undo/StateEdit.java	18 Apr 2004 13:52:15 -0000
@@ -44,52 +44,54 @@
 /**
  * A helper class, making it easy to support undo and redo.
  *
- * <p>The following example shows how to use this class.
+ * <p>The following example shows how to use this class.</p>
  *
- * <pre>  Foo foo; // class Foo implements {@link StateEditable}
- *  StateEdit edit;
- *
- *  edit = new StateEdit(foo, "Name Change");
- *  foo.setName("Jane Doe");
- *  edit.end();
- *  undoManager.addEdit(edit);</pre>
+ * <pre>
+ * Foo foo; // class Foo implements {@link StateEditable}
+ * StateEdit edit;
+ *
+ * edit = new StateEdit(foo, "Name Change");
+ * foo.setName("Jane Doe");
+ * edit.end();
+ * undoManager.addEdit(edit);
+ * </pre>
  *
  * <p>If <code>Foo</code>&#x2019;s implementation of {@link
  * StateEditable} considers the name as part of the editable state,
  * the user can now choose &#x201c;Undo Name Change&#x201d; or
  * &#x201c;Redo Name Change&#x201d; from the respective menu. No
- * further undo support is needed from the application.
- *
- * <p>The following explains what happens in the example.
+ * further undo support is needed from the application.</p>
  *
- * <p><ol><li>When a <code>StateEdit</code> is created, the associated
- * {@link StateEditable} gets asked to store its state into a hash
- * table, {@link #preState}.</li>
+ * <p>The following explains what happens in the example.</p>
  *
+ * <ol>
+ * <li>When a <code>StateEdit</code> is created, the associated
+ *     {@link StateEditable} gets asked to store its state into a hash
+ *     table, {@link #preState}.</li>
  * <li>The application will now perform some changes to the edited
- * object.  This typically happens by invoking methods on the edited
- * object.</li>
- *
+ *     object. This typically happens by invoking methods on the edited
+ *     object.</li>
  * <li>The editing phase is terminated by invoking the {@link #end()}
- * method of the <code>StateEdit</code>. The <code>end()</code> method
- * does two things.
- *
- *   <ul><li>The edited object receives a second request for storing
- *   its state.  This time, it will use a different hash table, {@link
- *   #postState}.</li>
- *
- *   <li>To increase efficiency, the <code>StateEdit</code> now removes
- *   any entries from {@link #preState} and {@link #postState} that have
- *   the same key, and whose values are equal. Equality is determined
- *   by invoking the <code>equals</code> method inherited from
- *   {@link java.lang.Object}.</li></ul></li>
+ *     method of the <code>StateEdit</code>. The <code>end()</code> method
+ *     does two things.
  *
+ *     <ul>
+ *     <li>The edited object receives a second request for storing
+ *         its state.  This time, it will use a different hash table, {@link
+ *         #postState}.</li>
+ *     <li>To increase efficiency, the <code>StateEdit</code> now removes
+ *         any entries from {@link #preState} and {@link #postState} that have
+ *         the same key, and whose values are equal. Equality is determined
+ *         by invoking the <code>equals</code> method inherited from
+ *         {@link java.lang.Object}.</li>
+ *     </ul></li>
  * <li>When the user later chooses to undo the <code>StateEdit</code>,
  * the edited object is asked to {@linkplain StateEditable#restoreState
  * restore its state} from the {@link #preState} table.  Similarly,
  * when the user chooses to <i>redo</i> the <code>StateEdit</code>,
  * the edited object gets asked to restore its state from the {@link
- * #postState}.</li></ol>
+ * #postState}.</li>
+ * </ol>
  *
  * @author Andrew Selkirk (aselkirk@sympatico.ca)
  * @author Sascha Brawer (brawer@dandelis.ch)

--Boundary-00=_xlogAYI7rBTX3uE--




From MAILER-DAEMON Sun Apr 18 10:35:41 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFDOX-0007Dx-Am
	for mharc-commit-classpath@gnu.org; Sun, 18 Apr 2004 10:35:41 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFDOS-0007DU-Cm
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 10:35:36 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFDOQ-0007D4-G3
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 10:35:34 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFDOP-0007Cz-UG
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 10:35:34 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BFDON-0000Lr-00
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 16:35:31 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-ZJnthS4NnVJE77cJh/21"
Message-Id: <1082298924.1971.125.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Sun, 18 Apr 2004 16:35:31 +0200
Subject: FYI: java.io.File security check fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 18 Apr 2004 14:35:37 -0000


--=-ZJnthS4NnVJE77cJh/21
Content-Type: multipart/mixed; boundary="=-IXxKReONXZ91nyrJS7KT"


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

Hi,

This fixes a couple of File.security failures in Mauve.
It makes sure that we do the needed security check first before trying
to do any actual file operations. Unneeded checks have been eliminated.

2004-04-18  Mark Wielaard  <mark@klomp.org>

       * java/io/File.java (canWrite): Only do checkWrite() security
       check, use internal methods for actual actions.
       (createTempFile): Don't do security checks for temp files that
       won't be created.
       (setReadOnly): Do checkWrite() security check before trying to
       do anything else.
       (renameTo): Add checkWrite() security check for destination file.

Only one related mauve failure remains with this:

java.lang.SecurityException: Unexpected check: (java.io.FilePermission /tmp=
/mauve-testdir/test-dir-write1082297238707.tmp write)
FAIL: gnu.testlet.java.io.File.security: dir.canWrite - unexpected exceptio=
n (number 1)

This is because we actually use createTempFile() to check that a
directory is writable and that generates some extra security checks. It
would be nice to just check whether or not a directory is writable
directly without trying to do a couple of explicit file creation calls.
But currently our native layer doesn't offer such an option.

Cheers,

Mark

--=-IXxKReONXZ91nyrJS7KT
Content-Disposition: inline; filename=File.patch
Content-Type: text/x-patch; name=File.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IGphdmEvaW8vRmlsZS5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3Qv
Y2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZhL2lvL0ZpbGUuamF2YSx2DQpyZXRyaWV2aW5nIHJldmlz
aW9uIDEuNDANCmRpZmYgLXUgLXIxLjQwIEZpbGUuamF2YQ0KLS0tIGphdmEvaW8vRmlsZS5qYXZh
CTE3IEFwciAyMDA0IDE3OjI5OjE4IC0wMDAwCTEuNDANCisrKyBqYXZhL2lvL0ZpbGUuamF2YQkx
OCBBcHIgMjAwNCAxNDoyNjo1NCAtMDAwMA0KQEAgLTE3MywyMiArMTczLDIxIEBADQogICAgKi8N
CiAgIHB1YmxpYyBib29sZWFuIGNhbldyaXRlKCkNCiAgIHsNCi0gICAgLy8gV2Ugc3RpbGwgbmVl
ZCB0byBkbyBhIFNlY3VyaXR5Q2hlY2sgc2luY2UgZXhpc3RzKCkgb25seSBjaGVja3MNCi0gICAg
Ly8gZm9yIHJlYWQgYWNjZXNzDQorICAgIC8vIEZpcnN0IGRvIGEgU2VjdXJpdHlDaGVjayBiZWZv
cmUgZG9pbmcgYW55dGhpbmcgZWxzZS4NCiAgICAgY2hlY2tXcml0ZSgpOw0KICAgICAgDQogICAg
IC8vIFRlc3QgZm9yIGV4aXN0ZW5jZS4gIFRoaXMgaXMgcmVxdWlyZWQgYnkgdGhlIHNwZWMNCi0g
ICAgaWYgKCFleGlzdHMoKSkNCisgICAgaWYgKCFleGlzdHNJbnRlcm5hbChwYXRoKSkNCiAgICAg
ICByZXR1cm4gZmFsc2U7DQogDQotICAgIGlmICghaXNEaXJlY3RvcnkoKSkNCisgICAgaWYgKCFp
c0RpcmVjdG9yeUludGVybmFsKHBhdGgpKQ0KICAgICAgIHJldHVybiBjYW5Xcml0ZUludGVybmFs
KHBhdGgpOw0KICAgICBlbHNlDQogICAgICAgdHJ5DQogICAgICAgICB7DQogICAgICAgICAgIC8q
IElmIHRoZSBzZXBhcmF0b3IgaXMgJ1wnIGEgRE9TLXN0eWxlLWZpbGVzeXN0ZW0gaXMgYXNzdW1l
ZA0KICAgICAgICAgICAgICBhbmQgYSBzaG9ydCBuYW1lIGlzIHVzZWQsIG90aGVyd2lzZSB1c2Ug
YSBsb25nIG5hbWUuDQotICAgICAgICAgICAgIFdBUk5HSU46IHNvbWUgaW1wbGVtZW50YXRpb24g
b2YgRE9TLXN0eWxlLWZpbGVzeXN0ZW1zIGFsc28NCisgICAgICAgICAgICAgV0FSTklORzogc29t
ZSBpbXBsZW1lbnRhdGlvbiBvZiBET1Mtc3R5bGUtZmlsZXN5c3RlbXMgYWxzbw0KICAgICAgICAg
ICAgICBhY2NlcHQgJy8nIGFzIHNlcGFyYXRvci4gSW4gdGhhdCBjYXNlIHRoZSBmb2xsb3dpbmcg
Y29kZQ0KICAgICAgICAgICAgICB3aWxsIGZhaWwuDQogICAgICAgICAgICovDQpAQCAtOTYxLDEw
ICs5NjAsMTAgQEANCiAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKCJDYW5ub3QgZGV0
ZXJtaW5lIHN5c3RlbSB0ZW1wb3JhcnkgZGlyZWN0b3J5Iik7IA0KIAkNCiAgICAgICAgIGRpcmVj
dG9yeSA9IG5ldyBGaWxlKGRpcm5hbWUpOw0KLSAgICAgICAgaWYgKCFkaXJlY3RvcnkuZXhpc3Rz
KCkpDQorICAgICAgICBpZiAoIWRpcmVjdG9yeS5leGlzdHNJbnRlcm5hbChkaXJlY3RvcnkucGF0
aCkpDQogICAgICAgICAgIHRocm93IG5ldyBJT0V4Y2VwdGlvbigiU3lzdGVtIHRlbXBvcmFyeSBk
aXJlY3RvcnkgIg0KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKyBkaXJlY3Rvcnku
Z2V0TmFtZSgpICsgIiBkb2VzIG5vdCBleGlzdC4iKTsNCi0gICAgICAgIGlmICghZGlyZWN0b3J5
LmlzRGlyZWN0b3J5KCkpDQorICAgICAgICBpZiAoIWRpcmVjdG9yeS5pc0RpcmVjdG9yeUludGVy
bmFsKGRpcmVjdG9yeS5wYXRoKSkNCiAgICAgICAgICAgdGhyb3cgbmV3IElPRXhjZXB0aW9uKCJT
eXN0ZW0gdGVtcG9yYXJ5IGRpcmVjdG9yeSAiDQogICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICArIGRpcmVjdG9yeS5nZXROYW1lKCkNCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICsgIiBpcyBub3QgcmVhbGx5IGEgZGlyZWN0b3J5LiIpOw0KQEAgLTk5NCw3ICs5OTMsNyBA
QA0KICAgICAgICAgICAgIFN0cmluZyBmaWxlbmFtZSA9IHByZWZpeCArIFN5c3RlbS5jdXJyZW50
VGltZU1pbGxpcygpICsgc3VmZml4Ow0KICAgICAgICAgICAgIGZpbGUgPSBuZXcgRmlsZShkaXJl
Y3RvcnksIGZpbGVuYW1lKTsNCiAgICAgICAgICAgfQ0KLSAgICAgICAgd2hpbGUgKGZpbGUuZXhp
c3RzKCkpOw0KKyAgICAgICAgd2hpbGUgKGZpbGUuZXhpc3RzSW50ZXJuYWwoZmlsZS5wYXRoKSk7
DQogICAgICAgfQ0KICAgICBlbHNlDQogICAgICAgew0KQEAgLTEwMTEsNyArMTAxMCw3IEBADQog
ICAgICAgICAgICAgU3RyaW5nIGZpbGVuYW1lID0gcHJlZml4ICsgamF2YS5sYW5nLkludGVnZXIu
dG9IZXhTdHJpbmcobikgKyBzdWZmaXg7DQogICAgICAgICAgICAgZmlsZSA9IG5ldyBGaWxlKGRp
cmVjdG9yeSwgZmlsZW5hbWUpOw0KICAgICAgICAgICB9DQotICAgICAgICB3aGlsZSAoZmlsZS5l
eGlzdHMoKSk7DQorICAgICAgICB3aGlsZSAoZmlsZS5leGlzdHNJbnRlcm5hbChmaWxlLnBhdGgp
KTsNCiAgICAgICB9DQogDQogICAgIC8vIFZlcmlmeSB0aGF0IHdlIGFyZSBhbGxvd2VkIHRvIGNy
ZWF0ZSB0aGlzIGZpbGUNCkBAIC0xMDIwLDYgKzEwMTksNyBAQA0KICAgICAgIHNtLmNoZWNrV3Jp
dGUoZmlsZS5nZXRBYnNvbHV0ZVBhdGgoKSk7DQogDQogICAgIC8vIE5vdyBjcmVhdGUgdGhlIGZp
bGUgYW5kIHJldHVybiBvdXIgZmlsZSBvYmplY3QNCisgICAgLy8gWFhYIC0gRklYTUUgcmFjZSBj
b25kaXRpb24uDQogICAgIGNyZWF0ZUludGVybmFsKGZpbGUuZ2V0QWJzb2x1dGVQYXRoKCkpOyAN
CiAgICAgcmV0dXJuIGZpbGU7DQogICB9DQpAQCAtMTA0NSwxMyArMTA0NSwxMyBAQA0KICAgICov
DQogICBwdWJsaWMgYm9vbGVhbiBzZXRSZWFkT25seSgpDQogICB7DQorICAgIC8vIERvIGEgc2Vj
dXJpdHkgY2hlY2sgYmVmb3JlIHRyeWluZyB0byBkbyBhbnl0aGluZyBlbHNlLg0KKyAgICBjaGVj
a1dyaXRlKCk7DQorDQogICAgIC8vIFRlc3QgZm9yIGV4aXN0ZW5jZS4NCi0gICAgaWYgKCFleGlz
dHMoKSkNCisgICAgaWYgKCFleGlzdHNJbnRlcm5hbChwYXRoKSkNCiAgICAgICByZXR1cm4gZmFs
c2U7DQogDQotICAgIC8vIFdlIHN0aWxsIG5lZWQgdG8gZG8gYSBTZWN1cml0eUNoZWNrIHNpbmNl
IGV4aXN0cygpIG9ubHkgY2hlY2tzDQotICAgIC8vIGZvciByZWFkIGFjY2Vzcw0KLSAgICBjaGVj
a1dyaXRlKCk7DQogICAgIHJldHVybiBzZXRSZWFkT25seUludGVybmFsKHBhdGgpOw0KICAgfQ0K
IA0KQEAgLTExOTIsNiArMTE5Miw3IEBADQogICBwdWJsaWMgc3luY2hyb25pemVkIGJvb2xlYW4g
cmVuYW1lVG8oRmlsZSBkZXN0KQ0KICAgew0KICAgICBjaGVja1dyaXRlKCk7DQorICAgIGRlc3Qu
Y2hlY2tXcml0ZSgpOw0KICAgICAvLyBDYWxsIG91ciBuYXRpdmUgcmVuYW1lIG1ldGhvZA0KICAg
ICByZXR1cm4gcmVuYW1lVG9JbnRlcm5hbChwYXRoLCBkZXN0LnBhdGgpOw0KICAgfQ0K

--=-IXxKReONXZ91nyrJS7KT--

--=-ZJnthS4NnVJE77cJh/21
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)

iD8DBQBAgpIsxVhZCJWr9QwRAt4UAJ9M6S3lKcSqVxpFidN2TAXnHN5bVgCeNJ/n
n/1QcVwWDDMUkt6B6dSA+/Q=
=IrX0
-----END PGP SIGNATURE-----

--=-ZJnthS4NnVJE77cJh/21--




From MAILER-DAEMON Sun Apr 18 11:01:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFDn8-0002YY-Ty
	for mharc-commit-classpath@gnu.org; Sun, 18 Apr 2004 11:01:06 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFDn2-0002Kx-KN
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 11:01:00 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFDmP-00016U-6i
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 11:00:53 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BFDmH-00014E-SM
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 11:00:13 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BFDmP-00026n-M2
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 11:00:21 -0400
From: "Nikolay Fiykov" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8611
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.5) Gecko/20031007 Firebird/0.7
X-Apparently-From: 62.248.201.94
X-Copy-To: Array
Message-Id: <E1BFDmP-00026n-M2@savannah.gnu.org>
Date: Sun, 18 Apr 2004 11:00:21 -0400
Subject: [bugs #8611] classpath0.08: java.lang.Runtime.loadLibrary : causes
	UnsatisfiedLinkException when VM is intializing
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 18 Apr 2004 15:01:05 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.




/**************************************************************************/
[bugs #8611] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8611>
Project: classpath
Submitted by: Nikolay Fiykov
On: Sun 04/18/04 at 15:00

Severity:  5 - Average
Resolution:  None
Assigned to:  None
Status:  Open
Platform Version:  None


Summary:  classpath0.08: java.lang.Runtime.loadLibrary : causes UnsatisfiedLinkException when VM is intializing

Original Submission:  Hi,
While dealing with JAMVM I came across an exceptions related problem with java.lang.Runtime.loadLibrary.

Issue is that when scanning java.library.path dirs to find the required lib "loadLibrary" uses "load". In its turn "load" raise exeception if lib is not find.

In case of JAMVM when this exeception hapens during intialization it aborts VM. Because of that LD_LIBRARY_PATH is not scanned completely and lib is not located at all.

This also could be attributed to JAMVM specifics and probably it is true. Yet, I can understand also that VM exception handling may not be that "accurate" during VM build-up therefore I'd see it as Classpath issue as well.

Attached is a patch against Runtime.java which overcomes the problem by doing exactly what "load" does but without mentioned exception problem.

See sf.net/projects/jamvm:Forums-Help where this issues has been raised too.

-- niki





File Attachments
-------------------

-------------------------------------------------------
Date: Sun 04/18/04 at 15:00  Name: classpath-0.08-loadlibrary.patch  Size: 1KB   By: fikin

http://savannah.gnu.org/bugs/download.php?item_id=8611&amp;item_file_id=1201






For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8611>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Sun Apr 18 11:41:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFEPz-0002ZY-Cp
	for mharc-commit-classpath@gnu.org; Sun, 18 Apr 2004 11:41:15 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFEPu-0002XQ-Hv
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 11:41:10 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFEPq-0002VV-Oq
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 11:41:07 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFEO7-0001oe-So
	for commit-classpath@gnu.org; Sun, 18 Apr 2004 11:39:20 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BFEO5-0000XH-00
	for <commit-classpath@gnu.org>; Sun, 18 Apr 2004 17:39:17 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-rQLafgeprG04RPzpXh0H"
Message-Id: <1082302757.1971.131.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Sun, 18 Apr 2004 17:39:17 +0200
Subject: FYI: Header files cleanup
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 18 Apr 2004 15:41:13 -0000


--=-rQLafgeprG04RPzpXh0H
Content-Type: multipart/mixed; boundary="=-xU2RI1T/HCaJFAyHUMj4"


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

Hi,

Michael Koch pointed out that I had forgotten to regenerate the header
files while I updated the gtk-peer sources. While checking we found that
also gnu.java.nio_FileLockImpl had been rewritten and no headers were
updated. The following patch fixes all.

 2004-04-18  Mark Wielaard  <mark@klomp.org>
 =20
       * include/Makefile.am: Remove java_nio_FileLockImpl.h generation.
       * include/gnu_java_awt_peer_gtk_GtkMenuItemPeer.h: Regenerate.
       * include/gnu_java_awt_peer_gtk_GtkPanelPeer.h: Regenerate.
       * include/gnu_java_nio_FileLockImpl.h: Removed.
       * native/jni/java-nio/Makefile.am (libjavanio_la_SOURCES): Removed
       java_nio_FileLockImpl.c.
       * native/jni/java-nio/java_nio_FileLockImpl.c: Removed.

Cheers,

Mark

--=-xU2RI1T/HCaJFAyHUMj4
Content-Disposition: inline; filename=header.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=header.patch; charset=ISO-8859-1

SW5kZXg6IGluY2x1ZGUvTWFrZWZpbGUuYW0NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9jbGFzc3BhdGgvY2xhc3NwYXRoL2luY2x1ZGUvTWFrZWZpbGUuYW0sdg0KcmV0cmlldmluZyBy
ZXZpc2lvbiAxLjE0DQpkaWZmIC11IC1yMS4xNCBNYWtlZmlsZS5hbQ0KLS0tIGluY2x1ZGUvTWFr
ZWZpbGUuYW0JMTIgQXByIDIwMDQgMTI6NDU6MDUgLTAwMDAJMS4xNA0KKysrIGluY2x1ZGUvTWFr
ZWZpbGUuYW0JMTggQXByIDIwMDQgMTU6Mzc6MzkgLTAwMDANCkBAIC01NSw3ICs1NSw2IEBADQog
JCh0b3Bfc3JjZGlyKS9pbmNsdWRlL2phdmFfbmV0X0luZXRBZGRyZXNzLmggXA0KICQodG9wX3Ny
Y2RpcikvaW5jbHVkZS9qYXZhX25ldF9OZXR3b3JrSW50ZXJmYWNlLmggXA0KICQodG9wX3NyY2Rp
cikvaW5jbHVkZS9qYXZhX25pb19EaXJlY3RCeXRlQnVmZmVySW1wbC5oIFwNCi0kKHRvcF9zcmNk
aXIpL2luY2x1ZGUvZ251X2phdmFfbmlvX0ZpbGVMb2NrSW1wbC5oIFwNCiAkKHRvcF9zcmNkaXIp
L2luY2x1ZGUvamF2YV91dGlsX1RpbWVab25lLmgNCiANCiBpZiBDUkVBVEVfSk5JX0hFQURFUlMN
CkBAIC0xNjYsOCArMTY1LDYgQEANCiAJJChKQVZBSCkgLW8gJEAgamF2YS5uaW8uRGlyZWN0Qnl0
ZUJ1ZmZlckltcGwNCiAkKHRvcF9zcmNkaXIpL2luY2x1ZGUvZ251X2phdmFfbmlvX2NoYW5uZWxz
X0ZpbGVDaGFubmVsSW1wbC5oOiAkKHRvcF9zcmNkaXIpL2dudS9qYXZhL25pby9jaGFubmVscy9G
aWxlQ2hhbm5lbEltcGwuamF2YQ0KIAkkKEpBVkFIKSAtbyAkQCBnbnUuamF2YS5uaW8uY2hhbm5l
bHMuRmlsZUNoYW5uZWxJbXBsDQotJCh0b3Bfc3JjZGlyKS9pbmNsdWRlL2dudV9qYXZhX25pb19G
aWxlTG9ja0ltcGwuaDogJCh0b3Bfc3JjZGlyKS9nbnUvamF2YS9uaW8vRmlsZUxvY2tJbXBsLmph
dmENCi0JJChKQVZBSCkgLW8gJEAgZ251LmphdmEubmlvLkZpbGVMb2NrSW1wbA0KICQodG9wX3Ny
Y2RpcikvaW5jbHVkZS9qYXZhX3V0aWxfVGltZVpvbmUuaDogJCh0b3Bfc3JjZGlyKS9qYXZhL3V0
aWwvVGltZVpvbmUuamF2YQ0KIAkkKEpBVkFIKSAtbyAkQCBqYXZhLnV0aWwuVGltZVpvbmUNCiAN
CkluZGV4OiBpbmNsdWRlL2dudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtNZW51SXRlbVBlZXIuaA0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvaW5jbHVk
ZS9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrTWVudUl0ZW1QZWVyLmgsdg0KcmV0cmlldmluZyBy
ZXZpc2lvbiAxLjMNCmRpZmYgLXUgLXIxLjMgZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a01lbnVJ
dGVtUGVlci5oDQotLS0gaW5jbHVkZS9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrTWVudUl0ZW1Q
ZWVyLmgJOCBPY3QgMjAwMyAxNjowMDo1NiAtMDAwMAkxLjMNCisrKyBpbmNsdWRlL2dudV9qYXZh
X2F3dF9wZWVyX2d0a19HdGtNZW51SXRlbVBlZXIuaAkxOCBBcHIgMjAwNCAxNTozNzozOSAtMDAw
MA0KQEAgLTExLDYgKzExLDcgQEANCiAjZW5kaWYNCiANCiBleHRlcm4gSk5JRVhQT1JUIHZvaWQg
Sk5JQ0FMTCBKYXZhX2dudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtNZW51SXRlbVBlZXJfY3JlYXRl
IChKTklFbnYgKmVudiwgam9iamVjdCwganN0cmluZyk7DQorZXh0ZXJuIEpOSUVYUE9SVCB2b2lk
IEpOSUNBTEwgSmF2YV9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrTWVudUl0ZW1QZWVyX2Nvbm5l
Y3RTaWduYWxzIChKTklFbnYgKmVudiwgam9iamVjdCk7DQogZXh0ZXJuIEpOSUVYUE9SVCB2b2lk
IEpOSUNBTEwgSmF2YV9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrTWVudUl0ZW1QZWVyX3NldExh
YmVsIChKTklFbnYgKmVudiwgam9iamVjdCwganN0cmluZyk7DQogDQogI2lmZGVmIF9fY3BsdXNw
bHVzDQpJbmRleDogaW5jbHVkZS9nbnVfamF2YV9hd3RfcGVlcl9ndGtfR3RrUGFuZWxQZWVyLmgN
Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2luY2x1
ZGUvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a1BhbmVsUGVlci5oLHYNCnJldHJpZXZpbmcgcmV2
aXNpb24gMS4zDQpkaWZmIC11IC1yMS4zIGdudV9qYXZhX2F3dF9wZWVyX2d0a19HdGtQYW5lbFBl
ZXIuaA0KLS0tIGluY2x1ZGUvZ251X2phdmFfYXd0X3BlZXJfZ3RrX0d0a1BhbmVsUGVlci5oCTcg
SmFuIDIwMDQgMDI6MjM6MzcgLTAwMDAJMS4zDQorKysgaW5jbHVkZS9nbnVfamF2YV9hd3RfcGVl
cl9ndGtfR3RrUGFuZWxQZWVyLmgJMTggQXByIDIwMDQgMTU6Mzc6MzkgLTAwMDANCkBAIC0xMiw3
ICsxMiw2IEBADQogDQogZXh0ZXJuIEpOSUVYUE9SVCB2b2lkIEpOSUNBTEwgSmF2YV9nbnVfamF2
YV9hd3RfcGVlcl9ndGtfR3RrUGFuZWxQZWVyX2NyZWF0ZSAoSk5JRW52ICplbnYsIGpvYmplY3Qp
Ow0KIGV4dGVybiBKTklFWFBPUlQgdm9pZCBKTklDQUxMIEphdmFfZ251X2phdmFfYXd0X3BlZXJf
Z3RrX0d0a1BhbmVsUGVlcl9jb25uZWN0Sk9iamVjdCAoSk5JRW52ICplbnYsIGpvYmplY3QpOw0K
LWV4dGVybiBKTklFWFBPUlQgdm9pZCBKTklDQUxMIEphdmFfZ251X2phdmFfYXd0X3BlZXJfZ3Rr
X0d0a1BhbmVsUGVlcl9jb25uZWN0U2lnbmFscyAoSk5JRW52ICplbnYsIGpvYmplY3QpOw0KIA0K
ICNpZmRlZiBfX2NwbHVzcGx1cw0KIH0NCkluZGV4OiBpbmNsdWRlL2dudV9qYXZhX25pb19GaWxl
TG9ja0ltcGwuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IGluY2x1ZGUvZ251X2phdmFfbmlvX0Zp
bGVMb2NrSW1wbC5oDQpkaWZmIC1OIGluY2x1ZGUvZ251X2phdmFfbmlvX0ZpbGVMb2NrSW1wbC5o
DQotLS0gaW5jbHVkZS9nbnVfamF2YV9uaW9fRmlsZUxvY2tJbXBsLmgJMiBKdWwgMjAwMyAwOTox
Njo1MiAtMDAwMAkxLjENCisrKyAvZGV2L251bGwJMSBKYW4gMTk3MCAwMDowMDowMCAtMDAwMA0K
QEAgLTEsMTkgKzAsMCBAQA0KLS8qIERPIE5PVCBFRElUIFRISVMgRklMRSAtIGl0IGlzIG1hY2hp
bmUgZ2VuZXJhdGVkICovDQotDQotI2lmbmRlZiBfX2dudV9qYXZhX25pb19GaWxlTG9ja0ltcGxf
Xw0KLSNkZWZpbmUgX19nbnVfamF2YV9uaW9fRmlsZUxvY2tJbXBsX18NCi0NCi0jaW5jbHVkZSA8
am5pLmg+DQotDQotI2lmZGVmIF9fY3BsdXNwbHVzDQotZXh0ZXJuICJDIg0KLXsNCi0jZW5kaWYN
Ci0NCi1leHRlcm4gSk5JRVhQT1JUIHZvaWQgSk5JQ0FMTCBKYXZhX2dudV9qYXZhX25pb19GaWxl
TG9ja0ltcGxfcmVsZWFzZUltcGwgKEpOSUVudiAqZW52LCBqb2JqZWN0KTsNCi0NCi0jaWZkZWYg
X19jcGx1c3BsdXMNCi19DQotI2VuZGlmDQotDQotI2VuZGlmIC8qIF9fZ251X2phdmFfbmlvX0Zp
bGVMb2NrSW1wbF9fICovDQpJbmRleDogbmF0aXZlL2puaS9qYXZhLW5pby9NYWtlZmlsZS5hbQ0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvbmF0aXZl
L2puaS9qYXZhLW5pby9NYWtlZmlsZS5hbSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNQ0KZGlm
ZiAtdSAtcjEuNSBNYWtlZmlsZS5hbQ0KLS0tIG5hdGl2ZS9qbmkvamF2YS1uaW8vTWFrZWZpbGUu
YW0JMTIgQXByIDIwMDQgMTA6NDM6NDEgLTAwMDAJMS41DQorKysgbmF0aXZlL2puaS9qYXZhLW5p
by9NYWtlZmlsZS5hbQkxOCBBcHIgMjAwNCAxNTozNzo0MCAtMDAwMA0KQEAgLTQsOCArNCw3IEBA
DQogCQkJZ251X2phdmFfbmlvX1BpcGVJbXBsLmMgXA0KIAkJCWdudV9qYXZhX25pb19TZWxlY3Rv
ckltcGwuYyBcDQogCQkJZ251X2phdmFfbmlvX2NoYW5uZWxzX0ZpbGVDaGFubmVsSW1wbC5jIFwN
Ci0JCQlqYXZhX25pb19EaXJlY3RCeXRlQnVmZmVySW1wbC5jIFwNCi0JCQlqYXZhX25pb19GaWxl
TG9ja0ltcGwuYw0KKwkJCWphdmFfbmlvX0RpcmVjdEJ5dGVCdWZmZXJJbXBsLmMNCiANCiBsaWJq
YXZhbmlvX2xhX0xERkxBR1MgPSBAQ0xBU1NQQVRIX01PRFVMRUANCiBsaWJqYXZhbmlvX2xhX0xJ
QkFERCA9ICQodG9wX2J1aWxkZGlyKS9uYXRpdmUvam5pL2NsYXNzcGF0aC9qY2wubG8NCkluZGV4
OiBuYXRpdmUvam5pL2phdmEtbmlvL2phdmFfbmlvX0ZpbGVMb2NrSW1wbC5jDQo9PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
DQpSQ1MgZmlsZTogbmF0aXZlL2puaS9qYXZhLW5pby9qYXZhX25pb19GaWxlTG9ja0ltcGwuYw0K
ZGlmZiAtTiBuYXRpdmUvam5pL2phdmEtbmlvL2phdmFfbmlvX0ZpbGVMb2NrSW1wbC5jDQotLS0g
bmF0aXZlL2puaS9qYXZhLW5pby9qYXZhX25pb19GaWxlTG9ja0ltcGwuYwkyOSBNYXIgMjAwNCAw
NzowNzozOSAtMDAwMAkxLjMNCisrKyAvZGV2L251bGwJMSBKYW4gMTk3MCAwMDowMDowMCAtMDAw
MA0KQEAgLTEsNTMgKzAsMCBAQA0KLS8qIE5ldHdvcmtJbnRlcmZhY2UuYyAtIE5hdGl2ZSBtZXRo
b2RzIGZvciBOZXR3b3JrSW50ZXJmYWNlIGNsYXNzDQotICAgQ29weXJpZ2h0IChDKSAyMDAzIEZy
ZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KLQ0KLVRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdO
VSBDbGFzc3BhdGguDQotDQotR05VIENsYXNzcGF0aCBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2Fu
IHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9kaWZ5DQotaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRo
ZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkNCi10aGUgRnJlZSBT
b2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIgdmVyc2lvbiAyLCBvciAoYXQgeW91ciBvcHRpb24p
DQotYW55IGxhdGVyIHZlcnNpb24uDQotIA0KLUdOVSBDbGFzc3BhdGggaXMgZGlzdHJpYnV0ZWQg
aW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwgYnV0DQotV0lUSE9VVCBBTlkgV0FS
UkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZg0KLU1FUkNIQU5UQUJJ
TElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VDQot
R2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3IgbW9yZSBkZXRhaWxzLg0KLQ0KLVlvdSBzaG91bGQg
aGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlDQot
YWxvbmcgd2l0aCBHTlUgQ2xhc3NwYXRoOyBzZWUgdGhlIGZpbGUgQ09QWUlORy4gIElmIG5vdCwg
d3JpdGUgdG8gdGhlDQotRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuLCA1OSBUZW1wbGUg
UGxhY2UsIFN1aXRlIDMzMCwgQm9zdG9uLCBNQQ0KLTAyMTExLTEzMDcgVVNBLg0KLQ0KLUxpbmtp
bmcgdGhpcyBsaWJyYXJ5IHN0YXRpY2FsbHkgb3IgZHluYW1pY2FsbHkgd2l0aCBvdGhlciBtb2R1
bGVzIGlzDQotbWFraW5nIGEgY29tYmluZWQgd29yayBiYXNlZCBvbiB0aGlzIGxpYnJhcnkuICBU
aHVzLCB0aGUgdGVybXMgYW5kDQotY29uZGl0aW9ucyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGlj
IExpY2Vuc2UgY292ZXIgdGhlIHdob2xlDQotY29tYmluYXRpb24uDQotDQotQXMgYSBzcGVjaWFs
IGV4Y2VwdGlvbiwgdGhlIGNvcHlyaWdodCBob2xkZXJzIG9mIHRoaXMgbGlicmFyeSBnaXZlIHlv
dQ0KLXBlcm1pc3Npb24gdG8gbGluayB0aGlzIGxpYnJhcnkgd2l0aCBpbmRlcGVuZGVudCBtb2R1
bGVzIHRvIHByb2R1Y2UgYW4NCi1leGVjdXRhYmxlLCByZWdhcmRsZXNzIG9mIHRoZSBsaWNlbnNl
IHRlcm1zIG9mIHRoZXNlIGluZGVwZW5kZW50DQotbW9kdWxlcywgYW5kIHRvIGNvcHkgYW5kIGRp
c3RyaWJ1dGUgdGhlIHJlc3VsdGluZyBleGVjdXRhYmxlIHVuZGVyDQotdGVybXMgb2YgeW91ciBj
aG9pY2UsIHByb3ZpZGVkIHRoYXQgeW91IGFsc28gbWVldCwgZm9yIGVhY2ggbGlua2VkDQotaW5k
ZXBlbmRlbnQgbW9kdWxlLCB0aGUgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdGhlIGxpY2Vuc2Ug
b2YgdGhhdA0KLW1vZHVsZS4gIEFuIGluZGVwZW5kZW50IG1vZHVsZSBpcyBhIG1vZHVsZSB3aGlj
aCBpcyBub3QgZGVyaXZlZCBmcm9tDQotb3IgYmFzZWQgb24gdGhpcyBsaWJyYXJ5LiAgSWYgeW91
IG1vZGlmeSB0aGlzIGxpYnJhcnksIHlvdSBtYXkgZXh0ZW5kDQotdGhpcyBleGNlcHRpb24gdG8g
eW91ciB2ZXJzaW9uIG9mIHRoZSBsaWJyYXJ5LCBidXQgeW91IGFyZSBub3QNCi1vYmxpZ2F0ZWQg
dG8gZG8gc28uICBJZiB5b3UgZG8gbm90IHdpc2ggdG8gZG8gc28sIGRlbGV0ZSB0aGlzDQotZXhj
ZXB0aW9uIHN0YXRlbWVudCBmcm9tIHlvdXIgdmVyc2lvbi4gKi8NCi0NCi0jaW5jbHVkZSA8Y29u
ZmlnLmg+DQotI2luY2x1ZGUgPGVycm5vLmg+DQotDQotI2luY2x1ZGUgPGpuaS5oPg0KLSNpbmNs
dWRlIDxqY2wuaD4NCi0NCi0jaW5jbHVkZSAiZ251X2phdmFfbmlvX0ZpbGVMb2NrSW1wbC5oIg0K
LQ0KLSNkZWZpbmUgSU9fRVhDRVBUSU9OICJqYXZhL2lvL0lPRXhjZXB0aW9uIg0KLQ0KLUpOSUVY
UE9SVCB2b2lkIEpOSUNBTEwNCi1KYXZhX2dudV9qYXZhX25pb19GaWxlTG9ja0ltcGxfcmVsZWFz
ZUltcGwgKEpOSUVudiAqZW52LCBqY2xhc3MgY2xhc3MpDQotew0KLSAgSkNMX1Rocm93RXhjZXB0
aW9uIChlbnYsIElPX0VYQ0VQVElPTiwgImphdmEubmlvLkZpbGVDaGFubmVsSW1wbC4oKTogbm90
IGltcGxlbWVudGVkIik7DQotfQ0KLQ0K

--=-xU2RI1T/HCaJFAyHUMj4--

--=-rQLafgeprG04RPzpXh0H
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)

iD8DBQBAgqElxVhZCJWr9QwRAjCUAJ9yHqOtvuWCYwKF9wKynrRwEo+CxQCgo6h9
dSnzlojzLT4dcs9cUz83bh8=
=De39
-----END PGP SIGNATURE-----

--=-rQLafgeprG04RPzpXh0H--




From MAILER-DAEMON Mon Apr 19 00:02:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFPzb-0000Sd-6H
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 00:02:47 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFPzY-0000SC-LE
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 00:02:44 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFPz2-0008KF-BV
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 00:02:43 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFPz1-0008Io-IF
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 00:02:11 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 96D27622EA
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 04:02:09 +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 12276-01 for <commit-classpath@gnu.org>;
	Mon, 19 Apr 2004 04:02:08 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-72-176.adsl.solnet.ch
	[212.41.72.176])
	by mail01.solnet.ch (Postfix) with ESMTP id 7865C622E5
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 04:02:08 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 03BDBBA980; Mon, 19 Apr 2004 06:00:04 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040419040004.03BDBBA980@reali.dnsalias.net>
Date: Mon, 19 Apr 2004 06:00:04 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040419 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 04:02:45 -0000




From MAILER-DAEMON Mon Apr 19 07:06:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFWZl-0003K9-DT
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 07:04:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFWXq-0002y2-JF
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:02:34 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFWNm-0001Xy-OU
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 06:52:42 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFWLM-00018R-1y
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 06:49:40 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFWLI-0007bV-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 12:49:36 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFWL1-0007XA-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 12:49:19 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JAnILT023909
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 12:49:19 +0200 (MEST)
Message-ID: <4083AEAE.4000406@kaffe.org>
Date: Mon, 19 Apr 2004 12:49:18 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------010309030106040907090109"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: import statement cleanup in
	javax/security/auth/x500/X500Principal.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 11:04:31 -0000

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

Hi all,

I've checked in the attached patch to clean up unused imports in 
javax/security/auth/x500/X500Principal.java.

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/security/auth/x500/X500Principal.java:
         Cleaned up imports.


--------------010309030106040907090109
Content-Type: text/plain;
 name="cpath-x500-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-x500-imports"

Index: javax/security/auth/x500/X500Principal.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/security/auth/x500/X500Principal.java,v
retrieving revision 1.2
diff -u -r1.2 X500Principal.java
--- javax/security/auth/x500/X500Principal.java	27 Jun 2003 21:03:53 -0000	1.2
+++ javax/security/auth/x500/X500Principal.java	19 Apr 2004 10:41:17 -0000
@@ -38,20 +38,15 @@
 
 package javax.security.auth.x500;
 
-import java.io.ByteArrayInputStream;
+import gnu.java.security.x509.X500DistinguishedName;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.NotActiveException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-
 import java.security.Principal;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-
-import gnu.java.security.x509.X500DistinguishedName;
 
 public final class X500Principal implements Principal, Serializable
 {

--------------010309030106040907090109--



From MAILER-DAEMON Mon Apr 19 07:27:56 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFWwN-0005hO-Rr
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 07:27:55 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFWWm-0002si-8u
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:01:28 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFWW8-0002iK-3O
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:01:19 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFWW6-0002hj-PW
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:00:46 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFWW6-0001Vm-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:00:46 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFWW3-0001Vc-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:00:43 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JB0hLT000150
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:00:43 +0200 (MEST)
Message-ID: <4083B15B.7090502@kaffe.org>
Date: Mon, 19 Apr 2004 13:00:43 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------070907070909070409000907"
X-Virus-Scanned: by AMaViS perl-11
Subject: cleaned up imports in javax/rmi/PortableRemoteObject.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 11:27:53 -0000

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

Hi all,

I've checked in the following patch to clean up the imports in 
javax/rmi/PortableRemoteObject.java.

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/rmi/PortableRemoteObject.java:
         Cleaned up imports.


--------------070907070909070409000907
Content-Type: text/plain;
 name="cpath-rmi-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-rmi-imports"

Index: javax/rmi/PortableRemoteObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/PortableRemoteObject.java,v
retrieving revision 1.1
diff -u -r1.1 PortableRemoteObject.java
--- javax/rmi/PortableRemoteObject.java	31 Oct 2002 18:35:23 -0000	1.1
+++ javax/rmi/PortableRemoteObject.java	19 Apr 2004 10:56:20 -0000
@@ -38,13 +38,14 @@
 
 package javax.rmi;
 
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.rmi.NoSuchObjectException;
 import gnu.javax.rmi.CORBA.DelegateFactory;
 import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
+
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
+
 import javax.rmi.CORBA.PortableRemoteObjectDelegate;
-import javax.rmi.CORBA.Util;
 
 public class PortableRemoteObject
   implements Remote /* why doc doesn't say should implement Remote */

--------------070907070909070409000907--



From MAILER-DAEMON Mon Apr 19 08:11:41 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFXcj-0002Hb-2X
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 08:11:41 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFXFB-0007sJ-Mh
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:47:21 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFX4C-0006hm-Tv
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:36:32 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFX4B-0006hV-OP
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:35:59 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFX4A-00007X-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:35:58 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFX41-00005P-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:35:49 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JBZmLT020364
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:35:48 +0200 (MEST)
Message-ID: <4083B994.8060902@kaffe.org>
Date: Mon, 19 Apr 2004 13:35:48 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------010908010606070608060705"
X-Virus-Scanned: by AMaViS perl-11
Subject: cleaned up imports  in javax/rmi/CORBA/Util.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 12:11:29 -0000

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

Hi all,

I've cleaned up the imports in javax/rmi/CORBA/Util.java.

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/rmi/CORBA/Util.java:
         Cleaned up imports.


--------------010908010606070608060705
Content-Type: text/plain;
 name="cpath-util-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-util-imports"

Index: javax/rmi/CORBA/Util.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/Util.java,v
retrieving revision 1.1
diff -u -r1.1 Util.java
--- javax/rmi/CORBA/Util.java	31 Oct 2002 18:35:23 -0000	1.1
+++ javax/rmi/CORBA/Util.java	19 Apr 2004 11:28:22 -0000
@@ -38,15 +38,13 @@
 
 package javax.rmi.CORBA;
 
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.lang.Object;
-import java.io.*;
-//import org.omg.CORBA.*;
-//import org.omg.CORBA.portable.InputStream;
-//import org.omg.CORBA.portable.OutputStream;
 import gnu.javax.rmi.CORBA.DelegateFactory;
 import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 public class Util
 {

--------------010908010606070608060705--



From MAILER-DAEMON Mon Apr 19 09:30:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFYqq-0007d7-Pf
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 09:30:20 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFXnN-0003zY-3K
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 08:22:41 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFXg1-0002oP-R2
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 08:15:37 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFXCj-0007bG-IA
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:44:49 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFXCb-0001eG-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:44:41 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFXCY-0001dq-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:44:38 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JBibLT025259
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:44:38 +0200 (MEST)
Message-ID: <4083BBA5.1030704@kaffe.org>
Date: Mon, 19 Apr 2004 13:44:37 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------060702070904060308050102"
X-Virus-Scanned: by AMaViS perl-11
Subject: cleaned up imports in javax/rmi/CORBA/Stub.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 13:30:14 -0000

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

hi all,

i've cleaned up the import statements in javax/rmi/CORBA/Stub.java.

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/rmi/CORBA/Stub.java:
         Cleaned up imports.


--------------060702070904060308050102
Content-Type: text/plain;
 name="cpath-stub-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-stub-imports"

Index: javax/rmi/CORBA/Stub.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/Stub.java,v
retrieving revision 1.1
diff -u -r1.1 Stub.java
--- javax/rmi/CORBA/Stub.java	31 Oct 2002 18:35:23 -0000	1.1
+++ javax/rmi/CORBA/Stub.java	19 Apr 2004 11:38:41 -0000
@@ -38,16 +38,14 @@
 
 package javax.rmi.CORBA;
 
+import gnu.javax.rmi.CORBA.DelegateFactory;
+import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.rmi.RemoteException;
-//import org.omg.CORBA.ORB;
-//import org.omg.CORBA_2_3.portable.ObjectImpl;
-//import org.omg.CORBA.portable.ObjectImpl;
-import gnu.javax.rmi.CORBA.DelegateFactory;
-import gnu.javax.rmi.CORBA.GetDelegateInstanceException;
 
 public abstract class Stub extends ObjectImpl
   implements Serializable

--------------060702070904060308050102--



From MAILER-DAEMON Mon Apr 19 09:32:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFYt9-0008Ia-IV
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 09:32:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFYt6-0008IG-Ry
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 09:32:40 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFXsD-0005FA-2m
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 08:28:12 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFXTK-00010t-TF
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 08:01:59 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFXTH-0003y8-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 14:01:55 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFXTF-0003xk-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 14:01:53 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JC1qLT004362
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 14:01:53 +0200 (MEST)
Message-ID: <4083BFB0.8020802@kaffe.org>
Date: Mon, 19 Apr 2004 14:01:52 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------050407060006010801030105"
X-Virus-Scanned: by AMaViS perl-11
Subject: Added 2004 to copright notices on files I modified
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 13:32:41 -0000

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

hi all,

I've added the '2004' to the files I;ve changed today.

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/rmi/CORBA/PortableRemoteObjectDelegate.java,
         javax/rmi/CORBA/Stub.java,
         javax/rmi/CORBA/Util.java,
         javax/rmi/CORBA/ValueHandler.java,
         javax/rmi/CORBA/ValueHandler.java,
         javax/rmi/PortableRemoteObject.java,
         javax/security/auth/x500/X500Principal.java:
         Added 2004 to copyright notices.


--------------050407060006010801030105
Content-Type: text/plain;
 name="cpath-2004-fix"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-2004-fix"

Index: javax/rmi/CORBA/PortableRemoteObjectDelegate.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java,v
retrieving revision 1.2
diff -u -r1.2 PortableRemoteObjectDelegate.java
--- javax/rmi/CORBA/PortableRemoteObjectDelegate.java	19 Apr 2004 11:49:32 -0000	1.2
+++ javax/rmi/CORBA/PortableRemoteObjectDelegate.java	19 Apr 2004 11:59:03 -0000
@@ -1,5 +1,5 @@
 /* PortableRemoteObjectDelegate.java -- Interface supporting PortableRemoteObject
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: javax/rmi/CORBA/Stub.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/Stub.java,v
retrieving revision 1.2
diff -u -r1.2 Stub.java
--- javax/rmi/CORBA/Stub.java	19 Apr 2004 11:44:48 -0000	1.2
+++ javax/rmi/CORBA/Stub.java	19 Apr 2004 11:59:03 -0000
@@ -1,5 +1,5 @@
 /* Stub.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: javax/rmi/CORBA/Util.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/Util.java,v
retrieving revision 1.2
diff -u -r1.2 Util.java
--- javax/rmi/CORBA/Util.java	19 Apr 2004 11:32:32 -0000	1.2
+++ javax/rmi/CORBA/Util.java	19 Apr 2004 11:59:03 -0000
@@ -1,5 +1,5 @@
 /* Util.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: javax/rmi/CORBA/ValueHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/ValueHandler.java,v
retrieving revision 1.2
diff -u -r1.2 ValueHandler.java
--- javax/rmi/CORBA/ValueHandler.java	19 Apr 2004 11:09:43 -0000	1.2
+++ javax/rmi/CORBA/ValueHandler.java	19 Apr 2004 11:59:03 -0000
@@ -1,5 +1,5 @@
 /* ValueHandler.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: javax/rmi/PortableRemoteObject.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/PortableRemoteObject.java,v
retrieving revision 1.2
diff -u -r1.2 PortableRemoteObject.java
--- javax/rmi/PortableRemoteObject.java	19 Apr 2004 10:59:21 -0000	1.2
+++ javax/rmi/PortableRemoteObject.java	19 Apr 2004 11:59:03 -0000
@@ -1,5 +1,5 @@
 /* PortableRemoteObject.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
Index: javax/security/auth/x500/X500Principal.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/security/auth/x500/X500Principal.java,v
retrieving revision 1.3
diff -u -r1.3 X500Principal.java
--- javax/security/auth/x500/X500Principal.java	19 Apr 2004 10:53:15 -0000	1.3
+++ javax/security/auth/x500/X500Principal.java	19 Apr 2004 11:59:03 -0000
@@ -1,5 +1,5 @@
 /* X500Principal.java -- X.500 principal.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

--------------050407060006010801030105--



From MAILER-DAEMON Mon Apr 19 09:42:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFZ2f-0002BW-Mt
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 09:42:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFYfg-0004hY-Gj
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 09:18:48 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFXqW-0004oq-57
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 08:26:27 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFXI4-00086S-7w
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:50:20 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFXI1-0002Im-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:50:17 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFXHy-0002Ib-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:50:14 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JBoELT028213
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:50:14 +0200 (MEST)
Message-ID: <4083BCF6.8010904@kaffe.org>
Date: Mon, 19 Apr 2004 13:50:14 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------000109080708050704020408"
X-Virus-Scanned: by AMaViS perl-11
Subject: cleaned up imports in
	javax/rmi/CORBA/PortableRemoteObjectDelegate.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 13:42:31 -0000

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

hi all,

i've cleaned up the imports in 
javax/rmi/CORBA/PortableRemoteObjectDelegate.java

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/rmi/CORBA/PortableRemoteObjectDelegate.java:
         Cleaned up imports.


--------------000109080708050704020408
Content-Type: text/plain;
 name="cpath-prod-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-prod-imports"

Index: javax/rmi/CORBA/PortableRemoteObjectDelegate.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/PortableRemoteObjectDelegate.java,v
retrieving revision 1.1
diff -u -r1.1 PortableRemoteObjectDelegate.java
--- javax/rmi/CORBA/PortableRemoteObjectDelegate.java	31 Oct 2002 18:35:23 -0000	1.1
+++ javax/rmi/CORBA/PortableRemoteObjectDelegate.java	19 Apr 2004 11:47:10 -0000
@@ -38,7 +38,9 @@
 
 package javax.rmi.CORBA;
 
-import java.rmi.*;
+import java.rmi.NoSuchObjectException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
 
 /**
  * A delegate is a singleton class that support delegation for method

--------------000109080708050704020408--



From MAILER-DAEMON Mon Apr 19 10:02:41 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFZ43-0002Wu-DA
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 09:43:59 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFXVQ-0001CH-Qi
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 08:04:08 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFXUg-00018H-H2
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 08:03:53 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFWlb-0004ee-CT
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:16:47 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFWla-0004Cp-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:16:46 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFWlW-0004Bx-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:16:42 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JBGfLT009040
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:16:42 +0200 (MEST)
Message-ID: <4083B519.7010104@kaffe.org>
Date: Mon, 19 Apr 2004 13:16:41 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------040201070807080508090701"
X-Virus-Scanned: by AMaViS perl-11
Subject: cleaned up imports in javax/rmi/CORBA/ValueHandler.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 13:43:57 -0000

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

hi all,

i've cleaned up the imports in javax/rmi/CORBA/ValueHandler.java with 
ther attached patch.

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/rmi/CORBA/ValueHandler.java:
         Cleaned up imports.


--------------040201070807080508090701
Content-Type: text/plain;
 name="cpath-value-handler-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-value-handler-imports"

Index: javax/rmi/CORBA/ValueHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/ValueHandler.java,v
retrieving revision 1.1
diff -u -r1.1 ValueHandler.java
--- javax/rmi/CORBA/ValueHandler.java	31 Oct 2002 18:35:23 -0000	1.1
+++ javax/rmi/CORBA/ValueHandler.java	19 Apr 2004 11:03:04 -0000
@@ -38,7 +38,9 @@
 
 package javax.rmi.CORBA;
 
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
 //import org.omg.CORBA.portable.InputStream;
 //import org.omg.CORBA.portable.OutputStream;
 //import org.omg.SendingContext.RunTime;

--------------040201070807080508090701--



From MAILER-DAEMON Mon Apr 19 11:08:58 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFaOI-0001g0-2Z
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 11:08:58 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFaOF-0001fJ-Ed
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:08:55 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFZsh-0003vy-B3
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 10:36:51 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFZsf-0003vN-I6
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 10:36:17 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFZse-0004rE-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 16:36:16 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFZsW-0004pK-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 16:36:08 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JEa6LT005330
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 16:36:08 +0200 (MEST)
Message-ID: <4083E3D6.4030305@kaffe.org>
Date: Mon, 19 Apr 2004 16:36:06 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------030802080308080506000504"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: Fixed HTML tags in JSlider docs
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 15:08:56 -0000

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

Hi all,

I've fixed a few tags gjdoc was complaining about.

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/swing/JSlider.java:
         Fixed HTML tags in comments.

--------------030802080308080506000504
Content-Type: text/plain;
 name="cpath-jslider-comments"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-jslider-comments"

Index: javax/swing/JSlider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JSlider.java,v
retrieving revision 1.5
diff -u -r1.5 JSlider.java
--- javax/swing/JSlider.java	17 Apr 2004 23:24:46 -0000	1.5
+++ javax/swing/JSlider.java	19 Apr 2004 14:32:26 -0000
@@ -71,7 +71,7 @@
  * </p>
  * 
  * <table>
- * <tr><th> Property         </td><th> Stored in </td><th> Bound? </td></tr>
+ * <tr><th> Property         </th><th> Stored in </th><th> Bound? </th></tr>
  * <tr><td> extent           </td><td> model     </td><td> no     </td></tr>
  * <tr><td> inverted         </td><td> slider    </td><td> yes    </td></tr>
  * <tr><td> labelTable       </td><td> slider    </td><td> yes    </td></tr>

--------------030802080308080506000504--



From MAILER-DAEMON Mon Apr 19 11:28:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFagu-0005a0-Ue
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 11:28:12 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFags-0005Yv-D1
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:28:10 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFagI-0005Pj-98
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:28:06 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BFagH-0005PR-UE
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:27:34 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BFagP-0006dm-1S
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:27:41 -0400
From: "Stephen Crawley" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: patch
X-Savannah-Artifact-ID: 2951
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.2.1) Gecko/20030225
X-Apparently-From: 130.102.176.6
X-Copy-To: Array
Message-Id: <E1BFagP-0006dm-1S@savannah.gnu.org>
Date: Mon, 19 Apr 2004 11:27:41 -0400
Subject: [patch #2951] FileChannelImpl read/write(buff, offset,
	length) fails when buff.length == 0
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 15:28:11 -0000

This mail is an automated notification from the patch tracker
 of the project: classpath.




/**************************************************************************/
[patch #2951] Full Item Snapshot:

URL: <http://savannah.gnu.org/patch/?func=detailitem&item_id=2951>
Project: classpath
Submitted by: Stephen Crawley
On: Mon 04/19/04 at 15:27

Category:  None
Priority:  5 - Normal
Resolution:  None
Assigned to:  None
Originator Email:  
Status:  Open


Summary:  FileChannelImpl read/write(buff, offset, length) fails when buff.length == 0

Original Submission:  The current native implementation of the 3 argument read 
and write methods of gnu.java.nio.channel.FileChannelImpl
throw an IOException with message "Unexpected JNI error"
when the buff argument has zero length.  This can happen
if an application tries to read or write an zero length
byte array with a File{Input,Output}Stream.  The problem
is that the native methods don't check the length arg
before making the JNI GetByteArrayElements call.  The
latter call then fails ...

The bugs are exercised by these Mauve testcases:
  gnu.testlet.java.io.FileOutputStream.write
  gnu.testlet.java.io.FileInputStream.read

The obvious fix is to have the native methods test for
length == 0 explicitly.  Suggested ChangeLog entries:

2004-04-20 Stephen Crawley <crawley@dstc.edu.au>
  * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c (Java_gnu_java_nio_channels_FileChannelImpl_read___3BII) :
  check for length == 0
  *  native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c (Java_gnu_java_nio_channels_FileChannelImpl_write___3BII)
  ditto









File Attachments
-------------------

-------------------------------------------------------
Date: Mon 04/19/04 at 15:27  Name: diffs  Size: 1KB   By: crawley

http://savannah.gnu.org/patch/download.php?item_id=2951&amp;item_file_id=3124






For detailed info, follow this link:
<http://savannah.gnu.org/patch/?func=detailitem&item_id=2951>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Mon Apr 19 11:36:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFap8-0007T3-Jf
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 11:36:42 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFaox-0007Q7-AR
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:36:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFaoN-0007Fa-Io
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:36:26 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFaYd-0003rb-Rj
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:19:40 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFaYc-0006Ge-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 17:19:38 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFaYZ-0006Fl-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 17:19:35 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JFJYLT003966
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 17:19:35 +0200 (MEST)
Message-ID: <4083EE06.9060406@kaffe.org>
Date: Mon, 19 Apr 2004 17:19:34 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------040007070808040708000107"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: Cleaned up javax.naming imports
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 15:36:33 -0000

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

Hi all,

I've cleaned up the import statements in javax.naming.

cheers,
dalibor topic

  2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/naming/AuthenticationException.java,
         javax/naming/AuthenticationNotSupportedException.java,
         javax/naming/CannotProceedException.java,
         javax/naming/CommunicationException.java,
         javax/naming/CompoundName.java,
         javax/naming/ConfigurationException.java,
         javax/naming/ContextNotEmptyException.java,
         javax/naming/InitialContext.java,
         javax/naming/InsufficientResourcesException.java,
         javax/naming/InterruptedNamingException.java,
         javax/naming/LimitExceededException.java,
         javax/naming/LinkException.java,
         javax/naming/LinkLoopException.java,
         javax/naming/LinkRef.java,
         javax/naming/MalformedLinkException.java,
         javax/naming/Name.java,
         javax/naming/NameAlreadyBoundException.java,
         javax/naming/NameNotFoundException.java,
         javax/naming/NamingSecurityException.java,
         javax/naming/NoInitialContextException.java,
         javax/naming/NoPermissionException.java,
         javax/naming/NotContextException.java,
         javax/naming/PartialResultException.java,
         javax/naming/ReferralException.java,
         javax/naming/ServiceUnavailableException.java,
         javax/naming/SizeLimitExceededException.java,
         javax/naming/TimeLimitExceededException.java,
         javax/naming/directory/Attribute.java,
         javax/naming/directory/Attributes.java,
         javax/naming/directory/SearchResult.java,
         javax/naming/event/NamingExceptionEvent.java,
         javax/naming/spi/ResolveResult.java:
         Cleaned up imports.

--------------040007070808040708000107
Content-Type: text/plain;
 name="cpath-naming-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-naming-imports"

Index: javax/naming/AuthenticationException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/AuthenticationException.java,v
retrieving revision 1.1
diff -u -r1.1 AuthenticationException.java
--- javax/naming/AuthenticationException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/AuthenticationException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* AuthenticationException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class AuthenticationException extends NamingSecurityException
 {
Index: javax/naming/AuthenticationNotSupportedException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/AuthenticationNotSupportedException.java,v
retrieving revision 1.1
diff -u -r1.1 AuthenticationNotSupportedException.java
--- javax/naming/AuthenticationNotSupportedException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/AuthenticationNotSupportedException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* AuthenticationNotSupportedException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class AuthenticationNotSupportedException
   extends NamingSecurityException
Index: javax/naming/CannotProceedException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/CannotProceedException.java,v
retrieving revision 1.1
diff -u -r1.1 CannotProceedException.java
--- javax/naming/CannotProceedException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/CannotProceedException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* CannotProceedException.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
  
 package javax.naming;
 
-import java.lang.Exception;
 import java.util.Hashtable;
  
 /**
Index: javax/naming/CommunicationException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/CommunicationException.java,v
retrieving revision 1.1
diff -u -r1.1 CommunicationException.java
--- javax/naming/CommunicationException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/CommunicationException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* CommunicationException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class CommunicationException extends NamingException
 {
Index: javax/naming/CompoundName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/CompoundName.java,v
retrieving revision 1.4
diff -u -r1.4 CompoundName.java
--- javax/naming/CompoundName.java	15 Nov 2003 22:42:20 -0000	1.4
+++ javax/naming/CompoundName.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* CompoundName.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,8 +40,8 @@
 
 import java.io.Serializable;
 import java.util.Enumeration;
-import java.util.Properties;
 import java.util.NoSuchElementException;
+import java.util.Properties;
 import java.util.Vector;
 
 /**
Index: javax/naming/ConfigurationException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/ConfigurationException.java,v
retrieving revision 1.1
diff -u -r1.1 ConfigurationException.java
--- javax/naming/ConfigurationException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/ConfigurationException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* ConfigurationException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class ConfigurationException extends NamingException
 {
Index: javax/naming/ContextNotEmptyException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/ContextNotEmptyException.java,v
retrieving revision 1.1
diff -u -r1.1 ContextNotEmptyException.java
--- javax/naming/ContextNotEmptyException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/ContextNotEmptyException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* ContextNotEmptyException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class ContextNotEmptyException extends NamingException
 {
Index: javax/naming/InitialContext.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/InitialContext.java,v
retrieving revision 1.6
diff -u -r1.6 InitialContext.java
--- javax/naming/InitialContext.java	25 Oct 2003 13:12:07 -0000	1.6
+++ javax/naming/InitialContext.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* InitialContext.java --
-   Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,14 +39,13 @@
 package javax.naming;
 
 import java.applet.Applet;
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Properties;
+
 import javax.naming.spi.NamingManager;
 
 public class InitialContext implements Context
Index: javax/naming/InsufficientResourcesException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/InsufficientResourcesException.java,v
retrieving revision 1.1
diff -u -r1.1 InsufficientResourcesException.java
--- javax/naming/InsufficientResourcesException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/InsufficientResourcesException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* InsufficientResourcesException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class InsufficientResourcesException extends NamingException
 {
Index: javax/naming/InterruptedNamingException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/InterruptedNamingException.java,v
retrieving revision 1.1
diff -u -r1.1 InterruptedNamingException.java
--- javax/naming/InterruptedNamingException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/InterruptedNamingException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* InterruptedNamingException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class InterruptedNamingException extends NamingException
 {
Index: javax/naming/LimitExceededException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/LimitExceededException.java,v
retrieving revision 1.1
diff -u -r1.1 LimitExceededException.java
--- javax/naming/LimitExceededException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/LimitExceededException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* LimitExceededException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class LimitExceededException extends NamingException
 {
Index: javax/naming/LinkException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/LinkException.java,v
retrieving revision 1.1
diff -u -r1.1 LinkException.java
--- javax/naming/LinkException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/LinkException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* LinkException.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
  
 package javax.naming;
 
-import java.lang.Exception;
  
 /**
  * @author Warren Levy <warrenl@redhat.com>
Index: javax/naming/LinkLoopException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/LinkLoopException.java,v
retrieving revision 1.1
diff -u -r1.1 LinkLoopException.java
--- javax/naming/LinkLoopException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/LinkLoopException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* LinkLoopException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class LinkLoopException extends LinkException
 {
Index: javax/naming/LinkRef.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/LinkRef.java,v
retrieving revision 1.2
diff -u -r1.2 LinkRef.java
--- javax/naming/LinkRef.java	27 Jun 2003 21:03:53 -0000	1.2
+++ javax/naming/LinkRef.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* LinkRef.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.io.Serializable;
 
 /**
  * @author Tom Tromey <tromey@redhat.com>
Index: javax/naming/MalformedLinkException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/MalformedLinkException.java,v
retrieving revision 1.1
diff -u -r1.1 MalformedLinkException.java
--- javax/naming/MalformedLinkException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/MalformedLinkException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* MalformedLinkException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class MalformedLinkException extends LinkException
 {
Index: javax/naming/NameAlreadyBoundException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/NameAlreadyBoundException.java,v
retrieving revision 1.1
diff -u -r1.1 NameAlreadyBoundException.java
--- javax/naming/NameAlreadyBoundException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/NameAlreadyBoundException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* NameAlreadyBoundException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NameAlreadyBoundException extends NamingException
 {
Index: javax/naming/Name.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/Name.java,v
retrieving revision 1.4
diff -u -r1.4 Name.java
--- javax/naming/Name.java	12 Oct 2003 16:40:09 -0000	1.4
+++ javax/naming/Name.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* Name.java -- Name build up from different components
-   Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package javax.naming;
 
-import java.util.Enumeration;
 import java.io.Serializable;
+import java.util.Enumeration;
 
 /**
  * Interface descriping a name build up from different components.
Index: javax/naming/NameNotFoundException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/NameNotFoundException.java,v
retrieving revision 1.1
diff -u -r1.1 NameNotFoundException.java
--- javax/naming/NameNotFoundException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/NameNotFoundException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* NameNotFoundException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
  
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NameNotFoundException extends NamingException
 {
Index: javax/naming/NamingSecurityException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/NamingSecurityException.java,v
retrieving revision 1.2
diff -u -r1.2 NamingSecurityException.java
--- javax/naming/NamingSecurityException.java	27 Jun 2003 21:03:53 -0000	1.2
+++ javax/naming/NamingSecurityException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* NamingSecurityException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public abstract class NamingSecurityException extends NamingException
 {
Index: javax/naming/NoInitialContextException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/NoInitialContextException.java,v
retrieving revision 1.1
diff -u -r1.1 NoInitialContextException.java
--- javax/naming/NoInitialContextException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/NoInitialContextException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* NoInitialContextException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NoInitialContextException extends NamingException
 {
Index: javax/naming/NoPermissionException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/NoPermissionException.java,v
retrieving revision 1.1
diff -u -r1.1 NoPermissionException.java
--- javax/naming/NoPermissionException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/NoPermissionException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* NoPermissionException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NoPermissionException extends NamingSecurityException
 {
Index: javax/naming/NotContextException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/NotContextException.java,v
retrieving revision 1.1
diff -u -r1.1 NotContextException.java
--- javax/naming/NotContextException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/NotContextException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* NotContextException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class NotContextException extends NamingException
 {
Index: javax/naming/PartialResultException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/PartialResultException.java,v
retrieving revision 1.1
diff -u -r1.1 PartialResultException.java
--- javax/naming/PartialResultException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/PartialResultException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* PartialResultException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class PartialResultException extends NamingException
 {
Index: javax/naming/ReferralException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/ReferralException.java,v
retrieving revision 1.2
diff -u -r1.2 ReferralException.java
--- javax/naming/ReferralException.java	27 Jun 2003 21:03:53 -0000	1.2
+++ javax/naming/ReferralException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* ReferralException.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
 import java.util.Hashtable;
  
 /**
Index: javax/naming/ServiceUnavailableException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/ServiceUnavailableException.java,v
retrieving revision 1.1
diff -u -r1.1 ServiceUnavailableException.java
--- javax/naming/ServiceUnavailableException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/ServiceUnavailableException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* ServiceUnavailableException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class ServiceUnavailableException extends NamingException
 {
Index: javax/naming/SizeLimitExceededException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/SizeLimitExceededException.java,v
retrieving revision 1.1
diff -u -r1.1 SizeLimitExceededException.java
--- javax/naming/SizeLimitExceededException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/SizeLimitExceededException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* SizeLimitExceededException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class SizeLimitExceededException extends LimitExceededException
 {
Index: javax/naming/TimeLimitExceededException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/TimeLimitExceededException.java,v
retrieving revision 1.1
diff -u -r1.1 TimeLimitExceededException.java
--- javax/naming/TimeLimitExceededException.java	23 Nov 2002 21:44:28 -0000	1.1
+++ javax/naming/TimeLimitExceededException.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* TimeLimitExceededException.java --
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming;
 
-import java.lang.Exception;
  
 public class TimeLimitExceededException extends LimitExceededException
 {
Index: javax/naming/directory/Attribute.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/directory/Attribute.java,v
retrieving revision 1.4
diff -u -r1.4 Attribute.java
--- javax/naming/directory/Attribute.java	26 Dec 2003 20:27:04 -0000	1.4
+++ javax/naming/directory/Attribute.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* Attribute.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,7 @@
 package javax.naming.directory;
 
 import java.io.Serializable;
-import javax.naming.Context;
-import javax.naming.Name;
+
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
Index: javax/naming/directory/Attributes.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/directory/Attributes.java,v
retrieving revision 1.3
diff -u -r1.3 Attributes.java
--- javax/naming/directory/Attributes.java	26 Dec 2003 20:27:04 -0000	1.3
+++ javax/naming/directory/Attributes.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* Attributes.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,7 @@
 package javax.naming.directory;
 
 import java.io.Serializable;
-import javax.naming.Context;
-import javax.naming.Name;
+
 import javax.naming.NamingEnumeration;
 
 /**
Index: javax/naming/directory/SearchResult.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/directory/SearchResult.java,v
retrieving revision 1.2
diff -u -r1.2 SearchResult.java
--- javax/naming/directory/SearchResult.java	26 Dec 2003 20:27:04 -0000	1.2
+++ javax/naming/directory/SearchResult.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* SearchResult.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.naming.directory;
 
-import java.io.Serializable;
 import javax.naming.Binding;
  
 /**
Index: javax/naming/event/NamingExceptionEvent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/event/NamingExceptionEvent.java,v
retrieving revision 1.2
diff -u -r1.2 NamingExceptionEvent.java
--- javax/naming/event/NamingExceptionEvent.java	26 Dec 2003 20:27:04 -0000	1.2
+++ javax/naming/event/NamingExceptionEvent.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* NamingExceptionEvent.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,7 @@
 package javax.naming.event;
 
 import java.util.EventObject;
-import javax.naming.Context;
-import javax.naming.Name;
+
 import javax.naming.NamingException;
  
 /**
Index: javax/naming/spi/ResolveResult.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/ResolveResult.java,v
retrieving revision 1.2
diff -u -r1.2 ResolveResult.java
--- javax/naming/spi/ResolveResult.java	26 Dec 2003 20:27:04 -0000	1.2
+++ javax/naming/spi/ResolveResult.java	19 Apr 2004 14:39:52 -0000
@@ -1,5 +1,5 @@
 /* ResolveResult.java --
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,10 +39,10 @@
 package javax.naming.spi;
 
 import java.io.Serializable;
-import java.util.EventObject;
-import javax.naming.Name;
+
 import javax.naming.CompositeName;
 import javax.naming.InvalidNameException;
+import javax.naming.Name;
  
 /**
  * @author Warren Levy <warrenl@redhat.com>

--------------040007070808040708000107--



From MAILER-DAEMON Mon Apr 19 12:46:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFbuO-00061Y-PC
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 12:46:12 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFXi6-0003EE-Ek
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 08:17:14 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFWsd-0005HD-E4
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:24:34 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFWsb-0005H1-Fj
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 07:24:01 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFWsZ-0005Q0-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:23:59 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFWsH-0005Lg-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:23:41 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JBNeLT013022
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 13:23:40 +0200 (MEST)
Message-ID: <4083B6BA.6000607@kaffe.org>
Date: Mon, 19 Apr 2004 13:23:38 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------070904080001020902010608"
X-Virus-Scanned: by AMaViS perl-11
Subject: cleaned up imports in javax/rmi/CORBA/UtilDelegate.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 16:46:10 -0000

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

hi all,

I've cleaned up the imports in javax/rmi/CORBA/UtilDelegate.java.

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/rmi/CORBA/UtilDelegate.java:
         Cleaned up imports.


--------------070904080001020902010608
Content-Type: text/plain;
 name="cpath-util-delegate-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-util-delegate-imports"

Index: javax/rmi/CORBA/UtilDelegate.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/rmi/CORBA/UtilDelegate.java,v
retrieving revision 1.1
diff -u -r1.1 UtilDelegate.java
--- javax/rmi/CORBA/UtilDelegate.java	31 Oct 2002 18:35:23 -0000	1.1
+++ javax/rmi/CORBA/UtilDelegate.java	19 Apr 2004 11:18:32 -0000
@@ -38,9 +38,10 @@
 
 package javax.rmi.CORBA;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.rmi.Remote;
 import java.rmi.RemoteException;
-import java.io.*;
 //import org.omg.CORBA.ORB;
 //import org.omg.CORBA.SystemException;
 //import org.omg.CORBA.portable.InputStream;

--------------070904080001020902010608--



From MAILER-DAEMON Mon Apr 19 15:19:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFeIQ-00075x-Lr
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 15:19:10 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFeIM-00073x-6I
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 15:19:06 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFeHm-0006uh-2c
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 15:19:01 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFaQc-00026W-VU
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 11:11:23 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFaQc-0004OG-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 17:11:22 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFaQZ-0004Nl-00
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 17:11:19 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3JFBJLT029194
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 17:11:19 +0200 (MEST)
Message-ID: <4083EC17.7000306@kaffe.org>
Date: Mon, 19 Apr 2004 17:11:19 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------090205000708050302010009"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: cleaned up imports in javax/accessibility/
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 19:19:08 -0000

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

hi all,

I've cleaned up (i.e rearranged alphabetically :) the imports in 
javax/accessibility/AccessibleText.java.

cheers,
dalibor topic

2004-04-19  Dalibor Topic  <robilad@kaffe.org>

         * javax/accessibility/AccessibleText.java:
         Cleaned up imports.

--------------090205000708050302010009
Content-Type: text/plain;
 name="cpath-accesible-text-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-accesible-text-imports"

Index: javax/accessibility/AccessibleText.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/accessibility/AccessibleText.java,v
retrieving revision 1.6
diff -u -r1.6 AccessibleText.java
--- javax/accessibility/AccessibleText.java	1 Apr 2002 07:38:58 -0000	1.6
+++ javax/accessibility/AccessibleText.java	19 Apr 2004 15:04:22 -0000
@@ -1,5 +1,5 @@
 /* AccessibleText.java -- aids in accessibly manipulating text
-   Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,8 +38,9 @@
 
 package javax.accessibility;
 
-import java.awt.Rectangle;
 import java.awt.Point;
+import java.awt.Rectangle;
+
 import javax.swing.text.AttributeSet;
 
 /**

--------------090205000708050302010009--



From MAILER-DAEMON Mon Apr 19 16:00:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFew4-0003JF-U2
	for mharc-commit-classpath@gnu.org; Mon, 19 Apr 2004 16:00:08 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFevx-0003Ht-0K
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 16:00:01 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFevP-00035S-Ru
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 15:59:59 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFesF-0002DP-7s
	for commit-classpath@gnu.org; Mon, 19 Apr 2004 15:56:11 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id A75B9621FA
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 19:56:09 +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 06371-05 for <commit-classpath@gnu.org>;
	Mon, 19 Apr 2004 19:56:08 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-72-176.adsl.solnet.ch
	[212.41.72.176])
	by mail01.solnet.ch (Postfix) with ESMTP id 0C4C562047
	for <commit-classpath@gnu.org>; Mon, 19 Apr 2004 19:56:08 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 500)
	id CCECC8211B; Mon, 19 Apr 2004 21:54:04 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040419195404.CCECC8211B@reali.dnsalias.net>
Date: Mon, 19 Apr 2004 21:54:04 +0200 (CEST)
From: reali@acm.org (Patrik Reali)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: doc/www.gnu.org/faq/faq.wml
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 19 Apr 2004 20:00:01 -0000

2004-04-19  Patrik Reali  <reali@acm.org>
	* doc/www.gnu.org/faq/faq.wml: new entry "How do you keep your
	sources synchronized"

Index: doc/www.gnu.org/faq/faq.wml
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/www.gnu.org/faq/faq.wml,v
retrieving revision 1.7
diff -u -r1.7 faq.wml
--- doc/www.gnu.org/faq/faq.wml	5 Apr 2004 21:13:14 -0000	1.7
+++ doc/www.gnu.org/faq/faq.wml	19 Apr 2004 19:43:46 -0000
@@ -286,6 +286,28 @@
 
 </faq>
 
+<faq question="How can I synchronize my sources with GNU Classpath?">
+
+When developing a JVM that uses GNU Classpath, a copy of GNU Classpath local to the JVM is often used. To keep the Classpath sources synchronized with the main development, a few approaches are possible (we assume here that you are keeping the local copy of Classpath in your JVM revision control software):
+<ul>
+<li>Use CVS import and CVS update as explained in <createlink url="http://www.cvshome.org/docs/manual/cvs-1.11.14/cvs_13.html#SEC104" name="Section 13: Tracking Thirdparty sources"> of the CVS manual. This works well for minor changes, but has the disadvantage of a limited control on the update / merge of the sources. In fact, most of the developers prefer merging the changes by hand.
+
+<li>libgcj, which is almost always trying to be
+as synchronized as possible with GNU Classpath CVS, has a script
+that runs daily which produces a (colored) differences overview
+(including patch/diffs). They also put in special markers into the
+source for gcj specific changes that the script recognizes.
+<ul>
+<li>Script can be found at:
+<createlink url="http://savannah.gnu.org/cgi-bin/viewcvs/gcc/wwwdocs/bin/gen-classpath-compare">
+
+<li>Daily updated result:
+<createlink url="http://gcc.gnu.org/java/libgcj-classpath-compare.html">
+</ul>
+</ul>
+
+</faq>
+
 </faq-section>
 
 <faq-section name="Classpath Implementation">



From MAILER-DAEMON Tue Apr 20 00:03:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFmTm-000144-Rh
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 00:03:26 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFmTj-00013o-TA
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 00:03:23 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFmTD-0000mz-6R
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 00:03:22 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFmTC-0000mk-Nh
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 00:02:50 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id ED80E621FA
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 04:02: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 29069-04 for <commit-classpath@gnu.org>;
	Tue, 20 Apr 2004 04:02:48 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-72-176.adsl.solnet.ch
	[212.41.72.176])
	by mail01.solnet.ch (Postfix) with ESMTP id C5E8E621EA
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 04:02:47 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 8C08CBAC2D; Tue, 20 Apr 2004 06:00:42 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040420040042.8C08CBAC2D@reali.dnsalias.net>
Date: Tue, 20 Apr 2004 06:00:42 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040420 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 20 Apr 2004 04:03:24 -0000




From MAILER-DAEMON Tue Apr 20 08:17:23 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFu7P-0002CW-Cr
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 08:12:51 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFu6C-0001v2-BZ
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 08:11:36 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFu0G-0000dp-4V
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 08:05:59 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BFts3-0007hF-4k
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 07:56:59 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-054.ewetel.net
	[80.228.94.54])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3KBuvA8001960
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 13:56:58 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFtsF-0000yL-00
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 13:57:11 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 20 Apr 2004 13:56:36 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_0/QhAJvT7wojJY2"
Message-Id: <200404201356.36724.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 20 Apr 2004 12:12:35 -0000


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

Hi list,


I just commited the attached patch to add "-I ." to the aclocal call.
This fixes the automatic inclusion of pkg.m4 on systems where pkgconfig 
is not installed. I really wonder how these people wanna install the 
GTK peer ...


Michael


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

	* autogen.sh: Added "-I ." to aclocal call.


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

Index: autogen.sh
===================================================================
RCS file: /cvsroot/classpath/classpath/autogen.sh,v
retrieving revision 1.4
diff -u -r1.4 autogen.sh
--- autogen.sh	9 Apr 2004 17:14:45 -0000	1.4
+++ autogen.sh	19 Apr 2004 15:12:22 -0000
@@ -38,7 +38,7 @@
 ${LIBTOOLIZE} --force --copy
 
 echo "aclocal ..."
-${ACLOCAL}
+${ACLOCAL} -I .
 
 echo "autoheader ..."
 ${AUTOHEADER} --force

--Boundary-00=_0/QhAJvT7wojJY2--




From MAILER-DAEMON Tue Apr 20 12:53:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BFyU7-0008Bl-CY
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 12:52:35 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BFyT1-0007c5-IE
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 12:51:27 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BFySM-0007Qd-1f
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 12:51:17 -0400
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 1BFySL-0007QV-KK
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 12:50:45 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BFvtt-0002Uy-4r
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 10:07:01 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BFvqF-0005kp-00
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 16:03:15 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BFvpy-0005h9-00; Tue, 20 Apr 2004 16:02:58 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3KE2wLT021553;
	Tue, 20 Apr 2004 16:02:58 +0200 (MEST)
Message-ID: <40852D91.406@kaffe.org>
Date: Tue, 20 Apr 2004 16:02:57 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Michael Koch <konqueror@gmx.de>
References: <200404201356.36724.konqueror@gmx.de>
In-Reply-To: <200404201356.36724.konqueror@gmx.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: by AMaViS perl-11
Cc: commit-classpath@gnu.org
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 20 Apr 2004 16:52:33 -0000

Michael Koch wrote:
> Hi list,
> 
> 
> I just commited the attached patch to add "-I ." to the aclocal call.
> This fixes the automatic inclusion of pkg.m4 on systems where pkgconfig 
> is not installed. I really wonder how these people wanna install the 
> GTK peer ...

I'll deal with GTK peers later, when we merge in Classpath's AWT. I'm 
glad to have the pure Java part of the build working now, so thanks for 
checking the patch in.

cheers,
dalibor topic



From MAILER-DAEMON Tue Apr 20 14:57:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BG0Qa-0005ZK-1R
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 14:57:04 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BG0QS-0005YM-A5
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 14:56:56 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BG0Pv-0005Qj-JR
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 14:56:54 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BG0Pu-0005QP-W2
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 14:56:23 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-054.ewetel.net
	[80.228.94.54])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3KIuLA8028822
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 20:56:21 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BG0Q8-0001zw-00
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 20:56:36 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 20 Apr 2004 20:55:59 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_/IXhA9xmAEaJyfZ"
Message-Id: <200404202055.59623.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.text.DateFormatSymbols
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 20 Apr 2004 18:56:57 -0000


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

Hi list,


I just commited the attached patch to fix the filename in the copyright.


Michael


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

	* java/text/DateFormatSymbols.java:
	Fixed file name in copyright.


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

Index: java/text/DateFormatSymbols.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/DateFormatSymbols.java,v
retrieving revision 1.11
diff -u -r1.11 DateFormatSymbols.java
--- java/text/DateFormatSymbols.java	17 Apr 2004 18:37:47 -0000	1.11
+++ java/text/DateFormatSymbols.java	20 Apr 2004 18:53:57 -0000
@@ -1,4 +1,4 @@
-/* ChoiceFormat.java -- Format over a range of numbers
+/* DateFormatSymbols.java -- Format over a range of numbers
    Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.

--Boundary-00=_/IXhA9xmAEaJyfZ--




From MAILER-DAEMON Tue Apr 20 14:57:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BG0Qe-0005b0-Jo
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 14:57:08 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BG0QZ-0005ZB-Dr
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 14:57:03 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BG0Gz-0003qS-OD
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 14:47:41 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BG0Gz-0003q3-9w
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 14:47:09 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-054.ewetel.net
	[80.228.94.54])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3KIl6pc012898
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 20:47:07 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BG0HB-0001zV-00
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 20:47:21 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 20 Apr 2004 20:46:44 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_UAXhAcy18jYiCIx"
Message-Id: <200404202046.44817.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.io.StringWriter
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 20 Apr 2004 18:57:06 -0000


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

Hi list,


I commited the attached patch which fixes a litte typo.


Michael


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

	* java/io/StringWriter.java
	(close): Fixed typo in javadoc.


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

Index: java/io/StringWriter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/StringWriter.java,v
retrieving revision 1.6
diff -u -r1.6 StringWriter.java
--- java/io/StringWriter.java	8 Apr 2004 15:04:37 -0000	1.6
+++ java/io/StringWriter.java	20 Apr 2004 18:42:06 -0000
@@ -61,7 +61,7 @@
    * This method closes the stream.  The contents of the internal buffer
    * can still be retrieved, but future writes are not guaranteed to work.
    *
-   * @excepttion IOException If an error orrurs.
+   * @exception IOException If an error orrurs.
    */
   public void close () throws IOException
   {

--Boundary-00=_UAXhAcy18jYiCIx--




From MAILER-DAEMON Tue Apr 20 16:40:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BG22n-0001dI-Sa
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 16:40:37 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BG22k-0001bv-VT
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 16:40:34 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BG1kd-0005xg-C2
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 16:22:23 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BG1kb-0005wo-W4
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 16:21:50 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-054.ewetel.net
	[80.228.94.54])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i3KKLmMo017784
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 22:21:48 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BG1kp-0002Ex-00
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 22:22:03 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 20 Apr 2004 22:21:26 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_GZYhA10wkB1whUp"
Message-Id: <200404202221.26477.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.lang.SecurityManager
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 20 Apr 2004 20:40:35 -0000


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

Hi list,


I just commited the attached patch which implements one method in 
java.lang.SecurityManager.


Michael


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

	* java/lang/SecurityManager.java
	(checkAWTEventQueueAccess): Implemented.


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

Index: java/lang/SecurityManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/SecurityManager.java,v
retrieving revision 1.18
diff -u -r1.18 SecurityManager.java
--- java/lang/SecurityManager.java	17 Apr 2004 17:08:22 -0000	1.18
+++ java/lang/SecurityManager.java	20 Apr 2004 19:53:14 -0000
@@ -873,8 +873,7 @@
    */
   public void checkAwtEventQueueAccess()
   {
-    // Should be: checkPermission(new AWTPermission("accessEventQueue"));
-    throw new SecurityException("Cannot access the AWT event queue.");
+    checkPermission(new AWTPermission("accessEventQueue"));
   }
 
   /**

--Boundary-00=_GZYhA10wkB1whUp--




From MAILER-DAEMON Tue Apr 20 17:25:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BG2ar-0002wt-M5
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 17:15:49 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BG2VS-0001K4-90
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 17:10:14 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BG2Sj-0000Vv-0V
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 17:07:56 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BG2RC-0008Pn-DA
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 17:05:50 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-054.ewetel.net
	[80.228.94.54])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3KL5jpc024240
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 23:05:46 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BG2RM-0002NZ-00
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 23:06:01 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 20 Apr 2004 23:05:22 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_SCZhArvuFyPdmrJ"
Message-Id: <200404202305.23268.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.text - fixes for attributed strings
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 20 Apr 2004 21:15:35 -0000


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

Hi list,


I just commited the attached patch to get a fix from Graydon Hoare from 
libgcj.


Michael


2004-04-20  Graydon Hoare  <graydon@redhat.com>

	* java/text/AttributedString.java 
	(addAttribute): Fix off-by-one.
	(getIterator): Likewise.	
	* java/text/AttributedStringIterator.java 
	(getRunLimit): Correct logic.
	(getRunStart): Likewise.
	(getAttribute): Fix inequality.
	(getAttributes): Likewise.


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

Index: java/text/AttributedStringIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedStringIterator.java,v
retrieving revision 1.5
diff -u -r1.5 AttributedStringIterator.java
--- java/text/AttributedStringIterator.java	28 Feb 2004 13:18:19 -0000	1.5
+++ java/text/AttributedStringIterator.java	20 Apr 2004 21:03:36 -0000
@@ -221,39 +221,28 @@
 public synchronized int
 getRunLimit(Set attribute_set)
 {
-  int orig_index = ci.getIndex();
-  int run_limit;
+  boolean hit = false;
+  int runLimit = ci.getEndIndex ();
+  int pos = ci.getIndex ();
 
-  do  
+  for (int i = 0; i < attribs.length; ++i)
     {
-      run_limit = ci.getIndex();
-
-      Map attribute_map = getAttributes();
-
-      boolean found = false;
-      Iterator iter = attribute_set.iterator();
-      while(iter.hasNext()) 
-        if (!attribute_map.containsKey(iter.next()))
-          {
-            found = true;
-            break;
-          }
-
-      if (found)
-        break;
+      if (pos >= attribs[i].begin_index &&
+          pos <= attribs[i].end_index)
+        {
+          Iterator iter = attribute_set.iterator();
+          while(iter.hasNext()) 
+            if (attribs[i].attribs.containsKey(iter.next()))
+              {
+                hit = true;
+                runLimit = Math.min(runLimit, attribs[i].end_index);
+              }
+        }
     }
-  while (ci.next() != CharacterIterator.DONE);
-
-  boolean hit_end = (ci.previous() == CharacterIterator.DONE);
-
-  ci.setIndex(orig_index);
-
-  if (run_limit == orig_index)
-    return(-1); // No characters match the given attributes
-//  else if (!hit_end)
-//    --run_limit;
-
-  return(run_limit); 
+  if (hit)
+    return runLimit;
+  else
+    return -1;
 }
 
 /*************************************************************************/
@@ -281,35 +270,28 @@
 public int
 getRunStart(Set attribute_set)
 {
-  int orig_index = ci.getIndex();
-  int run_start;
+  boolean hit = false;
+  int runBegin = 0;
+  int pos = ci.getIndex ();
 
-  do  
+  for (int i = 0; i < attribs.length; ++i)
     {
-      run_start = ci.getIndex();
-
-      Map attribute_map = getAttributes();
-
-      Iterator iter = attribute_set.iterator();
-      while(iter.hasNext())
-        if (!attribute_map.containsKey(iter.next()))
-          break;
-
-      if (iter.hasNext())
-        break;
+      if (pos >= attribs[i].begin_index &&
+          pos <= attribs[i].end_index)
+        {
+          Iterator iter = attribute_set.iterator();
+          while(iter.hasNext()) 
+            if (attribs[i].attribs.containsKey(iter.next()))
+              {
+                hit = true;
+                runBegin = Math.max(runBegin, attribs[i].begin_index);
+              }
+        }
     }
-  while (ci.previous() != CharacterIterator.DONE);
-
-  boolean hit_beginning = (ci.previous() == CharacterIterator.DONE);
-
-  ci.setIndex(orig_index);
-
-  if (run_start == orig_index)
-    return(-1); // No characters match the given attributes
-  else if (!hit_beginning)
-    ++run_start;
-
-  return(run_start); 
+  if (hit)
+    return runBegin;
+  else
+    return -1;
 }
 
 /*************************************************************************/
Index: java/text/AttributedString.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedString.java,v
retrieving revision 1.5
diff -u -r1.5 AttributedString.java
--- java/text/AttributedString.java	8 Mar 2004 23:27:04 -0000	1.5
+++ java/text/AttributedString.java	20 Apr 2004 21:03:36 -0000
@@ -38,6 +38,7 @@
 
 package java.text;
 
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.HashMap;
 import java.util.Hashtable;
@@ -219,26 +220,7 @@
   // Get the valid attribute list
   Set all_attribs = aci.getAllAttributeKeys();
   if (attributes != null)
-    {
-      Set valid_attribs = new HashSet();
-      Iterator iter = all_attribs.iterator();
-      while (iter.hasNext())
-        {
-          Object obj = iter.next();
-
-          int i;
-          for (i = 0; i < attributes.length; i++)
-            if (obj.equals(attributes[0]))
-              break;
-
-          if (i == attributes.length)
-            continue;
-
-          valid_attribs.add(obj);
-        }
-
-      all_attribs = valid_attribs;
-    } 
+    all_attribs.retainAll(Arrays.asList(attributes));
 
   // Loop through and extract the attributes
   char c = aci.setIndex(begin_index);
@@ -320,7 +302,7 @@
 public void
 addAttribute(AttributedCharacterIterator.Attribute attrib, Object value)
 {
-  addAttribute(attrib, value, 0, sci.getEndIndex() - 1);
+  addAttribute(attrib, value, 0, sci.getEndIndex());
 }
 
 /*************************************************************************/
@@ -389,8 +371,7 @@
 public AttributedCharacterIterator
 getIterator()
 {
-  return(new AttributedStringIterator(sci, attribs, 0, sci.getEndIndex() - 1,
-                                      null));
+  return(new AttributedStringIterator(sci, attribs, 0, sci.getEndIndex(), null));
 }
 
 /*************************************************************************/
@@ -409,7 +390,7 @@
 public AttributedCharacterIterator
 getIterator(AttributedCharacterIterator.Attribute[] attributes)
 {
-  return(getIterator(attributes, 0, sci.getEndIndex() - 1));
+  return(getIterator(attributes, 0, sci.getEndIndex()));
 }
 
 /*************************************************************************/

--Boundary-00=_SCZhArvuFyPdmrJ--




From MAILER-DAEMON Tue Apr 20 17:26:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BG2eg-000439-T5
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 17:19:46 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BG2dl-0003ik-5E
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 17:18:49 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BG2ZS-0002VR-MK
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 17:14:54 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BG2Y2-00026B-L1
	for commit-classpath@gnu.org; Tue, 20 Apr 2004 17:12:54 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-054.ewetel.net
	[80.228.94.54])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3KLCqpc028985
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 23:12:53 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BG2YG-0002OC-00
	for <commit-classpath@gnu.org>; Tue, 20 Apr 2004 23:13:08 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 20 Apr 2004 23:12:30 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_+IZhAREzrpcvC03"
Message-Id: <200404202312.30889.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: inner class access fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 20 Apr 2004 21:19:45 -0000


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

Hi list,


I just comited the attached patch which fixes the access modifiers to 
two inner classes.


Michael


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

	* java/text/AttributedCharacterIterator.java
	(Attribute): Made public.
	* javax/naming/spi/DirStateFactory.java
	(Result): Made public static.


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

Index: java/text/AttributedCharacterIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedCharacterIterator.java,v
retrieving revision 1.8
diff -u -r1.8 AttributedCharacterIterator.java
--- java/text/AttributedCharacterIterator.java	2 Apr 2004 21:29:34 -0000	1.8
+++ java/text/AttributedCharacterIterator.java	20 Apr 2004 21:10:49 -0000
@@ -60,7 +60,7 @@
   /**
    * This class defines attribute keys that are used as text attributes.
    */
-  class Attribute implements Serializable
+  public static class Attribute implements Serializable
   {
     private static final long serialVersionUID = -9142742483513960612L;
 
Index: javax/naming/spi/DirStateFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/spi/DirStateFactory.java,v
retrieving revision 1.4
diff -u -r1.4 DirStateFactory.java
--- javax/naming/spi/DirStateFactory.java	2 Apr 2004 21:29:34 -0000	1.4
+++ javax/naming/spi/DirStateFactory.java	20 Apr 2004 21:10:49 -0000
@@ -53,7 +53,7 @@
 {
   // Inner class
 
-  class Result
+  public static class Result
   {
     private Object obj;
     private Attributes outAttrs;

--Boundary-00=_+IZhAREzrpcvC03--




From MAILER-DAEMON Tue Apr 20 18:30:57 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BG3ZH-00072E-7q
	for mharc-commit-classpath@gnu.org; Tue, 20 Apr 2004 18:18:15 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BB67m-0004UI-Va
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 02:01:22 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BB67G-0004JT-3K
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 02:01:22 -0400
Received: from [130.102.176.1] (helo=piglet.dstc.edu.au)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BB67F-00049U-8w
	for commit-classpath@gnu.org; Wed, 07 Apr 2004 02:00:49 -0400
Received: from dstc.edu.au (credence.dstc.edu.au [130.102.177.137])
	by piglet.dstc.edu.au (8.12.10/8.12.10) with ESMTP id i3760YmT005287;
	Wed, 7 Apr 2004 16:00:34 +1000 (EST)
Message-Id: <200404070600.i3760YmT005287@piglet.dstc.edu.au>
X-Mailer: exmh version 2.6.1 02/18/2003 with nmh-1.0.4
To: tromey@redhat.com
In-Reply-To: Message from Tom Tromey <tromey@redhat.com> 
	of "06 Apr 2004 23:31:38 CST." <87vfkc4amd.fsf@fleche.redhat.com> 
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Wed, 07 Apr 2004 16:00:37 +1000
From: Stephen Crawley <crawley@dstc.edu.au>
X-Scanned-By: MIMEDefang 2.39 (DSTC)
X-Mailman-Approved-At: Tue, 20 Apr 2004 18:18:12 -0400
Cc: crawley@dstc.edu.au, mauve-discuss@sources.redhat.com,
	commit-classpath@gnu.org
Subject: Re: Mauve patch 
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 07 Apr 2004 06:01:23 -0000


Hi Tom,

> Perhaps it is better to just remove the test. 

That would be my preferred option.

> Or make a new "unportable" section of Mauve, since some things 
> seemingly can't be tested.

I think it would be better for each JVM projects to manage its own
non-portable testcases.   In Kissme for example, there is a small
regression testsuite (called "HitMe") that tests some of Kissme's low
level and VM specific features.  

The HitMe harness assumes that less of the VM infrastructure is working
that the Mauve harness does.  There is even a version that avoids using
java.lang.io.* and uses the rc returned using System.exit() to signal
test success / failure.  Some HitMe tests require special Kissme
commandline arguments.  The makefile understands this ...

-- Steve




From MAILER-DAEMON Wed Apr 21 00:03:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BG8xW-00025F-Gh
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 00:03:38 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BG8xT-000246-A9
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 00:03:35 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BG8wx-0001y4-NO
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 00:03:34 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BG8wx-0001xP-FN
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 00:03:03 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 03950624C4
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 04:03:02 +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 50908-08 for <commit-classpath@gnu.org>;
	Wed, 21 Apr 2004 04:03:01 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-72-176.adsl.solnet.ch
	[212.41.72.176])
	by mail01.solnet.ch (Postfix) with ESMTP id 8A696624AC
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 04:03:00 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id CD07870714; Wed, 21 Apr 2004 06:00:54 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040421040054.CD07870714@reali.dnsalias.net>
Date: Wed, 21 Apr 2004 06:00:54 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040421 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 04:03:36 -0000




From MAILER-DAEMON Wed Apr 21 04:42:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGDHg-00073W-Sx
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 04:40:44 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGDHK-0006nD-7a
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 04:40:22 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGDG1-00065s-PE
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 04:39:32 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGDFr-0005w7-4a
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 04:38:51 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-007.ewetel.net
	[80.228.95.7])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3L8cjnV029207
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 10:38:45 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGDG3-0000pl-00
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 10:39:03 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 21 Apr 2004 10:38:24 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_AMjhAYXOexGq57/"
Message-Id: <200404211038.24504.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: socket fix
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 08:40:42 -0000


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

Hi Helmer,


hier ist der Patch zum Testen.


Michael

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

Index: java/net/ServerSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ServerSocket.java,v
retrieving revision 1.36
diff -u -r1.36 ServerSocket.java
--- java/net/ServerSocket.java	8 Apr 2004 16:26:04 -0000	1.36
+++ java/net/ServerSocket.java	21 Apr 2004 08:37:30 -0000
@@ -374,7 +374,7 @@
         && ! ((PlainSocketImpl) getImpl()).isInChannelOperation())
       throw new IllegalBlockingModeException();
 
-    impl.accept(socket.getImpl());
+    impl.accept(socket.impl);
   }
 
   /**
Index: java/net/Socket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Socket.java,v
retrieving revision 1.43
diff -u -r1.43 Socket.java
--- java/net/Socket.java	8 Apr 2004 16:26:04 -0000	1.43
+++ java/net/Socket.java	21 Apr 2004 08:37:30 -0000
@@ -78,7 +78,8 @@
   /**
    * The implementation object to which calls are redirected
    */
-  private SocketImpl impl;
+  // package-private because ServerSocket.implAccept() needs to access it.
+  SocketImpl impl;
 
   /**
    * True if socket implementation was created by calling their

--Boundary-00=_AMjhAYXOexGq57/--




From MAILER-DAEMON Wed Apr 21 04:49:52 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGDQW-0003X7-Bo
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 04:49:52 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGDQT-0003WA-Ux
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 04:49:49 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGDPv-00037H-Of
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 04:49:46 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGDOI-0002LA-AG
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 04:47:34 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-007.ewetel.net
	[80.228.95.7])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3L8lWD2013506
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 10:47:32 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGDOY-0000qL-00
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 10:47:50 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 21 Apr 2004 10:47:11 +0200
User-Agent: KMail/1.5.4
References: <200404211038.24504.konqueror@gmx.de>
In-Reply-To: <200404211038.24504.konqueror@gmx.de>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404211047.11617.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Re: Patch: socket fix
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 08:49:51 -0000

Am Mittwoch, 21. April 2004 10:38 schrieb Michael Koch:
> Hi Helmer,
>
>
> hier ist der Patch zum Testen.

No, this is not in cvs yet. I wanted to send it Helmer and accidently 
send it to this list. Sorry for the confusion.


Michael




From MAILER-DAEMON Wed Apr 21 06:45:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGFDx-0004a7-NF
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 06:45:01 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGFDO-0004RD-3q
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 06:44:26 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGFCg-0004Eu-CH
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 06:44:13 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGFCf-0004EY-Lc
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 06:43:41 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-007.ewetel.net
	[80.228.95.7])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3LAheD2006392
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 12:43:40 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGFCw-00016Q-00
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 12:43:58 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 21 Apr 2004 12:43:18 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_GBlhAPhhH1uR7bf"
Message-Id: <200404211243.19022.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.net - double socket creation
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 10:44:58 -0000


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

Hi list,


I just commited the attached patch with fixes a double socket creation 
when using ServerSocket.accept(). This should fix several apps that use 
ServerSocket objects.


Michael


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

	* java/net/Socket.java
	(impl): Made package-private.
	* java/net/ServerSocket.java
	(implAccept): Access Socket.impl field directly.


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

Index: java/net/ServerSocket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/ServerSocket.java,v
retrieving revision 1.36
diff -u -r1.36 ServerSocket.java
--- java/net/ServerSocket.java	8 Apr 2004 16:26:04 -0000	1.36
+++ java/net/ServerSocket.java	21 Apr 2004 09:22:45 -0000
@@ -374,7 +374,8 @@
         && ! ((PlainSocketImpl) getImpl()).isInChannelOperation())
       throw new IllegalBlockingModeException();
 
-    impl.accept(socket.getImpl());
+    impl.accept(socket.impl);
+    socket.implCreated = true;
   }
 
   /**
Index: java/net/Socket.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Socket.java,v
retrieving revision 1.43
diff -u -r1.43 Socket.java
--- java/net/Socket.java	8 Apr 2004 16:26:04 -0000	1.43
+++ java/net/Socket.java	21 Apr 2004 09:22:45 -0000
@@ -78,13 +78,15 @@
   /**
    * The implementation object to which calls are redirected
    */
-  private SocketImpl impl;
+  // package-private because ServerSocket.implAccept() needs to access it.
+  SocketImpl impl;
 
   /**
    * True if socket implementation was created by calling their
    * create() method.
    */
-  private boolean implCreated;
+  // package-private because ServerSocket.implAccept() needs to access it.
+  boolean implCreated;
 
   /**
    * True if the socket is bound.

--Boundary-00=_GBlhAPhhH1uR7bf--




From MAILER-DAEMON Wed Apr 21 08:43:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGH50-0003ps-MD
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 08:43:54 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGH4w-0003ns-5J
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 08:43:50 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGFnk-0001BH-Ak
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 07:22:31 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGFGB-00054V-5X
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 06:47:19 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-007.ewetel.net
	[80.228.95.7])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3LAlHA8028214
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 12:47:18 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGFGR-00016W-00
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 12:47:35 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 21 Apr 2004 12:46:55 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_fElhA3FdsJHNjOa"
Message-Id: <200404211246.55740.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.nio.channels.spi.AbstractSelectableChannel
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 12:43:52 -0000


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

Hi list,


I just commited the attached patch to merge a fix in 
java.nio.channels.spi.AbstractSelectableChannel from libgcj to GNU 
classpath.


Michael


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

	* java/nio/channels/spi/AbstractSelectableChannel.java
	(register): Check ops for validity.


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

Index: java/nio/channels/spi/AbstractSelectableChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractSelectableChannel.java,v
retrieving revision 1.15
diff -u -r1.15 AbstractSelectableChannel.java
--- java/nio/channels/spi/AbstractSelectableChannel.java	8 Apr 2004 20:59:20 -0000	1.15
+++ java/nio/channels/spi/AbstractSelectableChannel.java	21 Apr 2004 10:45:45 -0000
@@ -216,6 +216,9 @@
     if (! isOpen())
       throw new ClosedChannelException();
 
+    if ((ops & ~validOps()) != 0)
+      throw new IllegalArgumentException();
+    
     SelectionKey key = null;
     AbstractSelector selector = (AbstractSelector) selin;
 

--Boundary-00=_fElhA3FdsJHNjOa--




From MAILER-DAEMON Wed Apr 21 11:22:42 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGJYf-0000uY-W2
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 11:22:41 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGJYd-0000tj-SU
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:22:39 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGJY7-0000hS-9X
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:22:38 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGJY1-0000fB-T4
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:22:02 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BGJXx-00084X-00
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 17:21:57 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGJXm-00081X-00
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 17:21:46 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3LFLkLT027582
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 17:21:46 +0200 (MEST)
Message-ID: <40869189.50407@kaffe.org>
Date: Wed, 21 Apr 2004 17:21:45 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------070909070702080509020403"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: cleaned up imports in java.util.regex
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 15:22:40 -0000

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

Hi all,

I've checked in the following patch to clean up the imports in 
java.util.regex.

cheers,
dalibor topic

2004-04-21  Dalibor Topic  <robilad@kaffe.org>

         * java/util/regex/Matcher.java,
         java/util/regex/Pattern.java:
         Cleaned up imports.

--------------070909070702080509020403
Content-Type: text/plain;
 name="cpath-regex-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-regex-imports"

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2077
diff -u -r1.2077 ChangeLog
--- ChangeLog	21 Apr 2004 11:03:00 -0000	1.2077
+++ ChangeLog	21 Apr 2004 15:10:36 -0000
@@ -1,3 +1,9 @@
+2004-04-21  Dalibor Topic  <robilad@kaffe.org>
+
+	* java/util/regex/Matcher.java,
+	java/util/regex/Pattern.java:
+	Cleaned up imports.
+
 2004-04-21  Michael Koch  <konqueror@gmx.de>
 
 	* native/jni/java-net/javanet.h
Index: java/util/regex/Matcher.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/regex/Matcher.java,v
retrieving revision 1.5
diff -u -r1.5 Matcher.java
--- java/util/regex/Matcher.java	7 Mar 2004 23:58:54 -0000	1.5
+++ java/util/regex/Matcher.java	21 Apr 2004 15:10:36 -0000
@@ -38,7 +38,6 @@
 
 package java.util.regex;
 
-import gnu.regexp.RE;
 import gnu.regexp.REMatch;
 
 /**
Index: java/util/regex/Pattern.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/regex/Pattern.java,v
retrieving revision 1.6
diff -u -r1.6 Pattern.java
--- java/util/regex/Pattern.java	7 Mar 2004 23:58:54 -0000	1.6
+++ java/util/regex/Pattern.java	21 Apr 2004 15:10:36 -0000
@@ -38,8 +38,8 @@
 package java.util.regex;
 
 import gnu.regexp.RE;
-import gnu.regexp.RESyntax;
 import gnu.regexp.REException;
+import gnu.regexp.RESyntax;
 
 import java.io.Serializable;
 import java.util.ArrayList;

--------------070909070702080509020403--



From MAILER-DAEMON Wed Apr 21 11:47:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGJwF-00017G-Sz
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 11:47:03 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGJwC-00016T-2l
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:47:00 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGJvf-0000xG-Rd
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:46:59 -0400
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 1BGJvf-0000x8-FG
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:46:27 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BGJv7-0007rL-5R
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:45:53 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BGJuX-0004pM-00
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 17:45:17 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGJuU-0004nD-00
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 17:45:14 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3LFjDLT011501
	for <commit-classpath@gnu.org>; Wed, 21 Apr 2004 17:45:14 +0200 (MEST)
Message-ID: <40869709.1070002@kaffe.org>
Date: Wed, 21 Apr 2004 17:45:13 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------080209010509040901010100"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: Cleaned up imports in java.util.prefs
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 15:47:00 -0000

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

Hi all,

I've cleaned up import in java.util.prefs (alphabetical sorting, yay!).

2004-04-21  Dalibor Topic  <robilad@kaffe.org>

         * java/util/prefs/Preferences.java,
         java/util/prefs/InvalidPreferencesFormatException.java,
         java/util/prefs/BackingStoreException.java,
         java/util/prefs/AbstractPreferences.java:
         Cleaned up imports.

--------------080209010509040901010100
Content-Type: text/plain;
 name="cpath-prefs-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-prefs-imports"

Index: java/util/prefs/AbstractPreferences.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/prefs/AbstractPreferences.java,v
retrieving revision 1.6
diff -u -r1.6 AbstractPreferences.java
--- java/util/prefs/AbstractPreferences.java	26 Dec 2003 22:45:19 -0000	1.6
+++ java/util/prefs/AbstractPreferences.java	21 Apr 2004 15:41:57 -0000
@@ -38,13 +38,14 @@
 
 package java.util.prefs;
 
+import gnu.java.util.prefs.NodeWriter;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.TreeSet;
-import gnu.java.util.prefs.NodeWriter;
 
 /**
  * Partial implementation of a Preference node.
Index: java/util/prefs/BackingStoreException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/prefs/BackingStoreException.java,v
retrieving revision 1.5
diff -u -r1.5 BackingStoreException.java
--- java/util/prefs/BackingStoreException.java	2 Oct 2002 12:58:40 -0000	1.5
+++ java/util/prefs/BackingStoreException.java	21 Apr 2004 15:41:57 -0000
@@ -38,9 +38,9 @@
 
 package java.util.prefs;
 
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
 import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
 /**
  * Chained exception thrown when backing store fails. This exception is
Index: java/util/prefs/InvalidPreferencesFormatException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/prefs/InvalidPreferencesFormatException.java,v
retrieving revision 1.5
diff -u -r1.5 InvalidPreferencesFormatException.java
--- java/util/prefs/InvalidPreferencesFormatException.java	2 Oct 2002 12:58:40 -0000	1.5
+++ java/util/prefs/InvalidPreferencesFormatException.java	21 Apr 2004 15:41:57 -0000
@@ -38,9 +38,9 @@
 
 package java.util.prefs;
 
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
 import java.io.NotSerializableException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
 /**
  * Indicates reading prefs from stream failed. Thrown by the
Index: java/util/prefs/Preferences.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/prefs/Preferences.java,v
retrieving revision 1.7
diff -u -r1.7 Preferences.java
--- java/util/prefs/Preferences.java	26 Dec 2003 22:45:19 -0000	1.7
+++ java/util/prefs/Preferences.java	21 Apr 2004 15:41:57 -0000
@@ -37,15 +37,14 @@
 
 package java.util.prefs;
 
+import gnu.java.util.prefs.NodeReader;
+
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.io.IOException;
-
 import java.security.AccessController;
 import java.security.Permission;
 import java.security.PrivilegedAction;
-
-import gnu.java.util.prefs.NodeReader;
 
 /**
  * Preference node containing key value entries and subnodes.

--------------080209010509040901010100--



From MAILER-DAEMON Wed Apr 21 11:59:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGK8E-0003lv-Do
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 11:59:26 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGK8B-0003l2-Eq
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:59:23 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGK7e-0003Zx-Do
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:59:21 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGK4I-0002xM-F4
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 11:55:22 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-007.ewetel.net
	[80.228.95.7])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3LFt8pc011274;
	Wed, 21 Apr 2004 17:55:09 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGK4M-0001mD-00; Wed, 21 Apr 2004 17:55:26 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 21 Apr 2004 17:54:45 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_FlphAeE8HldExY7"
Message-Id: <200404211754.45075.konqueror@gmx.de>
X-CheckCompat: OK
Cc: brawer@acm.org
Subject: Patch: javax.imageio improvements
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 15:59:24 -0000


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

Hi list,


I just commited the attache patch to put some of my javax.imageio work 
into CVS.

Sascha: there is much more to come, I just need to clean it up and write 
javadocs.


Michael


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

	* javax/imageio/IIOException.java,
	javax/imageio/event/IIOReadProgressListener.java,
	javax/imageio/event/IIOReadUpdateListener.java,
	javax/imageio/event/IIOReadWarningListener.java,
	javax/imageio/event/IIOWriteProgressListener.java,
	javax/imageio/event/IIOWriteWarningListener.java: New files.
	* configure.ac: Added all Makefiles under javax.imageio to
	AC_OUTPUT_FILES.
	* javax/Makefile.am
	(SUBDIRS): Added imageio.
	* javax/imageio/Makefile.am
	(SUBDIRS): Added event.
	(EXTRA_DIST): Added IIOException.java.
	* javax/imageio/event/Makefile.am: New file.
	* javax/imageio/event/.cvsignore,
	javax/imageio/spi/.cvsignore,
	javax/imageio/stream/.cvsignore: New files to ignore generated files.


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

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.19
diff -u -r1.19 configure.ac
--- configure.ac	12 Apr 2004 10:43:41 -0000	1.19
+++ configure.ac	21 Apr 2004 15:48:06 -0000
@@ -378,6 +378,10 @@
 java/util/zip/Makefile
 javax/Makefile
 javax/accessibility/Makefile
+javax/imageio/Makefile
+javax/imageio/event/Makefile
+javax/imageio/spi/Makefile
+javax/imageio/stream/Makefile
 javax/naming/Makefile
 javax/naming/directory/Makefile
 javax/naming/event/Makefile
Index: javax/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- javax/Makefile.am	29 Apr 2003 09:44:33 -0000	1.9
+++ javax/Makefile.am	21 Apr 2004 15:48:06 -0000
@@ -1,3 +1,3 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = accessibility naming print rmi security sql swing transaction
+SUBDIRS = accessibility imageio naming print rmi security sql swing transaction
Index: javax/imageio/IIOException.java
===================================================================
RCS file: javax/imageio/IIOException.java
diff -N javax/imageio/IIOException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/IIOException.java	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,69 @@
+/* IIOException.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.imageio;
+
+import java.io.IOException;
+
+
+/**
+ * @author Michael Koch <konqueror@gmx.de>
+ */
+public class IIOException extends IOException
+{
+  /**
+   * Create an exception with a descriptive error message.
+   *
+   * @param message The descriptive error message.
+   */
+  public IIOException(String message)
+  {
+    super(message);
+  }
+
+  /**
+   * Create an exception with a descriptive error message.
+   *
+   * @param message The descriptive error message.
+   * @param cause The cause for this exception.
+   */
+  public IIOException(String message, Throwable cause)
+  {
+    super(message);
+    initCause(cause);
+  }
+}
Index: javax/imageio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- javax/imageio/Makefile.am	15 Apr 2004 09:30:57 -0000	1.1
+++ javax/imageio/Makefile.am	21 Apr 2004 15:48:06 -0000
@@ -1,8 +1,9 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = stream spi
+SUBDIRS = event stream spi
 
 EXTRA_DIST = \
+IIOException.java \
 ImageReader.java \
 ImageTranscoder.java \
 ImageWriter.java \
Index: javax/imageio/event/IIOReadProgressListener.java
===================================================================
RCS file: javax/imageio/event/IIOReadProgressListener.java
diff -N javax/imageio/event/IIOReadProgressListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOReadProgressListener.java	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,116 @@
+/* IIOReadProgressListener.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.imageio.event;
+
+import java.util.EventListener;
+import javax.imageio.ImageReader;
+
+
+public interface IIOReadProgressListener extends EventListener
+{
+  /**
+   * Reports that the current image read operation has completed.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   */
+  void imageComplete(ImageReader source);
+
+  /**
+   * Reports the approximate percentage of completions of this image read
+   * operation.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param percentageDone the approximate percentage of encoding completed
+   */
+  void imageProgress(ImageReader source, float percentageDone);
+
+  /**
+   * Reports that the current image read operation has started.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param imageIndex the index of the image to read
+   */
+  void imageStarted(ImageReader source, int imageIndex);
+
+  /**
+   * Reports that a read operation has been aborted.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   */
+  void readAborted(ImageReader source);
+
+  /**
+   * Reports that a sequence of read operationshas completed.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   */
+  void sequenceComplete(ImageReader source);
+
+  /**
+   * Reports that a sequence of read operations is beginning.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param minIndex the index of the first image to be read
+   */
+  void sequenceStarted(ImageReader source, int minIndex);
+
+  /**
+   * Reports that a thumbnail read operation has completed.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   */
+  void thumbnailComplete(ImageReader source);
+
+  /**
+   * Reports the approximate percentage of completion of a thumbnail read
+   * operation.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param percentageDone the approximate percentage of encoding completed
+   */
+  void thumbnailProgress(ImageReader source, float percentageDone);
+
+  /**
+   * Reports that a thumbnail read operation is beginning.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param imageIndex the index of the image being read
+   * @param thumbnailIndex the index of the thumbnail being read
+   */
+  void thumbnailStarted(ImageReader source, int imageIndex, int thumbnailIndex);
+}
Index: javax/imageio/event/IIOReadUpdateListener.java
===================================================================
RCS file: javax/imageio/event/IIOReadUpdateListener.java
diff -N javax/imageio/event/IIOReadUpdateListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOReadUpdateListener.java	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,132 @@
+/* IIOReadUpdateListener.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.imageio.event;
+
+import java.awt.image.BufferedImage;
+import java.util.EventListener;
+import javax.imageio.ImageReader;
+
+
+public interface IIOReadUpdateListener extends EventListener
+{
+  /**
+   * Reports that a given region of the image has been updated.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   * @param minX the X coordinate of the leftmost updated column of pixels
+   * @param minY the Y coordinate of the uppermost updated row of pixels
+   * @param width the number of updated pixels horizontally
+   * @param height the number of updated pixels vertically
+   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
+   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
+   * @param bands an array of <code>int</code>s indicating which bands are being updated
+   */
+  void imageUpdate(ImageReader source, BufferedImage image, int minX,
+                   int minY, int width, int height, int periodX, int periodY,
+                   int[] bands);
+
+  /**
+   * Reports that the current read operation has completed a progressive pass.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   */
+  void passComplete(ImageReader source, BufferedImage image);
+
+  /**
+   * Reports that the current read operation is about to begin a progressive pass.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   * @param pass the numer of the pass that is about to begin, starting with 0
+   * @param minPass the index of the first pass that will be decoded
+   * @param maxPass the index of the last pass that will be decoded
+   * @param minX the X coordinate of the leftmost updated column of pixels
+   * @param minY the Y coordinate of the uppermost updated row of pixels
+   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
+   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
+   * @param bands an array of <code>int</code>s indicating which bands are being updated
+   */
+  void passStarted(ImageReader source, BufferedImage image, int pass,
+                   int minPass, int maxPass, int minX, int minY, int periodX,
+                   int periodY, int[] bands);
+
+  /**
+   * Reports that the current thumbnail read operation has completed a progressive pass.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   */
+  void thumbnailPassComplete(ImageReader source, BufferedImage image);
+
+  /**
+   * Reports that the current thumbnail read operation is about to begin a progressive pass.
+   * 
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   * @param pass the numer of the pass that is about to begin, starting with 0
+   * @param minPass the index of the first pass that will be decoded
+   * @param maxPass the index of the last pass that will be decoded
+   * @param minX the X coordinate of the leftmost updated column of pixels
+   * @param minY the Y coordinate of the uppermost updated row of pixels
+   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
+   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
+   * @param bands an array of <code>int</code>s indicating which bands are being updated
+   */
+  void thumbnailPassStarted(ImageReader source, BufferedImage image, int pass,
+                            int minPass, int maxPass, int minX, int minY,
+                            int periodX, int periodY, int[] bands);
+
+  /**
+   * Reports that a given region of a thumbnail image has been updated.
+   *
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param image the BufferedImage being updated
+   * @param minX the X coordinate of the leftmost updated column of pixels
+   * @param minY the Y coordinate of the uppermost updated row of pixels
+   * @param width the number of updated pixels horizontally
+   * @param height the number of updated pixels vertically
+   * @param periodX the horizontal spacing between updated pixels; a value of 1 means no gaps
+   * @param periodY the vertical spacing between updated pixels; a value of 1 means no gaps
+   * @param bands an array of <code>int</code>s indicating which bands are being updated
+   */
+  void thumbnailUpdate(ImageReader source, BufferedImage image, int minX,
+                       int minY, int width, int height, int periodX,
+                       int periodY, int[] bands);
+}
Index: javax/imageio/event/IIOReadWarningListener.java
===================================================================
RCS file: javax/imageio/event/IIOReadWarningListener.java
diff -N javax/imageio/event/IIOReadWarningListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOReadWarningListener.java	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,54 @@
+/* IIOReadProgressListener.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.imageio.event;
+
+import java.util.EventListener;
+import javax.imageio.ImageReader;
+
+
+public interface IIOReadWarningListener extends EventListener
+{
+  /**
+   * Reports the occurrence of a non-fatal error in decoding.
+   * Decoding will continue after this method is called.
+   *
+   * @param source the <code>ImageReader</code> object calling this method
+   * @param warning the warning
+   */
+  void warningOccurred(ImageReader source, String warning);
+}
Index: javax/imageio/event/IIOWriteProgressListener.java
===================================================================
RCS file: javax/imageio/event/IIOWriteProgressListener.java
diff -N javax/imageio/event/IIOWriteProgressListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOWriteProgressListener.java	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,101 @@
+/* IIOWriteProgressListener.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.imageio.event;
+
+import java.util.EventListener;
+import javax.imageio.ImageWriter;
+
+
+public interface IIOWriteProgressListener extends EventListener
+{
+  /**
+   * Reports that an image write operation has completed.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   */
+  void imageComplete(ImageWriter source);
+
+  /**
+   * Reports the approximate percentage of completion of an image write
+   * operation.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param percentageDone the approximate percentage of decoding completed
+   */
+  void imageProgress(ImageWriter source, float percentageDone);
+
+  /**
+   * Reports that a thumbnail write operation has started.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param imageIndex the index of the image being written
+   */
+  void imageStarted(ImageWriter source, int imageIndex);
+
+  /**
+   * Reports that a thumbnail write operation has completed.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   */
+  void thumbnailComplete(ImageWriter source);
+
+  /**
+   * Reports the approximate percentage of completion of a thumbnail write
+   * operation.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param percentageDone the approximate percentage of decoding completed
+   */
+  void thumbnailProgress(ImageWriter source, float percentageDone);
+
+  /**
+   * Reports that a thumbnail write operation is beginning.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param imageIndex the index of the image being written
+   * @param thumnailIndex the index of the thumbnail being written
+   */
+  void thumbnailStarted(ImageWriter source, int imageIndex, int thumnailIndex);
+
+  /**
+   * Reports that an image write operation is aborted.
+   * 
+   * @param source the <code>ImageWriter</code> object calling this method
+   */
+  void writeAborted(ImageWriter source);
+}
Index: javax/imageio/event/IIOWriteWarningListener.java
===================================================================
RCS file: javax/imageio/event/IIOWriteWarningListener.java
diff -N javax/imageio/event/IIOWriteWarningListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/IIOWriteWarningListener.java	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,59 @@
+/* IIOWriteWarningListener.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.imageio.event;
+
+import java.util.EventListener;
+import javax.imageio.ImageWriter;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface IIOWriteWarningListener extends EventListener
+{
+  /**
+   * Reports the occurrence of a non-fatal error in encoding.
+   * Encoding will continue after this method is called.
+   *
+   * @param source the <code>ImageWriter</code> object calling this method
+   * @param imageIndex the index of the image generating this warning,
+   * starting with 0
+   * @param warning the warning
+   */
+  void warningOccurred(ImageWriter source, int imageIndex, String warning);
+}
Index: javax/imageio/event/Makefile.am
===================================================================
RCS file: javax/imageio/event/Makefile.am
diff -N javax/imageio/event/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/Makefile.am	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,8 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+EXTRA_DIST = \
+IIOReadProgressListener.java \
+IIOReadUpdateListener.java \
+IIOReadWarningListener.java \
+IIOWriteProgressListener.java \
+IIOWriteWarningListener.java
Index: javax/imageio/event/.cvsignore
===================================================================
RCS file: javax/imageio/event/.cvsignore
diff -N javax/imageio/event/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/event/.cvsignore	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: javax/imageio/spi/.cvsignore
===================================================================
RCS file: javax/imageio/spi/.cvsignore
diff -N javax/imageio/spi/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/spi/.cvsignore	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
Index: javax/imageio/stream/.cvsignore
===================================================================
RCS file: javax/imageio/stream/.cvsignore
diff -N javax/imageio/stream/.cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/imageio/stream/.cvsignore	21 Apr 2004 15:48:06 -0000
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

--Boundary-00=_FlphAeE8HldExY7--




From MAILER-DAEMON Wed Apr 21 15:26:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGNKt-0006h0-Bz
	for mharc-commit-classpath@gnu.org; Wed, 21 Apr 2004 15:24:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGNKc-0006Tc-Vt
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 15:24:26 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGNKN-0006LC-Nn
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 15:24:12 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGNKM-0006Js-S0
	for commit-classpath@gnu.org; Wed, 21 Apr 2004 15:24:11 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BGNKC-0005KV-00; Wed, 21 Apr 2004 21:24:00 +0200
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200404201356.36724.konqueror@gmx.de>
References: <200404201356.36724.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-Wp/8YZMd5lrz3btG9vyw"
Message-Id: <1082575442.27234.13.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Wed, 21 Apr 2004 21:24:02 +0200
Cc: commit-classpath@gnu.org
Subject: Re: Patch: autogen.sh
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 21 Apr 2004 19:24:31 -0000


--=-Wp/8YZMd5lrz3btG9vyw
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

On Tue, 2004-04-20 at 13:56, Michael Koch wrote:
> I just commited the attached patch to add "-I ." to the aclocal call.
> This fixes the automatic inclusion of pkg.m4 on systems where pkgconfig=20
> is not installed. I really wonder how these people wanna install the=20
> GTK peer ...

If they need this patch then they probably don't want to do that.
It works for all of us because we want to install the GTK peers. But if
someone doesn't want that then they can now run autogen.sh and do a
configure --without-gtk-peeer and be done with it. (They miss out on the
nice new-menus for example, what heay, that is their loss.)

Thanks,

Mark

--=-Wp/8YZMd5lrz3btG9vyw
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)

iD8DBQBAhspSxVhZCJWr9QwRAorYAKCgTvXvl3BwJY0KLE0qrpFyXyDWogCcC+JB
ej3lTRp4xurWZjqxmuGMwNo=
=UGPq
-----END PGP SIGNATURE-----

--=-Wp/8YZMd5lrz3btG9vyw--




From MAILER-DAEMON Thu Apr 22 00:06:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGVTV-0003hn-EL
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 00:06:09 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGVTT-0003h2-97
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 00:06:07 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGVSw-0003d4-B2
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 00:06:06 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGVPe-0003EM-Nn
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 00:02:10 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 3281F62356
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 04:02:10 +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 53201-06 for <commit-classpath@gnu.org>;
	Thu, 22 Apr 2004 04:02:09 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-94-169.adsl.solnet.ch
	[212.41.94.169])
	by mail01.solnet.ch (Postfix) with ESMTP id 19C7C6234F
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 04:02:09 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id C0B0CBB11B; Thu, 22 Apr 2004 05:59:59 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040422035959.C0B0CBB11B@reali.dnsalias.net>
Date: Thu, 22 Apr 2004 05:59:59 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040422 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 04:06:07 -0000




From MAILER-DAEMON Thu Apr 22 03:24:22 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGYZK-00048X-NK
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 03:24:22 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGYZI-000479-CD
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 03:24:20 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGYYk-0003uC-W1
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 03:24:19 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGYYk-0003tu-Iv
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 03:23:46 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-201.ewetel.net
	[80.228.94.201])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3M7Nhpc009060
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 09:23:44 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGYZ4-00020y-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 09:24:06 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 22 Apr 2004 09:23:21 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_pL3hAzbLAMWGcgg"
Message-Id: <200404220923.22529.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.awt - font handling
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 07:24:21 -0000


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

Hi list,


I just commited the attached patch to merge a fix by Jerry Quinn from 
libgcj to GNU classpath.


Michael


2004-04-22  Jerry Quinn  <jlquinn@optonline.net>

	* java/awt/Font.java (deriveFont): Implement missing variants.
	* gnu/java/awt/peer/ClasspathFontPeer.java (deriveFont): Implement
	missing variants.


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

Index: gnu/java/awt/peer/ClasspathFontPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/ClasspathFontPeer.java,v
retrieving revision 1.3
diff -u -r1.3 ClasspathFontPeer.java
--- gnu/java/awt/peer/ClasspathFontPeer.java	19 Mar 2004 21:33:54 -0000	1.3
+++ gnu/java/awt/peer/ClasspathFontPeer.java	22 Apr 2004 07:22:00 -0000
@@ -1,5 +1,5 @@
 /* ClasspathFontPeer.java -- Font peer used by GNU Classpath.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -395,6 +395,23 @@
   }
 
   /** 
+   * Implementation of {@link Font#deriveFont(int, float)}
+   *
+   * @param font the font this peer is being called from. This may be
+   * useful if you are sharing peers between Font objects. Otherwise it may
+   * be ignored.
+   */
+
+  public Font deriveFont (Font font, int style, float size)
+  {
+    Map attrs = new HashMap ();
+    getStandardAttributes (attrs);
+    copyStyleToAttrs (style, attrs);
+    copySizeToAttrs (size, attrs);
+    return tk().getFont (logicalName, attrs);
+  }
+
+  /** 
    * Implementation of {@link Font#deriveFont(float)}
    *
    * @param font the font this peer is being called from. This may be
@@ -439,6 +456,22 @@
     Map attrs = new HashMap ();
     getStandardAttributes (attrs);
     copyStyleToAttrs (style, attrs);
+    copyTransformToAttrs (t, attrs);
+    return tk().getFont (logicalName, attrs);
+  }
+
+  /** 
+   * Implementation of {@link Font#deriveFont(AffineTransform)}
+   *
+   * @param font the font this peer is being called from. This may be
+   * useful if you are sharing peers between Font objects. Otherwise it may
+   * be ignored.
+   */
+
+  public Font deriveFont (Font font, AffineTransform t)
+  {
+    Map attrs = new HashMap ();
+    getStandardAttributes (attrs);
     copyTransformToAttrs (t, attrs);
     return tk().getFont (logicalName, attrs);
   }
Index: java/awt/Font.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Font.java,v
retrieving revision 1.15
diff -u -r1.15 Font.java
--- java/awt/Font.java	19 Mar 2004 21:22:24 -0000	1.15
+++ java/awt/Font.java	22 Apr 2004 07:22:00 -0000
@@ -1,5 +1,5 @@
 /* Font.java -- Font object
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -650,6 +650,22 @@
 
 /**
   * Produces a new {@link Font} based on the current font, adjusted to a
+  * new size and style.
+  *
+  * @param style The style of the newly created font.
+  * @param size The size of the newly created font.
+  *
+  * @return A clone of the current font, with the specified size and style.
+  *
+  * @since 1.2
+  */
+  public Font deriveFont (int style, float size)
+{
+    return peer.deriveFont (this, style, size);
+}
+
+/**
+  * Produces a new {@link Font} based on the current font, adjusted to a
   * new size.
   *
   * @param size The size of the newly created font.
@@ -699,6 +715,27 @@
       throw new IllegalArgumentException ("Affine transformation is null");
 
     return peer.deriveFont (this, style, a);
+}
+
+/**
+  * Produces a new {@link Font} based on the current font, subjected
+  * to a new affine transformation.
+  *
+  * @param a The transformation to apply.
+  *
+  * @return A clone of the current font, with the specified transform.
+  *
+  * @throws IllegalArgumentException If transformation is
+  * <code>null</code>.
+  *
+  * @since 1.2
+  */
+  public Font deriveFont (AffineTransform a)
+{
+    if (a == null)
+      throw new IllegalArgumentException ("Affine transformation is null");
+
+    return peer.deriveFont (this, a);
 }
 
 /**

--Boundary-00=_pL3hAzbLAMWGcgg--




From MAILER-DAEMON Thu Apr 22 03:34:56 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGYjY-0000XC-HP
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 03:34:56 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGYjW-0000WL-9W
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 03:34:54 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGYiy-0000NE-TJ
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 03:34:52 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGYfd-0008IL-WE
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 03:30:54 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-201.ewetel.net
	[80.228.94.201])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3M7UpD2015576
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 09:30:52 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGYfy-00021G-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 09:31:14 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 22 Apr 2004 09:30:30 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_WS3hA23jl+iPClc"
Message-Id: <200404220930.30647.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.nio - optimization for direct buffers
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 07:34:54 -0000


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

Hi list,


I just commited the attached patch to merge a fix to java.nio direct 
buffers from libgcj to GNU classpath. Now mapped byte buffers use the 
optimized shiftDown() method of DirectByteBufferImpl and view buffers 
can call the optimized method too when they are a view to a direct byte 
buffer.


Michael


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

	* java/nio/DirectByteBufferImpl.java
	(shiftDown): Overwrite shiftDown method from ByteBuffer.
	* java/nio/MappedByteBufferImpl.java
	(compact): Use optimized shiftDown() method.


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

Index: java/nio/DirectByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DirectByteBufferImpl.java,v
retrieving revision 1.9
diff -u -r1.9 DirectByteBufferImpl.java
--- java/nio/DirectByteBufferImpl.java	12 Apr 2004 12:55:11 -0000	1.9
+++ java/nio/DirectByteBufferImpl.java	22 Apr 2004 07:27:17 -0000
@@ -136,15 +136,20 @@
     return this;
   }
   
-  static native void shiftDown (RawData address, int dst_offset, int src_offset, int count);
+  static native void shiftDown(RawData address, int dst_offset, int src_offset, int count);
 
+  void shiftDown(int dst_offset, int src_offset, int count)
+  {
+    shiftDown(address, dst_offset, src_offset, count);
+  }
+  
   public ByteBuffer compact ()
   {
     int pos = position();
     if (pos > 0)
       {
 	int count = remaining();
-	shiftDown(0, pos, count);
+	shiftDown(address, 0, pos, count);
 	position(count);
 	limit(capacity());
       }
Index: java/nio/MappedByteBufferImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/MappedByteBufferImpl.java,v
retrieving revision 1.8
diff -u -r1.8 MappedByteBufferImpl.java
--- java/nio/MappedByteBufferImpl.java	8 Apr 2004 21:25:59 -0000	1.8
+++ java/nio/MappedByteBufferImpl.java	22 Apr 2004 07:27:17 -0000
@@ -121,7 +121,8 @@
     if (pos > 0)
       {
 	int count = remaining();
-	shiftDown(0, pos, count);
+	// Call shiftDown method optimized for direct buffers.
+	DirectByteBufferImpl.shiftDown(address, 0, pos, count);
 	position(count);
 	limit(capacity());
       }

--Boundary-00=_WS3hA23jl+iPClc--




From MAILER-DAEMON Thu Apr 22 04:03:12 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGZAt-0008Ve-Ss
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 04:03:11 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGZAq-0008T6-OE
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 04:03:08 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGZAo-0008Sl-R5
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 04:03:07 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGZAn-0008QM-FL
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 04:03:05 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BGZAj-0007We-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 10:03:01 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-FA22n0knskN+KICQsAsD"
Message-Id: <1082620983.27234.103.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Thu, 22 Apr 2004 10:03:03 +0200
Subject: FYI: Fix nasty off by one error in VMObjectStreamClass.c
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 08:03:09 -0000


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

Hi,

There was a nasty off by one error when allocating memory in
VMObjectStreamClass. The joys of C :)

2004-04-22  Mark Wielaard  <mark@klomp.org>

        * native/jni/java-io/java_io_VMObjectStreamClass.c
        (getFieldReference): Allocate type_len + 1 bytes for type.

Committed.

Cheers,

Mark

diff -u -r1.6 java_io_VMObjectStreamClass.c
--- native/jni/java-io/java_io_VMObjectStreamClass.c    13 Apr 2004 19:41:4=
4 -0000      1.6
+++ native/jni/java-io/java_io_VMObjectStreamClass.c    22 Apr 2004 07:58:1=
3 -0000
@@ -186,7 +186,7 @@
        }
       else
        {
-         type =3D (char *) malloc(type_len);
+         type =3D (char *) malloc(type_len + 1);
          type[type_len] =3D '\0';
        }


--=-FA22n0knskN+KICQsAsD
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)

iD8DBQBAh3w2xVhZCJWr9QwRAuJ3AJ9ocJnxKS8ip0TgVDzfdrHGoCuD7gCeK4uD
bE0ql+15MCTPxJNIrr3hp6M=
=BH4K
-----END PGP SIGNATURE-----

--=-FA22n0knskN+KICQsAsD--




From MAILER-DAEMON Thu Apr 22 05:35:25 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGac9-0001yy-JV
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 05:35:25 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGac6-0001xd-J6
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 05:35:22 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGaba-0001mD-2f
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 05:35:21 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGabZ-0001m4-HH
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 05:34:49 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BGabZ-0005H8-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 11:34:49 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGabW-0005Gs-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 11:34:46 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3M9YkLT004402
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 11:34:46 +0200 (MEST)
Message-ID: <408791B5.2000406@kaffe.org>
Date: Thu, 22 Apr 2004 11:34:45 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------050408000808000007020108"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: cleaned up imports in java.util.logging
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 09:35:23 -0000

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

hi all,

i've cleaned up the imports in java.util.logging.

cheers,
dalibor topic

2004-04-22  Dalibor Topic  <robilad@kaffe.org>

         * java/util/logging/FileHandler.java,
         java/util/logging/Formatter.java,
         java/util/logging/Handler.java,
         java/util/logging/Logger.java,
         java/util/logging/SimpleFormatter.java,
         java/util/logging/XMLFormatter.java:
         Cleaned up imports.

--------------050408000808000007020108
Content-Type: text/plain;
 name="cpath-logging-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-logging-imports"

Index: java/util/logging/FileHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/FileHandler.java,v
retrieving revision 1.3
diff -u -r1.3 FileHandler.java
--- java/util/logging/FileHandler.java	13 Mar 2003 19:11:34 -0000	1.3
+++ java/util/logging/FileHandler.java	22 Apr 2004 09:30:34 -0000
@@ -1,7 +1,7 @@
 /* FileHandler.java
    -- a class for publishing log messages to log files
 
-Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,9 +41,9 @@
 
 package java.util.logging;
 
-import java.io.IOException;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 
 /**
  * A <code>FileHandler</code> publishes log records to a set of log
Index: java/util/logging/Formatter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/Formatter.java,v
retrieving revision 1.2
diff -u -r1.2 Formatter.java
--- java/util/logging/Formatter.java	30 Oct 2002 19:20:04 -0000	1.2
+++ java/util/logging/Formatter.java	22 Apr 2004 09:30:34 -0000
@@ -2,7 +2,7 @@
    -- a class for formatting log messages by localizing message texts
       and performing substitution of parameters
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,8 +43,8 @@
 
 package java.util.logging;
 
-import java.util.ResourceBundle;
 import java.text.MessageFormat;
+import java.util.ResourceBundle;
 
 /**
  * A <code>Formatter</code> supports handlers by localizing
Index: java/util/logging/Handler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/Handler.java,v
retrieving revision 1.3
diff -u -r1.3 Handler.java
--- java/util/logging/Handler.java	16 Jul 2003 10:11:46 -0000	1.3
+++ java/util/logging/Handler.java	22 Apr 2004 09:30:34 -0000
@@ -1,7 +1,7 @@
 /* Handler.java
    -- a class for publishing log messages
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,6 @@
 package java.util.logging;
 
 import java.io.UnsupportedEncodingException;
-import java.security.AccessController;
 
 /**
  * A <code>Handler</code> publishes <code>LogRecords</code> to
Index: java/util/logging/Logger.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/Logger.java,v
retrieving revision 1.5
diff -u -r1.5 Logger.java
--- java/util/logging/Logger.java	12 Aug 2003 09:46:31 -0000	1.5
+++ java/util/logging/Logger.java	22 Apr 2004 09:30:34 -0000
@@ -1,7 +1,7 @@
 /* Logger.java
    -- a class for logging messages
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,9 +42,9 @@
 
 package java.util.logging;
 
-import java.util.ResourceBundle;
-import java.util.MissingResourceException;
 import java.util.List;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
 
 /**
  * A Logger is used for logging information about events. Usually, there
Index: java/util/logging/SimpleFormatter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/SimpleFormatter.java,v
retrieving revision 1.3
diff -u -r1.3 SimpleFormatter.java
--- java/util/logging/SimpleFormatter.java	12 Aug 2003 12:06:19 -0000	1.3
+++ java/util/logging/SimpleFormatter.java	22 Apr 2004 09:30:34 -0000
@@ -1,7 +1,7 @@
 /* SimpleFormatter.java
    -- a class for formatting log records into short human-readable messages
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,8 +42,8 @@
 
 package java.util.logging;
 
-import java.util.Date;
 import java.text.DateFormat;
+import java.util.Date;
 
 /**
  * A <code>SimpleFormatter</code> formats log records into
Index: java/util/logging/XMLFormatter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/XMLFormatter.java,v
retrieving revision 1.4
diff -u -r1.4 XMLFormatter.java
--- java/util/logging/XMLFormatter.java	9 Jan 2004 08:59:30 -0000	1.4
+++ java/util/logging/XMLFormatter.java	22 Apr 2004 09:30:34 -0000
@@ -1,7 +1,7 @@
 /* XMLFormatter.java
    -- a class for formatting log messages into a standard XML format
 
-Copyright (C) 2002 Free Software Foundation, Inc.
+Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,10 +42,9 @@
 
 package java.util.logging;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.ResourceBundle;
-import java.text.MessageFormat;
-import java.text.SimpleDateFormat;
 
 /**
  * An <code>XMLFormatter</code> formats LogRecords into

--------------050408000808000007020108--



From MAILER-DAEMON Thu Apr 22 10:22:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGdTK-0002vz-92
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 08:38:30 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGdOz-0001Lz-Ua
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 08:34:01 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGdOL-00019m-7A
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 08:33:53 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGdOK-00019W-GQ
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 08:33:20 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BGcKc-00088P-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 13:25:26 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGcKZ-00087y-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 13:25:23 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3MBPNLT007640
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 13:25:23 +0200 (MEST)
Message-ID: <4087ABA3.8020805@kaffe.org>
Date: Thu, 22 Apr 2004 13:25:23 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------000503010506050902000404"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: Cleaned up imports in java.util
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 12:38:10 -0000

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

Hi all,

I've cleaned up the imports in java.util.

cheers,
dalibor topic

2004-04-22  Dalibor Topic  <robilad@kaffe.org>

         * java/util/ArrayList.java,
         java/util/Calendar.java,
         java/util/Currency.java,
         java/util/HashMap.java,
         java/util/HashSet.java,
         java/util/Hashtable.java,
         java/util/LinkedList.java,
         java/util/Properties.java,
         java/util/PropertyPermission.java,
         java/util/TimeZone.java,
         java/util/TreeMap.java,
         java/util/TreeSet.java,
         java/util/Vector.java,
         java/util/WeakHashMap.java:
         Cleaned up imports.

--------------000503010506050902000404
Content-Type: text/plain;
 name="cpath-util-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-util-imports"

Index: java/util/ArrayList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/ArrayList.java,v
retrieving revision 1.24
diff -u -r1.24 ArrayList.java
--- java/util/ArrayList.java	25 Oct 2002 13:15:58 -0000	1.24
+++ java/util/ArrayList.java	22 Apr 2004 11:21:32 -0000
@@ -1,6 +1,6 @@
 /* ArrayList.java -- JDK1.2's answer to Vector; this is an array-backed
    implementation of the List interface
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,11 +39,11 @@
 
 package java.util;
 
-import java.lang.reflect.Array;
-import java.io.Serializable;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Array;
 
 /**
  * An array-backed implementation of the List interface.  This implements
Index: java/util/Calendar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Calendar.java,v
retrieving revision 1.21
diff -u -r1.21 Calendar.java
--- java/util/Calendar.java	26 Dec 2003 22:49:19 -0000	1.21
+++ java/util/Calendar.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* java.util.Calendar
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,11 +38,11 @@
 
 package java.util;
 
-import java.lang.reflect.InvocationTargetException;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
 
 /**
  * This class is an abstract base class for Calendars, which can be
Index: java/util/Currency.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Currency.java,v
retrieving revision 1.1
diff -u -r1.1 Currency.java
--- java/util/Currency.java	24 Oct 2003 14:15:00 -0000	1.1
+++ java/util/Currency.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* Currency.java -- Representation of a currency
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,6 @@
 package java.util;
 
 import java.io.Serializable;
-import java.util.ResourceBundle;
-import java.util.Locale;
 import java.text.NumberFormat;
 
 public final class Currency implements Serializable
Index: java/util/HashMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/HashMap.java,v
retrieving revision 1.26
diff -u -r1.26 HashMap.java
--- java/util/HashMap.java	4 Jan 2004 20:39:19 -0000	1.26
+++ java/util/HashMap.java	22 Apr 2004 11:21:32 -0000
@@ -1,6 +1,6 @@
 /* HashMap.java -- a class providing a basic hashtable data structure,
    mapping Object --> Object
-   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.
 
@@ -40,9 +40,9 @@
 package java.util;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 // NOTE: This implementation is very similar to that of Hashtable. If you fix
 // a bug in here, chances are you should make a similar change to the Hashtable
Index: java/util/HashSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/HashSet.java,v
retrieving revision 1.10
diff -u -r1.10 HashSet.java
--- java/util/HashSet.java	22 Jan 2002 22:27:01 -0000	1.10
+++ java/util/HashSet.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* HashSet.java -- a class providing a HashMap-backed Set
-   Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,9 +39,9 @@
 package java.util;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * This class provides a HashMap-backed implementation of the Set interface.
Index: java/util/Hashtable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Hashtable.java,v
retrieving revision 1.31
diff -u -r1.31 Hashtable.java
--- java/util/Hashtable.java	4 Jan 2004 20:39:19 -0000	1.31
+++ java/util/Hashtable.java	22 Apr 2004 11:21:32 -0000
@@ -1,6 +1,6 @@
 /* Hashtable.java -- a class providing a basic hashtable data structure,
    mapping Object --> Object
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,9 +39,9 @@
 package java.util;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 // NOTE: This implementation is very similar to that of HashMap. If you fix
 // a bug in here, chances are you should make a similar change to the HashMap
Index: java/util/LinkedList.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/LinkedList.java,v
retrieving revision 1.22
diff -u -r1.22 LinkedList.java
--- java/util/LinkedList.java	7 May 2002 05:13:05 -0000	1.22
+++ java/util/LinkedList.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* LinkedList.java -- Linked list implementation of the List interface
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,10 @@
 
 
 package java.util;
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 import java.lang.reflect.Array;
 
 /**
Index: java/util/Properties.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Properties.java,v
retrieving revision 1.25
diff -u -r1.25 Properties.java
--- java/util/Properties.java	27 Mar 2004 14:14:57 -0000	1.25
+++ java/util/Properties.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* Properties.java -- a set of persistent properties
-   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.
 
@@ -38,14 +38,14 @@
 
 package java.util;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.PrintStream;
 import java.io.OutputStreamWriter;
+import java.io.PrintStream;
+import java.io.PrintWriter;
 
 /**
  * A set of persistent properties, which can be saved or loaded from a stream.
Index: java/util/PropertyPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/PropertyPermission.java,v
retrieving revision 1.11
diff -u -r1.11 PropertyPermission.java
--- java/util/PropertyPermission.java	20 Mar 2003 17:04:02 -0000	1.11
+++ java/util/PropertyPermission.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* PropertyPermission.java -- permission to get and set System properties
-   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,13 +38,13 @@
 
 package java.util;
 
-import java.security.Permission;
-import java.security.BasicPermission;
-import java.security.PermissionCollection;
-import java.io.ObjectStreamField;
+import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.io.IOException;
+import java.io.ObjectStreamField;
+import java.security.BasicPermission;
+import java.security.Permission;
+import java.security.PermissionCollection;
 
 /**
  * This class represents the permission to access and modify a property.<br>
Index: java/util/TimeZone.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/TimeZone.java,v
retrieving revision 1.22
diff -u -r1.22 TimeZone.java
--- java/util/TimeZone.java	26 Dec 2003 20:36:22 -0000	1.22
+++ java/util/TimeZone.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* java.util.TimeZone
-   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.
@@ -38,8 +38,9 @@
 
 
 package java.util;
-import java.text.DateFormatSymbols;
 import gnu.classpath.Configuration;
+
+import java.text.DateFormatSymbols;
 
 /**
  * This class represents a time zone offset and handles daylight savings.
Index: java/util/TreeMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/TreeMap.java,v
retrieving revision 1.22
diff -u -r1.22 TreeMap.java
--- java/util/TreeMap.java	26 Oct 2003 02:47:56 -0000	1.22
+++ java/util/TreeMap.java	22 Apr 2004 11:21:32 -0000
@@ -1,6 +1,6 @@
 /* TreeMap.java -- a class providing a basic Red-Black Tree data structure,
    mapping Object --> Object
-   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,10 +39,10 @@
 
 package java.util;
 
-import java.io.Serializable;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * This class provides a red-black tree implementation of the SortedMap
Index: java/util/TreeSet.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/TreeSet.java,v
retrieving revision 1.14
diff -u -r1.14 TreeSet.java
--- java/util/TreeSet.java	23 Jan 2002 00:06:10 -0000	1.14
+++ java/util/TreeSet.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* TreeSet.java -- a class providing a TreeMap-backed SortedSet
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,9 +39,9 @@
 package java.util;
 
 import java.io.IOException;
-import java.io.Serializable;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.Serializable;
 
 /**
  * This class provides a TreeMap-backed implementation of the SortedSet
Index: java/util/Vector.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Vector.java,v
retrieving revision 1.19
diff -u -r1.19 Vector.java
--- java/util/Vector.java	7 Apr 2002 07:39:13 -0000	1.19
+++ java/util/Vector.java	22 Apr 2004 11:21:32 -0000
@@ -1,5 +1,5 @@
 /* Vector.java -- Class that provides growable arrays.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 
 package java.util;
-import java.lang.reflect.Array;
 import java.io.Serializable;
+import java.lang.reflect.Array;
 
 /**
  * The <code>Vector</code> classes implements growable arrays of Objects.
Index: java/util/WeakHashMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/WeakHashMap.java,v
retrieving revision 1.17
diff -u -r1.17 WeakHashMap.java
--- java/util/WeakHashMap.java	1 Aug 2003 21:17:40 -0000	1.17
+++ java/util/WeakHashMap.java	22 Apr 2004 11:21:32 -0000
@@ -1,6 +1,6 @@
 /* WeakHashMap -- a hashtable that keeps only weak references
    to its keys, allowing the virtual machine to reclaim them
-   Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,8 +39,8 @@
 
 package java.util;
 
-import java.lang.ref.WeakReference;
 import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
 
 /**
  * A weak hash map has only weak references to the key. This means that it

--------------000503010506050902000404--



From MAILER-DAEMON Thu Apr 22 11:29:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGg8l-0004dJ-7O
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 11:29:27 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGg8b-0004an-V6
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 11:29:17 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGfxO-0001iS-W1
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 11:18:15 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGfxJ-0001hm-K7
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 11:17:37 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BGfxI-0007uk-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 17:17:36 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGfxE-0007tu-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 17:17:32 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3MFHWLT026104
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 17:17:32 +0200 (MEST)
Message-ID: <4087E20B.7070508@kaffe.org>
Date: Thu, 22 Apr 2004 17:17:31 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------080203010305000806020806"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: Cleaned up imports in java.util.jar
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 15:29:24 -0000

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

Hi all,

I've cleaned up the imports in java.util.jar.

cheers,
dalibor topic

2004-04-22 Dalibor Topic <robilad@kaffe.org>

         * java/util/jar/JarFile.java,
         java/util/jar/JarInputStream.java,
         java/util/jar/JarOutputStream.java,
         java/util/jar/Manifest.java:
         Cleaned up imports.

--------------080203010305000806020806
Content-Type: text/plain;
 name="cpath-jar-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-jar-imports"

Index: java/util/jar/JarFile.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/jar/JarFile.java,v
retrieving revision 1.9
diff -u -r1.9 JarFile.java
--- java/util/jar/JarFile.java	5 Feb 2003 00:05:03 -0000	1.9
+++ java/util/jar/JarFile.java	22 Apr 2004 15:07:24 -0000
@@ -1,5 +1,5 @@
 /* JarFile.java - Representation of a jar file
-   Copyright (C) 2000, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,14 +37,14 @@
 
 package java.util.jar;
 
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
 import java.io.File;
 import java.io.FileNotFoundException;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Enumeration;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
+import java.util.zip.ZipFile;
 
 /**
  * Representation of a jar file.
Index: java/util/jar/JarInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/jar/JarInputStream.java,v
retrieving revision 1.6
diff -u -r1.6 JarInputStream.java
--- java/util/jar/JarInputStream.java	26 Oct 2003 13:58:45 -0000	1.6
+++ java/util/jar/JarInputStream.java	22 Apr 2004 15:07:24 -0000
@@ -1,5 +1,5 @@
 /* JarInputStream.java - InputStream for reading jar files
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package java.util.jar;
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
Index: java/util/jar/JarOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/jar/JarOutputStream.java,v
retrieving revision 1.5
diff -u -r1.5 JarOutputStream.java
--- java/util/jar/JarOutputStream.java	22 Jan 2002 22:27:01 -0000	1.5
+++ java/util/jar/JarOutputStream.java	22 Apr 2004 15:07:24 -0000
@@ -1,5 +1,5 @@
 /* JarOutputStream.java - OutputStream for writing jar files
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package java.util.jar;
 
-import java.io.OutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
Index: java/util/jar/Manifest.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/jar/Manifest.java,v
retrieving revision 1.7
diff -u -r1.7 Manifest.java
--- java/util/jar/Manifest.java	25 Mar 2002 20:52:22 -0000	1.7
+++ java/util/jar/Manifest.java	22 Apr 2004 15:07:24 -0000
@@ -1,5 +1,5 @@
-/* Attributes.java -- Reads, writes and manipulaties jar manifest files
-   Copyright (C) 2000 Free Software Foundation, Inc.
+/* Manifest.java -- Reads, writes and manipulaties jar manifest files
+   Copyright (C) 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,12 +45,9 @@
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.Reader;
-import java.io.Writer;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * Reads, writes and manipulaties jar manifest files.

--------------080203010305000806020806--



From MAILER-DAEMON Thu Apr 22 13:18:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGhqN-0004Nd-0D
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 13:18:35 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGhqK-0004NB-TQ
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 13:18:32 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGhd6-0001Hw-9T
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 13:05:23 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BGhDJ-00041t-2f
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 12:38:13 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BGgmW-0006tT-JX
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 12:10:32 -0400
From: "Steve Haslam" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8657
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6) Gecko/20040405 Firefox/0.8
X-Apparently-From: 213.86.111.168
X-Copy-To: Array
Message-Id: <E1BGgmW-0006tT-JX@savannah.gnu.org>
Date: Thu, 22 Apr 2004 12:10:32 -0400
Subject: [bugs #8657] inetilb: APOP authentication broken [PATCH]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 17:18:33 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.




/**************************************************************************/
[bugs #8657] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8657>
Project: classpath
Submitted by: Steve Haslam
On: Thu 04/22/04 at 16:10

Severity:  5 - Average
Resolution:  None
Assigned to:  None
Status:  Open
Platform Version:  None


Summary:  inetilb: APOP authentication broken [PATCH]

Original Submission:  I had to apply a patch (attached) to gnu.inet.pop3.POP3Connection to get APOP authentication to work. The default setup tries to use APOP, fails, and throws an undetailed AuthenticationFailedException :|

Should the POP3Connection fall back to using USER to log in if no APOP timestamp was available?






File Attachments
-------------------

-------------------------------------------------------
Date: Thu 04/22/04 at 16:10  Name: apop.patch  Size: 812KB   By: araqnid
Patch for POP3Connection.java
http://savannah.gnu.org/bugs/download.php?item_id=8657&amp;item_file_id=1221






For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8657>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Thu Apr 22 13:21:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGhdL-0001LS-JI
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 13:05:07 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGhd4-0001HC-Vj
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 13:04:50 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGgjS-0004Ns-Jr
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 12:07:53 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGggS-0003Sp-EF
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 12:04:16 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BGggR-0007wx-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 18:04:15 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGggO-0007wE-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 18:04:12 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3MG4CLT022582
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 18:04:12 +0200 (MEST)
Message-ID: <4087ECFB.807@kaffe.org>
Date: Thu, 22 Apr 2004 18:04:11 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------020505000506030907010205"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: Cleaned up imports in java.sql
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 17:04:53 -0000

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

Hi all,

I've cleaned up imports in java.sql.

cheers,
dalibor topic

2004-04-22 Dalibor Topic <robilad@kaffe.org>

         * java/sql/DriverManager.java:
         Cleaned up imports.

--------------020505000506030907010205
Content-Type: text/plain;
 name="cpath-sql-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-sql-imports"

Index: java/sql/DriverManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/sql/DriverManager.java,v
retrieving revision 1.10
diff -u -r1.10 DriverManager.java
--- java/sql/DriverManager.java	19 Apr 2003 21:14:06 -0000	1.10
+++ java/sql/DriverManager.java	22 Apr 2004 16:00:26 -0000
@@ -1,5 +1,5 @@
 /* DriverManager.java -- Manage JDBC drivers
-   Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,8 +41,8 @@
 import java.io.PrintWriter;
 import java.util.Enumeration;
 import java.util.Properties;
-import java.util.Vector;
 import java.util.StringTokenizer;
+import java.util.Vector;
 
 /**
   * This class manages the JDBC drivers in the system. It maintains a

--------------020505000506030907010205--



From MAILER-DAEMON Thu Apr 22 13:39:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGi7l-0000YY-Mr
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 13:36:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGi7b-0000WV-3T
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 13:36:23 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGhQX-00074U-9x
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 12:52:24 -0400
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGguc-0007Wy-H1
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 12:18:54 -0400
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----_=_NextPart_001_01C42885.7BA5B48F"
Date: Thu, 22 Apr 2004 18:18:39 +0200
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC0ADE8F@LEMBU.sumatrasoftware.com>
Content-class: urn:content-classes:message
X-MS-Has-Attach: yes
X-MimeOLE: Produced By Microsoft Exchange V6.5.6944.0
X-MS-TNEF-Correlator: 
Thread-Topic: FYI: Patch: java.lang.Class and java.lang.VMClass
Thread-Index: AcQohXjvu5zCk63jS7mB4/QD/3p0EA==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "commit-classpath" <commit-classpath@gnu.org>
Subject: FYI: Patch: java.lang.Class and java.lang.VMClass
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 17:36:30 -0000

This is a multi-part message in MIME format.

------_=_NextPart_001_01C42885.7BA5B48F
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Hi,

I committed the attached patch.

Regards,
Jeroen

2004-04-22  Jeroen Frijters  <jeroen@frijters.net>

        * java/lang/Class.java: Changed all calls to VMClass to static
calls.
        (vmClass) Removed. (vmdata) Added. (Class) Changed argument type
        from VMClass to Object.
        * vm/reference/java/lang/VMClass.java: Changed all instance
methods
        to static methods.
        * NEWS: Added entry to describe Class/VMClass interface change.

------_=_NextPart_001_01C42885.7BA5B48F
Content-Type: application/octet-stream;
	name="class.patch"
Content-Transfer-Encoding: base64
Content-Description: class.patch
Content-Disposition: attachment;
	filename="class.patch"

SW5kZXg6IE5FV1MNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xh
c3NwYXRoL05FV1Msdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjM3DQpkaWZmIC11IC1yMS4zNyBO
RVdTDQotLS0gTkVXUwk4IEFwciAyMDA0IDA2OjQ3OjUzIC0wMDAwCTEuMzcNCisrKyBORVdTCTIy
IEFwciAyMDA0IDA5OjUzOjE2IC0wMDAwDQpAQCAtMiw2ICsyLDkgQEANCiANCiBWTSBJbnRlcmZh
Y2UgY2hhbmdlczoNCiANCisqIGphdmEubGFuZy5DbGFzcy9WTUNsYXNzIGludGVyZmFjZSB3YXMg
Y2hhbmdlZC4gVGhlIGludGVyZmFjZSBub3cgbm8NCitsb25nZXIgcmVxdWlyZXMgYW4gaW5zdGFu
Y2Ugb2YgVk1DbGFzcyBmb3IgZWFjaCBDbGFzcyBpbnN0YW5jZS4gSW5zdGVhZA0KK3RoZSBmaWVs
ZCB2bWRhdGEgaW4gQ2xhc3MgaXMgbm93IG9mIHR5cGUgT2JqZWN0Lg0KICogR05VIENsYXNzcGF0
aCBub3cgYXNzdW1lcyB0aGF0IEpOSSBjYWxscyBTZXRYRmllbGQgY2FuIG1vZGlmeSBmaW5hbA0K
IGZpZWxkcy4gVGhpcyB3YXMgcHJldmlvdXNseSB1c2VkIHNpbGVudGx5IGZvciBTeXN0ZW0uaW4v
b3V0L2VyciBhbmQgc2hvdWxkDQogYmUgY29uc2lkZXJlZCBhcyBhIGZlYXR1cmUgbm93LiANCklu
ZGV4OiBqYXZhL2xhbmcvQ2xhc3MuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290
L2NsYXNzcGF0aC9jbGFzc3BhdGgvamF2YS9sYW5nL0NsYXNzLmphdmEsdg0KcmV0cmlldmluZyBy
ZXZpc2lvbiAxLjE4DQpkaWZmIC11IC1yMS4xOCBDbGFzcy5qYXZhDQotLS0gamF2YS9sYW5nL0Ns
YXNzLmphdmEJMTcgQXByIDIwMDQgMTc6MDg6MjIgLTAwMDAJMS4xOA0KKysrIGphdmEvbGFuZy9D
bGFzcy5qYXZhCTIyIEFwciAyMDA0IDA5OjUzOjMxIC0wMDAwDQpAQCAtMTA1LDcgKzEwNSw3IEBA
DQogICAgIHVua25vd25Qcm90ZWN0aW9uRG9tYWluID0gbmV3IFByb3RlY3Rpb25Eb21haW4obnVs
bCwgcGVybWlzc2lvbnMpOw0KICAgfQ0KIA0KLSAgdHJhbnNpZW50IGZpbmFsIFZNQ2xhc3Mgdm1D
bGFzczsNCisgIHRyYW5zaWVudCBmaW5hbCBPYmplY3Qgdm1kYXRhOw0KIA0KICAgLyoqIG5ld0lu
c3RhbmNlKCkgY2FjaGVzIHRoZSBkZWZhdWx0IGNvbnN0cnVjdG9yICovDQogICBwcml2YXRlIHRy
YW5zaWVudCBDb25zdHJ1Y3RvciBjb25zdHJ1Y3RvcjsNCkBAIC0xMTQsOSArMTE0LDkgQEANCiAg
ICAqIENsYXNzIGlzIG5vbi1pbnN0YW50aWFibGUgZnJvbSBKYXZhIGNvZGU7IG9ubHkgdGhlIFZN
IGNhbiBjcmVhdGUNCiAgICAqIGluc3RhbmNlcyBvZiB0aGlzIGNsYXNzLg0KICAgICovDQotICBD
bGFzcyhWTUNsYXNzIHZtQ2xhc3MpDQorICBDbGFzcyhPYmplY3Qgdm1kYXRhKQ0KICAgew0KLSAg
ICB0aGlzLnZtQ2xhc3MgPSB2bUNsYXNzOw0KKyAgICB0aGlzLnZtZGF0YSA9IHZtZGF0YTsNCiAg
IH0NCiANCiAgIC8qKg0KQEAgLTE5MCw3ICsxOTAsNyBAQA0KIAlpZiAoYyAhPSBudWxsKQ0KIAkg
IHsNCiAJICAgIGlmIChpbml0aWFsaXplKQ0KLQkgICAgICBjLnZtQ2xhc3MuaW5pdGlhbGl6ZSgp
Ow0KKwkgICAgICBWTUNsYXNzLmluaXRpYWxpemUoYyk7DQogCSAgICByZXR1cm4gYzsNCiAJICB9
DQogICAgICAgICB0aHJvdyBuZXcgQ2xhc3NOb3RGb3VuZEV4Y2VwdGlvbihuYW1lKTsNCkBAIC0y
MDAsNyArMjAwLDcgQEANCiAgICAgQ2xhc3MgYyA9IGNsYXNzbG9hZGVyLmxvYWRDbGFzcyhuYW1l
KTsNCiAgICAgY2xhc3Nsb2FkZXIucmVzb2x2ZUNsYXNzKGMpOw0KICAgICBpZiAoaW5pdGlhbGl6
ZSkNCi0gICAgICBjLnZtQ2xhc3MuaW5pdGlhbGl6ZSgpOw0KKyAgICAgIFZNQ2xhc3MuaW5pdGlh
bGl6ZShjKTsNCiAgICAgcmV0dXJuIGM7DQogICB9DQogICANCkBAIC0yNTYsNyArMjU2LDcgQEAN
CiAgICAgaWYgKG5hbWUuc3RhcnRzV2l0aCgiamF2YS4iKSB8fCBuYW1lLnN0YXJ0c1dpdGgoImdu
dS5qYXZhLiIpKQ0KICAgICAgIHJldHVybiBudWxsOw0KIA0KLSAgICBDbGFzc0xvYWRlciBsb2Fk
ZXIgPSB2bUNsYXNzLmdldENsYXNzTG9hZGVyKCk7DQorICAgIENsYXNzTG9hZGVyIGxvYWRlciA9
IFZNQ2xhc3MuZ2V0Q2xhc3NMb2FkZXIodGhpcyk7DQogICAgIC8vIENoZWNrIGlmIHdlIG1heSBn
ZXQgdGhlIGNsYXNzbG9hZGVyDQogICAgIFNlY3VyaXR5TWFuYWdlciBzbSA9IFN5c3RlbS5nZXRT
ZWN1cml0eU1hbmFnZXIoKTsNCiAgICAgaWYgKHNtICE9IG51bGwpDQpAQCAtMjgyLDcgKzI4Miw3
IEBADQogICAgKi8NCiAgIHB1YmxpYyBDbGFzcyBnZXRDb21wb25lbnRUeXBlKCkNCiAgIHsNCi0g
ICAgcmV0dXJuIHZtQ2xhc3MuZ2V0Q29tcG9uZW50VHlwZSAoKTsNCisgICAgcmV0dXJuIFZNQ2xh
c3MuZ2V0Q29tcG9uZW50VHlwZSAodGhpcyk7DQogICB9DQogDQogICAvKioNCkBAIC0zNzgsNyAr
Mzc4LDcgQEANCiANCiAgIENsYXNzW10gZ2V0RGVjbGFyZWRDbGFzc2VzIChib29sZWFuIHB1Ymxp
Y09ubHkpDQogICB7DQotICAgIHJldHVybiB2bUNsYXNzLmdldERlY2xhcmVkQ2xhc3NlcyAocHVi
bGljT25seSk7DQorICAgIHJldHVybiBWTUNsYXNzLmdldERlY2xhcmVkQ2xhc3NlcyAodGhpcywg
cHVibGljT25seSk7DQogICB9DQogDQogICAvKioNCkBAIC00MDEsNyArNDAxLDcgQEANCiANCiAg
IENvbnN0cnVjdG9yW10gZ2V0RGVjbGFyZWRDb25zdHJ1Y3RvcnMgKGJvb2xlYW4gcHVibGljT25s
eSkNCiAgIHsNCi0gICAgcmV0dXJuIHZtQ2xhc3MuZ2V0RGVjbGFyZWRDb25zdHJ1Y3RvcnMgKHB1
YmxpY09ubHkpOw0KKyAgICByZXR1cm4gVk1DbGFzcy5nZXREZWNsYXJlZENvbnN0cnVjdG9ycyAo
dGhpcywgcHVibGljT25seSk7DQogICB9DQogICANCiAgIC8qKg0KQEAgLTQ0OSw3ICs0NDksNyBA
QA0KIA0KICAgRmllbGRbXSBnZXREZWNsYXJlZEZpZWxkcyAoYm9vbGVhbiBwdWJsaWNPbmx5KQ0K
ICAgew0KLSAgICByZXR1cm4gdm1DbGFzcy5nZXREZWNsYXJlZEZpZWxkcyAocHVibGljT25seSk7
DQorICAgIHJldHVybiBWTUNsYXNzLmdldERlY2xhcmVkRmllbGRzICh0aGlzLCBwdWJsaWNPbmx5
KTsNCiAgIH0NCiANCiAgIC8qKg0KQEAgLTUwNyw3ICs1MDcsNyBAQA0KIA0KICAgTWV0aG9kW10g
Z2V0RGVjbGFyZWRNZXRob2RzIChib29sZWFuIHB1YmxpY09ubHkpDQogICB7DQotICAgIHJldHVy
biB2bUNsYXNzLmdldERlY2xhcmVkTWV0aG9kcyAocHVibGljT25seSk7DQorICAgIHJldHVybiBW
TUNsYXNzLmdldERlY2xhcmVkTWV0aG9kcyAodGhpcywgcHVibGljT25seSk7DQogICB9DQogIA0K
ICAgLyoqDQpAQCAtNTE5LDcgKzUxOSw3IEBADQogICAgKi8NCiAgIHB1YmxpYyBDbGFzcyBnZXRE
ZWNsYXJpbmdDbGFzcygpDQogICB7DQotICAgIHJldHVybiB2bUNsYXNzLmdldERlY2xhcmluZ0Ns
YXNzICgpOw0KKyAgICByZXR1cm4gVk1DbGFzcy5nZXREZWNsYXJpbmdDbGFzcyAodGhpcyk7DQog
ICB9DQogDQogICAvKioNCkBAIC02MDgsNyArNjA4LDcgQEANCiAgICAqLw0KICAgcHVibGljIENs
YXNzW10gZ2V0SW50ZXJmYWNlcygpDQogICB7DQotICAgIHJldHVybiB2bUNsYXNzLmdldEludGVy
ZmFjZXMgKCk7DQorICAgIHJldHVybiBWTUNsYXNzLmdldEludGVyZmFjZXMgKHRoaXMpOw0KICAg
fQ0KIA0KICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgY2xhc3MgTWV0aG9kS2V5DQpAQCAtODM3LDcg
KzgzNyw3IEBADQogICAgKi8NCiAgIHB1YmxpYyBpbnQgZ2V0TW9kaWZpZXJzKCkNCiAgIHsNCi0g
ICAgcmV0dXJuIHZtQ2xhc3MuZ2V0TW9kaWZpZXJzICgpOw0KKyAgICByZXR1cm4gVk1DbGFzcy5n
ZXRNb2RpZmllcnMgKHRoaXMpOw0KICAgfQ0KICAgDQogICAvKioNCkBAIC04NjIsNyArODYyLDcg
QEANCiAgICAqLw0KICAgcHVibGljIFN0cmluZyBnZXROYW1lKCkNCiAgIHsgDQotICAgIHJldHVy
biB2bUNsYXNzLmdldE5hbWUgKCk7DQorICAgIHJldHVybiBWTUNsYXNzLmdldE5hbWUgKHRoaXMp
Ow0KICAgfQ0KIA0KICAgLyoqDQpAQCAtOTY5LDcgKzk2OSw3IEBADQogICAgKi8NCiAgIHB1Ymxp
YyBDbGFzcyBnZXRTdXBlcmNsYXNzKCkNCiAgIHsNCi0gICAgcmV0dXJuIHZtQ2xhc3MuZ2V0U3Vw
ZXJjbGFzcyAoKTsNCisgICAgcmV0dXJuIFZNQ2xhc3MuZ2V0U3VwZXJjbGFzcyAodGhpcyk7DQog
ICB9DQogICANCiAgIC8qKg0KQEAgLTk4MCwxMSArOTgwLDcgQEANCiAgICAqLw0KICAgcHVibGlj
IGJvb2xlYW4gaXNBcnJheSgpDQogICB7DQotICAgIGludCByZXN1bHQgPSAtMTsNCi0gICAgaWYg
KChyZXN1bHQgPSB2bUNsYXNzLmlzQXJyYXkgKCkpIDwgMCkNCi0gICAgICByZXR1cm4gZ2V0TmFt
ZSgpLmNoYXJBdCgwKSA9PSAnWyc7DQotDQotICAgIHJldHVybiByZXN1bHQgPT0gMTsNCisgICAg
cmV0dXJuIFZNQ2xhc3MuaXNBcnJheSAodGhpcyk7DQogICB9DQogICANCiAgIC8qKg0KQEAgLTEw
MDMsNyArOTk5LDcgQEANCiAgICAqLw0KICAgcHVibGljIGJvb2xlYW4gaXNBc3NpZ25hYmxlRnJv
bShDbGFzcyBjKQ0KICAgew0KLSAgICByZXR1cm4gdm1DbGFzcy5pc0Fzc2lnbmFibGVGcm9tIChj
KTsNCisgICAgcmV0dXJuIFZNQ2xhc3MuaXNBc3NpZ25hYmxlRnJvbSAodGhpcywgYyk7DQogICB9
DQogIA0KICAgLyoqDQpAQCAtMTAxNiw3ICsxMDEyLDcgQEANCiAgICAqLw0KICAgcHVibGljIGJv
b2xlYW4gaXNJbnN0YW5jZShPYmplY3QgbykNCiAgIHsNCi0gICAgcmV0dXJuIHZtQ2xhc3MuaXNJ
bnN0YW5jZSAobyk7DQorICAgIHJldHVybiBWTUNsYXNzLmlzSW5zdGFuY2UgKHRoaXMsIG8pOw0K
ICAgfQ0KICAgDQogICAvKioNCkBAIC0xMDI3LDcgKzEwMjMsNyBAQA0KICAgICovDQogICBwdWJs
aWMgYm9vbGVhbiBpc0ludGVyZmFjZSgpDQogICB7DQotICAgIHJldHVybiB2bUNsYXNzLmlzSW50
ZXJmYWNlICgpOw0KKyAgICByZXR1cm4gVk1DbGFzcy5pc0ludGVyZmFjZSAodGhpcyk7DQogICB9
DQogICANCiAgIC8qKg0KQEAgLTEwNTEsNyArMTA0Nyw3IEBADQogICAgKi8NCiAgIHB1YmxpYyBi
b29sZWFuIGlzUHJpbWl0aXZlKCkNCiAgIHsNCi0gICAgcmV0dXJuIHZtQ2xhc3MuaXNQcmltaXRp
dmUgKCk7DQorICAgIHJldHVybiBWTUNsYXNzLmlzUHJpbWl0aXZlICh0aGlzKTsNCiAgIH0NCiAg
IA0KICAgLyoqDQpJbmRleDogdm0vcmVmZXJlbmNlL2phdmEvbGFuZy9WTUNsYXNzLmphdmENCj09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL3ZtL3JlZmVy
ZW5jZS9qYXZhL2xhbmcvVk1DbGFzcy5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS44DQpk
aWZmIC11IC1yMS44IFZNQ2xhc3MuamF2YQ0KLS0tIHZtL3JlZmVyZW5jZS9qYXZhL2xhbmcvVk1D
bGFzcy5qYXZhCTE3IEFwciAyMDAzIDEyOjMyOjI5IC0wMDAwCTEuOA0KKysrIHZtL3JlZmVyZW5j
ZS9qYXZhL2xhbmcvVk1DbGFzcy5qYXZhCTIyIEFwciAyMDA0IDA5OjUzOjQ4IC0wMDAwDQpAQCAt
MSw1ICsxLDUgQEANCiAvKiBWTUNsYXNzLmphdmEgLS0gVk0gU3BlY2lmaWMgQ2xhc3MgbWV0aG9k
cw0KLSAgIENvcHlyaWdodCAoQykgMjAwMyBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24NCisgICBD
b3B5cmlnaHQgKEMpIDIwMDMsIDIwMDQgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uDQogDQogVGhp
cyBmaWxlIGlzIHBhcnQgb2YgR05VIENsYXNzcGF0aC4NCiANCkBAIC0zNyw3ICszNyw2IEBADQog
DQogcGFja2FnZSBqYXZhLmxhbmc7DQogDQotaW1wb3J0IGdudS5jbGFzc3BhdGguUmF3RGF0YTsN
CiBpbXBvcnQgamF2YS5sYW5nLnJlZmxlY3QuQ29uc3RydWN0b3I7DQogaW1wb3J0IGphdmEubGFu
Zy5yZWZsZWN0LkZpZWxkOw0KIGltcG9ydCBqYXZhLmxhbmcucmVmbGVjdC5NZXRob2Q7DQpAQCAt
NjgsMTcgKzY3LDYgQEANCiAgIHByaXZhdGUgbmF0aXZlIHZvaWQgc3RlcDcoKTsNCiAgIHByaXZh
dGUgbmF0aXZlIHZvaWQgc3RlcDgoKTsNCiANCi0gIC8qKg0KLSAgICogUG9pbnRlciB0byBWTSBp
bnRlcm5hbCBjbGFzcyBzdHJ1Y3R1cmUuDQotICAgKi8NCi0NCi0gIHByaXZhdGUgZmluYWwgUmF3
RGF0YSB2bURhdGE7ICANCi0NCi0gIHByaXZhdGUgVk1DbGFzcyhSYXdEYXRhIHZtRGF0YSkgDQot
ICB7IA0KLSAgICB0aGlzLnZtRGF0YSA9IHZtRGF0YTsNCi0gIH0NCi0NCiAgIHByaXZhdGUgdm9p
ZCBpbml0aWFsaXplKGludCB0aHJlYWQpIHRocm93cyBJbnRlcnJ1cHRlZEV4Y2VwdGlvbg0KICAg
ew0KICAgICBFcnJvciBlcnJvcjsNCkBAIC0xNTYsMTEgKzE0NCwxMiBAQA0KICAgICogRGlzY292
ZXIgd2hldGhlciBhbiBPYmplY3QgaXMgYW4gaW5zdGFuY2Ugb2YgdGhpcyBDbGFzcy4gIFRoaW5r
IG9mIGl0DQogICAgKiBhcyBhbG1vc3QgbGlrZSA8Y29kZT5vIGluc3RhbmNlb2YgKHRoaXMgY2xh
c3MpPC9jb2RlPi4NCiAgICAqDQorICAgKiBAcGFyYW0ga2xhc3MgdGhlIENsYXNzIG9iamVjdCB0
aGF0J3MgY2FsbGluZyB1cw0KICAgICogQHBhcmFtIG8gdGhlIE9iamVjdCB0byBjaGVjaw0KICAg
ICogQHJldHVybiB3aGV0aGVyIG8gaXMgYW4gaW5zdGFuY2Ugb2YgdGhpcyBjbGFzcw0KICAgICog
QHNpbmNlIDEuMQ0KICAgICovDQotICBuYXRpdmUgYm9vbGVhbiBpc0luc3RhbmNlKE9iamVjdCBv
KTsNCisgIHN0YXRpYyBuYXRpdmUgYm9vbGVhbiBpc0luc3RhbmNlKENsYXNzIGtsYXNzLCBPYmpl
Y3Qgbyk7DQogDQogICAvKioNCiAgICAqIERpc2NvdmVyIHdoZXRoZXIgYW4gaW5zdGFuY2Ugb2Yg
dGhlIENsYXNzIHBhcmFtZXRlciB3b3VsZCBiZSBhbg0KQEAgLTE3MCwyMSArMTU5LDIzIEBADQog
ICAgKiBjaGVja3Mgd2lkZW5pbmcgY29udmVyc2lvbnMgZm9yIG9iamVjdHMsIGl0IG11c3QgYmUg
ZXhhY3QgZm9yIHByaW1pdGl2ZQ0KICAgICogdHlwZXMuDQogICAgKg0KKyAgICogQHBhcmFtIGts
YXNzIHRoZSBDbGFzcyBvYmplY3QgdGhhdCdzIGNhbGxpbmcgdXMNCiAgICAqIEBwYXJhbSBjIHRo
ZSBjbGFzcyB0byBjaGVjaw0KICAgICogQHJldHVybiB3aGV0aGVyIGFuIGluc3RhbmNlIG9mIGMg
d291bGQgYmUgYW4gaW5zdGFuY2Ugb2YgdGhpcyBjbGFzcw0KICAgICogICAgICAgICBhcyB3ZWxs
DQogICAgKiBAdGhyb3dzIE51bGxQb2ludGVyRXhjZXB0aW9uIGlmIGMgaXMgbnVsbA0KICAgICog
QHNpbmNlIDEuMQ0KICAgICovDQotICBuYXRpdmUgYm9vbGVhbiBpc0Fzc2lnbmFibGVGcm9tKENs
YXNzIGMpOw0KKyAgc3RhdGljIG5hdGl2ZSBib29sZWFuIGlzQXNzaWduYWJsZUZyb20oQ2xhc3Mg
a2xhc3MsIENsYXNzIGMpOw0KIA0KICAgLyoqDQogICAgKiBDaGVjayB3aGV0aGVyIHRoaXMgY2xh
c3MgaXMgYW4gaW50ZXJmYWNlIG9yIG5vdC4gIEFycmF5IHR5cGVzIGFyZSBub3QNCiAgICAqIGlu
dGVyZmFjZXMuDQogICAgKg0KKyAgICogQHBhcmFtIGtsYXNzIHRoZSBDbGFzcyBvYmplY3QgdGhh
dCdzIGNhbGxpbmcgdXMNCiAgICAqIEByZXR1cm4gd2hldGhlciB0aGlzIGNsYXNzIGlzIGFuIGlu
dGVyZmFjZSBvciBub3QNCiAgICAqLw0KLSAgbmF0aXZlIGJvb2xlYW4gaXNJbnRlcmZhY2UoKTsN
CisgIHN0YXRpYyBuYXRpdmUgYm9vbGVhbiBpc0ludGVyZmFjZShDbGFzcyBrbGFzcyk7DQogDQog
ICAvKioNCiAgICAqIFJldHVybiB3aGV0aGVyIHRoaXMgY2xhc3MgaXMgYSBwcmltaXRpdmUgdHlw
ZS4gIEEgcHJpbWl0aXZlIHR5cGUgY2xhc3MNCkBAIC0xOTMsNiArMTg0LDcgQEANCiAgICAqIGNs
YXNzZXMgdGhyb3VnaCBqYXZhLmxhbmcuQm9vbGVhbi5UWVBFLCBqYXZhLmxhbmcuSW50ZWdlci5U
WVBFLCBldGMuLA0KICAgICogb3IgdGhyb3VnaCBib29sZWFuLmNsYXNzLCBpbnQuY2xhc3MsIGV0
Yy4NCiAgICAqDQorICAgKiBAcGFyYW0ga2xhc3MgdGhlIENsYXNzIG9iamVjdCB0aGF0J3MgY2Fs
bGluZyB1cw0KICAgICogQHJldHVybiB3aGV0aGVyIHRoaXMgY2xhc3MgaXMgYSBwcmltaXRpdmUg
dHlwZQ0KICAgICogQHNlZSBCb29sZWFuI1RZUEUNCiAgICAqIEBzZWUgQnl0ZSNUWVBFDQpAQCAt
MjA1LDcgKzE5Nyw3IEBADQogICAgKiBAc2VlIFZvaWQjVFlQRQ0KICAgICogQHNpbmNlIDEuMQ0K
ICAgICovDQotICBuYXRpdmUgYm9vbGVhbiBpc1ByaW1pdGl2ZSgpOw0KKyAgc3RhdGljIG5hdGl2
ZSBib29sZWFuIGlzUHJpbWl0aXZlKENsYXNzIGtsYXNzKTsNCiANCiAgIC8qKg0KICAgICogR2V0
IHRoZSBuYW1lIG9mIHRoaXMgY2xhc3MsIHNlcGFyYXRlZCBieSBkb3RzIGZvciBwYWNrYWdlIHNl
cGFyYXRvcnMuDQpAQCAtMjI0LDE4ICsyMTYsMjAgQEANCiAgICAqIGNsYXNzIG9yIGludGVyZmFj
ZSwgYWxvbmU6ICZsdDtkb3R0ZWQgbmFtZSZndDsNCiAgICAqIGNsYXNzIG9yIGludGVyZmFjZSwg
YXMgZWxlbWVudCB0eXBlOiBMJmx0O2RvdHRlZCBuYW1lJmd0OzsNCiAgICAqDQorICAgKiBAcGFy
YW0ga2xhc3MgdGhlIENsYXNzIG9iamVjdCB0aGF0J3MgY2FsbGluZyB1cw0KICAgICogQHJldHVy
biB0aGUgbmFtZSBvZiB0aGlzIGNsYXNzDQogICAgKi8NCi0gIG5hdGl2ZSBTdHJpbmcgZ2V0TmFt
ZSgpOw0KKyAgc3RhdGljIG5hdGl2ZSBTdHJpbmcgZ2V0TmFtZShDbGFzcyBrbGFzcyk7DQogDQog
ICAvKioNCiAgICAqIEdldCB0aGUgZGlyZWN0IHN1cGVyY2xhc3Mgb2YgdGhpcyBjbGFzcy4gIElm
IHRoaXMgaXMgYW4gaW50ZXJmYWNlLA0KICAgICogT2JqZWN0LCBhIHByaW1pdGl2ZSB0eXBlLCBv
ciB2b2lkLCBpdCB3aWxsIHJldHVybiBudWxsLiBJZiB0aGlzIGlzIGFuDQogICAgKiBhcnJheSB0
eXBlLCBpdCB3aWxsIHJldHVybiBPYmplY3QuDQogICAgKg0KKyAgICogQHBhcmFtIGtsYXNzIHRo
ZSBDbGFzcyBvYmplY3QgdGhhdCdzIGNhbGxpbmcgdXMNCiAgICAqIEByZXR1cm4gdGhlIGRpcmVj
dCBzdXBlcmNsYXNzIG9mIHRoaXMgY2xhc3MNCiAgICAqLw0KLSAgbmF0aXZlIENsYXNzIGdldFN1
cGVyY2xhc3MoKTsNCisgIHN0YXRpYyBuYXRpdmUgQ2xhc3MgZ2V0U3VwZXJjbGFzcyhDbGFzcyBr
bGFzcyk7DQogDQogICAvKioNCiAgICAqIEdldCB0aGUgaW50ZXJmYWNlcyB0aGlzIGNsYXNzIDxF
TT5kaXJlY3RseTwvRU0+IGltcGxlbWVudHMsIGluIHRoZQ0KQEAgLTI0Myw5ICsyMzcsMTAgQEAN
CiAgICAqIGZvciBPYmplY3QsIHByaW1pdGl2ZXMsIHZvaWQsIGFuZCBjbGFzc2VzIG9yIGludGVy
ZmFjZXMgd2l0aCBubyBkaXJlY3QNCiAgICAqIHN1cGVyaW50ZXJmYWNlLiBBcnJheSB0eXBlcyBy
ZXR1cm4gQ2xvbmVhYmxlIGFuZCBTZXJpYWxpemFibGUuDQogICAgKg0KKyAgICogQHBhcmFtIGts
YXNzIHRoZSBDbGFzcyBvYmplY3QgdGhhdCdzIGNhbGxpbmcgdXMNCiAgICAqIEByZXR1cm4gdGhl
IGludGVyZmFjZXMgdGhpcyBjbGFzcyBkaXJlY3RseSBpbXBsZW1lbnRzDQogICAgKi8NCi0gIG5h
dGl2ZSBDbGFzc1tdIGdldEludGVyZmFjZXMoKTsNCisgIHN0YXRpYyBuYXRpdmUgQ2xhc3NbXSBn
ZXRJbnRlcmZhY2VzKENsYXNzIGtsYXNzKTsNCiANCiAgIC8qKg0KICAgICogSWYgdGhpcyBpcyBh
biBhcnJheSwgZ2V0IHRoZSBDbGFzcyByZXByZXNlbnRpbmcgdGhlIHR5cGUgb2YgYXJyYXkuDQpA
QCAtMjUzLDExICsyNDgsMTIgQEANCiAgICAqIGNhbGxpbmcgZ2V0Q29tcG9uZW50VHlwZSBvbiB0
aGF0IHdvdWxkIGdpdmUgImphdmEubGFuZy5TdHJpbmciLiAgSWYNCiAgICAqIHRoaXMgaXMgbm90
IGFuIGFycmF5LCByZXR1cm5zIG51bGwuDQogICAgKg0KKyAgICogQHBhcmFtIGtsYXNzIHRoZSBD
bGFzcyBvYmplY3QgdGhhdCdzIGNhbGxpbmcgdXMNCiAgICAqIEByZXR1cm4gdGhlIGFycmF5IHR5
cGUgb2YgdGhpcyBjbGFzcywgb3IgbnVsbA0KICAgICogQHNlZSBBcnJheQ0KICAgICogQHNpbmNl
IDEuMQ0KICAgICovDQotICBuYXRpdmUgQ2xhc3MgZ2V0Q29tcG9uZW50VHlwZSgpOw0KKyAgc3Rh
dGljIG5hdGl2ZSBDbGFzcyBnZXRDb21wb25lbnRUeXBlKENsYXNzIGtsYXNzKTsNCiANCiAgIC8q
Kg0KICAgICogR2V0IHRoZSBtb2RpZmllcnMgb2YgdGhpcyBjbGFzcy4gIFRoZXNlIGNhbiBiZSBk
ZWNvZGVkIHVzaW5nIE1vZGlmaWVyLA0KQEAgLTI2Nyw1NiArMjYzLDYzIEBADQogICAgKiBtYXJr
ZWQgZmluYWwgYnV0IG5vdCBhbiBpbnRlcmZhY2UuIFByaW1pdGl2ZSB0eXBlcyBhbmQgdm9pZCBh
cmUgbWFya2VkDQogICAgKiBwdWJsaWMgYW5kIGZpbmFsLCBidXQgbm90IGFuIGludGVyZmFjZS4N
CiAgICAqDQorICAgKiBAcGFyYW0ga2xhc3MgdGhlIENsYXNzIG9iamVjdCB0aGF0J3MgY2FsbGlu
ZyB1cw0KICAgICogQHJldHVybiB0aGUgbW9kaWZpZXJzIG9mIHRoaXMgY2xhc3MNCiAgICAqIEBz
ZWUgTW9kaWZlcg0KICAgICogQHNpbmNlIDEuMQ0KICAgICovDQotICBuYXRpdmUgaW50IGdldE1v
ZGlmaWVycygpOw0KKyAgc3RhdGljIG5hdGl2ZSBpbnQgZ2V0TW9kaWZpZXJzKENsYXNzIGtsYXNz
KTsNCiANCiAgIC8qKg0KICAgICogSWYgdGhpcyBpcyBhIG5lc3RlZCBvciBpbm5lciBjbGFzcywg
cmV0dXJuIHRoZSBjbGFzcyB0aGF0IGRlY2xhcmVkIGl0Lg0KICAgICogSWYgbm90LCByZXR1cm4g
bnVsbC4NCiAgICAqDQorICAgKiBAcGFyYW0ga2xhc3MgdGhlIENsYXNzIG9iamVjdCB0aGF0J3Mg
Y2FsbGluZyB1cw0KICAgICogQHJldHVybiB0aGUgZGVjbGFyaW5nIGNsYXNzIG9mIHRoaXMgY2xh
c3MNCiAgICAqIEBzaW5jZSAxLjENCiAgICAqLw0KLSAgbmF0aXZlIENsYXNzIGdldERlY2xhcmlu
Z0NsYXNzKCk7DQorICBzdGF0aWMgbmF0aXZlIENsYXNzIGdldERlY2xhcmluZ0NsYXNzKENsYXNz
IGtsYXNzKTsNCiANCiAgIC8qKg0KICAgICogTGlrZSA8Y29kZT5nZXREZWNsYXJlZENsYXNzZXMo
KTwvY29kZT4gYnV0IHdpdGhvdXQgdGhlIHNlY3VyaXR5IGNoZWNrcy4NCiAgICAqDQorICAgKiBA
cGFyYW0ga2xhc3MgdGhlIENsYXNzIG9iamVjdCB0aGF0J3MgY2FsbGluZyB1cw0KICAgICogQHBh
cmFtIHB1bGljT25seSBPbmx5IHB1YmxpYyBjbGFzc2VzIHNob3VsZCBiZSByZXR1cm5lZA0KICAg
ICovDQotICBuYXRpdmUgQ2xhc3NbXSBnZXREZWNsYXJlZENsYXNzZXMoYm9vbGVhbiBwdWJsaWNP
bmx5KTsNCisgIHN0YXRpYyBuYXRpdmUgQ2xhc3NbXSBnZXREZWNsYXJlZENsYXNzZXMoQ2xhc3Mg
a2xhc3MsIGJvb2xlYW4gcHVibGljT25seSk7DQogDQogICAvKioNCiAgICAqIExpa2UgPGNvZGU+
Z2V0RGVjbGFyZWRGaWVsZHMoKTwvY29kZT4gYnV0IHdpdGhvdXQgdGhlIHNlY3VyaXR5IGNoZWNr
cy4NCiAgICAqDQorICAgKiBAcGFyYW0ga2xhc3MgdGhlIENsYXNzIG9iamVjdCB0aGF0J3MgY2Fs
bGluZyB1cw0KICAgICogQHBhcmFtIHB1bGljT25seSBPbmx5IHB1YmxpYyBmaWVsZHMgc2hvdWxk
IGJlIHJldHVybmVkDQogICAgKi8NCi0gIG5hdGl2ZSBGaWVsZFtdIGdldERlY2xhcmVkRmllbGRz
KGJvb2xlYW4gcHVibGljT25seSk7DQorICBzdGF0aWMgbmF0aXZlIEZpZWxkW10gZ2V0RGVjbGFy
ZWRGaWVsZHMoQ2xhc3Mga2xhc3MsIGJvb2xlYW4gcHVibGljT25seSk7DQogDQogICAvKioNCiAg
ICAqIExpa2UgPGNvZGU+Z2V0RGVjbGFyZWRNZXRob2RzKCk8L2NvZGU+IGJ1dCB3aXRob3V0IHRo
ZSBzZWN1cml0eSBjaGVja3MuDQogICAgKg0KKyAgICogQHBhcmFtIGtsYXNzIHRoZSBDbGFzcyBv
YmplY3QgdGhhdCdzIGNhbGxpbmcgdXMNCiAgICAqIEBwYXJhbSBwdWxpY09ubHkgT25seSBwdWJs
aWMgbWV0aG9kcyBzaG91bGQgYmUgcmV0dXJuZWQNCiAgICAqLw0KLSAgbmF0aXZlIE1ldGhvZFtd
IGdldERlY2xhcmVkTWV0aG9kcyhib29sZWFuIHB1YmxpY09ubHkpOw0KKyAgc3RhdGljIG5hdGl2
ZSBNZXRob2RbXSBnZXREZWNsYXJlZE1ldGhvZHMoQ2xhc3Mga2xhc3MsIGJvb2xlYW4gcHVibGlj
T25seSk7DQogDQogICAvKioNCiAgICAqIExpa2UgPGNvZGU+Z2V0RGVjbGFyZWRDb25zdHJ1Y3Rv
cnMoKTwvY29kZT4gYnV0IHdpdGhvdXQNCiAgICAqIHRoZSBzZWN1cml0eSBjaGVja3MuDQogICAg
Kg0KKyAgICogQHBhcmFtIGtsYXNzIHRoZSBDbGFzcyBvYmplY3QgdGhhdCdzIGNhbGxpbmcgdXMN
CiAgICAqIEBwYXJhbSBwdWxpY09ubHkgT25seSBwdWJsaWMgY29uc3RydWN0b3JzIHNob3VsZCBi
ZSByZXR1cm5lZA0KICAgICovDQotICBuYXRpdmUgQ29uc3RydWN0b3JbXSBnZXREZWNsYXJlZENv
bnN0cnVjdG9ycyhib29sZWFuIHB1YmxpY09ubHkpOw0KKyAgc3RhdGljIG5hdGl2ZSBDb25zdHJ1
Y3RvcltdIGdldERlY2xhcmVkQ29uc3RydWN0b3JzKENsYXNzIGtsYXNzLCBib29sZWFuIHB1Ymxp
Y09ubHkpOw0KIA0KICAgLyoqDQogICAgKiBSZXR1cm4gdGhlIGNsYXNzIGxvYWRlciBvZiB0aGlz
IGNsYXNzLg0KICAgICoNCisgICAqIEBwYXJhbSBrbGFzcyB0aGUgQ2xhc3Mgb2JqZWN0IHRoYXQn
cyBjYWxsaW5nIHVzDQogICAgKiBAcmV0dXJuIHRoZSBjbGFzcyBsb2FkZXINCiAgICAqLw0KLSAg
bmF0aXZlIENsYXNzTG9hZGVyIGdldENsYXNzTG9hZGVyKCk7DQorICBzdGF0aWMgbmF0aXZlIENs
YXNzTG9hZGVyIGdldENsYXNzTG9hZGVyKENsYXNzIGtsYXNzKTsNCiANCiAgIC8qKg0KICAgICog
Vk0gaW1wbGVtZW50b3JzIGFyZSBmcmVlIHRvIG1ha2UgdGhpcyBtZXRob2QgYSBub29wIGlmIA0K
QEAgLTMzNSwxOSArMzM4LDIxIEBADQogICAvKioNCiAgICAqIFJldHVybiB3aGV0aGVyIHRoaXMg
Y2xhc3MgaXMgYW4gYXJyYXkgdHlwZS4NCiAgICAqDQotICAgKiBAcmV0dXJuIDEgaWYgdGhpcyBj
bGFzcyBpcyBhbiBhcnJheSB0eXBlLCAwIG90aGVyd2lzZSwgLTEgaWYgdW5zdXBwb3J0ZWQNCisg
ICAqIEBwYXJhbSBrbGFzcyB0aGUgQ2xhc3Mgb2JqZWN0IHRoYXQncyBjYWxsaW5nIHVzDQorICAg
KiBAcmV0dXJuIHRydWUgaWYgdGhpcyBjbGFzcyBpcyBhbiBhcnJheSB0eXBlDQogICAgKiBvcGVy
YXRpb24NCiAgICAqLw0KLSAgbmF0aXZlIGludCBpc0FycmF5KCk7DQorICBzdGF0aWMgbmF0aXZl
IGJvb2xlYW4gaXNBcnJheShDbGFzcyBrbGFzcyk7DQogDQogICAvKioNCiAgICAqIFRoaXMgbWV0
aG9kIHNob3VsZCB0cmlnZ2VyIGNsYXNzIGluaXRpYWxpemF0aW9uIChpZiB0aGUNCiAgICAqIGNs
YXNzIGhhc24ndCBhbHJlYWR5IGJlZW4gaW5pdGlhbGl6ZWQpDQogICAgKiANCisgICAqIEBwYXJh
bSBrbGFzcyB0aGUgQ2xhc3Mgb2JqZWN0IHRoYXQncyBjYWxsaW5nIHVzDQogICAgKiBAdGhyb3dz
IEV4Y2VwdGlvbkluSW5pdGlhbGl6ZXJFcnJvciBpZiBhbiBleGNlcHRpb24NCiAgICAqICAgICAg
ICAgb2NjdXJzIGR1cmluZyBpbml0aWFsaXphdGlvbg0KICAgICovDQotICBuYXRpdmUgdm9pZCBp
bml0aWFsaXplKCk7DQorICBzdGF0aWMgbmF0aXZlIHZvaWQgaW5pdGlhbGl6ZShDbGFzcyBrbGFz
cyk7DQogDQogICAvKioNCiAgICAqIExvYWQgYW4gYXJyYXkgY2xhc3MuDQo=

------_=_NextPart_001_01C42885.7BA5B48F--



From MAILER-DAEMON Thu Apr 22 15:23:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGjnJ-0001DA-On
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 15:23:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGjnF-0001Bh-EQ
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 15:23:29 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGjHY-00028Z-7Q
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 14:51:15 -0400
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 1BGjHX-00028Q-IF
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 14:50:43 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BGium-00029f-If
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 14:27:12 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-93-229.ewetel.net
	[80.228.93.229])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3MIOwB5014501
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 20:24:58 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGit1-0003V1-00
	for <commit-classpath@gnu.org>; Thu, 22 Apr 2004 20:25:23 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 22 Apr 2004 20:24:37 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_l3AiAXGkyTor0MO"
Message-Id: <200404222024.37869.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: gtk embedded window peer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 19:23:31 -0000


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

Hi list,


I just megred the attached patch from libgcj to make it possible with 
GNU classpath to embed awt/swing windows into other apps.
This is the GTK peer implementation for this GNU extension.


Michael


2004-04-22  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c:
	(create(long)): Take long parameter, not int.  Cast gtk_plug_new
	argument to GdkNativeWindow.
	(construct): New method.


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

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c	29 Mar 2004 07:07:26 -0000	1.3
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c	22 Apr 2004 18:10:09 -0000
@@ -1,5 +1,6 @@
-/* GtkEmbeddedWindowPeer.c -
-   Copyright (C) 2004 Free Software Foundation, Inc.
+/* gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.c -- Native
+   implementation of GtkEmbeddedWindowPeer
+   Copyright (C) 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +8,7 @@
 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
@@ -35,24 +36,51 @@
 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 "gtkpeer.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)
+Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_create
+  (JNIEnv *env, jobject obj, jlong socket_id)
 {
-  JCL_ThrowException (env, AWT_EXCEPTION, "gnu.java.awt.peer.gtk.GtkEmbbeddedWindowPeer.create(): not implemented");
+  GtkWidget *window;
+  GtkWidget *vbox, *layout;
+
+  /* Create global reference and save it for future use */
+  NSA_SET_GLOBAL_REF (env, obj);
+
+  gdk_threads_enter ();
+
+  window = gtk_plug_new ((GdkNativeWindow) socket_id);
+
+  vbox = gtk_vbox_new (0, 0);
+  layout = gtk_layout_new (NULL, NULL);
+  gtk_box_pack_end (GTK_BOX (vbox), layout, 1, 1, 0);
+  gtk_container_add (GTK_CONTAINER (window), vbox);
+
+  gtk_widget_show (layout);
+  gtk_widget_show (vbox);
+
+  gdk_threads_leave ();
+
+  NSA_SET_PTR (env, obj, window);
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject obj, jlong socket_id)
+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");
+  void *ptr;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  if (GTK_WIDGET_REALIZED (GTK_WIDGET (ptr)))
+    g_printerr ("ERROR: GtkPlug is already realized\n");
+
+  gtk_plug_construct (GTK_PLUG (ptr), (GdkNativeWindow) socket_id);
+
+  gdk_threads_leave ();
 }

--Boundary-00=_l3AiAXGkyTor0MO--




From MAILER-DAEMON Thu Apr 22 18:14:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGmSJ-0007yS-2t
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 18:14:03 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGmS9-0007wc-V0
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 18:13:53 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGmS8-0007wI-FG
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 18:13:52 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGmS6-0007vd-C6
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 18:13:50 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BGmRw-0001cm-00; Fri, 23 Apr 2004 00:13:40 +0200
From: Mark Wielaard <mark@klomp.org>
To: Archie Cobbs <archie@dellroad.org>
In-Reply-To: <200404221803.i3MI3KeH016620@arch20m.dellroad.org>
References: <200404221803.i3MI3KeH016620@arch20m.dellroad.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-9jFwX4oN8nG6k0Lubjfn"
Message-Id: <1082672022.27234.178.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 23 Apr 2004 00:13:42 +0200
Cc: commit-classpath@gnu.org
Subject: Re: 0.09 release target date is next Friday April 30
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 22:13:54 -0000


--=-9jFwX4oN8nG6k0Lubjfn
Content-Type: multipart/mixed; boundary="=-QlCuS4ifVXayNANDopOZ"


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

Hi (CC commit-classpath so others can review),

On Thu, 2004-04-22 at 20:03, Archie Cobbs wrote:
> Mark Wielaard wrote:
> > I had some troubles with waitpid which was using an uninitialized pid_t
> > argument which I assume should actually be -1. And FileDescriptors are
> > now created differently. I'll let you know when I have it up and
> > running.
>=20
> Great.. here's the latest version of my patch. It probably has some
> of the same fixes you have made, plus a few others.. hopefully our
> fixes should merge easily.

OK. I added two things.

- Explicitly set the path to change to.
- Make setProcessInfo() accept Input and Output streams which are now
  completely constructed natively (because of changes to
  FileDescriptor).

My diff is attached.

There is only one test in Mauve for Runtime.exec() though (and it isn't
really a test for Runtime.exec()) so it probably needs some more
testing. But it is certainly better then what we had!

We do need to reindent the java sources to conform to the coding
conventions. And I would like to see the VMProcess interface being a bit
smaller. Maybe we can have a package private class non-abstract
ClasspathProcess class in java/lang. And then a VMProcess class that
just has the nativeSpawn, nativeReap and nativeKill methods and holds
the pid. That would prevent to much copy/paste programming for some of
the runtime implementers. But I haven't thought about that very hard
yet.

Thanks,

Mark

--=-QlCuS4ifVXayNANDopOZ
Content-Disposition: inline; filename=Process.diff
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=Process.diff; charset=ISO-8859-1

SW5kZXg6IGluY2x1ZGUvTWFrZWZpbGUuYW0NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9jbGFzc3BhdGgvY2xhc3NwYXRoL2luY2x1ZGUvTWFrZWZpbGUuYW0sdg0KcmV0cmlldmluZyBy
ZXZpc2lvbiAxLjE1DQpkaWZmIC11IC11IC1yMS4xNSBNYWtlZmlsZS5hbQ0KLS0tIGluY2x1ZGUv
TWFrZWZpbGUuYW0JMTggQXByIDIwMDQgMTU6NDE6MTcgLTAwMDAJMS4xNQ0KKysrIGluY2x1ZGUv
TWFrZWZpbGUuYW0JMjIgQXByIDIwMDQgMjI6MDU6MDUgLTAwMDANCkBAIC00OSw2ICs0OSw3IEBA
DQogJCh0b3Bfc3JjZGlyKS9pbmNsdWRlL2phdmFfbGFuZ19NYXRoLmggXA0KICQodG9wX3NyY2Rp
cikvaW5jbHVkZS9qYXZhX2xhbmdfT2JqZWN0LmggXA0KICQodG9wX3NyY2RpcikvaW5jbHVkZS9q
YXZhX2xhbmdfVk1GbG9hdC5oIFwNCiskKHRvcF9zcmNkaXIpL2luY2x1ZGUvamF2YV9sYW5nX1ZN
UHJvY2Vzcy5oIFwNCiAkKHRvcF9zcmNkaXIpL2luY2x1ZGUvamF2YV9sYW5nX1ZNUnVudGltZS5o
IFwNCiAkKHRvcF9zcmNkaXIpL2luY2x1ZGUvamF2YV9sYW5nX1ZNU3lzdGVtLmggXA0KICQodG9w
X3NyY2RpcikvaW5jbHVkZS9qYXZhX2xhbmdfcmVmbGVjdF9BcnJheS5oIFwNCkBAIC0xNTEsNiAr
MTUyLDggQEANCiAJJChKQVZBSCkgLW8gJEAgamF2YS5sYW5nLk9iamVjdA0KICQodG9wX3NyY2Rp
cikvaW5jbHVkZS9qYXZhX2xhbmdfVk1GbG9hdC5oOiAkKHRvcF9zcmNkaXIpL3ZtL3JlZmVyZW5j
ZS9qYXZhL2xhbmcvVk1GbG9hdC5qYXZhDQogCSQoSkFWQUgpIC1vICRAIGphdmEubGFuZy5WTUZs
b2F0DQorJCh0b3Bfc3JjZGlyKS9pbmNsdWRlL2phdmFfbGFuZ19WTVByb2Nlc3MuaDogJCh0b3Bf
c3JjZGlyKS92bS9yZWZlcmVuY2UvamF2YS9sYW5nL1ZNUHJvY2Vzcy5qYXZhDQorCSQoSkFWQUgp
IC1vICRAIGphdmEubGFuZy5WTVByb2Nlc3MNCiAkKHRvcF9zcmNkaXIpL2luY2x1ZGUvamF2YV9s
YW5nX1ZNUnVudGltZS5oOiAkKHRvcF9zcmNkaXIpL3ZtL3JlZmVyZW5jZS9qYXZhL2xhbmcvVk1S
dW50aW1lLmphdmENCiAJJChKQVZBSCkgLW8gJEAgamF2YS5sYW5nLlZNUnVudGltZQ0KICQodG9w
X3NyY2RpcikvaW5jbHVkZS9qYXZhX2xhbmdfVk1TeXN0ZW0uaDogJCh0b3Bfc3JjZGlyKS92bS9y
ZWZlcmVuY2UvamF2YS9sYW5nL1ZNU3lzdGVtLmphdmENCkluZGV4OiBpbmNsdWRlL2phdmFfbGFu
Z19WTVByb2Nlc3MuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IGluY2x1ZGUvamF2YV9sYW5nX1ZN
UHJvY2Vzcy5oDQpkaWZmIC1OIGluY2x1ZGUvamF2YV9sYW5nX1ZNUHJvY2Vzcy5oDQotLS0gL2Rl
di9udWxsCTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDANCisrKyBpbmNsdWRlL2phdmFfbGFuZ19W
TVByb2Nlc3MuaAkyMiBBcHIgMjAwNCAyMjowNTowNSAtMDAwMA0KQEAgLTAsMCArMSwyMSBAQA0K
Ky8qIERPIE5PVCBFRElUIFRISVMgRklMRSAtIGl0IGlzIG1hY2hpbmUgZ2VuZXJhdGVkICovDQor
DQorI2lmbmRlZiBfX2phdmFfbGFuZ19WTVByb2Nlc3NfXw0KKyNkZWZpbmUgX19qYXZhX2xhbmdf
Vk1Qcm9jZXNzX18NCisNCisjaW5jbHVkZSA8am5pLmg+DQorDQorI2lmZGVmIF9fY3BsdXNwbHVz
DQorZXh0ZXJuICJDIg0KK3sNCisjZW5kaWYNCisNCitleHRlcm4gSk5JRVhQT1JUIHZvaWQgSk5J
Q0FMTCBKYXZhX2phdmFfbGFuZ19WTVByb2Nlc3NfbmF0aXZlU3Bhd24gKEpOSUVudiAqZW52LCBq
b2JqZWN0LCBqb2JqZWN0QXJyYXksIGpvYmplY3RBcnJheSwgam9iamVjdCk7DQorZXh0ZXJuIEpO
SUVYUE9SVCBqYm9vbGVhbiBKTklDQUxMIEphdmFfamF2YV9sYW5nX1ZNUHJvY2Vzc19uYXRpdmVS
ZWFwIChKTklFbnYgKmVudiwgamNsYXNzKTsNCitleHRlcm4gSk5JRVhQT1JUIHZvaWQgSk5JQ0FM
TCBKYXZhX2phdmFfbGFuZ19WTVByb2Nlc3NfbmF0aXZlS2lsbCAoSk5JRW52ICplbnYsIGpjbGFz
cywgamxvbmcpOw0KKw0KKyNpZmRlZiBfX2NwbHVzcGx1cw0KK30NCisjZW5kaWYNCisNCisjZW5k
aWYgLyogX19qYXZhX2xhbmdfVk1Qcm9jZXNzX18gKi8NCkluZGV4OiBpbmNsdWRlL2phdmFfbGFu
Z19WTVJ1bnRpbWUuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9j
bGFzc3BhdGgvaW5jbHVkZS9qYXZhX2xhbmdfVk1SdW50aW1lLmgsdg0KcmV0cmlldmluZyByZXZp
c2lvbiAxLjINCmRpZmYgLXUgLXUgLXIxLjIgamF2YV9sYW5nX1ZNUnVudGltZS5oDQotLS0gaW5j
bHVkZS9qYXZhX2xhbmdfVk1SdW50aW1lLmgJMjcgRGVjIDIwMDMgMTY6Mzg6NDMgLTAwMDAJMS4y
DQorKysgaW5jbHVkZS9qYXZhX2xhbmdfVk1SdW50aW1lLmgJMjIgQXByIDIwMDQgMjI6MDU6MDUg
LTAwMDANCkBAIC0yMyw3ICsyMyw2IEBADQogZXh0ZXJuIEpOSUVYUE9SVCB2b2lkIEpOSUNBTEwg
SmF2YV9qYXZhX2xhbmdfVk1SdW50aW1lX2V4aXQgKEpOSUVudiAqZW52LCBqY2xhc3MsIGppbnQp
Ow0KIGV4dGVybiBKTklFWFBPUlQgamludCBKTklDQUxMIEphdmFfamF2YV9sYW5nX1ZNUnVudGlt
ZV9uYXRpdmVMb2FkIChKTklFbnYgKmVudiwgamNsYXNzLCBqc3RyaW5nKTsNCiBleHRlcm4gSk5J
RVhQT1JUIGpzdHJpbmcgSk5JQ0FMTCBKYXZhX2phdmFfbGFuZ19WTVJ1bnRpbWVfbmF0aXZlR2V0
TGlibmFtZSAoSk5JRW52ICplbnYsIGpjbGFzcywganN0cmluZywganN0cmluZyk7DQotZXh0ZXJu
IEpOSUVYUE9SVCBqb2JqZWN0IEpOSUNBTEwgSmF2YV9qYXZhX2xhbmdfVk1SdW50aW1lX2V4ZWMg
KEpOSUVudiAqZW52LCBqY2xhc3MsIGpvYmplY3RBcnJheSwgam9iamVjdEFycmF5LCBqb2JqZWN0
KTsNCiBleHRlcm4gSk5JRVhQT1JUIHZvaWQgSk5JQ0FMTCBKYXZhX2phdmFfbGFuZ19WTVJ1bnRp
bWVfaW5zZXJ0U3lzdGVtUHJvcGVydGllcyAoSk5JRW52ICplbnYsIGpjbGFzcywgam9iamVjdCk7
DQogDQogI2lmZGVmIF9fY3BsdXNwbHVzDQpJbmRleDogbmF0aXZlL2puaS9qYXZhLWxhbmcvTWFr
ZWZpbGUuYW0NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3Nw
YXRoL25hdGl2ZS9qbmkvamF2YS1sYW5nL01ha2VmaWxlLmFtLHYNCnJldHJpZXZpbmcgcmV2aXNp
b24gMS43DQpkaWZmIC11IC11IC1yMS43IE1ha2VmaWxlLmFtDQotLS0gbmF0aXZlL2puaS9qYXZh
LWxhbmcvTWFrZWZpbGUuYW0JMTIgQXByIDIwMDQgMTA6NDM6NDEgLTAwMDAJMS43DQorKysgbmF0
aXZlL2puaS9qYXZhLWxhbmcvTWFrZWZpbGUuYW0JMjIgQXByIDIwMDQgMjI6MDU6MTkgLTAwMDAN
CkBAIC01LDcgKzUsOCBAQA0KIAkJCWphdmFfbGFuZ19WTUZsb2F0LmMgXA0KIAkJCWphdmFfbGFu
Z19Eb3VibGUuYyBcDQogCQkJamF2YV9sYW5nX1ZNRG91YmxlLmMgXA0KLQkJCWphdmFfbGFuZ19N
YXRoLmMNCisJCQlqYXZhX2xhbmdfTWF0aC5jIFwNCisJCQlqYXZhX2xhbmdfVk1Qcm9jZXNzLmMN
CiANCiBsaWJqYXZhbGFuZ3JlZmxlY3RfbGFfU09VUkNFUyA9IGphdmFfbGFuZ19yZWZsZWN0X0Fy
cmF5LmMNCiANCkluZGV4OiBuYXRpdmUvam5pL2phdmEtbGFuZy9qYXZhX2xhbmdfVk1Qcm9jZXNz
LmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0NClJDUyBmaWxlOiBuYXRpdmUvam5pL2phdmEtbGFuZy9qYXZhX2xhbmdf
Vk1Qcm9jZXNzLmMNCmRpZmYgLU4gbmF0aXZlL2puaS9qYXZhLWxhbmcvamF2YV9sYW5nX1ZNUHJv
Y2Vzcy5jDQotLS0gL2Rldi9udWxsCTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDANCisrKyBuYXRp
dmUvam5pL2phdmEtbGFuZy9qYXZhX2xhbmdfVk1Qcm9jZXNzLmMJMjIgQXByIDIwMDQgMjI6MDU6
MTkgLTAwMDANCkBAIC0wLDAgKzEsNDgyIEBADQorLyogamF2YV9sYW5nX1ZNUHJvY2Vzcy5jIC0t
IG5hdGl2ZSBjb2RlIGZvciBqYXZhLmxhbmcuVk1Qcm9jZXNzDQorICAgQ29weXJpZ2h0IChDKSAx
OTk4LCAxOTk5LCAyMDAwLCAyMDAyLCAyMDA0IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5j
Lg0KKw0KK1RoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBDbGFzc3BhdGguDQorDQorR05VIENsYXNz
cGF0aCBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IgbW9k
aWZ5DQoraXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5z
ZSBhcyBwdWJsaXNoZWQgYnkNCit0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIg
dmVyc2lvbiAyLCBvciAoYXQgeW91ciBvcHRpb24pDQorYW55IGxhdGVyIHZlcnNpb24uDQorIA0K
K0dOVSBDbGFzc3BhdGggaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUgdGhhdCBpdCB3aWxsIGJl
IHVzZWZ1bCwgYnV0DQorV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdpdGhvdXQgZXZlbiB0aGUgaW1w
bGllZCB3YXJyYW50eSBvZg0KK01FUkNIQU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJ
Q1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VDQorR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBmb3Ig
bW9yZSBkZXRhaWxzLg0KKw0KK1lvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhl
IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlDQorYWxvbmcgd2l0aCBHTlUgQ2xhc3NwYXRoOyBz
ZWUgdGhlIGZpbGUgQ09QWUlORy4gIElmIG5vdCwgd3JpdGUgdG8gdGhlDQorRnJlZSBTb2Z0d2Fy
ZSBGb3VuZGF0aW9uLCBJbmMuLCA1OSBUZW1wbGUgUGxhY2UsIFN1aXRlIDMzMCwgQm9zdG9uLCBN
QQ0KKzAyMTExLTEzMDcgVVNBLg0KKw0KK0xpbmtpbmcgdGhpcyBsaWJyYXJ5IHN0YXRpY2FsbHkg
b3IgZHluYW1pY2FsbHkgd2l0aCBvdGhlciBtb2R1bGVzIGlzDQorbWFraW5nIGEgY29tYmluZWQg
d29yayBiYXNlZCBvbiB0aGlzIGxpYnJhcnkuICBUaHVzLCB0aGUgdGVybXMgYW5kDQorY29uZGl0
aW9ucyBvZiB0aGUgR05VIEdlbmVyYWwgUHVibGljIExpY2Vuc2UgY292ZXIgdGhlIHdob2xlDQor
Y29tYmluYXRpb24uDQorDQorQXMgYSBzcGVjaWFsIGV4Y2VwdGlvbiwgdGhlIGNvcHlyaWdodCBo
b2xkZXJzIG9mIHRoaXMgbGlicmFyeSBnaXZlIHlvdQ0KK3Blcm1pc3Npb24gdG8gbGluayB0aGlz
IGxpYnJhcnkgd2l0aCBpbmRlcGVuZGVudCBtb2R1bGVzIHRvIHByb2R1Y2UgYW4NCitleGVjdXRh
YmxlLCByZWdhcmRsZXNzIG9mIHRoZSBsaWNlbnNlIHRlcm1zIG9mIHRoZXNlIGluZGVwZW5kZW50
DQorbW9kdWxlcywgYW5kIHRvIGNvcHkgYW5kIGRpc3RyaWJ1dGUgdGhlIHJlc3VsdGluZyBleGVj
dXRhYmxlIHVuZGVyDQordGVybXMgb2YgeW91ciBjaG9pY2UsIHByb3ZpZGVkIHRoYXQgeW91IGFs
c28gbWVldCwgZm9yIGVhY2ggbGlua2VkDQoraW5kZXBlbmRlbnQgbW9kdWxlLCB0aGUgdGVybXMg
YW5kIGNvbmRpdGlvbnMgb2YgdGhlIGxpY2Vuc2Ugb2YgdGhhdA0KK21vZHVsZS4gIEFuIGluZGVw
ZW5kZW50IG1vZHVsZSBpcyBhIG1vZHVsZSB3aGljaCBpcyBub3QgZGVyaXZlZCBmcm9tDQorb3Ig
YmFzZWQgb24gdGhpcyBsaWJyYXJ5LiAgSWYgeW91IG1vZGlmeSB0aGlzIGxpYnJhcnksIHlvdSBt
YXkgZXh0ZW5kDQordGhpcyBleGNlcHRpb24gdG8geW91ciB2ZXJzaW9uIG9mIHRoZSBsaWJyYXJ5
LCBidXQgeW91IGFyZSBub3QNCitvYmxpZ2F0ZWQgdG8gZG8gc28uICBJZiB5b3UgZG8gbm90IHdp
c2ggdG8gZG8gc28sIGRlbGV0ZSB0aGlzDQorZXhjZXB0aW9uIHN0YXRlbWVudCBmcm9tIHlvdXIg
dmVyc2lvbi4gKi8NCisNCisjaW5jbHVkZSA8Y29uZmlnLmg+DQorDQorI2luY2x1ZGUgImphdmFf
bGFuZ19WTVByb2Nlc3MuaCINCisjaW5jbHVkZSA8c3lzL3R5cGVzLmg+DQorI2luY2x1ZGUgPHN5
cy93YWl0Lmg+DQorI2luY2x1ZGUgPHNpZ25hbC5oPg0KKyNpbmNsdWRlIDxzdGRsaWIuaD4NCisj
aW5jbHVkZSA8dW5pc3RkLmg+DQorI2luY2x1ZGUgPHN0cmluZy5oPg0KKyNpbmNsdWRlIDxlcnJu
by5oPg0KKyNpbmNsdWRlIDxmY250bC5oPg0KKyNpbmNsdWRlIDxzdGRpby5oPg0KKw0KKyNpbmNs
dWRlICJ0YXJnZXRfbmF0aXZlLmgiDQorI2luY2x1ZGUgInRhcmdldF9uYXRpdmVfbWlzYy5oIg0K
Kw0KKy8qIEludGVybmFsIGZ1bmN0aW9ucyAqLw0KK3N0YXRpYyBjaGFyICpjb3B5X3N0cmluZyhK
TklFbnYgKmVudiwgam9iamVjdCBzdHJpbmcpOw0KK3N0YXRpYyBjaGFyICpjb3B5X2VsZW0oSk5J
RW52ICplbnYsIGpvYmplY3Qgc3RyaW5nQXJyYXksIGppbnQgaSk7DQorDQorLyogU29tZSBPL1Mn
cyBkb24ndCBkZWNsYXJlIHRoaXMgKi8NCitleHRlcm4gY2hhciAqKmVudmlyb247DQorDQorLyoN
CisgKiBJbnRlcm5hbCBoZWxwZXIgZnVuY3Rpb24gdG8gY29weSBhIFN0cmluZyBpbiBVVEYtOCBm
b3JtYXQuDQorICovDQorc3RhdGljIGNoYXIgKg0KK2NvcHlfc3RyaW5nKEpOSUVudiAqZW52LCBq
b2JqZWN0IHN0cmluZykNCit7DQorICBjaGFyIGVycmJ1Zls2NF07DQorICBjb25zdCBqYnl0ZSAq
dXRmOw0KKyAgamNsYXNzIGNsYXp6Ow0KKyAgY2hhciAqY29weTsNCisNCisgIC8qIENoZWNrIGZv
ciBudWxsICovDQorICBpZiAoc3RyaW5nID09IE5VTEwpDQorICAgIHsNCisgICAgICBjbGF6eiA9
ICgqZW52KS0+RmluZENsYXNzKGVudiwgImphdmEvbGFuZy9OdWxsUG9pbnRlckV4Y2VwdGlvbiIp
Ow0KKyAgICAgIGlmICgoKmVudiktPkV4Y2VwdGlvbk9jY3VycmVkKGVudikpDQorCXJldHVybiBO
VUxMOw0KKyAgICAgICgqZW52KS0+VGhyb3dOZXcoZW52LCBjbGF6eiwgTlVMTCk7DQorICAgICAg
cmV0dXJuIE5VTEw7DQorICAgIH0NCisNCisgIC8qIEV4dHJhY3QgVVRGLTggKi8NCisgIHV0ZiA9
ICgqZW52KS0+R2V0U3RyaW5nVVRGQ2hhcnMoZW52LCBzdHJpbmcsIE5VTEwpOw0KKyAgaWYgKCgq
ZW52KS0+RXhjZXB0aW9uT2NjdXJyZWQoZW52KSkNCisgICAgcmV0dXJuIE5VTEw7DQorDQorICAv
KiBDb3B5IGl0ICovDQorICBpZiAoKGNvcHkgPSBzdHJkdXAodXRmKSkgPT0gTlVMTCkNCisgICAg
ew0KKyAgICAgIFRBUkdFVF9OQVRJVkVfTUlTQ19GT1JNQVRfU1RSSU5HMShlcnJidWYsIHNpemVv
ZihlcnJidWYpLA0KKwkic3RyZHVwOiAlcyIsIHN0cmVycm9yKGVycm5vKSk7DQorICAgICAgY2xh
enogPSAoKmVudiktPkZpbmRDbGFzcyhlbnYsICJqYXZhL2xhbmcvSW50ZXJuYWxFcnJvciIpOw0K
KyAgICAgIGlmICgoKmVudiktPkV4Y2VwdGlvbk9jY3VycmVkKGVudikpDQorCXJldHVybiBOVUxM
Ow0KKyAgICAgICgqZW52KS0+VGhyb3dOZXcoZW52LCBjbGF6eiwgZXJyYnVmKTsNCisgICAgfQ0K
Kw0KKyAgLyogRG9uZSAqLw0KKyAgKCplbnYpLT5SZWxlYXNlU3RyaW5nVVRGQ2hhcnMoZW52LCBz
dHJpbmcsIHV0Zik7DQorICByZXR1cm4gY29weTsNCit9DQorDQorLyoNCisgKiBJbnRlcm5hbCBo
ZWxwZXIgZnVuY3Rpb24gdG8gY29weSBhIFN0cmluZ1tdIGVsZW1lbnQgaW4gVVRGLTggZm9ybWF0
Lg0KKyAqLw0KK3N0YXRpYyBjaGFyICoNCitjb3B5X2VsZW0oSk5JRW52ICplbnYsIGpvYmplY3Qg
c3RyaW5nQXJyYXksIGppbnQgaSkNCit7DQorICBqb2JqZWN0IGVsZW07DQorICBjaGFyICpydG47
DQorDQorICBlbGVtID0gKCplbnYpLT5HZXRPYmplY3RBcnJheUVsZW1lbnQoZW52LCBzdHJpbmdB
cnJheSwgaSk7DQorICBpZiAoKCplbnYpLT5FeGNlcHRpb25PY2N1cnJlZChlbnYpKQ0KKyAgICBy
ZXR1cm4gTlVMTDsNCisgIGlmICgocnRuID0gY29weV9zdHJpbmcoZW52LCBlbGVtKSkgPT0gTlVM
TCkNCisgICAgcmV0dXJuIE5VTEw7DQorICAoKmVudiktPkRlbGV0ZUxvY2FsUmVmKGVudiwgZWxl
bSk7DQorICByZXR1cm4gcnRuOw0KK30NCisNCisvKg0KKyAqIHByaXZhdGUgZmluYWwgbmF0aXZl
IHZvaWQgbmF0aXZlU3Bhd24oU3RyaW5nW10sIFN0cmluZ1tdLCBGaWxlKQ0KKyAqCXRocm93cyBq
YXZhL2lvL0lPRXhjZXB0aW9uDQorICovDQorSk5JRVhQT1JUIHZvaWQgSk5JQ0FMTA0KK0phdmFf
amF2YV9sYW5nX1ZNUHJvY2Vzc19uYXRpdmVTcGF3bihKTklFbnYgKmVudiwgam9iamVjdCB0aGlz
LA0KKwlqb2JqZWN0QXJyYXkgY21kQXJyYXksIGpvYmplY3RBcnJheSBlbnZBcnJheSwgam9iamVj
dCBkaXJGaWxlKQ0KK3sNCisgIGludCBmZHNbM11bMl0gPSB7IHsgLTEsIC0xIH0sIHsgLTEsIC0x
IH0sIHsgLTEsIC0xIH0gfTsNCisgIGpvYmplY3Qgc3RyZWFtc1szXSA9IHsgTlVMTCwgTlVMTCwg
TlVMTCB9Ow0KKyAgam9iamVjdCBkaXJTdHJpbmcgPSBOVUxMOw0KKyAgY2hhciAqKm5ld0Vudmly
b24gPSBOVUxMOw0KKyAganNpemUgY21kQXJyYXlMZW4gPSAwOw0KKyAganNpemUgZW52QXJyYXlM
ZW4gPSAwOw0KKyAgY2hhciAqKnN0cmluZ3MgPSBOVUxMOw0KKyAgaW50IG51bV9zdHJpbmdzID0g
MDsNCisgIGNoYXIgKmRpciA9IE5VTEw7DQorICBwaWRfdCBwaWQgPSAtMTsNCisgIGNoYXIgZXJy
YnVmWzY0XTsNCisgIGptZXRob2RJRCBtZXRob2Q7DQorICBqY2xhc3MgY2xheno7DQorICBpbnQg
aTsNCisNCisgIC8qIENoZWNrIGZvciBudWxsICovDQorICBpZiAoY21kQXJyYXkgPT0gTlVMTCkN
CisgICAgZ290byBudWxsX3BvaW50ZXJfZXhjZXB0aW9uOw0KKw0KKyAgLyogSW52b2tlIGRpckZp
bGUuZ2V0UGF0aCgpICovDQorICBpZiAoZGlyRmlsZSAhPSBOVUxMKQ0KKyAgICB7DQorICAgICAg
Y2xhenogPSAoKmVudiktPkZpbmRDbGFzcyhlbnYsICJqYXZhL2lvL0ZpbGUiKTsNCisgICAgICBp
ZiAoKCplbnYpLT5FeGNlcHRpb25PY2N1cnJlZChlbnYpKQ0KKwlyZXR1cm47DQorICAgICAgbWV0
aG9kID0gKCplbnYpLT5HZXRNZXRob2RJRChlbnYsDQorCWNsYXp6LCAiZ2V0UGF0aCIsICIoKUxq
YXZhL2xhbmcvU3RyaW5nOyIpOw0KKyAgICAgIGlmICgoKmVudiktPkV4Y2VwdGlvbk9jY3VycmVk
KGVudikpDQorCXJldHVybjsNCisgICAgICBkaXJTdHJpbmcgPSAoKmVudiktPkNhbGxPYmplY3RN
ZXRob2QoZW52LCBkaXJGaWxlLCBtZXRob2QpOw0KKyAgICAgIGlmICgoKmVudiktPkV4Y2VwdGlv
bk9jY3VycmVkKGVudikpDQorCXJldHVybjsNCisgICAgICAoKmVudiktPkRlbGV0ZUxvY2FsUmVm
KGVudiwgY2xhenopOw0KKyAgICB9DQorDQorICAvKg0KKyAgICogQWxsb2NhdGUgYXJyYXkgb2Yg
QyBzdHJpbmdzLiBXZSBwdXQgYWxsIHRoZSBDIHN0cmluZ3Mgd2UgbmVlZCB0bw0KKyAgICogaGFu
ZGxlIHRoZSBjb21tYW5kIHBhcmFtZXRlcnMsIHRoZSBuZXcgZW52aXJvbm1lbnQsIGFuZCB0aGUg
bmV3DQorICAgKiBkaXJlY3RvcnkgaW50byBhIHNpbmdsZSBhcnJheSBmb3Igc2ltcGxpY2l0eSBv
ZiAoZGUpYWxsb2NhdGlvbi4NCisgICAqLw0KKyAgY21kQXJyYXlMZW4gPSAoKmVudiktPkdldEFy
cmF5TGVuZ3RoKGVudiwgY21kQXJyYXkpOw0KKyAgaWYgKGVudkFycmF5ICE9IE5VTEwpDQorICAg
IGVudkFycmF5TGVuID0gKCplbnYpLT5HZXRBcnJheUxlbmd0aChlbnYsIGVudkFycmF5KTsNCisg
IGlmICgoc3RyaW5ncyA9IG1hbGxvYygoKGNtZEFycmF5TGVuICsgMSkNCisgICAgICArIChlbnZB
cnJheSAhPSBOVUxMID8gZW52QXJyYXlMZW4gKyAxIDogMCkNCisgICAgICArIChkaXJTdHJpbmcg
IT0gTlVMTCA/IDEgOiAwKSkgKiBzaXplb2YoKnN0cmluZ3MpKSkgPT0gTlVMTCkNCisgICAgew0K
KyAgICAgIFRBUkdFVF9OQVRJVkVfTUlTQ19GT1JNQVRfU1RSSU5HMShlcnJidWYsDQorCXNpemVv
ZihlcnJidWYpLCAibWFsbG9jOiAlcyIsIHN0cmVycm9yKGVycm5vKSk7DQorICAgICAgZ290byBv
dXRfb2ZfbWVtb3J5Ow0KKyAgICB9DQorDQorICAvKiBFeHRyYWN0IEMgc3RyaW5ncyBmcm9tIHRo
ZSB2YXJpb3VzIFN0cmluZyBwYXJhbWV0ZXJzICovDQorICBmb3IgKGkgPSAwOyBpIDwgY21kQXJy
YXlMZW47IGkrKykNCisgICAgew0KKyAgICAgIGlmICgoc3RyaW5nc1tudW1fc3RyaW5ncysrXSA9
IGNvcHlfZWxlbShlbnYsIGNtZEFycmF5LCBpKSkgPT0gTlVMTCkNCisJZ290byBkb25lOw0KKyAg
ICB9DQorICBzdHJpbmdzW251bV9zdHJpbmdzKytdID0gTlVMTDsJCS8qIHRlcm1pbmF0ZSBhcnJh
eSB3aXRoIE5VTEwgKi8NCisgIGlmIChlbnZBcnJheSAhPSBOVUxMKQ0KKyAgICB7DQorICAgICAg
bmV3RW52aXJvbiA9IHN0cmluZ3MgKyBudW1fc3RyaW5nczsNCisgICAgICBmb3IgKGkgPSAwOyBp
IDwgZW52QXJyYXlMZW47IGkrKykNCisJew0KKwkgIGlmICgoc3RyaW5nc1tudW1fc3RyaW5ncysr
XSA9IGNvcHlfZWxlbShlbnYsIGVudkFycmF5LCBpKSkgPT0gTlVMTCkNCisJICAgIGdvdG8gZG9u
ZTsNCisJfQ0KKyAgICAgIHN0cmluZ3NbbnVtX3N0cmluZ3MrK10gPSBOVUxMOwkJLyogdGVybWlu
YXRlIGFycmF5IHdpdGggTlVMTCAqLw0KKyAgICB9DQorICBpZiAoZGlyU3RyaW5nICE9IE5VTEwp
DQorICAgIHsNCisgICAgICBpZiAoKGRpciA9IGNvcHlfc3RyaW5nKGVudiwgZGlyU3RyaW5nKSkg
PT0gTlVMTCkNCisJZ290byBkb25lOw0KKyAgICAgIHN0cmluZ3NbbnVtX3N0cmluZ3MrK10gPSBk
aXI7DQorICAgIH0NCisNCisgIC8qIENyZWF0ZSBpbnRlci1wcm9jZXNzIHBpcGVzICovDQorICBm
b3IgKGkgPSAwOyBpIDwgMzsgaSsrKQ0KKyAgICB7DQorICAgICAgaWYgKHBpcGUoZmRzW2ldKSA9
PSAtMSkNCisJew0KKwkgIFRBUkdFVF9OQVRJVkVfTUlTQ19GT1JNQVRfU1RSSU5HMShlcnJidWYs
DQorCSAgICBzaXplb2YoZXJyYnVmKSwgInBpcGU6ICVzIiwgc3RyZXJyb3IoZXJybm8pKTsNCisJ
ICBnb3RvIHN5c3RlbV9lcnJvcjsNCisJfQ0KKyAgICB9DQorDQorICAvKiBTZXQgY2xvc2Utb24t
ZXhlYyBmbGFnIGZvciBwYXJlbnQncyBlbmRzIG9mIHBpcGVzICovDQorICAodm9pZClmY250bChm
ZHNbMF1bMV0sIEZfU0VURkQsIDEpOw0KKyAgKHZvaWQpZmNudGwoZmRzWzFdWzBdLCBGX1NFVEZE
LCAxKTsNCisgICh2b2lkKWZjbnRsKGZkc1syXVswXSwgRl9TRVRGRCwgMSk7DQorDQorICAvKiBG
b3JrIGludG8gcGFyZW50IGFuZCBjaGlsZCBwcm9jZXNzZXMgKi8NCisgIGlmICgocGlkID0gZm9y
aygpKSA9PSAocGlkX3QpLTEpDQorICAgIHsNCisgICAgICBUQVJHRVRfTkFUSVZFX01JU0NfRk9S
TUFUX1NUUklORzEoZXJyYnVmLA0KKwlzaXplb2YoZXJyYnVmKSwgImZvcms6ICVzIiwgc3RyZXJy
b3IoZXJybm8pKTsNCisgICAgICBnb3RvIHN5c3RlbV9lcnJvcjsNCisgICAgfQ0KKw0KKyAgLyog
Q2hpbGQgYmVjb21lcyB0aGUgbmV3IHByb2Nlc3MgKi8NCisgIGlmIChwaWQgPT0gMCkNCisgICAg
ew0KKyAgICAgIGNoYXIgKmNvbnN0IHBhdGggPSBzdHJpbmdzWzBdOw0KKw0KKyAgICAgIGkgPSAw
Ow0KKyAgICAgIHdoaWxlIChzdHJpbmdzW2ldICE9IE5VTEwpDQorICAgICAgICB7DQorCSAgaSsr
Ow0KKwl9DQorDQorICAgICAgLyogTW92ZSBmaWxlIGRlc2NyaXB0b3JzIHRvIHN0YW5kYXJkIGxv
Y2F0aW9ucyAqLw0KKyAgICAgIGlmIChmZHNbMF1bMF0gIT0gMCkNCisJew0KKwkgIGlmIChkdXAy
KGZkc1swXVswXSwgMCkgPT0gLTEpDQorCSAgICB7DQorCSAgICAgIGZwcmludGYoc3RkZXJyLCAi
ZHVwMjogJXMiLCBzdHJlcnJvcihlcnJubykpOw0KKwkgICAgICBleGl0KDEyNyk7DQorCSAgICB9
DQorCSAgY2xvc2UoZmRzWzBdWzBdKTsNCisJfQ0KKyAgICAgIGlmIChmZHNbMV1bMV0gIT0gMSkN
CisJew0KKwkgIGlmIChkdXAyKGZkc1sxXVsxXSwgMSkgPT0gLTEpDQorCSAgICB7DQorCSAgICAg
IGZwcmludGYoc3RkZXJyLCAiZHVwMjogJXMiLCBzdHJlcnJvcihlcnJubykpOw0KKwkgICAgICBl
eGl0KDEyNyk7DQorCSAgICB9DQorCSAgY2xvc2UoZmRzWzFdWzFdKTsNCisJfQ0KKyAgICAgIGlm
IChmZHNbMl1bMV0gIT0gMikNCisJew0KKwkgIGlmIChkdXAyKGZkc1syXVsxXSwgMikgPT0gLTEp
DQorCSAgICB7DQorCSAgICAgIGZwcmludGYoc3RkZXJyLCAiZHVwMjogJXMiLCBzdHJlcnJvcihl
cnJubykpOw0KKwkgICAgICBleGl0KDEyNyk7DQorCSAgICB9DQorCSAgY2xvc2UoZmRzWzJdWzFd
KTsNCisJfQ0KKw0KKyAgICAgIC8qIENoYW5nZSBpbnRvIGRlc3RpbmF0aW9uIGRpcmVjdG9yeSAq
Lw0KKyAgICAgIGlmIChkaXIgIT0gTlVMTCAmJiBjaGRpcihkaXIpID09IC0xKQ0KKwl7DQorCSAg
ZnByaW50ZihzdGRlcnIsICIlczogJXMiLCBkaXIsIHN0cmVycm9yKGVycm5vKSk7DQorCSAgZXhp
dCgxMjcpOw0KKwl9DQorDQorICAgICAgLyogTWFrZSBhcmd2WzBdIGxhc3QgY29tcG9uZW50IG9m
IGV4ZWN1dGFibGUgcGF0aG5hbWUgKi8NCisgICAgICAvKiBYWFggc2hvdWxkIHVzZSAiZmlsZS5z
ZXBhcmF0b3IiIHByb3BlcnR5IGhlcmUgWFhYICovDQorICAgICAgZm9yIChpID0gc3RybGVuKHBh
dGgpOyBpID4gMCAmJiBwYXRoW2kgLSAxXSAhPSAnLyc7IGktLSk7DQorICAgICAgc3RyaW5nc1sw
XSA9IHBhdGggKyBpOw0KKw0KKyAgICAgIC8qIFNldCBuZXcgZW52aXJvbm1lbnQgKi8NCisgICAg
ICBpZiAobmV3RW52aXJvbiAhPSBOVUxMKQ0KKwllbnZpcm9uID0gbmV3RW52aXJvbjsNCisNCisg
ICAgICAvKiBFeGVjdXRlIG5ldyBwcm9ncmFtICh0aGlzIHdpbGwgY2xvc2UgdGhlIHBhcmVudCBl
bmQgb2YgdGhlIHBpcGVzKSAqLw0KKyAgICAgIGV4ZWN2cChwYXRoLCBzdHJpbmdzKTsNCisNCisg
ICAgICAvKiBGYWlsZWQgKi8NCisgICAgICBmcHJpbnRmKHN0ZGVyciwgIiVzOiAlcyIsIHBhdGgs
IHN0cmVycm9yKGVycm5vKSk7DQorICAgICAgZXhpdCgxMjcpOw0KKyAgICB9DQorDQorICAvKiBD
cmVhdGUgSW5wdXQvT3V0cHV0U3RyZWFtIG9iamVjdHMgYXJvdW5kIHBhcmVudCBmaWxlIGRlc2Ny
aXB0b3JzICovDQorICBjbGF6eiA9ICgqZW52KS0+RmluZENsYXNzKGVudiwgImdudS9qYXZhL25p
by9jaGFubmVscy9GaWxlQ2hhbm5lbEltcGwiKTsNCisgIGlmICgoKmVudiktPkV4Y2VwdGlvbk9j
Y3VycmVkKGVudikpDQorICAgIGdvdG8gZG9uZTsNCisgIG1ldGhvZCA9ICgqZW52KS0+R2V0TWV0
aG9kSUQoZW52LCBjbGF6eiwgIjxpbml0PiIsICIoSUkpViIpOw0KKyAgaWYgKCgqZW52KS0+RXhj
ZXB0aW9uT2NjdXJyZWQoZW52KSkNCisgICAgZ290byBkb25lOw0KKyAgZm9yIChpID0gMDsgaSA8
IDM7IGkrKykNCisgICAgew0KKyAgICAgIC8qIE1vZGUgaXMgV1JJVEUgKDIpIGZvciBpbiBhbmQg
UkVBRCAoMSkgZm9yIG91dCBhbmQgZXJyLiAqLw0KKyAgICAgIGNvbnN0IGludCBmZCA9IGZkc1tp
XVtpID09IDBdOw0KKyAgICAgIGNvbnN0IGludCBtb2RlID0gKGkgPT0gMCkgPyAyIDogMTsNCisg
ICAgICBqY2xhc3Mgc2NsYXp6Ow0KKyAgICAgIGptZXRob2RJRCBzbWV0aG9kOw0KKw0KKyAgICAg
IGpvYmplY3QgY2hhbm5lbCA9ICgqZW52KS0+TmV3T2JqZWN0KGVudiwgY2xhenosIG1ldGhvZCwg
ZmQsIG1vZGUpOw0KKyAgICAgIGlmICgoKmVudiktPkV4Y2VwdGlvbk9jY3VycmVkKGVudikpDQor
CWdvdG8gZG9uZTsNCisNCisgICAgICBpZiAobW9kZSA9PSAyKQ0KKwlzY2xhenogPSAoKmVudikt
PkZpbmRDbGFzcyhlbnYsICJqYXZhL2lvL0ZpbGVPdXRwdXRTdHJlYW0iKTsNCisgICAgICBlbHNl
DQorCXNjbGF6eiA9ICgqZW52KS0+RmluZENsYXNzKGVudiwgImphdmEvaW8vRmlsZUlucHV0U3Ry
ZWFtIik7DQorICAgICAgaWYgKCgqZW52KS0+RXhjZXB0aW9uT2NjdXJyZWQoZW52KSkNCisJZ290
byBkb25lOw0KKw0KKyAgICAgIHNtZXRob2QgPSAoKmVudiktPkdldE1ldGhvZElEKGVudiwgc2Ns
YXp6LCAiPGluaXQ+IiwNCisJCQkiKExnbnUvamF2YS9uaW8vY2hhbm5lbHMvRmlsZUNoYW5uZWxJ
bXBsOylWIik7DQorICAgICAgaWYgKCgqZW52KS0+RXhjZXB0aW9uT2NjdXJyZWQoZW52KSkNCisJ
Z290byBkb25lOw0KKw0KKyAgICAgIHN0cmVhbXNbaV0gPSAoKmVudiktPk5ld09iamVjdChlbnYs
IHNjbGF6eiwgc21ldGhvZCwgY2hhbm5lbCk7DQorICAgICAgaWYgKCgqZW52KS0+RXhjZXB0aW9u
T2NjdXJyZWQoZW52KSkNCisJZ290byBkb25lOw0KKw0KKyAgICAgICgqZW52KS0+RGVsZXRlTG9j
YWxSZWYoZW52LCBzY2xhenopOw0KKyAgICAgICgqZW52KS0+RGVsZXRlTG9jYWxSZWYoZW52LCBz
bWV0aG9kKTsNCisgICAgfQ0KKyAgKCplbnYpLT5EZWxldGVMb2NhbFJlZihlbnYsIGNsYXp6KTsN
CisNCisgIC8qIEludm9rZSBWTVByb2Nlc3Muc2V0UHJvY2Vzc0luZm8oKSB0byB1cGRhdGUgVk1Q
cm9jZXNzIG9iamVjdCAqLw0KKyAgbWV0aG9kID0gKCplbnYpLT5HZXRNZXRob2RJRChlbnYsDQor
ICAgICgqZW52KS0+R2V0T2JqZWN0Q2xhc3MoZW52LCB0aGlzKSwgInNldFByb2Nlc3NJbmZvIiwN
CisgICAgIihMamF2YS9pby9PdXRwdXRTdHJlYW07TGphdmEvaW8vSW5wdXRTdHJlYW07TGphdmEv
aW8vSW5wdXRTdHJlYW07SilWIik7DQorICBpZiAoKCplbnYpLT5FeGNlcHRpb25PY2N1cnJlZChl
bnYpKQ0KKyAgICBnb3RvIGRvbmU7DQorICAoKmVudiktPkNhbGxWb2lkTWV0aG9kKGVudiwgdGhp
cywgbWV0aG9kLA0KKyAgICBzdHJlYW1zWzBdLCBzdHJlYW1zWzFdLCBzdHJlYW1zWzJdLCAoamxv
bmcpcGlkKTsNCisgIGlmICgoKmVudiktPkV4Y2VwdGlvbk9jY3VycmVkKGVudikpDQorICAgIGdv
dG8gZG9uZTsNCisgICgqZW52KS0+RGVsZXRlTG9jYWxSZWYoZW52LCBjbGF6eik7DQorDQorZG9u
ZToNCisgIC8qDQorICAgKiBXZSBnZXQgaGVyZSBpbiBib3RoIHRoZSBzdWNjZXNzIGFuZCBmYWls
dXJlIGNhc2VzIGluIHRoZQ0KKyAgICogcGFyZW50IHByb2Nlc3MuIE91ciBnb2FsIGlzIHRvIGNs
ZWFuIHVwIHRoZSBtZXNzIHdlIGNyZWF0ZWQuDQorICAgKi8NCisNCisgIC8qIENsb3NlIGNoaWxk
J3MgZW5kcyBvZiBwaXBlcyAqLw0KKyAgZm9yIChpID0gMDsgaSA8IDM7IGkrKykNCisgICAgew0K
KyAgICAgIGNvbnN0IGludCBmZCA9IGZkc1tpXVtpICE9IDBdOw0KKw0KKyAgICAgIGlmIChmZCAh
PSAtMSkNCisJY2xvc2UoZmQpOw0KKyAgICB9DQorDQorICAvKg0KKyAgICogQ2xvc2UgcGFyZW50
J3MgZW5kcyBvZiBwaXBlcyBpZiBJbnB1dC9PdXRwdXRTdHJlYW1zIG5ldmVyIGdvdCBjcmVhdGVk
Lg0KKyAgICogVGhpcyBjYW4gb25seSBoYXBwZW4gaW4gYSBmYWlsdXJlIGNhc2UuIElmIGEgU3Ry
ZWFtIG9iamVjdA0KKyAgICogd2FzIGNyZWF0ZWQgZm9yIGEgZmlsZSBkZXNjcmlwdG9yLCB3ZSBk
b24ndCBjbG9zZSBpdCBiZWNhdXNlIGl0DQorICAgKiB3aWxsIGdldCBjbG9zZWQgd2hlbiB0aGUg
RmlsZURlc2NyaXB0b3Igb2JqZWN0IGlzIGZpbmFsaXplZC4NCisgICAqLw0KKyAgZm9yIChpID0g
MDsgaSA8IDM7IGkrKykNCisgICAgew0KKyAgICAgIGNvbnN0IGludCBmZCA9IGZkc1tpXVtpID09
IDBdOw0KKw0KKyAgICAgIGlmIChmZCAhPSAtMSAmJiBzdHJlYW1zW2ldID09IE5VTEwpDQorCWNs
b3NlKGZkKTsNCisgICAgfQ0KKw0KKyAgLyogRnJlZSBDIHN0cmluZ3MgKi8NCisgIHdoaWxlIChu
dW1fc3RyaW5ncyA+IDApDQorICAgIGZyZWUoc3RyaW5nc1stLW51bV9zdHJpbmdzXSk7DQorICBm
cmVlKHN0cmluZ3MpOw0KKw0KKyAgLyogRG9uZSAqLw0KKyAgcmV0dXJuOw0KKw0KK251bGxfcG9p
bnRlcl9leGNlcHRpb246DQorICBjbGF6eiA9ICgqZW52KS0+RmluZENsYXNzKGVudiwgImphdmEv
bGFuZy9OdWxsUG9pbnRlckV4Y2VwdGlvbiIpOw0KKyAgaWYgKCgqZW52KS0+RXhjZXB0aW9uT2Nj
dXJyZWQoZW52KSkNCisgICAgZ290byBkb25lOw0KKyAgKCplbnYpLT5UaHJvd05ldyhlbnYsIGNs
YXp6LCBOVUxMKTsNCisgICgqZW52KS0+RGVsZXRlTG9jYWxSZWYoZW52LCBjbGF6eik7DQorICBn
b3RvIGRvbmU7DQorDQorb3V0X29mX21lbW9yeToNCisgIGNsYXp6ID0gKCplbnYpLT5GaW5kQ2xh
c3MoZW52LCAiamF2YS9sYW5nL0ludGVybmFsRXJyb3IiKTsNCisgIGlmICgoKmVudiktPkV4Y2Vw
dGlvbk9jY3VycmVkKGVudikpDQorICAgIGdvdG8gZG9uZTsNCisgICgqZW52KS0+VGhyb3dOZXco
ZW52LCBjbGF6eiwgZXJyYnVmKTsNCisgICgqZW52KS0+RGVsZXRlTG9jYWxSZWYoZW52LCBjbGF6
eik7DQorICBnb3RvIGRvbmU7DQorDQorc3lzdGVtX2Vycm9yOg0KKyAgY2xhenogPSAoKmVudikt
PkZpbmRDbGFzcyhlbnYsICJqYXZhL2lvL0lPRXhjZXB0aW9uIik7DQorICBpZiAoKCplbnYpLT5F
eGNlcHRpb25PY2N1cnJlZChlbnYpKQ0KKyAgICBnb3RvIGRvbmU7DQorICAoKmVudiktPlRocm93
TmV3KGVudiwgY2xhenosIGVycmJ1Zik7DQorICAoKmVudiktPkRlbGV0ZUxvY2FsUmVmKGVudiwg
Y2xhenopOw0KKyAgZ290byBkb25lOw0KK30NCisNCisvKg0KKyAqIHByaXZhdGUgc3RhdGljIGZp
bmFsIG5hdGl2ZSBib29sZWFuIG5hdGl2ZVJlYXAoKQ0KKyAqLw0KK0pOSUVYUE9SVCBqYm9vbGVh
biBKTklDQUxMDQorSmF2YV9qYXZhX2xhbmdfVk1Qcm9jZXNzX25hdGl2ZVJlYXAoSk5JRW52ICpl
bnYsIGpjbGFzcyBjbGF6eikNCit7DQorICBjaGFyIGVidWZbNjRdOw0KKyAgamZpZWxkSUQgZmll
bGQ7DQorICBpbnQgc3RhdHVzOw0KKyAgcGlkX3QgcGlkOw0KKw0KKyAgLyogVHJ5IHRvIHJlYXAg
YSBjaGlsZCBwcm9jZXNzLCBidXQgZG9uJ3QgYmxvY2sgKi8NCisgIGlmICgocGlkID0gd2FpdHBp
ZCgocGlkX3QpLTEsICZzdGF0dXMsIFdOT0hBTkcpKSA9PSAwKQ0KKyAgICByZXR1cm4gSk5JX0ZB
TFNFOw0KKw0KKyAgLyogQ2hlY2sgcmVzdWx0IGZyb20gd2FpdHBpZCgpICovDQorICBpZiAocGlk
ID09IChwaWRfdCktMSkNCisgICAgew0KKyAgICAgIGlmIChlcnJubyA9PSBFQ0hJTEQpDQorCXJl
dHVybiBKTklfRkFMU0U7DQorICAgICAgVEFSR0VUX05BVElWRV9NSVNDX0ZPUk1BVF9TVFJJTkcy
KGVidWYsDQorCXNpemVvZihlYnVmKSwgIndhaXRwaWQoJWxkKTogJXMiLCAobG9uZylwaWQsIHN0
cmVycm9yKGVycm5vKSk7DQorICAgICAgY2xhenogPSAoKmVudiktPkZpbmRDbGFzcyhlbnYsICJq
YXZhL2xhbmcvSW50ZXJuYWxFcnJvciIpOw0KKyAgICAgIGlmICgoKmVudiktPkV4Y2VwdGlvbk9j
Y3VycmVkKGVudikpDQorCXJldHVybiBKTklfRkFMU0U7DQorICAgICAgKCplbnYpLT5UaHJvd05l
dyhlbnYsIGNsYXp6LCBlYnVmKTsNCisgICAgICAoKmVudiktPkRlbGV0ZUxvY2FsUmVmKGVudiwg
Y2xhenopOw0KKyAgICAgIHJldHVybiBKTklfRkFMU0U7DQorICAgIH0NCisNCisgIC8qIEdldCBl
eGl0IGNvZGU7IGZvciBzaWduYWwgdGVybWluYXRpb24gcmV0dXJuIG5lZ2F0aXZlIHNpZ25hbCB2
YWx1ZSBYWFggKi8NCisgIGlmIChXSUZFWElURUQoc3RhdHVzKSkNCisgICAgc3RhdHVzID0gKGpp
bnQpV0VYSVRTVEFUVVMoc3RhdHVzKTsNCisgIGVsc2UgaWYgKFdJRlNJR05BTEVEKHN0YXR1cykp
DQorICAgIHN0YXR1cyA9IC0oamludClXVEVSTVNJRyhzdGF0dXMpOw0KKyAgZWxzZQ0KKyAgICBy
ZXR1cm4gSk5JX0ZBTFNFOwkJCS8qIHByb2Nlc3MgbWVyZWx5IHN0b3BwZWQ7IGlnbm9yZSAqLw0K
Kw0KKyAgLyogUmV0dXJuIHByb2Nlc3MgcGlkIGFuZCBleGl0IHN0YXR1cyAqLw0KKyAgZmllbGQg
PSAoKmVudiktPkdldFN0YXRpY0ZpZWxkSUQoZW52LCBjbGF6eiwgInJlYXBlZFBpZCIsICJKIik7
DQorICBpZiAoKCplbnYpLT5FeGNlcHRpb25PY2N1cnJlZChlbnYpKQ0KKyAgICByZXR1cm4gSk5J
X0ZBTFNFOw0KKyAgKCplbnYpLT5TZXRTdGF0aWNMb25nRmllbGQoZW52LCBjbGF6eiwgZmllbGQs
IChqbG9uZylwaWQpOw0KKyAgaWYgKCgqZW52KS0+RXhjZXB0aW9uT2NjdXJyZWQoZW52KSkNCisg
ICAgcmV0dXJuIEpOSV9GQUxTRTsNCisgIGZpZWxkID0gKCplbnYpLT5HZXRTdGF0aWNGaWVsZElE
KGVudiwgY2xhenosICJyZWFwZWRFeGl0VmFsdWUiLCAiSSIpOw0KKyAgaWYgKCgqZW52KS0+RXhj
ZXB0aW9uT2NjdXJyZWQoZW52KSkNCisgICAgcmV0dXJuIEpOSV9GQUxTRTsNCisgICgqZW52KS0+
U2V0U3RhdGljSW50RmllbGQoZW52LCBjbGF6eiwgZmllbGQsIChqaW50KXN0YXR1cyk7DQorICBp
ZiAoKCplbnYpLT5FeGNlcHRpb25PY2N1cnJlZChlbnYpKQ0KKyAgICByZXR1cm4gSk5JX0ZBTFNF
Ow0KKw0KKyAgLyogRG9uZSAqLw0KKyAgcmV0dXJuIEpOSV9UUlVFOw0KK30NCisNCisvKg0KKyAq
IHByaXZhdGUgc3RhdGljIGZpbmFsIG5hdGl2ZSB2b2lkIG5hdGl2ZUtpbGwobG9uZykNCisgKi8N
CitKTklFWFBPUlQgdm9pZCBKTklDQUxMDQorSmF2YV9qYXZhX2xhbmdfVk1Qcm9jZXNzX25hdGl2
ZUtpbGwoSk5JRW52ICplbnYsIGpjbGFzcyBjbGF6eiwgamxvbmcgcGlkKQ0KK3sNCisgIGNoYXIg
ZWJ1Zls2NF07DQorDQorICBpZiAoa2lsbCgocGlkX3QpcGlkLCBTSUdLSUxMKSA9PSAtMSkNCisg
ICAgew0KKyAgICAgIFRBUkdFVF9OQVRJVkVfTUlTQ19GT1JNQVRfU1RSSU5HMihlYnVmLA0KKwlz
aXplb2YoZWJ1ZiksICJraWxsKCVsZCk6ICVzIiwgKGxvbmcpcGlkLCBzdHJlcnJvcihlcnJubykp
Ow0KKyAgICAgIGNsYXp6ID0gKCplbnYpLT5GaW5kQ2xhc3MoZW52LCAiamF2YS9sYW5nL0ludGVy
bmFsRXJyb3IiKTsNCisgICAgICBpZiAoKCplbnYpLT5FeGNlcHRpb25PY2N1cnJlZChlbnYpKQ0K
KwlyZXR1cm47DQorICAgICAgKCplbnYpLT5UaHJvd05ldyhlbnYsIGNsYXp6LCBlYnVmKTsNCisg
ICAgICAoKmVudiktPkRlbGV0ZUxvY2FsUmVmKGVudiwgY2xhenopOw0KKyAgICB9DQorfQ0KKw0K
SW5kZXg6IHZtL3JlZmVyZW5jZS9qYXZhL2xhbmcvTWFrZWZpbGUuYW0NCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJD
UyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL3ZtL3JlZmVyZW5jZS9qYXZhL2xh
bmcvTWFrZWZpbGUuYW0sdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjgNCmRpZmYgLXUgLXUgLXIx
LjggTWFrZWZpbGUuYW0NCi0tLSB2bS9yZWZlcmVuY2UvamF2YS9sYW5nL01ha2VmaWxlLmFtCTI3
IERlYyAyMDAzIDE2OjM4OjQzIC0wMDAwCTEuOA0KKysrIHZtL3JlZmVyZW5jZS9qYXZhL2xhbmcv
TWFrZWZpbGUuYW0JMjIgQXByIDIwMDQgMjI6MDU6MjAgLTAwMDANCkBAIC04LDYgKzgsNyBAQA0K
IFZNRG91YmxlLmphdmEgXA0KIFZNRmxvYXQuamF2YSBcDQogVk1PYmplY3QuamF2YSBcDQorVk1Q
cm9jZXNzLmphdmEgXA0KIFZNUnVudGltZS5qYXZhIFwNCiBWTVNlY3VyaXR5TWFuYWdlci5qYXZh
IFwNCiBWTVN0cmluZy5qYXZhIFwNCkluZGV4OiB2bS9yZWZlcmVuY2UvamF2YS9sYW5nL1ZNUHJv
Y2Vzcy5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogdm0vcmVmZXJlbmNlL2phdmEvbGFuZy9W
TVByb2Nlc3MuamF2YQ0KZGlmZiAtTiB2bS9yZWZlcmVuY2UvamF2YS9sYW5nL1ZNUHJvY2Vzcy5q
YXZhDQotLS0gL2Rldi9udWxsCTEgSmFuIDE5NzAgMDA6MDA6MDAgLTAwMDANCisrKyB2bS9yZWZl
cmVuY2UvamF2YS9sYW5nL1ZNUHJvY2Vzcy5qYXZhCTIyIEFwciAyMDA0IDIyOjA1OjIwIC0wMDAw
DQpAQCAtMCwwICsxLDMwMSBAQA0KKy8qIGphdmEubGFuZy5WTVByb2Nlc3MgLS0gVk0gaW1wbGVt
ZW50YXRpb24gb2YgamF2YS5sYW5nLlByb2Nlc3MNCisgICBDb3B5cmlnaHQgKEMpIDIwMDQgRnJl
ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQorDQorVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05V
IENsYXNzcGF0aC4NCisNCitHTlUgQ2xhc3NwYXRoIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4g
cmVkaXN0cmlidXRlIGl0IGFuZC9vciBtb2RpZnkNCitpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhl
IEdOVSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGFzIHB1Ymxpc2hlZCBieQ0KK3RoZSBGcmVlIFNv
ZnR3YXJlIEZvdW5kYXRpb247IGVpdGhlciB2ZXJzaW9uIDIsIG9yIChhdCB5b3VyIG9wdGlvbikN
CithbnkgbGF0ZXIgdmVyc2lvbi4NCisNCitHTlUgQ2xhc3NwYXRoIGlzIGRpc3RyaWJ1dGVkIGlu
IHRoZSBob3BlIHRoYXQgaXQgd2lsbCBiZSB1c2VmdWwsIGJ1dA0KK1dJVEhPVVQgQU5ZIFdBUlJB
TlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YNCitNRVJDSEFOVEFCSUxJ
VFkgb3IgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UuICBTZWUgdGhlIEdOVQ0KK0dl
bmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWlscy4NCisNCitZb3Ugc2hvdWxkIGhh
dmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZQ0KK2Fs
b25nIHdpdGggR05VIENsYXNzcGF0aDsgc2VlIHRoZSBmaWxlIENPUFlJTkcuICBJZiBub3QsIHdy
aXRlIHRvIHRoZQ0KK0ZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLiwgNTkgVGVtcGxlIFBs
YWNlLCBTdWl0ZSAzMzAsIEJvc3RvbiwgTUENCiswMjExMS0xMzA3IFVTQS4NCisNCitMaW5raW5n
IHRoaXMgbGlicmFyeSBzdGF0aWNhbGx5IG9yIGR5bmFtaWNhbGx5IHdpdGggb3RoZXIgbW9kdWxl
cyBpcw0KK21ha2luZyBhIGNvbWJpbmVkIHdvcmsgYmFzZWQgb24gdGhpcyBsaWJyYXJ5LiAgVGh1
cywgdGhlIHRlcm1zIGFuZA0KK2NvbmRpdGlvbnMgb2YgdGhlIEdOVSBHZW5lcmFsIFB1YmxpYyBM
aWNlbnNlIGNvdmVyIHRoZSB3aG9sZQ0KK2NvbWJpbmF0aW9uLg0KKw0KK0FzIGEgc3BlY2lhbCBl
eGNlcHRpb24sIHRoZSBjb3B5cmlnaHQgaG9sZGVycyBvZiB0aGlzIGxpYnJhcnkgZ2l2ZSB5b3UN
CitwZXJtaXNzaW9uIHRvIGxpbmsgdGhpcyBsaWJyYXJ5IHdpdGggaW5kZXBlbmRlbnQgbW9kdWxl
cyB0byBwcm9kdWNlIGFuDQorZXhlY3V0YWJsZSwgcmVnYXJkbGVzcyBvZiB0aGUgbGljZW5zZSB0
ZXJtcyBvZiB0aGVzZSBpbmRlcGVuZGVudA0KK21vZHVsZXMsIGFuZCB0byBjb3B5IGFuZCBkaXN0
cmlidXRlIHRoZSByZXN1bHRpbmcgZXhlY3V0YWJsZSB1bmRlcg0KK3Rlcm1zIG9mIHlvdXIgY2hv
aWNlLCBwcm92aWRlZCB0aGF0IHlvdSBhbHNvIG1lZXQsIGZvciBlYWNoIGxpbmtlZA0KK2luZGVw
ZW5kZW50IG1vZHVsZSwgdGhlIHRlcm1zIGFuZCBjb25kaXRpb25zIG9mIHRoZSBsaWNlbnNlIG9m
IHRoYXQNCittb2R1bGUuICBBbiBpbmRlcGVuZGVudCBtb2R1bGUgaXMgYSBtb2R1bGUgd2hpY2gg
aXMgbm90IGRlcml2ZWQgZnJvbQ0KK29yIGJhc2VkIG9uIHRoaXMgbGlicmFyeS4gIElmIHlvdSBt
b2RpZnkgdGhpcyBsaWJyYXJ5LCB5b3UgbWF5IGV4dGVuZA0KK3RoaXMgZXhjZXB0aW9uIHRvIHlv
dXIgdmVyc2lvbiBvZiB0aGUgbGlicmFyeSwgYnV0IHlvdSBhcmUgbm90DQorb2JsaWdhdGVkIHRv
IGRvIHNvLiAgSWYgeW91IGRvIG5vdCB3aXNoIHRvIGRvIHNvLCBkZWxldGUgdGhpcw0KK2V4Y2Vw
dGlvbiBzdGF0ZW1lbnQgZnJvbSB5b3VyIHZlcnNpb24uICovDQorDQorcGFja2FnZSBqYXZhLmxh
bmc7DQorDQoraW1wb3J0IGphdmEuaW8uRmlsZTsNCitpbXBvcnQgamF2YS5pby5GaWxlSW5wdXRT
dHJlYW07DQoraW1wb3J0IGphdmEuaW8uRmlsZU91dHB1dFN0cmVhbTsNCitpbXBvcnQgamF2YS5p
by5JT0V4Y2VwdGlvbjsNCitpbXBvcnQgamF2YS5pby5JbnB1dFN0cmVhbTsNCitpbXBvcnQgamF2
YS5pby5PdXRwdXRTdHJlYW07DQoraW1wb3J0IGphdmEudXRpbC5IYXNoTWFwOw0KK2ltcG9ydCBq
YXZhLnV0aWwuTGlua2VkTGlzdDsNCisNCisvKioNCisgKiBSZXByZXNlbnRzIG9uZSBleHRlcm5h
bCBwcm9jZXNzLiBFYWNoIGluc3RhbmNlIG9mIHRoaXMgY2xhc3MgaXMgaW4NCisgKiBvbmUgb2Yg
dGhyZWUgc3RhdGVzOiBJTklUSUFMLCBSVU5OSU5HLCBvciBURVJNSU5BVEVELiBUaGUgaW5zdGFu
Y2UNCisgKiBpcyB7QGxpbmsgT2JqZWN0I25vdGlmeUFsbCBub3RpZnlBbGwoKX0nZCBlYWNoIHRp
bWUgdGhlIHN0YXRlIGNoYW5nZXMuDQorICogVGhlIHN0YXRlIG9mIGFsbCBpbnN0YW5jZXMgaXMg
bWFuYWdlZCBieSBhIHNpbmdsZSBkZWRpY2F0ZWQgdGhyZWFkDQorICogd2hpY2ggZG9lcyB0aGUg
YWN0dWFsIGZvcmsoKS9leGVjKCkgYW5kIHdhaXQoKSBzeXN0ZW0gY2FsbHMuIFVzZXINCisgKiB0
aHJlYWRzIHtAbGluayBPYmplY3Qjd2FpdCB3YWl0KCl9IG9uIHRoZSBpbnN0YW5jZSB3aGVuIGNy
ZWF0aW5nIHRoZQ0KKyAqIHByb2Nlc3Mgb3Igd2FpdGluZyBmb3IgaXQgdG8gdGVybWluYXRlLg0K
KyAqDQorICogPHA+DQorICogU2VlDQorICogPGEgaHJlZj0iaHR0cDovL2djYy5nbnUub3JnL2J1
Z3ppbGxhL3Nob3dfYnVnLmNnaT9pZD0xMTgwMSI+R0NDIGJ1Zw0KKyAqICMxMTgwMTwvYT4gZm9y
IHRoZSBtb3RpdmF0aW9uIGJlaGluZCB0aGUgZGVzaWduIG9mIHRoaXMgY2xhc3MuDQorICoNCisg
KiBAYXV0aG9yIEFyY2hpZSBDb2Jicw0KKyAqIEBzZWUgUHJvY2Vzcw0KKyAqIEBzZWUgUnVudGlt
ZSNleGVjDQorICovDQorZmluYWwgY2xhc3MgVk1Qcm9jZXNzIGV4dGVuZHMgUHJvY2VzcyB7DQor
DQorICAvLyBQb3NzaWJsZSBzdGF0ZXMgZm9yIGEgVk1Qcm9jZXNzDQorICBwcml2YXRlIHN0YXRp
YyBmaW5hbCBpbnQgSU5JVElBTCA9IDA7DQorICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgUlVO
TklORyA9IDE7DQorICBwcml2YXRlIHN0YXRpYyBmaW5hbCBpbnQgVEVSTUlOQVRFRCA9IDI7DQor
DQorICAvLyBEZWRpY2F0ZWQgdGhyZWFkIHRoYXQgZG9lcyBhbGwgdGhlIGZvcmsoKSdpbmcgYW5k
IHdhaXQoKSdpbmcuDQorICBwcml2YXRlIHN0YXRpYyBUaHJlYWQgcHJvY2Vzc1RocmVhZDsNCisN
CisgIC8vIE5ldyBwcm9jZXNzZXMgd2FpdGluZyB0byBiZSBzcGF3bmVkIGJ5IHByb2Nlc3NUaHJl
YWQuDQorICBwcml2YXRlIHN0YXRpYyBmaW5hbCBMaW5rZWRMaXN0IHdvcmtMaXN0ID0gbmV3IExp
bmtlZExpc3QoKTsNCisNCisgIC8vIFJldHVybiB2YWx1ZXMgc2V0IGJ5IG5hdGl2ZVJlYXAoKSB3
aGVuIGEgY2hpbGQgaXMgcmVhcGVkLg0KKyAgLy8gVGhlc2UgYXJlIG9ubHkgYWNjZXNzZWQgYnkg
cHJvY2Vzc1RocmVhZCBzbyBubyBsb2NraW5nIHJlcXVpcmVkLg0KKyAgcHJpdmF0ZSBzdGF0aWMg
bG9uZyByZWFwZWRQaWQ7DQorICBwcml2YXRlIHN0YXRpYyBpbnQgcmVhcGVkRXhpdFZhbHVlOw0K
Kw0KKyAgLy8gSW5mb3JtYXRpb24gYWJvdXQgdGhpcyBwcm9jZXNzDQorICBwcml2YXRlIGludCBz
dGF0ZTsJCQkJLy8gY3VycmVudCBzdGF0ZSBvZiBwcm9jZXNzDQorICBwcml2YXRlIGZpbmFsIFN0
cmluZ1tdIGNtZDsJCQkvLyBjb3BpZWQgZnJvbSBSdW50aW1lLmV4ZWMoKQ0KKyAgcHJpdmF0ZSBm
aW5hbCBTdHJpbmdbXSBlbnY7CQkJLy8gY29waWVkIGZyb20gUnVudGltZS5leGVjKCkNCisgIHBy
aXZhdGUgZmluYWwgRmlsZSBkaXI7CQkJLy8gY29waWVkIGZyb20gUnVudGltZS5leGVjKCkNCisg
IHByaXZhdGUgVGhyb3dhYmxlIGV4Y2VwdGlvbjsJCQkvLyBpZiBwcm9jZXNzIGZhaWxlZCB0byBz
dGFydA0KKyAgcHJpdmF0ZSBsb25nIHBpZDsJCQkJLy8gcHJvY2VzcyBpZA0KKyAgcHJpdmF0ZSBP
dXRwdXRTdHJlYW0gc3RkaW47CQkJLy8gcHJvY2VzcyBpbnB1dCBzdHJlYW0NCisgIHByaXZhdGUg
SW5wdXRTdHJlYW0gc3Rkb3V0OwkJCS8vIHByb2Nlc3Mgb3V0cHV0IHN0cmVhbQ0KKyAgcHJpdmF0
ZSBJbnB1dFN0cmVhbSBzdGRlcnI7CQkJLy8gcHJvY2VzcyBlcnJvciBzdHJlYW0NCisgIHByaXZh
dGUgaW50IGV4aXRWYWx1ZTsJCQkvLyBwcm9jZXNzIGV4aXQgdmFsdWUNCisNCisgIC8vDQorICAv
LyBEZWRpY2F0ZWQgdGhyZWFkIHRoYXQgZG9lcyBhbGwgdGhlIGZvcmsoKSdpbmcgYW5kIHdhaXQo
KSdpbmcNCisgIC8vIGZvciBleHRlcm5hbCBwcm9jZXNzZXMuIFRoaXMgaXMgbmVlZGVkIGJlY2F1
c2Ugc29tZSBzeXN0ZW1zIGxpa2UNCisgIC8vIExpbnV4IHVzZSBhIHByb2Nlc3MtcGVyLXRocmVh
ZCBtb2RlbCwgd2hpY2ggbWVhbnMgdGhlIHNhbWUgdGhyZWFkDQorICAvLyB0aGF0IGRpZCB0aGUg
Zm9yaygpL2V4ZWMoKSBtdXN0IGFsc28gZG8gdGhlIHdhaXQoKS4NCisgIC8vDQorICBwcml2YXRl
IHN0YXRpYyBjbGFzcyBQcm9jZXNzVGhyZWFkIGV4dGVuZHMgVGhyZWFkIHsNCisNCisgICAgLy8g
TWF4IHRpbWUgKGluIG1zKSB3ZSdsbCBkZWxheSBiZWZvcmUgdHJ5aW5nIHRvIHJlYXAgYW5vdGhl
ciBjaGlsZC4NCisgICAgcHJpdmF0ZSBzdGF0aWMgZmluYWwgaW50IE1BWF9SRUFQX0RFTEFZID0g
MTAwMDsNCisNCisgICAgLy8gUHJvY2Vzc2VzIGNyZWF0ZWQgYnV0IG5vdCB5ZXQgdGVybWluYXRl
ZDsgbWFwcyBMb25nKHBpZCkgLT4gVk1Qcm9jZXNzDQorICAgIHByaXZhdGUgZmluYWwgSGFzaE1h
cCBhY3RpdmVNYXAgPSBuZXcgSGFzaE1hcCgpOw0KKw0KKyAgICBwdWJsaWMgdm9pZCBydW4oKSB7
DQorICAgICAgZmluYWwgTGlua2VkTGlzdCB3b3JrTGlzdCA9IFZNUHJvY2Vzcy53b3JrTGlzdDsN
CisgICAgICB3aGlsZSAodHJ1ZSkgew0KKw0KKwkvLyBHZXQgdGhlIG5leHQgcHJvY2VzcyB0byBz
cGF3biAoaWYgYW55KSBhbmQgc3Bhd24gaXQuIFNwYXduDQorCS8vIGF0IG1vc3Qgb25lIGF0IGEg
dGltZSBiZWZvcmUgY2hlY2tpbmcgZm9yIHJlYXBhYmxlIGNoaWxkcmVuLg0KKwlWTVByb2Nlc3Mg
cHJvY2VzcyA9IG51bGw7DQorCXN5bmNocm9uaXplZCAod29ya0xpc3QpIHsNCisJICBpZiAoIXdv
cmtMaXN0LmlzRW1wdHkoKSkNCisJICAgIHByb2Nlc3MgPSAoVk1Qcm9jZXNzKXdvcmtMaXN0LnJl
bW92ZUZpcnN0KCk7DQorCX0NCisJaWYgKHByb2Nlc3MgIT0gbnVsbCkNCisJICBzcGF3bihwcm9j
ZXNzKTsNCisNCisJLy8gQ2hlY2sgZm9yIHRlcm1pbmF0aW9uIG9mIGFjdGl2ZSBjaGlsZCBwcm9j
ZXNzZXMNCisJd2hpbGUgKFZNUHJvY2Vzcy5uYXRpdmVSZWFwKCkpIHsNCisJICBsb25nIHBpZCA9
IFZNUHJvY2Vzcy5yZWFwZWRQaWQ7DQorCSAgaW50IGV4aXRWYWx1ZSA9IFZNUHJvY2Vzcy5yZWFw
ZWRFeGl0VmFsdWU7DQorCSAgcHJvY2VzcyA9IChWTVByb2Nlc3MpYWN0aXZlTWFwLnJlbW92ZShu
ZXcgTG9uZyhwaWQpKTsNCisJICBzeW5jaHJvbml6ZWQgKHByb2Nlc3MpIHsNCisJICAgIHByb2Nl
c3MuZXhpdFZhbHVlID0gZXhpdFZhbHVlOw0KKwkgICAgcHJvY2Vzcy5zdGF0ZSA9IFRFUk1JTkFU
RUQ7DQorCSAgICBwcm9jZXNzLm5vdGlmeSgpOw0KKwkgIH0NCisJfQ0KKw0KKwkvLyBJZiB0aGVy
ZSBhcmUgbW9yZSBuZXcgcHJvY2Vzc2VzIHRvIGNyZWF0ZSwgZ28gZG8gdGhhdCBub3cuDQorCS8v
IElmIHRoZXJlIGlzIG5vdGhpbmcgbGVmdCB0byBkbywgZXhpdCB0aGlzIHRocmVhZC4gT3RoZXJ3
aXNlLA0KKwkvLyBzbGVlcCBhIGxpdHRsZSB3aGlsZSwgYW5kIHRoZW4gY2hlY2sgYWdhaW4gZm9y
IHJlYXBhYmxlIGNoaWxkcmVuLg0KKwkvLyBXZSB3aWxsIGdldCB3b2tlbiB1cCBpbW1lZGlhdGVs
eSBpZiB0aGVyZSBhcmUgbmV3IHByb2Nlc3NlcyB0bw0KKwkvLyBzcGF3biwgYnV0IG5vdCBpZiB0
aGVyZSBhcmUgbmV3IGNoaWxkcmVuIHRvIHJlYXAuIFNvIHdlIG9ubHkNCisJLy8gc2xlZXAgYSBz
aG9ydCB0aW1lLCBpbiBlZmZlY3QgcG9sbGluZyB3aGlsZSBwcm9jZXNzZXMgYXJlIGFjdGl2ZS4N
CisJc3luY2hyb25pemVkICh3b3JrTGlzdCkgew0KKwkgIGlmICghd29ya0xpc3QuaXNFbXB0eSgp
KQ0KKwkgICAgY29udGludWU7DQorCSAgaWYgKGFjdGl2ZU1hcC5pc0VtcHR5KCkpIHsNCisJICAg
IHByb2Nlc3NUaHJlYWQgPSBudWxsOw0KKwkgICAgYnJlYWs7DQorCSAgfQ0KKwkgIHRyeSB7DQor
CSAgICB3b3JrTGlzdC53YWl0KE1BWF9SRUFQX0RFTEFZKTsNCisJICB9IGNhdGNoIChJbnRlcnJ1
cHRlZEV4Y2VwdGlvbiBlKSB7DQorCSAgfQ0KKwl9DQorICAgICAgfQ0KKyAgICB9DQorDQorICAg
IC8vIFNwYXduIGEgcHJvY2Vzcw0KKyAgICBwcml2YXRlIHZvaWQgc3Bhd24oVk1Qcm9jZXNzIHBy
b2Nlc3MpIHsNCisNCisgICAgICAvLyBTcGF3biB0aGUgcHJvY2VzcyBhbmQgcHV0IGl0IGluIG91
ciBhY3RpdmUgbWFwIGluZGV4ZWQgYnkgcGlkLg0KKyAgICAgIC8vIElmIHRoZSBzcGF3biBvcGVy
YXRpb24gZmFpbHMsIHN0b3JlIHRoZSBleGNlcHRpb24gd2l0aCB0aGUgcHJvY2Vzcy4NCisgICAg
ICAvLyBJbiBlaXRoZXIgY2FzZSwgd2FrZSB1cCB0aHJlYWQgdGhhdCBjcmVhdGVkIHRoZSBwcm9j
ZXNzLg0KKyAgICAgIHN5bmNocm9uaXplZCAocHJvY2Vzcykgew0KKwl0cnkgew0KKwkgIHByb2Nl
c3MubmF0aXZlU3Bhd24ocHJvY2Vzcy5jbWQsIHByb2Nlc3MuZW52LCBwcm9jZXNzLmRpcik7DQor
CSAgcHJvY2Vzcy5zdGF0ZSA9IFJVTk5JTkc7DQorCSAgYWN0aXZlTWFwLnB1dChuZXcgTG9uZyhw
cm9jZXNzLnBpZCksIHByb2Nlc3MpOw0KKwl9IGNhdGNoIChUaHJvd2FibGUgdCkgew0KKwkgIHBy
b2Nlc3Muc3RhdGUgPSBURVJNSU5BVEVEOw0KKwkgIHByb2Nlc3MuZXhjZXB0aW9uID0gdDsNCisJ
fQ0KKwlwcm9jZXNzLm5vdGlmeSgpOw0KKyAgICAgIH0NCisgICAgfQ0KKyAgfQ0KKw0KKyAgLy8g
Q29uc3RydWN0b3INCisgIHByaXZhdGUgVk1Qcm9jZXNzKFN0cmluZ1tdIGNtZCwgU3RyaW5nW10g
ZW52LCBGaWxlIGRpcikgdGhyb3dzIElPRXhjZXB0aW9uIHsNCisNCisgICAgLy8gSW5pdGlhbGl6
ZSB0aGlzIHByb2Nlc3MNCisgICAgdGhpcy5zdGF0ZSA9IElOSVRJQUw7DQorICAgIHRoaXMuY21k
ID0gY21kOw0KKyAgICB0aGlzLmVudiA9IGVudjsNCisgICAgdGhpcy5kaXIgPSBkaXI7DQorICAN
CisgICAgLy8gQWRkIHByb2Nlc3MgdG8gdGhlIG5ldyBwcm9jZXNzIHdvcmsgbGlzdCBhbmQgd2Fr
ZXVwIHByb2Nlc3NUaHJlYWQNCisgICAgc3luY2hyb25pemVkICh3b3JrTGlzdCkgew0KKyAgICAg
IHdvcmtMaXN0LmFkZCh0aGlzKTsNCisgICAgICBpZiAocHJvY2Vzc1RocmVhZCA9PSBudWxsKSB7
DQorCXByb2Nlc3NUaHJlYWQgPSBuZXcgUHJvY2Vzc1RocmVhZCgpOw0KKwlwcm9jZXNzVGhyZWFk
LnNldERhZW1vbih0cnVlKTsNCisJcHJvY2Vzc1RocmVhZC5zdGFydCgpOw0KKyAgICAgIH0gZWxz
ZSB7DQorCXdvcmtMaXN0Lm5vdGlmeSgpOw0KKyAgICAgIH0NCisgICAgfQ0KKw0KKyAgICAvLyBX
YWl0IGZvciBwcm9jZXNzVGhyZWFkIHRvIHNwYXduIHRoaXMgcHJvY2VzcyBhbmQgdXBkYXRlIGl0
cyBzdGF0ZQ0KKyAgICBzeW5jaHJvbml6ZWQgKHRoaXMpIHsNCisgICAgICB3aGlsZSAoc3RhdGUg
PT0gSU5JVElBTCkgew0KKwl0cnkgew0KKwkgIHdhaXQoKTsNCisJfSBjYXRjaCAoSW50ZXJydXB0
ZWRFeGNlcHRpb24gZSkgew0KKwl9DQorICAgICAgfQ0KKyAgICB9DQorDQorICAgIC8vIElmIHNw
YXduaW5nIGZhaWxlZCwgcmV0aHJvdyB0aGUgZXhjZXB0aW9uIGluIHRoaXMgdGhyZWFkDQorICAg
IGlmIChleGNlcHRpb24gIT0gbnVsbCkgew0KKyAgICAgIGV4Y2VwdGlvbi5wcmludFN0YWNrVHJh
Y2UoKTsNCisgICAgICBleGNlcHRpb24uZmlsbEluU3RhY2tUcmFjZSgpOw0KKyAgICAgIGlmIChl
eGNlcHRpb24gaW5zdGFuY2VvZiBJT0V4Y2VwdGlvbikNCisJdGhyb3cgKElPRXhjZXB0aW9uKWV4
Y2VwdGlvbjsNCisgICAgICBpZiAoZXhjZXB0aW9uIGluc3RhbmNlb2YgRXJyb3IpDQorCXRocm93
IChFcnJvcilleGNlcHRpb247DQorICAgICAgaWYgKGV4Y2VwdGlvbiBpbnN0YW5jZW9mIFJ1bnRp
bWVFeGNlcHRpb24pDQorCXRocm93IChSdW50aW1lRXhjZXB0aW9uKWV4Y2VwdGlvbjsNCisgICAg
ICB0aHJvdyBuZXcgUnVudGltZUV4Y2VwdGlvbihleGNlcHRpb24pOw0KKyAgICB9DQorICB9DQor
DQorICAvLyBJbnZva2VkIGJ5IG5hdGl2ZSBjb2RlIChmcm9tIG5hdGl2ZVNwYXduKCkpIHRvIHJl
Y29yZCBwcm9jZXNzIGluZm8uDQorICBwcml2YXRlIHZvaWQgc2V0UHJvY2Vzc0luZm8oT3V0cHV0
U3RyZWFtIHN0ZGluLA0KKwkJICBJbnB1dFN0cmVhbSBzdGRvdXQsIElucHV0U3RyZWFtIHN0ZGVy
ciwgbG9uZyBwaWQpDQorICB7DQorICAgIHRoaXMuc3RkaW4gPSBzdGRpbjsNCisgICAgdGhpcy5z
dGRvdXQgPSBzdGRvdXQ7DQorICAgIHRoaXMuc3RkZXJyID0gc3RkZXJyOw0KKyAgICB0aGlzLnBp
ZCA9IHBpZDsNCisgIH0NCisNCisgIC8qKg0KKyAgICogRW50cnkgcG9pbnQgZnJvbSBSdW50aW1l
LmV4ZWMoKS4NCisgICAqLw0KKyAgc3RhdGljIFByb2Nlc3MgZXhlYyhTdHJpbmdbXSBjbWQsIFN0
cmluZ1tdIGVudiwgRmlsZSBkaXIpIHRocm93cyBJT0V4Y2VwdGlvbiB7DQorICAgIHJldHVybiBu
ZXcgVk1Qcm9jZXNzKGNtZCwgZW52LCBkaXIpOw0KKyAgfQ0KKw0KKyAgcHVibGljIE91dHB1dFN0
cmVhbSBnZXRPdXRwdXRTdHJlYW0oKSB7DQorICAgIHJldHVybiBzdGRpbjsNCisgIH0NCisNCisg
IHB1YmxpYyBJbnB1dFN0cmVhbSBnZXRJbnB1dFN0cmVhbSgpIHsNCisgICAgcmV0dXJuIHN0ZG91
dDsNCisgIH0NCisNCisgIHB1YmxpYyBJbnB1dFN0cmVhbSBnZXRFcnJvclN0cmVhbSgpIHsNCisg
ICAgcmV0dXJuIHN0ZGVycjsNCisgIH0NCisNCisgIHB1YmxpYyBzeW5jaHJvbml6ZWQgaW50IHdh
aXRGb3IoKSB0aHJvd3MgSW50ZXJydXB0ZWRFeGNlcHRpb24gew0KKyAgICB3aGlsZSAoc3RhdGUg
IT0gVEVSTUlOQVRFRCkNCisgICAgICB3YWl0KCk7DQorICAgIHJldHVybiBleGl0VmFsdWU7DQor
ICB9DQorDQorICBwdWJsaWMgc3luY2hyb25pemVkIGludCBleGl0VmFsdWUoKSB7DQorICAgIGlm
IChzdGF0ZSAhPSBURVJNSU5BVEVEKQ0KKyAgICAgIHRocm93IG5ldyBJbGxlZ2FsVGhyZWFkU3Rh
dGVFeGNlcHRpb24oKTsNCisgICAgcmV0dXJuIGV4aXRWYWx1ZTsNCisgIH0NCisNCisgIHB1Ymxp
YyBzeW5jaHJvbml6ZWQgdm9pZCBkZXN0cm95KCkgew0KKyAgICBpZiAoc3RhdGUgPT0gVEVSTUlO
QVRFRCkNCisgICAgICByZXR1cm47DQorICAgIG5hdGl2ZUtpbGwocGlkKTsNCisgICAgd2hpbGUg
KHRydWUpIHsNCisgICAgICB0cnkgew0KKwl3YWl0Rm9yKCk7DQorICAgICAgfSBjYXRjaCAoSW50
ZXJydXB0ZWRFeGNlcHRpb24gZSkgew0KKyAgICAgIH0NCisgICAgfQ0KKyAgfQ0KKw0KKyAgLyoq
DQorICAgKiBEb2VzIHRoZSBmb3JrKCkvZXhlYygpIHRoaW5nIHRvIGNyZWF0ZSB0aGUgTy9TIHBy
b2Nlc3MuDQorICAgKiBNdXN0IGludm9rZSBzZXRQcm9jZXNzSW5mbygpIGJlZm9yZSByZXR1cm5p
bmcgc3VjY2Vzc2Z1bGx5Lg0KKyAgICogVGhpcyBtZXRob2QgaXMgb25seSBpbnZva2VkIGJ5IHBy
b2Nlc3NUaHJlYWQuDQorICAgKg0KKyAgICogQHRocm93cyBJT0V4Y2VwdGlvbiBpZiB0aGUgTy9T
IHByb2Nlc3MgY291bGQgbm90IGJlIGNyZWF0ZWQuDQorICAgKi8NCisgIHByaXZhdGUgbmF0aXZl
IHZvaWQgbmF0aXZlU3Bhd24oU3RyaW5nW10gY21kLCBTdHJpbmdbXSBlbnYsIEZpbGUgZGlyKQ0K
KyAgICB0aHJvd3MgSU9FeGNlcHRpb247DQorDQorICAvKioNCisgICAqIFRlc3QgZm9yIGEgcmVh
cGFibGUgY2hpbGQgcHJvY2VzcywgYW5kIHJlYXAgaWYgc28uIERvZXMgbm90IGJsb2NrLg0KKyAg
ICogSWYgYSBjaGlsZCB3YXMgcmVhcGVkLCB0aGlzIG1ldGhvZCBtdXN0IHNldCByZWFwZWRQaWQg
YW5kDQorICAgKiByZWFwZWRFeGl0VmFsdWUgYXBwcm9wcmlhdGVseSBiZWZvcmUgcmV0dXJuaW5n
Lg0KKyAgICogVGhpcyBtZXRob2QgaXMgb25seSBpbnZva2VkIGJ5IHByb2Nlc3NUaHJlYWQuDQor
ICAgKg0KKyAgICogQHJldHVybiB0cnVlIGlmIGEgY2hpbGQgd2FzIHJlYXBlZCwgb3RoZXJ3aXNl
IGZhbHNlDQorICAgKi8NCisgIHByaXZhdGUgc3RhdGljIG5hdGl2ZSBib29sZWFuIG5hdGl2ZVJl
YXAoKTsNCisNCisgIC8qKg0KKyAgICogS2lsbCBhIHByb2Nlc3MuIFRoaXMgc2VuZHMgaXQgYSBm
YXRhbCBzaWduYWwgYnV0IGRvZXMgbm90IHJlYXAgaXQuDQorICAgKi8NCisgIHByaXZhdGUgc3Rh
dGljIG5hdGl2ZSB2b2lkIG5hdGl2ZUtpbGwobG9uZyBwaWQpOw0KK30NCisNCkluZGV4OiB2bS9y
ZWZlcmVuY2UvamF2YS9sYW5nL1ZNUnVudGltZS5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTog
L2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC92bS9yZWZlcmVuY2UvamF2YS9sYW5nL1ZNUnVu
dGltZS5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4zDQpkaWZmIC11IC11IC1yMS4zIFZN
UnVudGltZS5qYXZhDQotLS0gdm0vcmVmZXJlbmNlL2phdmEvbGFuZy9WTVJ1bnRpbWUuamF2YQky
NyBEZWMgMjAwMyAxMDo0ODo0OCAtMDAwMAkxLjMNCisrKyB2bS9yZWZlcmVuY2UvamF2YS9sYW5n
L1ZNUnVudGltZS5qYXZhCTIyIEFwciAyMDA0IDIyOjA1OjIwIC0wMDAwDQpAQCAtMzgsNiArMzgs
NyBAQA0KIHBhY2thZ2UgamF2YS5sYW5nOw0KIA0KIGltcG9ydCBqYXZhLmlvLkZpbGU7DQoraW1w
b3J0IGphdmEuaW8uSU9FeGNlcHRpb247DQogaW1wb3J0IGphdmEudXRpbC5Qcm9wZXJ0aWVzOw0K
IA0KIC8qKg0KQEAgLTE3OCw3ICsxNzksMTAgQEANCiAgICAgICogQHJldHVybiB0aGUgbmV3bHkg
Y3JlYXRlZCBwcm9jZXNzDQogICAgICAqIEB0aHJvd3MgTnVsbFBvaW50ZXJFeGNlcHRpb24gaWYg
Y21kIG9yIGVudiBoYXZlIG51bGwgZWxlbWVudHMNCiAgICAgICovDQotICAgIHN0YXRpYyBuYXRp
dmUgUHJvY2VzcyBleGVjKFN0cmluZ1tdIGNtZCwgU3RyaW5nW10gZW52LCBGaWxlIGRpcik7DQor
ICAgIHN0YXRpYyBQcm9jZXNzIGV4ZWMoU3RyaW5nW10gY21kLCBTdHJpbmdbXSBlbnYsIEZpbGUg
ZGlyKQ0KKwl0aHJvd3MgSU9FeGNlcHRpb24gew0KKyAgICAgIHJldHVybiBWTVByb2Nlc3MuZXhl
YyhjbWQsIGVudiwgZGlyKTsNCisgICAgfQ0KIA0KICAgICAvKioNCiAgICAgICogR2V0IHRoZSBz
eXN0ZW0gcHJvcGVydGllcy4gVGhpcyBpcyBkb25lIGhlcmUsIGluc3RlYWQgb2YgaW4gU3lzdGVt
LA0K

--=-QlCuS4ifVXayNANDopOZ--

--=-9jFwX4oN8nG6k0Lubjfn
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)

iD8DBQBAiEOWxVhZCJWr9QwRAlToAJ0aquw6rv8x7KL6Kofmw0wIEbcdmgCghxwe
4gHdu7x0kGVyhgDhrEj0G34=
=6T6X
-----END PGP SIGNATURE-----

--=-9jFwX4oN8nG6k0Lubjfn--




From MAILER-DAEMON Thu Apr 22 19:07:26 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGnHx-0008L2-ED
	for mharc-commit-classpath@gnu.org; Thu, 22 Apr 2004 19:07:25 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGnHs-0008GX-46
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 19:07:20 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGnHm-0008B2-WB
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 19:07:16 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGnHm-00089e-13
	for commit-classpath@gnu.org; Thu, 22 Apr 2004 19:07:14 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BGnHd-0001oT-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 01:07:05 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-oflYrzXaSp89LgTZSDo0"
Message-Id: <1082675227.27234.217.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 23 Apr 2004 01:07:08 +0200
Subject: Getting FIONREAD for checking available bytes on (non-file) channel
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 22 Apr 2004 23:07:22 -0000


--=-oflYrzXaSp89LgTZSDo0
Content-Type: multipart/mixed; boundary="=-exfQZ7IcgSPjFZgToNA4"


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

Hi,

I want to make the following change to target_generic_file.h which
defines TARGET_NATIVE_FILE_AVAILABLE. The original tested for
HAVE_FIONREAD, but I couldn't find a good way to test for this. So I
took the approach that libgcj also uses.

2004-04-22  Mark Wielaard  <mark@klomp.org>

        * configure.ac (AC_CHECK_HEADERS): Check for sys/filio.h.
        * native/target/generic/target_generic_file.h
        (TARGET_NATIVE_FILE_AVAILABLE): First include headers if they exist=
,
        then check for FIONREAD.

Without this change you will get exceptions when calling available on
non-file streams like System.in for example:

java.io.IOException: No such file or directory
   at gnu.java.nio.channels.FileChannelImpl.available (Native Method)

If someone knows a better way to get this functionality please let me
know. If nobody objects I will commit this this weekend.

Cheers,

Mark

--=-exfQZ7IcgSPjFZgToNA4
Content-Disposition: inline; filename=FIONREAD.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=FIONREAD.patch; charset=ISO-8859-1

SW5kZXg6IGNvbmZpZ3VyZS5hYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNz
cGF0aC9jbGFzc3BhdGgvY29uZmlndXJlLmFjLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMA0K
ZGlmZiAtdSAtcjEuMjAgY29uZmlndXJlLmFjDQotLS0gY29uZmlndXJlLmFjCTIxIEFwciAyMDA0
IDE1OjUzOjM3IC0wMDAwCTEuMjANCisrKyBjb25maWd1cmUuYWMJMjIgQXByIDIwMDQgMjI6NTg6
MTQgLTAwMDANCkBAIC05Nyw3ICs5NywxMyBAQA0KIA0KIGlmIHRlc3QgIngke0NPTVBJTEVfSk5J
fSIgPSB4eWVzOyB0aGVuDQogICBBQ19IRUFERVJfU1REQw0KLSAgQUNfQ0hFQ0tfSEVBREVSUyh1
bmlzdGQuaCBzeXMvdHlwZXMuaCBzeXMvY29uZmlnLmggc3lzL2lvY3RsLmggYXNtL2lvY3Rscy5o
IGludHR5cGVzLmggc3RkaW50LmggdXRpbWUuaCBzeXMvdXRpbWUuaCkNCisNCisgIGRubCBXZSBj
aGVjayBmb3Igc3lzL2ZpbGlvLmggYmVjYXVzZSBTb2xhcmlzIDIuNSBkZWZpbmVzIEZJT05SRUFE
IHRoZXJlLg0KKyAgZG5sIE9uIHRoYXQgc3lzdGVtLCBzeXMvaW9jdGwuaCB3aWxsIG5vdCBpbmNs
dWRlIHN5cy9maWxpby5oIHVubGVzcw0KKyAgZG5sIEJTRF9DT01QIGlzIGRlZmluZWQ7IGp1c3Qg
aW5jbHVkaW5nIHN5cy9maWxpby5oIGlzIHNpbXBsZXIuDQorICBBQ19DSEVDS19IRUFERVJTKHVu
aXN0ZC5oIHN5cy90eXBlcy5oIHN5cy9jb25maWcuaCBzeXMvaW9jdGwuaCBhc20vaW9jdGxzLmgp
DQorICBBQ19DSEVDS19IRUFERVJTKGludHR5cGVzLmggc3RkaW50LmggdXRpbWUuaCBzeXMvdXRp
bWUuaCBzeXMvZmlsaW8uaCkNCisNCiAgIEFDX0VHUkVQX0hFQURFUih1aW50MzJfdCwgc3RkaW50
LmgsIEFDX0RFRklORShIQVZFX0lOVDMyX0RFRklORUQsIDEsIFtEZWZpbmUgdG8gMSBpZiB5b3Ug
aGF2ZSB1aW50MzJfdF0pKQ0KICAgQUNfRUdSRVBfSEVBREVSKHVpbnQzMl90LCBpbnR0eXBlcy5o
LCBBQ19ERUZJTkUoSEFWRV9JTlQzMl9ERUZJTkVELCAxLCBbRGVmaW5lIHRvIDEgaWYgeW91IGhh
dmUgdWludDMyX3RdKSkNCiAgIEFDX0VHUkVQX0hFQURFUih1X2ludDMyX3QsIHN5cy90eXBlcy5o
LCBBQ19ERUZJTkUoSEFWRV9CU0RfSU5UMzJfREVGSU5FRCwgMSwgW0RlZmluZSB0byAxIGlmIHlv
dSBoYXZlIEJTRCB1X2ludDMyX3RdKSkNCkluZGV4OiBuYXRpdmUvdGFyZ2V0L2dlbmVyaWMvdGFy
Z2V0X2dlbmVyaWNfZmlsZS5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3Nw
YXRoL2NsYXNzcGF0aC9uYXRpdmUvdGFyZ2V0L2dlbmVyaWMvdGFyZ2V0X2dlbmVyaWNfZmlsZS5o
LHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNg0KZGlmZiAtdSAtcjEuMTYgdGFyZ2V0X2dlbmVy
aWNfZmlsZS5oDQotLS0gbmF0aXZlL3RhcmdldC9nZW5lcmljL3RhcmdldF9nZW5lcmljX2ZpbGUu
aAk5IEFwciAyMDA0IDE0OjA0OjUwIC0wMDAwCTEuMTYNCisrKyBuYXRpdmUvdGFyZ2V0L2dlbmVy
aWMvdGFyZ2V0X2dlbmVyaWNfZmlsZS5oCTIyIEFwciAyMDA0IDIyOjU4OjE0IC0wMDAwDQpAQCAt
NDEzLDE0ICs0MTMsMTQgQEANCiBcKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovDQogDQogI2lmbmRlZiBUQVJHRVRf
TkFUSVZFX0ZJTEVfQVZBSUxBQkxFDQotICAjaWYgICBkZWZpbmVkKEhBVkVfRklPTlJFQUQpDQot
ICAgICNpZmRlZiBIQVZFX1NZU19JT0NUTA0KLSAgICAgICNkZWZpbmUgQlNEX0NPTVAgLyogR2V0
IEZJT05SRUFEIG9uIFNvbGFyaXMyICovDQotICAgICAgI2luY2x1ZGUgPHN5cy9pb2N0bC5oPg0K
LSAgICAjZW5kaWYNCi0gICAgI2lmZGVmIEhBVkVfU1lTX0ZJTElPIC8qIEdldCBGSU9OUkVBRCBv
biBTb2xhcmlzIDIuNSAqLw0KLSAgICAgICNpbmNsdWRlIDxzeXMvZmlsaW8uaD4NCi0gICAgI2Vu
ZGlmDQorICAjaWZkZWYgSEFWRV9TWVNfSU9DVExfSA0KKyAgICAjZGVmaW5lIEJTRF9DT01QIC8q
IEdldCBGSU9OUkVBRCBvbiBTb2xhcmlzMiAqLw0KKyAgICAjaW5jbHVkZSA8c3lzL2lvY3RsLmg+
DQorICAjZW5kaWYNCisgICNpZmRlZiBIQVZFX1NZU19GSUxJT19IIC8qIEdldCBGSU9OUkVBRCBv
biBTb2xhcmlzIDIuNSAqLw0KKyAgICAjaW5jbHVkZSA8c3lzL2ZpbGlvLmg+DQorICAjZW5kaWYN
CisgICNpZiBkZWZpbmVkIChGSU9OUkVBRCkNCiAgICAgI2RlZmluZSBUQVJHRVRfTkFUSVZFX0ZJ
TEVfQVZBSUxBQkxFKGZpbGVkZXNjcmlwdG9yLGxlbmd0aCxyZXN1bHQpIFwNCiAgICAgICBkbyB7
IFwNCiAgICAgICAgIHNzaXplX3QgX19uOyBcDQo=

--=-exfQZ7IcgSPjFZgToNA4--

--=-oflYrzXaSp89LgTZSDo0
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)

iD8DBQBAiFAbxVhZCJWr9QwRAjuPAJ9GbdjPvayoozjGs0zK/cqTEidn/wCgi+de
UR/1LPNk6FVTLX464MdzWPc=
=TQRV
-----END PGP SIGNATURE-----

--=-oflYrzXaSp89LgTZSDo0--




From MAILER-DAEMON Fri Apr 23 00:05:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGrwF-0006fq-RS
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 00:05:19 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGrwD-0006fA-Qb
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 00:05:17 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGrvg-0006Dy-TK
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 00:05:16 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGrvg-0006Dm-Hg
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 00:04:44 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id F152362505
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 04:04:43 +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 53808-08 for <commit-classpath@gnu.org>;
	Fri, 23 Apr 2004 04:04:42 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-74-46.adsl.solnet.ch [212.41.74.46])
	by mail01.solnet.ch (Postfix) with ESMTP id 730F8624FD
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 04:04:42 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 2BDA3B9A77; Fri, 23 Apr 2004 06:02:33 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040423040233.2BDA3B9A77@reali.dnsalias.net>
Date: Fri, 23 Apr 2004 06:02:33 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040423 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 04:05:18 -0000




From MAILER-DAEMON Fri Apr 23 01:44:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGtUF-0005o4-1s
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 01:44:31 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGtUD-0005nu-BP
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 01:44:29 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGtTh-0005k3-Hq
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 01:44:28 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGtTh-0005jy-2C
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 01:43:57 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-204.ewetel.net
	[80.228.95.204])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3N5gQnV018312
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 07:43:02 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGtRI-0000SC-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 07:41:28 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 23 Apr 2004 07:40:41 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ZxKiA39vOkyDtFJ"
Message-Id: <200404230740.41907.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.nio.channels.spi.AbstractInterruptibleChannel
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 05:44:29 -0000


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

Hi list,


I just commited the attached patch to partly implement 
java.nio.channels.spi.AbstractInterruptibleChannel.end().


Michael


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

	* java/nio/channels/spi/AbstractInterruptibleChannel.java
	(end): Throw AsynchronousCloseException if stream is close.


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

Index: java/nio/channels/spi/AbstractInterruptibleChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractInterruptibleChannel.java,v
retrieving revision 1.8
diff -u -r1.8 AbstractInterruptibleChannel.java
--- java/nio/channels/spi/AbstractInterruptibleChannel.java	8 Apr 2004 20:59:20 -0000	1.8
+++ java/nio/channels/spi/AbstractInterruptibleChannel.java	23 Apr 2004 05:38:49 -0000
@@ -1,5 +1,5 @@
-/* AbstractInterruptibleChannel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* AbstractInterruptibleChannel.java -- 
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -95,6 +95,9 @@
   protected final void end(boolean completed)
     throws AsynchronousCloseException
   {
+    // FIXME: check more here.
+    
+    if (closed) throw new AsynchronousCloseException();
   }
 
   /**

--Boundary-00=_ZxKiA39vOkyDtFJ--




From MAILER-DAEMON Fri Apr 23 02:12:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGtvh-0001ut-2C
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 02:12:53 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGtve-0001tM-6G
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:12:50 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGtv4-0001hL-8I
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:12:45 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGttq-0001GD-4u
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:10:58 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-204.ewetel.net
	[80.228.95.204])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3N69UR9010093
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 08:10:39 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGtqX-0000Yz-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 08:07:33 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 23 Apr 2004 08:06:46 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_2JLiACVWNqkl5+v"
Message-Id: <200404230806.46799.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.nio.charset
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 06:12:51 -0000


--Boundary-00=_2JLiACVWNqkl5+v
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.


Michael


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

	* java/nio/charset/IllegalCharsetNameException.java
	(charsetName): Made private.
	(IllegalCharsetNameException): Added @param tag to javadoc.
	(getCharsetName): Added @return tag to javadoc.
	* java/nio/charset/MalformedInputException.java
	(MalformedInputException): Added @param tag to javadoc.
	(getInputLength): Revised method description, added @return tag.
	(getMessage): Added @return tag.


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

Index: java/nio/charset/IllegalCharsetNameException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/charset/IllegalCharsetNameException.java,v
retrieving revision 1.3
diff -u -r1.3 IllegalCharsetNameException.java
--- java/nio/charset/IllegalCharsetNameException.java	3 Mar 2003 07:09:20 -0000	1.3
+++ java/nio/charset/IllegalCharsetNameException.java	23 Apr 2004 06:05:29 -0000
@@ -48,10 +48,12 @@
    */
   private static final long serialVersionUID = 1457525358470002989L;
   
-  String charsetName;
+  private String charsetName;
   
   /**
    * Creates the exception
+   *
+   * @param charsetName name of the illegal charset
    */
   public IllegalCharsetNameException (String charsetName)
   {
@@ -61,6 +63,8 @@
 
   /**
    * Retrieves the illegal charset name
+   *
+   * @return the illegal charset name
    */
   public String getCharsetName ()
   {
Index: java/nio/charset/MalformedInputException.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/charset/MalformedInputException.java,v
retrieving revision 1.2
diff -u -r1.2 MalformedInputException.java
--- java/nio/charset/MalformedInputException.java	8 Nov 2002 12:15:32 -0000	1.2
+++ java/nio/charset/MalformedInputException.java	23 Apr 2004 06:05:29 -0000
@@ -46,6 +46,8 @@
   
   /**
    * Creates the exception
+   *
+   * @param inputLength the position of malformed input in the input stream
    */
   public MalformedInputException (int inputLength)
   {
@@ -54,7 +56,9 @@
   }
 
   /**
-   * Retrieves the illegal charset name
+   * Retrieves the position of the malformed input in the input stream.
+   *
+   * @return the position
    */
   public int getInputLength ()
   {
@@ -63,6 +67,8 @@
 
   /**
    * Returns the detail message string of this throwable
+   *
+   * @return the message
    */
   public String getMessage ()
   {

--Boundary-00=_2JLiACVWNqkl5+v--




From MAILER-DAEMON Fri Apr 23 02:16:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGtww-0002wO-8e
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 02:14:10 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGtwb-0002dE-0Z
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:13:49 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGtwK-0002Nz-6x
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:13:45 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGttb-0001DY-SQ
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:10:44 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-204.ewetel.net
	[80.228.95.204])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3N69UR7010093
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 08:10:06 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGtX6-0000SI-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 07:47:28 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 23 Apr 2004 07:46:41 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_B3KiA3+D+ZuEp7g"
Message-Id: <200404230746.41954.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: unicode-muncher.pl
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 06:13:58 -0000


--Boundary-00=_B3KiA3+D+ZuEp7g
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 typo in 
unicode-muncher.pl.


Michael


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

	* scripts/unicode-muncher.pl: Fixed typo.


--Boundary-00=_B3KiA3+D+ZuEp7g
Content-Type: text/x-diff;
  charset="us-ascii";
  name="unicode.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="unicode.diff"

Index: scripts/unicode-muncher.pl
===================================================================
RCS file: /cvsroot/classpath/classpath/scripts/unicode-muncher.pl,v
retrieving revision 1.3
diff -u -r1.3 unicode-muncher.pl
--- scripts/unicode-muncher.pl	9 Mar 2002 21:20:04 -0000	1.3
+++ scripts/unicode-muncher.pl	23 Apr 2004 05:45:30 -0000
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 # unicode-muncher.pl -- generate Unicode database for java.lang.Character
-# Copyright (C) 1998, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998, 2002, 2004  Free Software Foundation, Inc.
 #
 # This file is part of GNU Classpath.
 #
@@ -370,7 +370,7 @@
  * java.lang.Character needs.  It is generated automatically from
  * <code>$ARGV[0]</code> and
  * <code>$ARGV[1]</code>, by some
- * perl scripts. These Unicode definition file can be found on the
+ * perl scripts. These Unicode definition files can be found on the
  * <a href="http://www.unicode.org">http://www.unicode.org</a> website.
  * JDK 1.4 uses Unicode version 3.0.0.
  *

--Boundary-00=_B3KiA3+D+ZuEp7g--




From MAILER-DAEMON Fri Apr 23 02:19:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGu2E-0006R6-VG
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 02:19:38 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGu2A-0006QD-NB
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:19:34 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGu1d-0006Kj-My
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:19:33 -0400
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 1BGu1d-0006Jy-Db
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:19:01 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BGttk-0004f8-2B
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 02:10:52 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-204.ewetel.net
	[80.228.95.204])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3N69UR8010093
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 08:10:22 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGtbw-0000SV-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 07:52:28 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 23 Apr 2004 07:51:41 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_t7KiAgYGFv5Up+3"
Message-Id: <200404230751.42009.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: gnu.java.nio.channels.FileChannelImpl
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 06:19:36 -0000


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

Hi list,


I just commited the attached patch to remove unused stuff in 
gnu.java.nio.channels.FileChannelImpl.


Michael


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

	* gnu/java/nio/channels/FileChannelImpl.java
	(SET, CUR): Unused, removed.


--Boundary-00=_t7KiAgYGFv5Up+3
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/channels/FileChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/channels/FileChannelImpl.java,v
retrieving revision 1.4
diff -u -r1.4 FileChannelImpl.java
--- gnu/java/nio/channels/FileChannelImpl.java	13 Apr 2004 09:50:39 -0000	1.4
+++ gnu/java/nio/channels/FileChannelImpl.java	23 Apr 2004 05:49:37 -0000
@@ -60,13 +60,8 @@
  * Instances of this class are created by invoking getChannel
  * Upon a Input/Output/RandomAccessFile object.
  */
-
 public final class FileChannelImpl extends FileChannel
 {
-  // These are WHENCE values for seek.
-//   public static final int SET = 0;
-//   public static final int CUR = 1;
-
   // These are mode values for open().
   public static final int READ   = 1;
   public static final int WRITE  = 2;

--Boundary-00=_t7KiAgYGFv5Up+3--




From MAILER-DAEMON Fri Apr 23 03:34:41 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BGvCr-0000S2-6X
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 03:34:41 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BGvCo-0000Qz-2f
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 03:34:38 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BGvCF-0000FH-IP
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 03:34:34 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BGvCF-0000Dv-1e
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 03:34:03 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-204.ewetel.net
	[80.228.95.204])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3N7Y0R7010132
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 09:34:01 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BGvCe-0000j4-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 09:34:28 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 23 Apr 2004 09:33:40 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_UbMiA0uSBkmrr6K"
Message-Id: <200404230933.40741.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.net - little coding style cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 07:34:39 -0000


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

Hi list,


I just commited this little coding style cleanup to get more in line 
with libgcj's versions of these files.


Michael


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

	* java/net/URL.java,
	java/net/URLConnection.java:
	Fixed coding style.


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

Index: java/net/URL.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URL.java,v
retrieving revision 1.27
diff -u -r1.27 URL.java
--- java/net/URL.java	20 Apr 2004 16:29:11 -0000	1.27
+++ java/net/URL.java	23 Apr 2004 07:27:03 -0000
@@ -823,7 +823,9 @@
 
     // If a non-default factory has been set, use it to find the protocol.
     if (factory != null)
-      ph = factory.createURLStreamHandler(protocol);
+      {
+	ph = factory.createURLStreamHandler(protocol);
+      }
 
     // Non-default factory may have returned null or a factory wasn't set.
     // Use the default search algorithm to find a handler for this protocol.
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLConnection.java,v
retrieving revision 1.26
diff -u -r1.26 URLConnection.java
--- java/net/URLConnection.java	17 Apr 2004 18:42:20 -0000	1.26
+++ java/net/URLConnection.java	23 Apr 2004 07:27:03 -0000
@@ -161,6 +161,7 @@
    * This is the URL associated with this connection
    */
   protected URL url;
+
   private static SimpleDateFormat dateFormat1;
   private static SimpleDateFormat dateFormat2;
   private static SimpleDateFormat dateFormat3;

--Boundary-00=_UbMiA0uSBkmrr6K--




From MAILER-DAEMON Fri Apr 23 12:08:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH3EJ-0001yc-1I
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 12:08:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH3ED-0001vw-Uj
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 12:08:37 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH3Dh-0001gj-Nd
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 12:08:36 -0400
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 1BH3De-0001g1-OM
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 12:08:02 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BH3C0-000393-4w
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 12:06:20 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BH3AT-0002rM-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 18:04:45 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BH3AP-0002p7-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 18:04:41 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3NG4eLT023837
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 18:04:41 +0200 (MEST)
Message-ID: <40893E98.4060907@kaffe.org>
Date: Fri, 23 Apr 2004 18:04:40 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------040908070600030804000805"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: cleaned up imports in java.text
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 16:08:38 -0000

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

Hi all,

I've cleaned up the imports in java.text

cheers,
dalibor topic

2004-04-22 Dalibor Topic <robilad@kaffe.org>

         java/text/AttributedString.java,
         java/text/AttributedStringIterator.java,
         java/text/CollationElementIterator.java,
         java/text/Collator.java,
         java/text/DecimalFormatSymbols.java,
         java/text/NumberFormat.java,
         java/text/RuleBasedCollator.java:
         Cleaned up imports.

--------------040908070600030804000805
Content-Type: text/plain;
 name="cpath-text-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-text-imports"

Index: java/text/AttributedStringIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedStringIterator.java,v
retrieving revision 1.6
diff -u -r1.6 AttributedStringIterator.java
--- java/text/AttributedStringIterator.java	20 Apr 2004 21:04:36 -0000	1.6
+++ java/text/AttributedStringIterator.java	23 Apr 2004 15:53:21 -0000
@@ -1,5 +1,5 @@
 /* AttributedStringIterator.java -- Class to iterate over AttributedString
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,11 +38,11 @@
 
 package java.text;
 
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Map;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
 
 /**
   * This class implements the AttributedCharacterIterator interface.  It
Index: java/text/AttributedString.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedString.java,v
retrieving revision 1.6
diff -u -r1.6 AttributedString.java
--- java/text/AttributedString.java	20 Apr 2004 21:04:36 -0000	1.6
+++ java/text/AttributedString.java	23 Apr 2004 15:53:21 -0000
@@ -39,10 +39,10 @@
 package java.text;
 
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
Index: java/text/CollationElementIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationElementIterator.java,v
retrieving revision 1.15
diff -u -r1.15 CollationElementIterator.java
--- java/text/CollationElementIterator.java	17 Apr 2004 18:37:47 -0000	1.15
+++ java/text/CollationElementIterator.java	23 Apr 2004 15:53:21 -0000
@@ -39,9 +39,6 @@
 package java.text;
 
 import java.util.Vector;
-import java.util.NoSuchElementException;
-import java.util.Map;
-import java.util.SortedMap;
 
 /* Written using "Java Class Libraries", 2nd edition, plus online
  * API docs for JDK 1.2 from http://www.javasoft.com.
Index: java/text/Collator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/Collator.java,v
retrieving revision 1.8
diff -u -r1.8 Collator.java
--- java/text/Collator.java	17 Apr 2004 18:37:47 -0000	1.8
+++ java/text/Collator.java	23 Apr 2004 15:53:21 -0000
@@ -1,5 +1,5 @@
 /* Collator.java -- Perform locale dependent String comparisons.
-   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,10 +38,10 @@
 
 package java.text;
 
+import java.util.Comparator;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.util.Comparator;
 
 /**
  * This class is the abstract superclass of classes which perform 
Index: java/text/DecimalFormatSymbols.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/DecimalFormatSymbols.java,v
retrieving revision 1.9
diff -u -r1.9 DecimalFormatSymbols.java
--- java/text/DecimalFormatSymbols.java	17 Apr 2004 18:37:47 -0000	1.9
+++ java/text/DecimalFormatSymbols.java	23 Apr 2004 15:53:21 -0000
@@ -1,5 +1,5 @@
 /* DecimalFormatSymbols.java -- Format symbols used by DecimalFormat
-   Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,13 +38,13 @@
 
 package java.text;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.util.Currency;
 import java.util.Locale;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
-import java.io.ObjectInputStream;
-import java.io.IOException;
 
 /**
  * This class is a container for the symbols used by 
Index: java/text/NumberFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/NumberFormat.java,v
retrieving revision 1.9
diff -u -r1.9 NumberFormat.java
--- java/text/NumberFormat.java	26 Mar 2004 20:21:26 -0000	1.9
+++ java/text/NumberFormat.java	23 Apr 2004 15:53:21 -0000
@@ -38,8 +38,8 @@
 
 package java.text;
 
-import java.io.InvalidObjectException;
 import java.io.IOException;
+import java.io.InvalidObjectException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Currency;
Index: java/text/RuleBasedCollator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/RuleBasedCollator.java,v
retrieving revision 1.21
diff -u -r1.21 RuleBasedCollator.java
--- java/text/RuleBasedCollator.java	17 Apr 2004 18:37:47 -0000	1.21
+++ java/text/RuleBasedCollator.java	23 Apr 2004 15:53:21 -0000
@@ -1,5 +1,5 @@
 /* RuleBasedCollator.java -- Concrete Collator Class
-   Copyright (C) 1998, 1999, 2000, 2001, 2003  Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,7 +37,6 @@
 
 package java.text;
 
-import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Vector;

--------------040908070600030804000805--



From MAILER-DAEMON Fri Apr 23 13:18:42 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH4K2-0002O6-Ke
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 13:18:42 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH4Jz-0002Mk-FZ
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 13:18:39 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH4Jx-0002LV-6c
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 13:18:37 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BH4Jw-0002Ku-9n
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 13:18:36 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BH4Jr-0004yF-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 19:18:31 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-W3wHEuxFFW9zY+gjQbtQ"
Message-Id: <1082740713.27234.259.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 23 Apr 2004 19:18:33 +0200
Subject: FYI: Fixed some static field/method accesses and wrong assignments
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 17:18:40 -0000


--=-W3wHEuxFFW9zY+gjQbtQ
Content-Type: multipart/mixed; boundary="=-JO2vJ1QCCKPKEQwZFKys"


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

Hi,

Played with the eclipse compiler for java and fixed some of the warnings
it pointed out. Some are just code cleanups, but there are actually some
subtle bugs fixed by this.

2004-04-23  Mark Wielaard  <mark@klomp.org>

       * gnu/java/security/der/DERReader.java: Call static methods staticly=
.
       * java/awt/TextComponent.java (select): Use selectionEnd parameter.
       * java/lang/System.java (runFinalizersOnExit): Call static
       Runtime.runFinalizersOnExit staticly.
       * java/net/URL.java
       (set(String, String, int, String, String, String, String, String)):
       Assign this.file to path or path + "?" + query.
       * java/text/RuleBasedCollator.java: Call static methods staticly.A
       * java/util/Arrays.java: Likewise.
       * java/util/zip/ZipEntry.java: Likewise.
       * javax/swing/plaf/basic/BasicArrowButton.java (setDirection): Assig=
n
       dir to this.direction.
       * javax/swing/table/DefaultTableCellRenderer.java (noFocusBorder):
       Assign static field only once.
       (DefaultTableCellRenderer): Don't reassign noFocusBorder each time.

Committed.

Cheers,

Mark

--=-JO2vJ1QCCKPKEQwZFKys
Content-Disposition: inline; filename=static-fixes.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=static-fixes.patch; charset=ISO-8859-1

SW5kZXg6IGdudS9qYXZhL3NlY3VyaXR5L2Rlci9ERVJSZWFkZXIuamF2YQ0KPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0K
UkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvZ251L2phdmEvc2VjdXJpdHkv
ZGVyL0RFUlJlYWRlci5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xDQpkaWZmIC11IC1y
MS4xIERFUlJlYWRlci5qYXZhDQotLS0gZ251L2phdmEvc2VjdXJpdHkvZGVyL0RFUlJlYWRlci5q
YXZhCTIzIEFwciAyMDAzIDIyOjUxOjQ2IC0wMDAwCTEuMQ0KKysrIGdudS9qYXZhL3NlY3VyaXR5
L2Rlci9ERVJSZWFkZXIuamF2YQkyMyBBcHIgMjAwNCAxNjozOTozMiAtMDAwMA0KQEAgLTMzNSw3
ICszMzUsNyBAQA0KICAgICAgICAgICAgICAgSW50ZWdlci5wYXJzZUludChzdHIuc3Vic3RyaW5n
KCA2LCAgOCkpLCAgICAvLyBob3VyDQogICAgICAgICAgICAgICBJbnRlZ2VyLnBhcnNlSW50KHN0
ci5zdWJzdHJpbmcoIDgsIDEwKSkpOyAgIC8vIG1pbnV0ZQ0KICAgICAgICAgICAgIGlmIChkYXRl
Lmxlbmd0aCgpID09IDEyKTsNCi0gICAgICAgICAgICAgIGNhbGVuZGFyLnNldChjYWxlbmRhci5T
RUNPTkQsDQorICAgICAgICAgICAgICBjYWxlbmRhci5zZXQoQ2FsZW5kYXIuU0VDT05ELA0KICAg
ICAgICAgICAgICAgICBJbnRlZ2VyLnBhcnNlSW50KHN0ci5zdWJzdHJpbmcoMTAsIDEyKSkpOw0K
ICAgICAgICAgICB9DQogICAgICAgICBjYXRjaCAoTnVtYmVyRm9ybWF0RXhjZXB0aW9uIG5mZSkN
CkBAIC0zNjIsMTMgKzM2MiwxMyBAQA0KICAgICAgICAgICAgICAgICBjYXNlIDE4Og0KICAgICAg
ICAgICAgICAgICBjYXNlIDE3Og0KICAgICAgICAgICAgICAgICBjYXNlIDE2Og0KLSAgICAgICAg
ICAgICAgICAgIGNhbGVuZGFyLnNldChjYWxlbmRhci5NSUxMSVNFQ09ORCwNCisgICAgICAgICAg
ICAgICAgICBjYWxlbmRhci5zZXQoQ2FsZW5kYXIuTUlMTElTRUNPTkQsDQogICAgICAgICAgICAg
ICAgICAgICBJbnRlZ2VyLnBhcnNlSW50KGRhdGUuc3Vic3RyaW5nKDE1KSkpOw0KICAgICAgICAg
ICAgICAgICBjYXNlIDE0Og0KLSAgICAgICAgICAgICAgICAgIGNhbGVuZGFyLnNldChjYWxlbmRh
ci5TRUNPTkQsDQorICAgICAgICAgICAgICAgICAgY2FsZW5kYXIuc2V0KENhbGVuZGFyLlNFQ09O
RCwNCiAgICAgICAgICAgICAgICAgICAgIEludGVnZXIucGFyc2VJbnQoZGF0ZS5zdWJzdHJpbmco
MTIsIDE0KSkpOw0KICAgICAgICAgICAgICAgICBjYXNlIDEyOg0KLSAgICAgICAgICAgICAgICAg
IGNhbGVuZGFyLnNldChjYWxlbmRhci5NSU5VVEUsDQorICAgICAgICAgICAgICAgICAgY2FsZW5k
YXIuc2V0KENhbGVuZGFyLk1JTlVURSwNCiAgICAgICAgICAgICAgICAgICAgIEludGVnZXIucGFy
c2VJbnQoZGF0ZS5zdWJzdHJpbmcoMTAsIDEyKSkpOw0KICAgICAgICAgICAgICAgfQ0KICAgICAg
ICAgICB9DQpJbmRleDogamF2YS9hd3QvVGV4dENvbXBvbmVudC5qYXZhDQo9PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpS
Q1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZhL2F3dC9UZXh0Q29tcG9u
ZW50LmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjEyDQpkaWZmIC11IC1yMS4xMiBUZXh0
Q29tcG9uZW50LmphdmENCi0tLSBqYXZhL2F3dC9UZXh0Q29tcG9uZW50LmphdmEJMjYgRGVjIDIw
MDMgMTY6Mzc6MjcgLTAwMDAJMS4xMg0KKysrIGphdmEvYXd0L1RleHRDb21wb25lbnQuamF2YQky
MyBBcHIgMjAwNCAxNjozOTozMiAtMDAwMA0KQEAgLTIzNCwxMSArMjM0LDExIEBADQogICAqIHNw
ZWNpZmllZCBzdGFydCBhbmQgZW5kIHBvc2l0aW9ucy4gIElsbGVnYWwgdmFsdWVzIGZvciB0aGVz
ZQ0KICAgKiBwb3NpdGlvbnMgYXJlIHNpbGVudGx5IGZpeGVkLg0KICAgKg0KLSAgKiBAcGFyYW0g
c3RhcnRTZWxlY3Rpb24gVGhlIG5ldyBzdGFydCBwb3NpdGlvbiBmb3IgdGhlIHNlbGVjdGVkIHRl
eHQuDQotICAqIEBwYXJhbSBlbmRTZWxlY3Rpb24gVGhlIG5ldyBlbmQgcG9zaXRpb24gZm9yIHRo
ZSBzZWxlY3RlZCB0ZXh0Lg0KKyAgKiBAcGFyYW0gc2VsZWN0aW9uU3RhcnQgVGhlIG5ldyBzdGFy
dCBwb3NpdGlvbiBmb3IgdGhlIHNlbGVjdGVkIHRleHQuDQorICAqIEBwYXJhbSBzZWxlY3Rpb25F
bmQgVGhlIG5ldyBlbmQgcG9zaXRpb24gZm9yIHRoZSBzZWxlY3RlZCB0ZXh0Lg0KICAgKi8NCiBw
dWJsaWMgc3luY2hyb25pemVkIHZvaWQNCi1zZWxlY3QoaW50IHNlbGVjdGlvblN0YXJ0LCBpbnQg
ZW5kU2VsZWN0aW9uKQ0KK3NlbGVjdChpbnQgc2VsZWN0aW9uU3RhcnQsIGludCBzZWxlY3Rpb25F
bmQpDQogew0KICAgaWYgKHNlbGVjdGlvblN0YXJ0IDwgMCkNCiAgICAgc2VsZWN0aW9uU3RhcnQg
PSAwOw0KSW5kZXg6IGphdmEvbGFuZy9TeXN0ZW0uamF2YQ0KPT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6
IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvamF2YS9sYW5nL1N5c3RlbS5qYXZhLHYNCnJl
dHJpZXZpbmcgcmV2aXNpb24gMS4zMg0KZGlmZiAtdSAtcjEuMzIgU3lzdGVtLmphdmENCi0tLSBq
YXZhL2xhbmcvU3lzdGVtLmphdmEJMTIgQXByIDIwMDQgMTQ6MzI6NTkgLTAwMDAJMS4zMg0KKysr
IGphdmEvbGFuZy9TeXN0ZW0uamF2YQkyMyBBcHIgMjAwNCAxNjozOTozMiAtMDAwMA0KQEAgLTYz
Miw3ICs2MzIsNyBAQA0KICAgICovDQogICBwdWJsaWMgc3RhdGljIHZvaWQgcnVuRmluYWxpemVy
c09uRXhpdChib29sZWFuIGZpbmFsaXplT25FeGl0KQ0KICAgew0KLSAgICBSdW50aW1lLmdldFJ1
bnRpbWUoKS5ydW5GaW5hbGl6ZXJzT25FeGl0KGZpbmFsaXplT25FeGl0KTsNCisgICAgUnVudGlt
ZS5ydW5GaW5hbGl6ZXJzT25FeGl0KGZpbmFsaXplT25FeGl0KTsNCiAgIH0NCiANCiAgIC8qKg0K
SW5kZXg6IGphdmEvbmV0L1VSTC5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3Qv
Y2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZhL25ldC9VUkwuamF2YSx2DQpyZXRyaWV2aW5nIHJldmlz
aW9uIDEuMjkNCmRpZmYgLXUgLXIxLjI5IFVSTC5qYXZhDQotLS0gamF2YS9uZXQvVVJMLmphdmEJ
MjMgQXByIDIwMDQgMTY6Mjc6MDYgLTAwMDAJMS4yOQ0KKysrIGphdmEvbmV0L1VSTC5qYXZhCTIz
IEFwciAyMDA0IDE2OjM5OjMyIC0wMDAwDQpAQCAtNzUxLDEyICs3NTEsMTEgQEANCiAgICAgdGhp
cy5ob3N0ID0gaG9zdDsNCiAgICAgdGhpcy51c2VySW5mbyA9IHVzZXJJbmZvOw0KICAgICB0aGlz
LnBvcnQgPSBwb3J0Ow0KLSAgICB0aGlzLmZpbGUgPSBwYXRoOw0KICAgICB0aGlzLmF1dGhvcml0
eSA9IGF1dGhvcml0eTsNCiAgICAgaWYgKHF1ZXJ5ID09IG51bGwpDQotICAgICAgdGhpcy5maWxl
ID0gZmlsZTsNCisgICAgICB0aGlzLmZpbGUgPSBwYXRoOw0KICAgICBlbHNlDQotICAgICAgdGhp
cy5maWxlID0gZmlsZSArICI/IiArIHF1ZXJ5Ow0KKyAgICAgIHRoaXMuZmlsZSA9IHBhdGggKyAi
PyIgKyBxdWVyeTsNCiAgICAgdGhpcy5yZWYgPSByZWY7DQogICAgIGhhc2hDb2RlID0gaGFzaENv
ZGUoKTsgLy8gVXNlZCBmb3Igc2VyaWFsaXphdGlvbi4NCiAgIH0NCkluZGV4OiBqYXZhL3RleHQv
UnVsZUJhc2VkQ29sbGF0b3IuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2Ns
YXNzcGF0aC9jbGFzc3BhdGgvamF2YS90ZXh0L1J1bGVCYXNlZENvbGxhdG9yLmphdmEsdg0KcmV0
cmlldmluZyByZXZpc2lvbiAxLjIyDQpkaWZmIC11IC1yMS4yMiBSdWxlQmFzZWRDb2xsYXRvci5q
YXZhDQotLS0gamF2YS90ZXh0L1J1bGVCYXNlZENvbGxhdG9yLmphdmEJMjMgQXByIDIwMDQgMTY6
MDM6MTAgLTAwMDAJMS4yMg0KKysrIGphdmEvdGV4dC9SdWxlQmFzZWRDb2xsYXRvci5qYXZhCTIz
IEFwciAyMDA0IDE2OjM5OjMyIC0wMDAwDQpAQCAtNzU1LDggKzc1NSw4IEBADQogCSAgfQ0KIA0K
ICAgICAgICAgLy8gQ2hlY2sgZm9yIHByaW1hcnkgc3RyZW5ndGggZGlmZmVyZW5jZXMNCi0gICAg
ICAgIGludCBwcmltMSA9IGNzLnByaW1hcnlPcmRlcihvcmQxKTsgDQotICAgICAgICBpbnQgcHJp
bTIgPSBjdC5wcmltYXJ5T3JkZXIob3JkMik7IA0KKyAgICAgICAgaW50IHByaW0xID0gQ29sbGF0
aW9uRWxlbWVudEl0ZXJhdG9yLnByaW1hcnlPcmRlcihvcmQxKTsgDQorICAgICAgICBpbnQgcHJp
bTIgPSBDb2xsYXRpb25FbGVtZW50SXRlcmF0b3IucHJpbWFyeU9yZGVyKG9yZDIpOyANCiANCiAg
ICAgICAgIGlmIChwcmltMSA8IHByaW0yKQ0KICAgICAgICAgICByZXR1cm4gLTE7DQpAQCAtNzY2
LDggKzc2Niw4IEBADQogICAgICAgICAgIGNvbnRpbnVlOw0KIA0KICAgICAgICAgLy8gQ2hlY2sg
Zm9yIHNlY29uZGFyeSBzdHJlbmd0aCBkaWZmZXJlbmNlcw0KLSAgICAgICAgaW50IHNlYzEgPSBj
cy5zZWNvbmRhcnlPcmRlcihvcmQxKTsNCi0gICAgICAgIGludCBzZWMyID0gY3Quc2Vjb25kYXJ5
T3JkZXIob3JkMik7DQorICAgICAgICBpbnQgc2VjMSA9IENvbGxhdGlvbkVsZW1lbnRJdGVyYXRv
ci5zZWNvbmRhcnlPcmRlcihvcmQxKTsNCisgICAgICAgIGludCBzZWMyID0gQ29sbGF0aW9uRWxl
bWVudEl0ZXJhdG9yLnNlY29uZGFyeU9yZGVyKG9yZDIpOw0KIA0KICAgICAgICAgaWYgKHNlYzEg
PCBzZWMyKQ0KICAgICAgICAgICByZXR1cm4gLTE7DQpAQCAtNzc3LDggKzc3Nyw4IEBADQogICAg
ICAgICAgIGNvbnRpbnVlOw0KIA0KICAgICAgICAgLy8gQ2hlY2sgZm9yIHRlcnRpYXJ5IGRpZmZl
cmVuY2VzDQotICAgICAgICBpbnQgdGVydDEgPSBjcy50ZXJ0aWFyeU9yZGVyKG9yZDEpOw0KLSAg
ICAgICAgaW50IHRlcnQyID0gY3QudGVydGlhcnlPcmRlcihvcmQyKTsNCisgICAgICAgIGludCB0
ZXJ0MSA9IENvbGxhdGlvbkVsZW1lbnRJdGVyYXRvci50ZXJ0aWFyeU9yZGVyKG9yZDEpOw0KKyAg
ICAgICAgaW50IHRlcnQyID0gQ29sbGF0aW9uRWxlbWVudEl0ZXJhdG9yLnRlcnRpYXJ5T3JkZXIo
b3JkMik7DQogDQogICAgICAgICBpZiAodGVydDEgPCB0ZXJ0MikNCiAgICAgICAgICAgcmV0dXJu
IC0xOw0KQEAgLTg5NCwxMSArODk0LDExIEBADQogICAgICAgICBzd2l0Y2ggKGdldFN0cmVuZ3Ro
KCkpDQogICAgICAgICAgIHsNCiAgICAgICAgICAgICBjYXNlIFBSSU1BUlk6DQotICAgICAgICAg
ICAgICAgb3JkID0gY2VpLnByaW1hcnlPcmRlcihvcmQpOw0KKyAgICAgICAgICAgICAgIG9yZCA9
IENvbGxhdGlvbkVsZW1lbnRJdGVyYXRvci5wcmltYXJ5T3JkZXIob3JkKTsNCiAgICAgICAgICAg
ICAgICBicmVhazsNCiANCiAgICAgICAgICAgICBjYXNlIFNFQ09OREFSWToNCi0gICAgICAgICAg
ICAgICBvcmQgPSBjZWkuc2Vjb25kYXJ5T3JkZXIob3JkKTsNCisgICAgICAgICAgICAgICBvcmQg
PSBDb2xsYXRpb25FbGVtZW50SXRlcmF0b3Iuc2Vjb25kYXJ5T3JkZXIob3JkKTsNCiANCiAgICAg
ICAgICAgICBkZWZhdWx0Og0KICAgICAgICAgICAgICAgIGJyZWFrOw0KSW5kZXg6IGphdmEvdXRp
bC9BcnJheXMuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9j
bGFzc3BhdGgvamF2YS91dGlsL0FycmF5cy5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4x
OQ0KZGlmZiAtdSAtcjEuMTkgQXJyYXlzLmphdmENCi0tLSBqYXZhL3V0aWwvQXJyYXlzLmphdmEJ
MTAgU2VwIDIwMDMgMTg6MDE6MzUgLTAwMDAJMS4xOQ0KKysrIGphdmEvdXRpbC9BcnJheXMuamF2
YQkyMyBBcHIgMjAwNCAxNjozOTozMyAtMDAwMA0KQEAgLTI0MDAsNyArMjQwMCw3IEBADQogICAg
IHsNCiAgICAgICBpbnQgc2l6ZSA9IGEubGVuZ3RoOw0KICAgICAgIGZvciAoaW50IGkgPSAwOyBp
IDwgc2l6ZTsgaSsrKQ0KLSAgICAgICAgaWYgKHRoaXMuZXF1YWxzKG8sIGFbaV0pKQ0KKyAgICAg
ICAgaWYgKEFycmF5TGlzdC5lcXVhbHMobywgYVtpXSkpDQogICAgICAgICAgIHJldHVybiBpOw0K
ICAgICAgIHJldHVybiAtMTsNCiAgICAgfQ0KQEAgLTI0MDksNyArMjQwOSw3IEBADQogICAgIHsN
CiAgICAgICBpbnQgaSA9IGEubGVuZ3RoOw0KICAgICAgIHdoaWxlICgtLWkgPj0gMCkNCi0gICAg
ICAgIGlmICh0aGlzLmVxdWFscyhvLCBhW2ldKSkNCisgICAgICAgIGlmIChBcnJheUxpc3QuZXF1
YWxzKG8sIGFbaV0pKQ0KICAgICAgICAgICByZXR1cm4gaTsNCiAgICAgICByZXR1cm4gLTE7DQog
ICAgIH0NCkluZGV4OiBqYXZhL3V0aWwvemlwL1ppcEVudHJ5LmphdmENCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJD
UyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmEvdXRpbC96aXAvWmlwRW50
cnkuamF2YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTANCmRpZmYgLXUgLXIxLjEwIFppcEVu
dHJ5LmphdmENCi0tLSBqYXZhL3V0aWwvemlwL1ppcEVudHJ5LmphdmEJMTggSnVuIDIwMDMgMDk6
NDI6NTcgLTAwMDAJMS4xMA0KKysrIGphdmEvdXRpbC96aXAvWmlwRW50cnkuamF2YQkyMyBBcHIg
MjAwNCAxNjozOTozMyAtMDAwMA0KQEAgLTE2OSwxMiArMTY5LDEyIEBADQogICAgIHN5bmNocm9u
aXplZCAoY2FsKQ0KICAgICAgIHsNCiAJY2FsLnNldFRpbWUobmV3IERhdGUodGltZSoxMDAwTCkp
Ow0KLQlkb3N0aW1lID0gKGNhbC5nZXQoY2FsLllFQVIpIC0gMTk4MCAmIDB4N2YpIDw8IDI1DQot
CSAgfCAoY2FsLmdldChjYWwuTU9OVEgpICsgMSkgPDwgMjENCi0JICB8IChjYWwuZ2V0KGNhbC5E
QVlfT0ZfTU9OVEgpKSA8PCAxNg0KLQkgIHwgKGNhbC5nZXQoY2FsLkhPVVJfT0ZfREFZKSkgPDwg
MTENCi0JICB8IChjYWwuZ2V0KGNhbC5NSU5VVEUpKSA8PCA1DQotCSAgfCAoY2FsLmdldChjYWwu
U0VDT05EKSkgPj4gMTsNCisJZG9zdGltZSA9IChjYWwuZ2V0KENhbGVuZGFyLllFQVIpIC0gMTk4
MCAmIDB4N2YpIDw8IDI1DQorCSAgfCAoY2FsLmdldChDYWxlbmRhci5NT05USCkgKyAxKSA8PCAy
MQ0KKwkgIHwgKGNhbC5nZXQoQ2FsZW5kYXIuREFZX09GX01PTlRIKSkgPDwgMTYNCisJICB8IChj
YWwuZ2V0KENhbGVuZGFyLkhPVVJfT0ZfREFZKSkgPDwgMTENCisJICB8IChjYWwuZ2V0KENhbGVu
ZGFyLk1JTlVURSkpIDw8IDUNCisJICB8IChjYWwuZ2V0KENhbGVuZGFyLlNFQ09ORCkpID4+IDE7
DQogICAgICAgfQ0KICAgICBkb3N0aW1lID0gKGludCkgKGRvc3RpbWUgLyAxMDAwTCk7DQogICAg
IHRoaXMua25vd24gfD0gS05PV05fVElNRTsNCkluZGV4OiBqYXZheC9zd2luZy9wbGFmL2Jhc2lj
L0Jhc2ljQXJyb3dCdXR0b24uamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2Ns
YXNzcGF0aC9jbGFzc3BhdGgvamF2YXgvc3dpbmcvcGxhZi9iYXNpYy9CYXNpY0Fycm93QnV0dG9u
LmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjENCmRpZmYgLXUgLXIxLjEgQmFzaWNBcnJv
d0J1dHRvbi5qYXZhDQotLS0gamF2YXgvc3dpbmcvcGxhZi9iYXNpYy9CYXNpY0Fycm93QnV0dG9u
LmphdmEJMTcgQXByIDIwMDQgMjM6MjQ6NDYgLTAwMDAJMS4xDQorKysgamF2YXgvc3dpbmcvcGxh
Zi9iYXNpYy9CYXNpY0Fycm93QnV0dG9uLmphdmEJMjMgQXByIDIwMDQgMTY6Mzk6MzMgLTAwMDAN
CkBAIC0yMjMsNyArMjIzLDcgQEANCiAgICAgICBzZXRJY29uKG5ldyBhcnJvd0ljb24oYXJyb3cp
KTsNCiAgICAgZWxzZQ0KICAgICAgICgoYXJyb3dJY29uKSBnZXRJY29uKCkpLnNldEFycm93KGFy
cm93KTsNCi0gICAgdGhpcy5kaXJlY3Rpb24gPSBkaXJlY3Rpb247DQorICAgIHRoaXMuZGlyZWN0
aW9uID0gZGlyOw0KICAgfQ0KIA0KICAgLyoqDQpJbmRleDogamF2YXgvc3dpbmcvdGFibGUvRGVm
YXVsdFRhYmxlQ2VsbFJlbmRlcmVyLmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmF4L3N3aW5nL3RhYmxlL0RlZmF1bHRUYWJsZUNlbGxS
ZW5kZXJlci5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS42DQpkaWZmIC11IC1yMS42IERl
ZmF1bHRUYWJsZUNlbGxSZW5kZXJlci5qYXZhDQotLS0gamF2YXgvc3dpbmcvdGFibGUvRGVmYXVs
dFRhYmxlQ2VsbFJlbmRlcmVyLmphdmEJMTIgSmFuIDIwMDQgMjA6Mzc6NTcgLTAwMDAJMS42DQor
KysgamF2YXgvc3dpbmcvdGFibGUvRGVmYXVsdFRhYmxlQ2VsbFJlbmRlcmVyLmphdmEJMjMgQXBy
IDIwMDQgMTY6Mzk6MzMgLTAwMDANCkBAIC01NCw3ICs1NCw3IEBADQogew0KICAgc3RhdGljIGZp
bmFsIGxvbmcgc2VyaWFsVmVyc2lvblVJRCA9IDc4Nzg5MTE0MTQ3MTU1MjgzMjRMOw0KIA0KLSAg
cHJvdGVjdGVkIHN0YXRpYyBCb3JkZXIgbm9Gb2N1c0JvcmRlcjsNCisgIHByb3RlY3RlZCBzdGF0
aWMgQm9yZGVyIG5vRm9jdXNCb3JkZXIgPSBuZXcgRW1wdHlCb3JkZXIoMCwgMCwgMCwgMCk7DQog
DQogICBwdWJsaWMgc3RhdGljIGNsYXNzIFVJUmVzb3VyY2UgZXh0ZW5kcyBEZWZhdWx0VGFibGVD
ZWxsUmVuZGVyZXINCiAgICAgaW1wbGVtZW50cyBqYXZheC5zd2luZy5wbGFmLlVJUmVzb3VyY2UN
CkBAIC03MCw3ICs3MCw2IEBADQogICBwdWJsaWMgRGVmYXVsdFRhYmxlQ2VsbFJlbmRlcmVyKCkN
CiAgIHsNCiAgICAgc3VwZXIoKTsNCi0gICAgdGhpcy5ub0ZvY3VzQm9yZGVyID0gbmV3IEVtcHR5
Qm9yZGVyKDAsIDAsIDAsIDApOw0KICAgfQ0KIA0KICAgLyoqDQo=

--=-JO2vJ1QCCKPKEQwZFKys--

--=-W3wHEuxFFW9zY+gjQbtQ
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)

iD8DBQBAiU/pxVhZCJWr9QwRAvV9AJ4xbCFtC0Aa+DHeT8w+vpFipc4YNwCfdqxh
VUxMatFdEjxWkn4vH+bTzZY=
=aVQ1
-----END PGP SIGNATURE-----

--=-W3wHEuxFFW9zY+gjQbtQ--




From MAILER-DAEMON Fri Apr 23 13:26:25 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH4RV-0005BF-8K
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 13:26:25 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH4Ly-00037f-C4
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 13:20:42 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH4LJ-0002uH-0u
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 13:20:35 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BH4GR-0001Rs-NN
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 13:14:59 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BH4GQ-0005hZ-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 19:14:58 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BH4GN-0005gV-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 19:14:55 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3NHEsLT020830
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 19:14:55 +0200 (MEST)
Message-ID: <40894F0E.4030600@kaffe.org>
Date: Fri, 23 Apr 2004 19:14:54 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------070909000701000306050607"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: Fixed the probably worst ChangeLog entry ever
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 17:26:22 -0000

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

Hi all,

I've fixed some problems with my last ChangeLog entry.

cheers,
dalibor topic

2004-04-23  Dalibor Topic  <robilad@kaffe.org>

         * ChangeLog: Fixed my last entry to follow
         coding conventions.

--------------070909000701000306050607
Content-Type: text/plain;
 name="cpath-chlog-beaty"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-chlog-beaty"

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2097
diff -u -r1.2097 ChangeLog
--- ChangeLog	23 Apr 2004 16:02:59 -0000	1.2097
+++ ChangeLog	23 Apr 2004 17:04:36 -0000
@@ -1,12 +1,17 @@
-2004-04-22 Dalibor Topic <robilad@kaffe.org>
+2004-04-23  Dalibor Topic  <robilad@kaffe.org>
 
-	java/text/AttributedString.java,
-        java/text/AttributedStringIterator.java,
-        java/text/CollationElementIterator.java,
-        java/text/Collator.java,
-        java/text/DecimalFormatSymbols.java,
-        java/text/NumberFormat.java,
-        java/text/RuleBasedCollator.java:
+	* ChangeLog: Fixed my last entry to follow
+	coding conventions.
+
+2004-04-23  Dalibor Topic  <robilad@kaffe.org>
+
+	* java/text/AttributedString.java,
+	java/text/AttributedStringIterator.java,
+	java/text/CollationElementIterator.java,
+	java/text/Collator.java,
+	java/text/DecimalFormatSymbols.java,
+	java/text/NumberFormat.java,
+	java/text/RuleBasedCollator.java:
 	Cleaned up imports.
 
 2004-04-23  Michael Koch  <konqueror@gmx.de>

--------------070909000701000306050607--



From MAILER-DAEMON Fri Apr 23 14:16:20 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH5Dn-0003MO-Pc
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 14:16:19 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH5Dk-0003L9-6Y
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 14:16:16 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH5DC-00038B-O5
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 14:16:14 -0400
Received: from [139.19.1.1] (helo=interferon.mpi-sb.mpg.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BH5DB-00037G-Lk
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 14:15:41 -0400
Received: from amavis by interferon.mpi-sb.mpg.de with scanned-ok (Exim 3.35
	#1 (Debian)) id 1BH5DB-0005fk-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 20:15:41 +0200
Received: from data ([139.19.90.238] helo=mpi-sb.mpg.de)
	by interferon.mpi-sb.mpg.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BH5D8-0005fR-00
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 20:15:38 +0200
Received: from kaffe.org (topic@mpiat2304 [139.19.20.93])
	by mpi-sb.mpg.de (8.12.9+Sun/8.12.9) with ESMTP id i3NIFcLT023785
	for <commit-classpath@gnu.org>; Fri, 23 Apr 2004 20:15:38 +0200 (MEST)
Message-ID: <40895D4A.3080002@kaffe.org>
Date: Fri, 23 Apr 2004 20:15:38 +0200
From: Dalibor Topic <robilad@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7b) Gecko/20040316
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="------------030001040202010105040607"
X-Virus-Scanned: by AMaViS perl-11
Subject: FYI: cleaned up imports in java.security.interfaces
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 18:16:17 -0000

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

hi all,

i've cleaned up imports in java.security.interfaces.

cheers,
dalibor topic

2004-04-23  Dalibor Topic  <robilad@kaffe.org>

         * java/security/interfaces/DSAKeyPairGenerator.java,
         java/security/interfaces/DSAPrivateKey.java,
         java/security/interfaces/DSAPublicKey.java,
         java/security/interfaces/RSAPrivateKey.java,
         java/security/interfaces/RSAPublicKey.java:
         Cleaned up imports.

--------------030001040202010105040607
Content-Type: text/plain;
 name="cpath-sec-intf-imports"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cpath-sec-intf-imports"

Index: java/security/interfaces/DSAKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/DSAKeyPairGenerator.java,v
retrieving revision 1.5
diff -u -r1.5 DSAKeyPairGenerator.java
--- java/security/interfaces/DSAKeyPairGenerator.java	12 Oct 2003 15:53:15 -0000	1.5
+++ java/security/interfaces/DSAKeyPairGenerator.java	23 Apr 2004 18:08:43 -0000
@@ -1,5 +1,5 @@
 /* DSAKeyPairGenerator.java -- Initialize a DSA key generator
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package java.security.interfaces;
 
-import java.security.SecureRandom;
 import java.security.InvalidParameterException;
+import java.security.SecureRandom;
 
 /**
  * This interface contains methods for intializing a Digital Signature
Index: java/security/interfaces/DSAPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/DSAPrivateKey.java,v
retrieving revision 1.5
diff -u -r1.5 DSAPrivateKey.java
--- java/security/interfaces/DSAPrivateKey.java	12 Oct 2003 15:53:15 -0000	1.5
+++ java/security/interfaces/DSAPrivateKey.java	23 Apr 2004 18:08:43 -0000
@@ -1,5 +1,5 @@
 /* DSAPublicKey.java -- A Digital Signature Algorithm private key
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package java.security.interfaces;
 
-import java.security.PrivateKey;
 import java.math.BigInteger;
+import java.security.PrivateKey;
 
 /**
  * This interface models a Digital Signature Algorithm (DSA) private key
Index: java/security/interfaces/DSAPublicKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/DSAPublicKey.java,v
retrieving revision 1.5
diff -u -r1.5 DSAPublicKey.java
--- java/security/interfaces/DSAPublicKey.java	12 Oct 2003 15:53:15 -0000	1.5
+++ java/security/interfaces/DSAPublicKey.java	23 Apr 2004 18:08:43 -0000
@@ -1,5 +1,5 @@
 /* DSAPublicKey.java -- A Digital Signature Algorithm public key
-   Copyright (C) 1998, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package java.security.interfaces;
 
-import java.security.PublicKey;
 import java.math.BigInteger;
+import java.security.PublicKey;
 
 /**
  * This interface models a Digital Signature Algorithm (DSA) public key
Index: java/security/interfaces/RSAPrivateKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/RSAPrivateKey.java,v
retrieving revision 1.6
diff -u -r1.6 RSAPrivateKey.java
--- java/security/interfaces/RSAPrivateKey.java	12 Oct 2003 15:53:15 -0000	1.6
+++ java/security/interfaces/RSAPrivateKey.java	23 Apr 2004 18:08:43 -0000
@@ -1,5 +1,5 @@
 /* RSAPrivateKey.java -- An RSA private key
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package java.security.interfaces;
 
-import java.security.PrivateKey;
 import java.math.BigInteger;
+import java.security.PrivateKey;
 
 /**
  * This interface provides access to information about an RSA private key.
Index: java/security/interfaces/RSAPublicKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/interfaces/RSAPublicKey.java,v
retrieving revision 1.6
diff -u -r1.6 RSAPublicKey.java
--- java/security/interfaces/RSAPublicKey.java	12 Oct 2003 15:53:15 -0000	1.6
+++ java/security/interfaces/RSAPublicKey.java	23 Apr 2004 18:08:43 -0000
@@ -1,5 +1,5 @@
 /* RSAPublicKey.java -- An RSA public key
-   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package java.security.interfaces;
 
-import java.security.PublicKey;
 import java.math.BigInteger;
+import java.security.PublicKey;
 
 /**
  * This interface provides access to information about an RSA public key.

--------------030001040202010105040607--



From MAILER-DAEMON Fri Apr 23 15:33:00 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH6Pz-0001pN-PW
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 15:32:59 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH6Px-0001o3-OE
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 15:32:57 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH6PQ-0001j3-Sw
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 15:32:56 -0400
Received: from [207.174.178.92] (helo=email2.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BH6PQ-0001iV-FF
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 15:32:24 -0400
Received: (qmail 30616 invoked from network); 23 Apr 2004 19:35:19 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email2.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 23 Apr 2004 19:35:19 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id B5FCE4F853E; Fri, 23 Apr 2004 13:21:00 -0600 (MDT)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Yow!  Is my fallout shelter termite proof?
Date: 23 Apr 2004 13:21:00 -0600
Message-ID: <87wu46o603.fsf@fleche.redhat.com>
Lines: 25
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: naming fixlet
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 23 Apr 2004 19:32:58 -0000

This fixes a buglet in javax.naming found by Eclipse.

Tom

2004-04-23  Tom Tromey  <tromey@redhat.com>

	* javax/naming/CompoundName.java (endsWith): Look at correct
	element of source name.

Index: javax/naming/CompoundName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/naming/CompoundName.java,v
retrieving revision 1.5
diff -u -r1.5 CompoundName.java
--- javax/naming/CompoundName.java	19 Apr 2004 14:45:05 -0000	1.5
+++ javax/naming/CompoundName.java	23 Apr 2004 19:09:31 -0000
@@ -264,7 +264,7 @@
     int delta = elts.size () - cn.elts.size ();
     for (int i = 0; i < cn.elts.size (); ++i)
       {
-	String f = canonicalize ((String) elts.get (i));
+	String f = canonicalize ((String) elts.get (delta + i));
 	if (! f.equals (canonicalize ((String) cn.elts.get (i))))
 	  return false;
       }



From MAILER-DAEMON Fri Apr 23 16:21:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH7B0-0001qQ-P9
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 16:21:34 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH7Ax-0001oq-Dx
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 16:21:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH7AQ-0001cy-Dh
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 16:21:29 -0400
Received: from [207.174.178.92] (helo=email2.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BH7AP-0001c6-Je
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 16:20:57 -0400
Received: (qmail 29592 invoked from network); 23 Apr 2004 20:23:52 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email2.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 23 Apr 2004 20:23:52 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 5E3214F853E; Fri, 23 Apr 2004 14:09:33 -0600 (MDT)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: NANCY!!  Why is everything RED?!
Date: 23 Apr 2004 14:09:33 -0600
Message-ID: <87n052o3r6.fsf@fleche.redhat.com>
Lines: 201
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: some minor cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 23 Apr 2004 20:21:32 -0000

I'm checking this in.
This is just some minor cleanups found by the Eclipse compiler.

Tom

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2101
diff -u -r1.2101 ChangeLog
--- ChangeLog	23 Apr 2004 19:38:16 -0000	1.2101
+++ ChangeLog	23 Apr 2004 20:15:48 -0000
@@ -1,5 +1,20 @@
 2004-04-23  Tom Tromey  <tromey@redhat.com>
 
+	* java/text/Format.java: Cleaned up imports.
+	* java/text/DecimalFormat.java: Cleaned up imports.
+	* java/security/SecureRandom.java: Cleaned up imports.
+	(SecureRandom): Removed unused variable.
+	* java/security/UnresolvedPermission.java: Cleaned up imports.
+	* java/util/Date.java (parse): Removed unused variable.
+	* java/util/ResourceBundle.java: Cleaned up imports.
+	(getBundle): Removed unused variable.
+	(tryBundle): Likewise.
+	* java/util/regex/Pattern.java (Pattern): Removed unused constructor.
+	* java/util/zip/DeflaterHuffman.java (buildCodes): Removed unused
+	variable.
+
+2004-04-23  Tom Tromey  <tromey@redhat.com>
+
 	* javax/naming/CompoundName.java (endsWith): Look at correct
 	element of source name.
 
Index: java/text/DecimalFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/DecimalFormat.java,v
retrieving revision 1.12
diff -u -r1.12 DecimalFormat.java
--- java/text/DecimalFormat.java	1 Apr 2004 12:28:12 -0000	1.12
+++ java/text/DecimalFormat.java	23 Apr 2004 20:16:11 -0000
@@ -37,12 +37,10 @@
 
 package java.text;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
 import java.util.Currency;
 import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.io.ObjectInputStream;
-import java.io.IOException;
 
 /**
  * @author Tom Tromey <tromey@cygnus.com>
Index: java/text/Format.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/Format.java,v
retrieving revision 1.9
diff -u -r1.9 Format.java
--- java/text/Format.java	17 Apr 2004 18:37:47 -0000	1.9
+++ java/text/Format.java	23 Apr 2004 20:16:11 -0000
@@ -38,10 +38,6 @@
 
 package java.text;
 
-import java.util.Set;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.HashMap;
 import java.io.Serializable;
 
 /**
Index: java/util/Date.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Date.java,v
retrieving revision 1.16
diff -u -r1.16 Date.java
--- java/util/Date.java	6 Jan 2004 09:40:31 -0000	1.16
+++ java/util/Date.java	23 Apr 2004 20:16:11 -0000
@@ -460,7 +460,6 @@
 			int curYear = 1900 + new Date().getYear();
 			int firstYear = curYear - 80;
 			year = firstYear / 100 * 100 + num;
-			int yx = year;
 			if (year < firstYear)
 			  year += 100;
 		      }
Index: java/util/ResourceBundle.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/ResourceBundle.java,v
retrieving revision 1.22
diff -u -r1.22 ResourceBundle.java
--- java/util/ResourceBundle.java	17 Apr 2004 19:23:19 -0000	1.22
+++ java/util/ResourceBundle.java	23 Apr 2004 20:16:12 -0000
@@ -44,7 +44,6 @@
 import java.io.IOException;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import gnu.classpath.Configuration;
 
 /**
  * A resource bundle contains locale-specific data. If you need localized
@@ -402,7 +401,6 @@
     else if (cache.containsKey(name))
       {
 	Reference ref = (Reference) cache.get(name);
-	ResourceBundle result = null;
 	// If REF is null, that means that we added a `null' value to
 	// the hash map.  That means we failed to find the bundle
 	// previously, and we cached that fact.  The JDK does this, so
@@ -497,7 +495,6 @@
     if (cache.containsKey(localizedName))
       {
 	Reference ref = (Reference) cache.get(localizedName);
-	ResourceBundle result = null;
 	// If REF is null, that means that we added a `null' value to
 	// the hash map.  That means we failed to find the bundle
 	// previously, and we cached that fact.  The JDK does this, so
Index: java/util/regex/Pattern.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/regex/Pattern.java,v
retrieving revision 1.7
diff -u -r1.7 Pattern.java
--- java/util/regex/Pattern.java	21 Apr 2004 15:21:34 -0000	1.7
+++ java/util/regex/Pattern.java	23 Apr 2004 20:16:12 -0000
@@ -67,12 +67,6 @@
 
   private final RE re;
 
-  private Pattern (String regex)
-    throws PatternSyntaxException
-  {
-    this (regex, 0);
-  }
-
   private Pattern (String regex, int flags)
     throws PatternSyntaxException
   {
Index: java/util/zip/DeflaterHuffman.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterHuffman.java,v
retrieving revision 1.3
diff -u -r1.3 DeflaterHuffman.java
--- java/util/zip/DeflaterHuffman.java	22 Jan 2002 22:27:02 -0000	1.3
+++ java/util/zip/DeflaterHuffman.java	23 Apr 2004 20:16:13 -0000
@@ -115,7 +115,6 @@
     }
 
     public void buildCodes() {
-      int numSymbols = freqs.length;
       int[] nextCode = new int[maxLength];
       int code = 0;
       codes = new short[freqs.length];
Index: java/security/UnresolvedPermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/UnresolvedPermission.java,v
retrieving revision 1.6
diff -u -r1.6 UnresolvedPermission.java
--- java/security/UnresolvedPermission.java	29 Mar 2002 08:30:51 -0000	1.6
+++ java/security/UnresolvedPermission.java	23 Apr 2004 20:16:10 -0000
@@ -37,7 +37,6 @@
 
 package java.security;
 
-import java.io.Serializable;
 // All uses of Certificate in this file refer to the one in the listed
 // package, not this one.
 import java.security.cert.Certificate;
Index: java/security/SecureRandom.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/security/SecureRandom.java,v
retrieving revision 1.13
diff -u -r1.13 SecureRandom.java
--- java/security/SecureRandom.java	10 May 2003 05:58:28 -0000	1.13
+++ java/security/SecureRandom.java	23 Apr 2004 20:16:10 -0000
@@ -37,12 +37,11 @@
 
 package java.security;
 
-import java.io.Serializable;
-import java.util.Random;
-import java.util.Enumeration;
-
 import gnu.java.security.Engine;
 
+import java.util.Enumeration;
+import java.util.Random;
+
 /**
  * An interface to a cryptographically secure pseudo-random number
  * generator (PRNG). Random (or at least unguessable) numbers are used
@@ -94,7 +93,7 @@
     String key;
 
     String classname = null;
-    int i, flag = 0;
+    int i;
     Enumeration e;
     for (i = 0; i < p.length; i++)
       {



From MAILER-DAEMON Fri Apr 23 17:02:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH7nf-0007vV-Py
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 17:01:31 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH7nM-0007oF-L8
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 17:01:12 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH7mf-0007Or-Bz
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 17:01:00 -0400
Received: from [207.174.178.92] (helo=email2.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BH7lZ-0006Ux-5G
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 16:59:21 -0400
Received: (qmail 20839 invoked from network); 23 Apr 2004 21:02:15 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email2.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 23 Apr 2004 21:02:15 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 194804F853E; Fri, 23 Apr 2004 14:47:56 -0600 (MDT)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: There's enough money here to buy 5000 cans of Noodle-Roni!
Date: 23 Apr 2004 14:47:55 -0600
Message-ID: <87hdvao1z8.fsf@fleche.redhat.com>
Lines: 580
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: more minor cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 23 Apr 2004 21:01:28 -0000

Even more minor cleanups found by Eclipse.
This is all unused variables, imports, or private constructors.
(Note that some private constructors in Classpath are used by native
code and are documented as such.  I don't think the ones below qualify.)

Tom

Index: gnu/classpath/ServiceFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/classpath/ServiceFactory.java,v
retrieving revision 1.1
diff -u -r1.1 ServiceFactory.java
--- gnu/classpath/ServiceFactory.java	24 Mar 2004 07:29:56 -0000	1.1
+++ gnu/classpath/ServiceFactory.java	23 Apr 2004 20:15:50 -0000
@@ -38,11 +38,9 @@
 
 package gnu.classpath;
 
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.Reader;
 import java.net.URL;
 import java.security.AccessControlContext;
 import java.security.AccessController;
@@ -52,8 +50,8 @@
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import java.util.logging.Level;
-import java.util.logging.Logger;
 import java.util.logging.LogRecord;
+import java.util.logging.Logger;
 
 
 /**
@@ -227,7 +225,6 @@
   public static Iterator lookupProviders(Class spi,
                                          ClassLoader loader)
   {
-    InputStream stream;
     String resourceName;
     Enumeration urls;
 
@@ -407,7 +404,6 @@
     private Object loadNextServiceProvider()
     {
       String line;
-      Class klass;
       
       if (reader == null)
         advanceReader();
Index: gnu/java/beans/BeanInfoEmbryo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/beans/BeanInfoEmbryo.java,v
retrieving revision 1.7
diff -u -r1.7 BeanInfoEmbryo.java
--- gnu/java/beans/BeanInfoEmbryo.java	23 Feb 2002 09:19:52 -0000	1.7
+++ gnu/java/beans/BeanInfoEmbryo.java	23 Apr 2004 20:15:50 -0000
@@ -38,10 +38,17 @@
 
 package gnu.java.beans;
 
-import java.beans.*;
-import java.util.*;
-import gnu.java.lang.*;
-import java.lang.reflect.*;
+import java.beans.BeanDescriptor;
+import java.beans.BeanInfo;
+import java.beans.EventSetDescriptor;
+import java.beans.IndexedPropertyDescriptor;
+import java.beans.MethodDescriptor;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import java.util.Vector;
 
 /**
  ** A BeanInfoEmbryo accumulates information about a Bean
Index: gnu/java/beans/info/ComponentBeanInfo.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/beans/info/ComponentBeanInfo.java,v
retrieving revision 1.4
diff -u -r1.4 ComponentBeanInfo.java
--- gnu/java/beans/info/ComponentBeanInfo.java	22 Jan 2002 22:26:57 -0000	1.4
+++ gnu/java/beans/info/ComponentBeanInfo.java	23 Apr 2004 20:15:51 -0000
@@ -38,8 +38,9 @@
 
 package gnu.java.beans.info;
 
-import gnu.java.beans.*;
-import java.beans.*;
+import java.beans.IntrospectionException;
+import java.beans.PropertyDescriptor;
+import java.beans.SimpleBeanInfo;
 
 /** BeanInfo class for java.awt.Component.
  ** This provides a few properties, but that's
Index: gnu/java/io/Base64InputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/io/Base64InputStream.java,v
retrieving revision 1.1
diff -u -r1.1 Base64InputStream.java
--- gnu/java/io/Base64InputStream.java	23 Apr 2003 23:05:52 -0000	1.1
+++ gnu/java/io/Base64InputStream.java	23 Apr 2004 20:15:51 -0000
@@ -39,9 +39,8 @@
 package gnu.java.io;
 
 import java.io.FilterInputStream;
-import java.io.InputStream;
 import java.io.IOException;
-import java.io.EOFException;
+import java.io.InputStream;
 
 /**
  * A filter input stream that decodes data encoded in the Base-64
Index: gnu/java/nio/FileLockImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/FileLockImpl.java,v
retrieving revision 1.6
diff -u -r1.6 FileLockImpl.java
--- gnu/java/nio/FileLockImpl.java	8 Apr 2004 20:04:12 -0000	1.6
+++ gnu/java/nio/FileLockImpl.java	23 Apr 2004 20:15:52 -0000
@@ -38,10 +38,10 @@
 
 package gnu.java.nio;
 
+import gnu.java.nio.channels.FileChannelImpl;
+
 import java.io.IOException;
 import java.nio.channels.FileLock;
-import gnu.classpath.Configuration;
-import gnu.java.nio.channels.FileChannelImpl;
 
 /**
  * @author Michael Koch
Index: gnu/java/nio/SocketChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/SocketChannelImpl.java,v
retrieving revision 1.22
diff -u -r1.22 SocketChannelImpl.java
--- gnu/java/nio/SocketChannelImpl.java	6 Feb 2004 09:13:24 -0000	1.22
+++ gnu/java/nio/SocketChannelImpl.java	23 Apr 2004 20:15:52 -0000
@@ -38,12 +38,12 @@
 
 package gnu.java.nio;
 
-import java.io.InputStream;
+import gnu.java.net.PlainSocketImpl;
+
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import gnu.java.net.PlainSocketImpl;
 import java.net.Socket;
 import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
@@ -53,13 +53,12 @@
 import java.nio.channels.ConnectionPendingException;
 import java.nio.channels.NoConnectionPendingException;
 import java.nio.channels.NotYetConnectedException;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.SocketChannel;
 import java.nio.channels.UnresolvedAddressException;
 import java.nio.channels.UnsupportedAddressTypeException;
-import java.nio.channels.SocketChannel;
-import java.nio.channels.Selector;
-import java.nio.channels.SelectionKey;
 import java.nio.channels.spi.SelectorProvider;
-import gnu.classpath.Configuration;
 
 public final class SocketChannelImpl extends SocketChannel
 {
Index: gnu/java/nio/charset/UTF_16Decoder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/charset/UTF_16Decoder.java,v
retrieving revision 1.2
diff -u -r1.2 UTF_16Decoder.java
--- gnu/java/nio/charset/UTF_16Decoder.java	8 Nov 2002 14:05:22 -0000	1.2
+++ gnu/java/nio/charset/UTF_16Decoder.java	23 Apr 2004 20:15:52 -0000
@@ -144,24 +144,6 @@
       }
   }
 
-  /**
-   * Writes <code>c</code> to <code>out</code> in the byte order
-   * specified by <code>byteOrder</code>.
-   **/
-  private void put (ByteBuffer out, char c)
-  {
-    if (byteOrder == BIG_ENDIAN)
-      {
-        out.put ((byte) (c >> 8));
-        out.put ((byte) (c & 0xFF));
-      }
-    else
-      {
-        out.put ((byte) (c & 0xFF));
-        out.put ((byte) (c >> 8));
-      }
-  }
-
   protected void implReset ()
   {
     byteOrder = originalByteOrder;
Index: gnu/java/security/der/DERWriter.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/der/DERWriter.java,v
retrieving revision 1.1
diff -u -r1.1 DERWriter.java
--- gnu/java/security/der/DERWriter.java	23 Apr 2003 22:52:15 -0000	1.1
+++ gnu/java/security/der/DERWriter.java	23 Apr 2004 20:15:53 -0000
@@ -38,27 +38,22 @@
 
 package gnu.java.security.der;
 
+import gnu.java.security.OID;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-
 import java.math.BigInteger;
-
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
-
 import java.text.SimpleDateFormat;
-
-import java.util.BitSet;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.TimeZone;
-
-import gnu.java.security.OID;
 
 /**
  * Methods that allow various Java types to be written as a DER
Index: gnu/java/security/provider/DSAKeyPairGenerator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/security/provider/DSAKeyPairGenerator.java,v
retrieving revision 1.3
diff -u -r1.3 DSAKeyPairGenerator.java
--- gnu/java/security/provider/DSAKeyPairGenerator.java	22 Jan 2002 22:26:58 -0000	1.3
+++ gnu/java/security/provider/DSAKeyPairGenerator.java	23 Apr 2004 20:15:53 -0000
@@ -39,19 +39,17 @@
 package gnu.java.security.provider;
 
 import java.math.BigInteger;
-import java.security.AlgorithmParameters;
 import java.security.AlgorithmParameterGenerator;
-import java.security.KeyPairGeneratorSpi;
+import java.security.AlgorithmParameters;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidParameterException;
 import java.security.KeyPair;
+import java.security.KeyPairGeneratorSpi;
 import java.security.SecureRandom;
-import java.security.InvalidParameterException;
-import java.security.InvalidAlgorithmParameterException;
 import java.security.interfaces.DSAParams;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.DSAParameterSpec;
 import java.util.Random;
-
-import gnu.java.security.util.Prime;
 
 public class DSAKeyPairGenerator extends KeyPairGeneratorSpi 
 	implements java.security.interfaces.DSAKeyPairGenerator
Index: gnu/java/text/CharacterBreakIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/text/CharacterBreakIterator.java,v
retrieving revision 1.2
diff -u -r1.2 CharacterBreakIterator.java
--- gnu/java/text/CharacterBreakIterator.java	22 Jan 2002 22:26:58 -0000	1.2
+++ gnu/java/text/CharacterBreakIterator.java	23 Apr 2004 20:15:53 -0000
@@ -38,7 +38,6 @@
 
 package gnu.java.text;
 
-import java.text.BreakIterator;
 import java.text.CharacterIterator;
 
 /**
@@ -161,7 +160,6 @@
     if (iter.getIndex() == iter.getBeginIndex())
       return DONE;
 
-    int start = iter.getBeginIndex();
     while (iter.getIndex() >= iter.getBeginIndex())
       {
 	char c = iter.previous();
Index: gnu/java/text/LineBreakIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/text/LineBreakIterator.java,v
retrieving revision 1.2
diff -u -r1.2 LineBreakIterator.java
--- gnu/java/text/LineBreakIterator.java	22 Jan 2002 22:26:58 -0000	1.2
+++ gnu/java/text/LineBreakIterator.java	23 Apr 2004 20:15:53 -0000
@@ -38,7 +38,6 @@
 
 package gnu.java.text;
 
-import java.text.BreakIterator;
 import java.text.CharacterIterator;
 
 /**
Index: gnu/java/text/SentenceBreakIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/text/SentenceBreakIterator.java,v
retrieving revision 1.3
diff -u -r1.3 SentenceBreakIterator.java
--- gnu/java/text/SentenceBreakIterator.java	12 May 2002 01:15:36 -0000	1.3
+++ gnu/java/text/SentenceBreakIterator.java	23 Apr 2004 20:15:54 -0000
@@ -38,7 +38,6 @@
 
 package gnu.java.text;
 
-import java.text.BreakIterator;
 import java.text.CharacterIterator;
 
 /**
Index: gnu/java/text/WordBreakIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/text/WordBreakIterator.java,v
retrieving revision 1.2
diff -u -r1.2 WordBreakIterator.java
--- gnu/java/text/WordBreakIterator.java	22 Jan 2002 22:26:58 -0000	1.2
+++ gnu/java/text/WordBreakIterator.java	23 Apr 2004 20:16:05 -0000
@@ -38,7 +38,6 @@
 
 package gnu.java.text;
 
-import java.text.BreakIterator;
 import java.text.CharacterIterator;
 
 /**
Index: gnu/java/util/DoubleEnumeration.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/util/DoubleEnumeration.java,v
retrieving revision 1.2
diff -u -r1.2 DoubleEnumeration.java
--- gnu/java/util/DoubleEnumeration.java	22 Jan 2002 22:26:58 -0000	1.2
+++ gnu/java/util/DoubleEnumeration.java	23 Apr 2004 20:16:05 -0000
@@ -37,7 +37,6 @@
 
 package gnu.java.util;
 
-import java.io.*;
 import java.util.Enumeration;
 import java.util.NoSuchElementException;
 
Index: gnu/java/util/prefs/NodeReader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/util/prefs/NodeReader.java,v
retrieving revision 1.3
diff -u -r1.3 NodeReader.java
--- gnu/java/util/prefs/NodeReader.java	10 Sep 2002 20:16:16 -0000	1.3
+++ gnu/java/util/prefs/NodeReader.java	23 Apr 2004 20:16:05 -0000
@@ -38,13 +38,13 @@
 package gnu.java.util.prefs;
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.InputStream;
-import java.io.IOException;
 import java.io.Reader;
-
-import java.util.prefs.*;
+import java.util.prefs.InvalidPreferencesFormatException;
+import java.util.prefs.Preferences;
+import java.util.prefs.PreferencesFactory;
 
 /**
  * Reads and imports preferences nodes from files.
Index: java/awt/TextComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/TextComponent.java,v
retrieving revision 1.13
diff -u -r1.13 TextComponent.java
--- java/awt/TextComponent.java	23 Apr 2004 17:37:46 -0000	1.13
+++ java/awt/TextComponent.java	23 Apr 2004 20:16:06 -0000
@@ -41,7 +41,6 @@
 import java.awt.event.TextEvent;
 import java.awt.event.TextListener;
 import java.awt.peer.TextComponentPeer;
-import java.awt.peer.ComponentPeer;
 import java.io.Serializable;
 import java.util.EventListener;
 
Index: java/io/FilePermission.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/FilePermission.java,v
retrieving revision 1.14
diff -u -r1.14 FilePermission.java
--- java/io/FilePermission.java	12 Mar 2004 14:32:36 -0000	1.14
+++ java/io/FilePermission.java	23 Apr 2004 20:16:07 -0000
@@ -229,7 +229,6 @@
 	        return false;
 	      /* Make sure there are no subdirectories specified 
                  underneath this one */
-	      String sub2 = f2.substring(sub1.length()+1);
 	      if(f2.substring(sub1.length()+1).indexOf(File.separatorChar) 
                  != -1)
 	        return false;
Index: java/lang/ClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/ClassLoader.java,v
retrieving revision 1.30
diff -u -r1.30 ClassLoader.java
--- java/lang/ClassLoader.java	17 Apr 2004 17:08:22 -0000	1.30
+++ java/lang/ClassLoader.java	23 Apr 2004 20:16:07 -0000
@@ -38,9 +38,11 @@
 
 package java.lang;
 
-import java.io.InputStream;
+import gnu.java.util.DoubleEnumeration;
+import gnu.java.util.EmptyEnumeration;
+
 import java.io.IOException;
-import java.lang.reflect.Constructor;
+import java.io.InputStream;
 import java.net.URL;
 import java.security.CodeSource;
 import java.security.PermissionCollection;
@@ -49,8 +51,6 @@
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import gnu.java.util.DoubleEnumeration;
-import gnu.java.util.EmptyEnumeration;
 
 /**
  * The ClassLoader is a way of customizing the way Java gets its classes
Index: java/lang/String.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/String.java,v
retrieving revision 1.55
diff -u -r1.55 String.java
--- java/lang/String.java	17 Apr 2004 17:08:22 -0000	1.55
+++ java/lang/String.java	23 Apr 2004 20:16:07 -0000
@@ -39,15 +39,15 @@
 
 package java.lang;
 
+import gnu.java.io.EncodingManager;
+import gnu.java.lang.CharData;
+
+import java.io.CharConversionException;
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Comparator;
 import java.util.Locale;
 import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-import java.io.CharConversionException;
-import gnu.java.io.EncodingManager;
-import gnu.java.lang.CharData;
 
 /**
  * Strings represent an immutable set of characters.  All String literals
Index: java/lang/Throwable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Throwable.java,v
retrieving revision 1.21
diff -u -r1.21 Throwable.java
--- java/lang/Throwable.java	17 Apr 2004 17:08:23 -0000	1.21
+++ java/lang/Throwable.java	23 Apr 2004 20:16:07 -0000
@@ -37,13 +37,9 @@
 
 package java.lang;
 
-import java.io.Serializable;
-import java.io.PrintWriter;
 import java.io.PrintStream;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Serializable;
 
 /**
  * Throwable is the superclass of all exceptions that can be raised.
Index: java/math/BigDecimal.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/math/BigDecimal.java,v
retrieving revision 1.16
diff -u -r1.16 BigDecimal.java
--- java/math/BigDecimal.java	1 Aug 2003 12:44:08 -0000	1.16
+++ java/math/BigDecimal.java	23 Apr 2004 20:16:08 -0000
@@ -271,7 +271,6 @@
       return newScale == 0 ? ZERO : new BigDecimal (ZERO.intVal, newScale);
     
     // Ensure that pow gets a non-negative value.
-    int valScale = val.scale;
     BigInteger valIntVal = val.intVal;
     int power = newScale - (scale - val.scale);
     if (power < 0)
Index: java/net/URLClassLoader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLClassLoader.java,v
retrieving revision 1.20
diff -u -r1.20 URLClassLoader.java
--- java/net/URLClassLoader.java	8 Apr 2004 17:25:02 -0000	1.20
+++ java/net/URLClassLoader.java	23 Apr 2004 20:16:08 -0000
@@ -548,25 +548,6 @@
   }
 
   /**
-   * Private constructor used by the static
-   * <code>newInstance(URL[])</code> method.  Creates an
-   * <code>URLClassLoader</code> without any <code>URL</code>s
-   * yet. This is used to bypass the normal security check for
-   * creating classloaders, but remembers the security context which
-   * will be used when defining classes.  The <code>URL</code>s to
-   * load from must be added by the <code>newInstance()</code> method
-   * in the security context of the caller.
-   *
-   * @param securityContext the security context of the unprivileged code.
-   */
-  private URLClassLoader(AccessControlContext securityContext)
-  {
-    super();
-    this.factory = null;
-    this.securityContext = securityContext;
-  }
-
-  /**
    * Creates a <code>URLClassLoader</code> that gets classes from the supplied
    * <code>URL</code>s.
    * To determine if this classloader may be created the constructor of
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLConnection.java,v
retrieving revision 1.27
diff -u -r1.27 URLConnection.java
--- java/net/URLConnection.java	23 Apr 2004 07:29:02 -0000	1.27
+++ java/net/URLConnection.java	23 Apr 2004 20:16:08 -0000
@@ -46,7 +46,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Collections;
 import java.util.Date;
-import java.util.Hashtable;
 import java.util.Locale;
 import java.util.Map;
 
Index: java/net/URLStreamHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLStreamHandler.java,v
retrieving revision 1.27
diff -u -r1.27 URLStreamHandler.java
--- java/net/URLStreamHandler.java	20 Apr 2004 16:29:11 -0000	1.27
+++ java/net/URLStreamHandler.java	23 Apr 2004 20:16:08 -0000
@@ -502,12 +502,9 @@
   protected String toExternalForm(URL url)
   {
     String protocol;
-    String host;
     String file;
     String ref;
-    String user;
     String authority;
-    int port;
 
     protocol = url.getProtocol();
     authority = url.getAuthority();



From MAILER-DAEMON Fri Apr 23 17:35:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH8Ki-00018w-HW
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 17:35:40 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH8Kf-00016b-BM
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 17:35:37 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH8K4-0000so-VV
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 17:35:33 -0400
Received: from [207.189.223.52] (helo=email3.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BH8K4-0000rA-G3
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 17:35:00 -0400
Received: (qmail 27637 invoked from network); 23 Apr 2004 21:53:42 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email3.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 23 Apr 2004 21:53:42 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 3BFAD4F853E; Fri, 23 Apr 2004 15:23:36 -0600 (MDT)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: ...It's REAL ROUND.. And it's got a POINTY PART right in the MIDDLE!!
	The shape is SMOOTH..  ..And COLD.. It feels very COMFORTABLE on my
	CHEEK..  I'm getting EMOTIONAL..
Date: 23 Apr 2004 15:23:35 -0600
Message-ID: <87ad12o0bs.fsf@fleche.redhat.com>
Lines: 44
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: javadoc and import fix
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 23 Apr 2004 21:35:38 -0000

One more minor patch.  This one fixes imports and javadoc.

Tom

2004-04-23  Tom Tromey  <tromey@redhat.com>

	* java/lang/System.java (runFinalizersOnExit): Updated javadoc.
	Cleaned up imports.

Index: java/lang/System.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/System.java,v
retrieving revision 1.33
diff -u -r1.33 System.java
--- java/lang/System.java	23 Apr 2004 17:37:46 -0000	1.33
+++ java/lang/System.java	23 Apr 2004 21:14:19 -0000
@@ -38,16 +38,12 @@
 
 package java.lang;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import gnu.classpath.Configuration;
+
 import java.io.InputStream;
 import java.io.PrintStream;
 import java.util.Properties;
 import java.util.PropertyPermission;
-import gnu.classpath.Configuration;
 
 /**
  * System represents system-wide resources; things that represent the
@@ -621,7 +617,7 @@
    * since it can force initialization on objects which are still in use
    * by live threads, leading to deadlock; therefore this is disabled by
    * default. There may be a security check, <code>checkExit(0)</code>. This
-   * calls <code>Runtime.getRuntime().runFinalizersOnExit()</code>.
+   * calls <code>Runtime.runFinalizersOnExit()</code>.
    *
    * @param finalizeOnExit whether to run finalizers on exit
    * @throws SecurityException if permission is denied



From MAILER-DAEMON Fri Apr 23 17:56:12 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH8eZ-0002fk-QP
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 17:56:11 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH8eV-0002dh-Dn
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 17:56:07 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH8dz-0002OQ-RO
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 17:56:06 -0400
Received: from [207.189.223.52] (helo=email3.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BH8dy-0002MG-VS
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 17:55:35 -0400
Received: (qmail 6383 invoked from network); 23 Apr 2004 22:14:16 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email3.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 23 Apr 2004 22:14:16 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 769954F853E; Fri, 23 Apr 2004 15:44:10 -0600 (MDT)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: I will invent "TIDY BOWL"...
Date: 23 Apr 2004 15:44:10 -0600
Message-ID: <8765bqnzdh.fsf@fleche.redhat.com>
Lines: 165
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: remove unused class
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 23 Apr 2004 21:56:08 -0000

Eclipse had pointed out a buglet in this class, but closer
investigation showed that it is no longer needed.  I'm removing it.

Tom

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2104
diff -u -r1.2104 ChangeLog
--- ChangeLog	23 Apr 2004 21:36:23 -0000	1.2104
+++ ChangeLog	23 Apr 2004 21:54:06 -0000
@@ -1,5 +1,9 @@
 2004-04-23  Tom Tromey  <tromey@redhat.com>
 
+	* gnu/java/lang/ClassLoaderHelper.java: Removed.
+
+2004-04-23  Tom Tromey  <tromey@redhat.com>
+
 	* java/lang/System.java (runFinalizersOnExit): Updated javadoc.
 	Cleaned up imports.
 
Index: gnu/java/lang/ClassLoaderHelper.java
===================================================================
RCS file: gnu/java/lang/ClassLoaderHelper.java
diff -N gnu/java/lang/ClassLoaderHelper.java
--- gnu/java/lang/ClassLoaderHelper.java	2 Dec 2003 09:12:07 -0000	1.8
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,136 +0,0 @@
-/* ClassLoaderHelper.java -- aids ClassLoader in finding resources
-   Copyright (C) 1998, 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 gnu.java.lang;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-import gnu.java.io.PlatformHelper;
-
-/**
- * ClassLoaderHelper has various methods that ought to have been
- * in ClassLoader.
- *
- * @author John Keiser
- * @author Eric Blake <ebb9@email.byu.edu>
- */
-public class ClassLoaderHelper
-{
-  /**
-   * Saves File instances mapping to specific absolute paths and jar urls.
-   */
-  private static final Hashtable fileResourceCache = new Hashtable();
-
-  private static final int READBUFSIZE = 1024;
-
-  /**
-   * Searches the CLASSPATH for a resource and returns it as a File.
-   *
-   * @param name name of resource to locate
-   *
-   * @return a File object representing the resource, or null
-   * if the resource could not be found
-   */
-  public static final File getSystemResourceAsFile(String name) {
-    if (name.charAt(0) == '/')
-      name = name.substring(1);
-
-    String path = System.getProperty("java.class.path", ".");
-    StringTokenizer st
-      = new StringTokenizer(path, System.getProperty("path.separator", ":"));
-    while (st.hasMoreElements())
-      {
-        String token = st.nextToken();
-        File file;
-        if (token.endsWith(".zip") || token.endsWith(".jar"))
-          {
-            file = new File(token);
-            if (! file.exists())
-              continue;
-            path = file.getAbsolutePath();
-            try
-              {
-                if (path.charAt(0) == '/')
-                  path = "jar:file:/" + path + "!/" + name;
-                else
-                  path = "jar:file://" + path + "!/" + name;
-                file = (File) fileResourceCache.get(path);
-                if (file == null)
-                  {
-                    //load jar/zip entry from the url
-                    URL url = new URL(path);
-                    URLConnection urlconn = url.openConnection();
-                    InputStream is = urlconn.getInputStream();
-                    byte[] buf = new byte[READBUFSIZE];
-                    file = File.createTempFile("tmp", "", new File("."));
-                    FileOutputStream fos = new FileOutputStream(file);
-                    int len = 0;
-                    while ((len = is.read(buf)) != -1)
-                      fos.write(buf);
-                    fos.close();
-                  }
-              }
-            catch(Exception e)
-              {
-                continue;
-              }
-          }
-        else
-          {
-            if (PlatformHelper.endWithSeparator(token))
-              path = token + name;
-            else
-              path = token + File.separator + name;
-            file = (File) fileResourceCache.get(path);
-            if (file == null)
-              file = new File(path);
-          }
-        if (file != null && file.isFile())
-          {
-            fileResourceCache.put(path, file);
-            return file;
-          }
-      }
-    return null;
-  }
-} // class ClassLoaderHelper



From MAILER-DAEMON Fri Apr 23 18:37:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BH9I6-0005fi-Sz
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 18:37:02 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BH9I3-0005eO-O2
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 18:36:59 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BH9I2-0005e6-Ch
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 18:36:58 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BH9I0-0005dx-JK
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 18:36:56 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BH9Hu-0005tv-00
	for <commit-classpath@gnu.org>; Sat, 24 Apr 2004 00:36:50 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-dIIR7n0wek2YfoD8q5KE"
Message-Id: <1082759812.27234.270.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Sat, 24 Apr 2004 00:36:52 +0200
Subject: FYI: Fix static protected confusion in En/Decoders
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 23 Apr 2004 22:37:00 -0000


--=-dIIR7n0wek2YfoD8q5KE
Content-Type: multipart/mixed; boundary="=-VJSYtjOlvq286fP8RMzd"


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

Hi,

This looks like a big patch, but it doesn't do that much. The main thing
it does is making some static protected fields into non-static private
fields that get initialized through the (super-class) constructor. The
original code assumed that protected static fields got inherited as
static fields by subclasses.

2004-04-23  Mark Wielaard  <mark@klomp.org>

       * java/io/OutputStreamWriter.java (getEncoding): Return null when
       out =3D=3D null, otherwise call out.getSchemeName.
       * gnu/java/io/decode/Decoder.java (scheme_name): Make non-static
       private final.
       (scheme_description): Removed.
       (in): Make final.
       (getSchemeName): Make non-static.
       (getSchemeDescription): Removed.
       (Decoder): Make protected and add name parameter.
       gnu/java/io/decode/Decoder8859_1.java (lookup_table_8859_1): Make
       private static final.
       (static): Removed block.
       (Decoder8859_1): Call super(in, name, table).
       * gnu/java/io/decode/Decoder8859_2.java: Likewise.
       * gnu/java/io/decode/Decoder8859_3.java: Likewise.
       * gnu/java/io/decode/Decoder8859_4.java: Likewise.
       * gnu/java/io/decode/Decoder8859_5.java: Likewise.
       * gnu/java/io/decode/DecoderEightBitLookup.java (lookup_table): Make
       private final.
       (DecoderEightBitLookup): Make protected. Add name and table
       parameters. Call super(in, name).
       * gnu/java/io/decode/DecoderUTF8.java (static): Remove block.
       (DecoderUTF8): Call super(in, name).
       * gnu/java/io/encode/Encoder.java (scheme_description): Remove field=
.
       (scheme_name): Make non-static private final.
       (out): Make final.
       (getSchemeName): Make non-static.
       (getSchemeDescription): Removed.
       (Encoder): Make protected and add parameter name to initialize
       scheme_name.
       * gnu/java/io/encode/Encoder8859_1.java (lookup_table_8859_1): Make
       private and final.
       (static): Remove block.
       (Encoder8859_1): Call super(out, name, table).
       gnu/java/io/encode/Encoder8859_2.java: Likewise.
       gnu/java/io/encode/Encoder8859_3.java: Likewise.
       gnu/java/io/encode/Encoder8859_4.java: Likewise.
       gnu/java/io/encode/Encoder8859_5.java: Likewise.
       * gnu/java/io/encode/EncoderEightBitLookup.java (lookup_table):
       Removed field.
       (encoding_table): Make non-static and final.
       (loadTable): Make non-static private and return byte[] table.
       (EncoderEightBitLookup): Add parameters name and table. Call
       super(out, name) and initialize encoding_table with loadTable(table)=
.
       * gnu/java/io/encode/EncoderUTF8.java (static): Remove block.
       (EncoderUTF8): Call super(out, name).

Committed.

Cheers,

Mark

--=-VJSYtjOlvq286fP8RMzd
Content-Disposition: inline; filename=EnDecoder.patch
Content-Type: text/x-patch; name=EnDecoder.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IGphdmEvaW8vT3V0cHV0U3RyZWFtV3JpdGVyLmphdmENCj09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBm
aWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmEvaW8vT3V0cHV0U3RyZWFtV3Jp
dGVyLmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjEwDQpkaWZmIC11IC1yMS4xMCBPdXRw
dXRTdHJlYW1Xcml0ZXIuamF2YQ0KLS0tIGphdmEvaW8vT3V0cHV0U3RyZWFtV3JpdGVyLmphdmEJ
MjggTWFyIDIwMDQgMTg6NDI6MzMgLTAwMDAJMS4xMA0KKysrIGphdmEvaW8vT3V0cHV0U3RyZWFt
V3JpdGVyLmphdmEJMjMgQXByIDIwMDQgMjI6MjY6NDMgLTAwMDANCkBAIC0xNTAsNyArMTUwLDcg
QEANCiAgICAqLw0KICAgcHVibGljIFN0cmluZyBnZXRFbmNvZGluZyAoKQ0KICAgew0KLSAgICBy
ZXR1cm4gb3V0LmdldFNjaGVtZU5hbWUgKCk7DQorICAgIHJldHVybiBvdXQgIT0gbnVsbCA/IG91
dC5nZXRTY2hlbWVOYW1lICgpIDogbnVsbDsNCiAgIH0NCiANCiAgIC8qKg0KSW5kZXg6IGdudS9q
YXZhL2lvL2RlY29kZS9EZWNvZGVyLmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9jbGFzc3BhdGgvY2xhc3NwYXRoL2dudS9qYXZhL2lvL2RlY29kZS9EZWNvZGVyLmphdmEsdg0K
cmV0cmlldmluZyByZXZpc2lvbiAxLjQNCmRpZmYgLXUgLXIxLjQgRGVjb2Rlci5qYXZhDQotLS0g
Z251L2phdmEvaW8vZGVjb2RlL0RlY29kZXIuamF2YQkyMiBKYW4gMjAwMiAyMjoyNjo1NyAtMDAw
MAkxLjQNCisrKyBnbnUvamF2YS9pby9kZWNvZGUvRGVjb2Rlci5qYXZhCTIzIEFwciAyMDA0IDIy
OjI2OjQzIC0wMDAwDQpAQCAtMSw1ICsxLDUgQEANCiAvKiBEZWNvZGVyLmphdmEgLS0gQmFzZSBj
bGFzcyBmb3IgYnl0ZS0+Y2hhciBkZWNvZGVycw0KLSAgIENvcHlyaWdodCAoQykgMTk5OCBGcmVl
IFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCisgICBDb3B5cmlnaHQgKEMpIDE5OTgsIDIwMDQg
RnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2Yg
R05VIENsYXNzcGF0aC4NCiANCkBAIC02MCwxNiArNjAsOSBAQA0KICAqLw0KIA0KIC8qKg0KLSAg
KiBUaGlzIGlzIHRoZSBuYW1lIG9mIHRoZSBjdXJyZW50IGVuY29kaW5nLiBNVVNUIGJlIG92ZXJy
aWRlbiBieQ0KLSAgKiBzdWJjbGFzc2VzLg0KKyAgKiBUaGlzIGlzIHRoZSBuYW1lIG9mIHRoZSBj
dXJyZW50IGVuY29kaW5nLiBTZXQgaW4gdGhlIGNvbnN0cnVjdG9yLg0KICAgKi8NCi1wcm90ZWN0
ZWQgc3RhdGljIFN0cmluZyBzY2hlbWVfbmFtZSA9ICJ1bmRlZmluZWQiOw0KLQ0KLS8qKg0KLSAg
KiBUaGlzIGlzIGEgZGVzY3JpcHRpb24gb2YgdGhlIGN1cnJlbnQgZW5jb2RpbmcuICBNVVNUIGJl
IG92ZXJyaWRkZW4NCi0gICogYnkgc3ViY2xhc3Nlcy4NCi0gICovDQotcHJvdGVjdGVkIHN0YXRp
YyBTdHJpbmcgc2NoZW1lX2Rlc2NyaXB0aW9uID0gInVuZGVmaW5lZCI7DQorcHJpdmF0ZSBmaW5h
bCBTdHJpbmcgc2NoZW1lX25hbWU7DQogDQogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovDQogDQpAQCAtODAs
NjIgKzczLDQ2IEBADQogLyoqDQogICAqIFRoaXMgaXMgdGhlIDxjb2RlPklucHV0U3RyZWFtPC9j
b2RlPiBieXRlcyBhcmUgcmVhZCBmcm9tDQogICAqLw0KLXByb3RlY3RlZCBJbnB1dFN0cmVhbSBp
bjsNCitwcm90ZWN0ZWQgZmluYWwgSW5wdXRTdHJlYW0gaW47DQogDQogLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovDQogDQogLyoNCi0gKiBDbGFzcyBNZXRob2RzDQorICogQ29uc3RydWN0b3JzDQogICovDQog
DQogLyoqDQotICAqIFRoaXMgbWV0aG9kIHJldHVybnMgdGhlIG5hbWUgb2YgdGhlIGVuY29kaW5n
IHNjaGVtZSBpbiB1c2UNCi0gICoNCi0gICogQHJldHVybiBUaGUgbmFtZSBvZiB0aGUgZW5jb2Rp
bmcgc2NoZW1lDQotICAqLw0KLXB1YmxpYyBzdGF0aWMgU3RyaW5nDQotZ2V0U2NoZW1lTmFtZSgp
DQotew0KLSAgcmV0dXJuKHNjaGVtZV9uYW1lKTsNCi19DQotDQotLyoqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiov
DQotDQotLyoqDQotICAqIFRoaXMgbWV0aG9kIHJldHVybnMgYSBkZXNjcmlwdGlvbiBvZiB0aGUg
ZW5jb2Rpbmcgc2NoZW1lIGluIHVzZQ0KKyAgKiBUaGlzIG1ldGhvZCBpbml0aWFsaXplcyBhIG5l
dyA8Y29kZT5EZWNvZGVyPC9jb2RlPiB0byByZWFkIGZyb20gdGhlDQorICAqIHNwZWNpZmllZCA8
Y29kZT5JbnB1dFN0cmVhbTwvY29kZT4uDQogICAqDQotICAqIEBwYXJhbSBBIGRlc2NyaXB0aW9u
IG9mIHRoZSBkZWNvZGluZyBzY2hlbWUuDQorICAqIEBwYXJhbSBpbiBUaGUgPGNvZGU+SW5wdXRT
dHJlYW08L2NvZGU+IHRvIHJlYWQgZnJvbQ0KKyAgKiBAcGFyYW0gbmFtZSBUaGUgY2hhcmFjdGVy
IHNjaGVtZSBuYW1lDQogICAqLw0KLXB1YmxpYyBzdGF0aWMgU3RyaW5nDQotZ2V0U2NoZW1lRGVz
Y3JpcHRpb24oKQ0KK3Byb3RlY3RlZA0KK0RlY29kZXIoSW5wdXRTdHJlYW0gaW4sIFN0cmluZyBu
YW1lKQ0KIHsNCi0gIHJldHVybihzY2hlbWVfZGVzY3JpcHRpb24pOw0KKyAgdGhpcy5pbiA9IGlu
Ow0KKyAgdGhpcy5zY2hlbWVfbmFtZSA9IG5hbWU7DQogfQ0KIA0KIC8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Lw0KIA0KIC8qDQotICogQ29uc3RydWN0b3JzDQorICogSW5zdGFuY2UgTWV0aG9kcw0KICAqLw0K
IA0KIC8qKg0KLSAgKiBUaGlzIG1ldGhvZCBpbml0aWFsaXplcyBhIG5ldyA8Y29kZT5EZWNvZGVy
PC9jb2RlPiB0byByZWFkIGZyb20gdGhlDQotICAqIHNwZWNpZmllZCA8Y29kZT5JbnB1dFN0cmVh
bTwvY29kZT4uDQorICAqIFRoaXMgbWV0aG9kIHJldHVybnMgdGhlIG5hbWUgb2YgdGhlIGVuY29k
aW5nIHNjaGVtZSBpbiB1c2UNCiAgICoNCi0gICogQHBhcmFtIGluIFRoZSA8Y29kZT5JbnB1dFN0
cmVhbTwvY29kZT4gdG8gcmVhZCBmcm9tDQorICAqIEByZXR1cm4gVGhlIG5hbWUgb2YgdGhlIGVu
Y29kaW5nIHNjaGVtZQ0KICAgKi8NCi1wdWJsaWMNCi1EZWNvZGVyKElucHV0U3RyZWFtIGluKQ0K
K3B1YmxpYyBTdHJpbmcNCitnZXRTY2hlbWVOYW1lKCkNCiB7DQotICB0aGlzLmluID0gaW47DQor
ICByZXR1cm4oc2NoZW1lX25hbWUpOw0KIH0NCiANCiAvKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8NCi0NCi0v
Kg0KLSAqIEluc3RhbmNlIE1ldGhvZHMNCi0gKi8NCi0NCiAvKioNCiAgICogRm9yIGEgZ2l2ZW4g
c2V0IG9mIGJ5dGVzLCB0aGlzIG1ldGhvZCByZXR1cm5zIHRoZSBudW1iZXIgb2YgY2hhcmFjdGVy
cw0KICAgKiB0aGF0IGJ5dGUgYXJyYXkgd2lsbCB0cmFuc2xhdGUgaW50by4gIElmIHRoZSBieXRl
cyBkbyBub3QgYWxsIHRyYW5zbGF0ZSANCkluZGV4OiBnbnUvamF2YS9pby9kZWNvZGUvRGVjb2Rl
cjg4NTlfMS5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2Ns
YXNzcGF0aC9nbnUvamF2YS9pby9kZWNvZGUvRGVjb2Rlcjg4NTlfMS5qYXZhLHYNCnJldHJpZXZp
bmcgcmV2aXNpb24gMS4zDQpkaWZmIC11IC1yMS4zIERlY29kZXI4ODU5XzEuamF2YQ0KLS0tIGdu
dS9qYXZhL2lvL2RlY29kZS9EZWNvZGVyODg1OV8xLmphdmEJMjIgSmFuIDIwMDIgMjI6MjY6NTcg
LTAwMDAJMS4zDQorKysgZ251L2phdmEvaW8vZGVjb2RlL0RlY29kZXI4ODU5XzEuamF2YQkyMyBB
cHIgMjAwNCAyMjoyNjo0MyAtMDAwMA0KQEAgLTEsNSArMSw1IEBADQogLyogRGVjb2Rlcjg4NTlf
MS5qYXZhIC0tIERlY29kZXIgZm9yIElTTy1MYXRpbi0xIENoYXJhY3RlciBzZXQNCi0gICBDb3B5
cmlnaHQgKEMpIDE5OTggRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQorICAgQ29weXJp
Z2h0IChDKSAxOTk4LCAyMDA0IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KIA0KIFRo
aXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBDbGFzc3BhdGguDQogDQpAQCAtNTAsMTMgKzUwLDExIEBA
DQogcHVibGljIGNsYXNzIERlY29kZXI4ODU5XzEgZXh0ZW5kcyBEZWNvZGVyRWlnaHRCaXRMb29r
dXANCiB7DQogDQotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovDQotDQogLyoqDQogICAqIFRoaXMgaXMgdGhl
IGxvb2t1cCB0YWJsZSBmb3IgdGhpcyBlbmNvZGluZw0KICAgKi8NCiANCi1wcm90ZWN0ZWQgc3Rh
dGljIGNoYXJbXSBsb29rdXBfdGFibGVfODg1OV8xID0geyANCitwcml2YXRlIHN0YXRpYyBmaW5h
bCBjaGFyW10gbG9va3VwX3RhYmxlXzg4NTlfMSA9IHsgDQogMHgwMDAwLA0KIDB4MDAwMSwNCiAw
eDAwMDIsDQpAQCAtMzE1LDIyICszMTMsMTAgQEANCiAweDAwRkYNCiB9Ow0KIA0KLXN0YXRpYw0K
LXsNCi0gIHNjaGVtZV9uYW1lID0gIjg4NTlfMSI7DQotICBzY2hlbWVfZGVzY3JpcHRpb24gPSAi
SVNPLTg4NTktMSAoTGF0aW4tMSBjaGFyYWN0ZXIgc2V0KSI7DQotICBsb29rdXBfdGFibGUgPSBs
b29rdXBfdGFibGVfODg1OV8xOw0KLX0NCi0NCi0vKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8NCi0NCi0vKg0K
LSAqIENvbnN0cnVjdG9ycw0KLSAqLw0KIHB1YmxpYw0KIERlY29kZXI4ODU5XzEoSW5wdXRTdHJl
YW0gaW4pDQogew0KLSAgc3VwZXIoaW4pOw0KKyAgc3VwZXIoaW4sICI4ODU5XzEiLCBsb29rdXBf
dGFibGVfODg1OV8xKTsNCiB9DQogDQogfSAvLyBjbGFzcyBEZWNvZGVyODg1OV8xDQpJbmRleDog
Z251L2phdmEvaW8vZGVjb2RlL0RlY29kZXI4ODU5XzIuamF2YQ0KPT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZp
bGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvZ251L2phdmEvaW8vZGVjb2RlL0RlY29k
ZXI4ODU5XzIuamF2YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMw0KZGlmZiAtdSAtcjEuMyBE
ZWNvZGVyODg1OV8yLmphdmENCi0tLSBnbnUvamF2YS9pby9kZWNvZGUvRGVjb2Rlcjg4NTlfMi5q
YXZhCTIyIEphbiAyMDAyIDIyOjI2OjU3IC0wMDAwCTEuMw0KKysrIGdudS9qYXZhL2lvL2RlY29k
ZS9EZWNvZGVyODg1OV8yLmphdmEJMjMgQXByIDIwMDQgMjI6MjY6NDMgLTAwMDANCkBAIC0xLDUg
KzEsNSBAQA0KIC8qIERlY29kZXI4ODU5XzIuamF2YSAtLSBEZWNvZGVyIGZvciBJU08tTGF0aW4t
MiBDaGFyYWN0ZXIgc2V0DQotICAgQ29weXJpZ2h0IChDKSAxOTk4IEZyZWUgU29mdHdhcmUgRm91
bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykgMTk5OCwgMjAwNCBGcmVlIFNvZnR3YXJl
IEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRo
Lg0KIA0KQEAgLTUwLDEzICs1MCwxMSBAQA0KIHB1YmxpYyBjbGFzcyBEZWNvZGVyODg1OV8yIGV4
dGVuZHMgRGVjb2RlckVpZ2h0Qml0TG9va3VwDQogew0KIA0KLS8qKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0K
LQ0KIC8qKg0KICAgKiBUaGlzIGlzIHRoZSBsb29rdXAgdGFibGUgZm9yIHRoaXMgZW5jb2RpbmcN
CiAgICovDQogDQotcHJvdGVjdGVkIHN0YXRpYyBjaGFyW10gbG9va3VwX3RhYmxlXzg4NTlfMiA9
IHsgDQorcHJpdmF0ZSBzdGF0aWMgZmluYWwgY2hhcltdIGxvb2t1cF90YWJsZV84ODU5XzIgPSB7
IA0KIC8vIFN0YXJ0IG9mIHJhbmdlIHVuZGVmaW5lZCBpbiB0aGUgc3BlYyBmaWxlIEkgdXNlZC4N
CiAweDAwMDAsDQogMHgwMDAxLA0KQEAgLTMxOSwyMiArMzE3LDEwIEBADQogMHgwMkQ5DQogfTsN
CiANCi1zdGF0aWMNCi17DQotICBzY2hlbWVfbmFtZSA9ICI4ODU5XzIiOw0KLSAgc2NoZW1lX2Rl
c2NyaXB0aW9uID0gIklTTy04ODU5LTIgKExhdGluLTIgY2hhcmFjdGVyIHNldCkiOw0KLSAgbG9v
a3VwX3RhYmxlID0gbG9va3VwX3RhYmxlXzg4NTlfMjsNCi19DQotDQotLyoqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KiovDQotDQotLyoNCi0gKiBDb25zdHJ1Y3RvcnMNCi0gKi8NCiBwdWJsaWMNCiBEZWNvZGVyODg1
OV8yKElucHV0U3RyZWFtIGluKQ0KIHsNCi0gIHN1cGVyKGluKTsNCisgIHN1cGVyKGluLCAiODg1
OV8yIiwgbG9va3VwX3RhYmxlXzg4NTlfMik7DQogfQ0KIA0KIH0gLy8gY2xhc3MgRGVjb2Rlcjg4
NTlfMg0KSW5kZXg6IGdudS9qYXZhL2lvL2RlY29kZS9EZWNvZGVyODg1OV8zLmphdmENCj09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2dudS9qYXZhL2lv
L2RlY29kZS9EZWNvZGVyODg1OV8zLmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjMNCmRp
ZmYgLXUgLXIxLjMgRGVjb2Rlcjg4NTlfMy5qYXZhDQotLS0gZ251L2phdmEvaW8vZGVjb2RlL0Rl
Y29kZXI4ODU5XzMuamF2YQkyMiBKYW4gMjAwMiAyMjoyNjo1NyAtMDAwMAkxLjMNCisrKyBnbnUv
amF2YS9pby9kZWNvZGUvRGVjb2Rlcjg4NTlfMy5qYXZhCTIzIEFwciAyMDA0IDIyOjI2OjQzIC0w
MDAwDQpAQCAtMSw1ICsxLDUgQEANCiAvKiBEZWNvZGVyODg1OV8zLmphdmEgLS0gRGVjb2RlciBm
b3IgSVNPLUxhdGluLTMgQ2hhcmFjdGVyIHNldA0KLSAgIENvcHlyaWdodCAoQykgMTk5OCBGcmVl
IFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCisgICBDb3B5cmlnaHQgKEMpIDE5OTgsIDIwMDQg
RnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2Yg
R05VIENsYXNzcGF0aC4NCiANCkBAIC01MCwxMyArNTAsMTEgQEANCiBwdWJsaWMgY2xhc3MgRGVj
b2Rlcjg4NTlfMyBleHRlbmRzIERlY29kZXJFaWdodEJpdExvb2t1cA0KIHsNCiANCi0vKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKi8NCi0NCiAvKioNCiAgICogVGhpcyBpcyB0aGUgbG9va3VwIHRhYmxlIGZvciB0
aGlzIGVuY29kaW5nDQogICAqLw0KIA0KLXByb3RlY3RlZCBzdGF0aWMgY2hhcltdIGxvb2t1cF90
YWJsZV84ODU5XzMgPSB7IA0KK3ByaXZhdGUgc3RhdGljIGZpbmFsICBjaGFyW10gbG9va3VwX3Rh
YmxlXzg4NTlfMyA9IHsgDQogLy8gQmVnaW4gcmFuZ2UgdW5kZWZpbmVkIGluIHNwZWMgZG9jdW1l
bnQgSSB1c2VkDQogMHgwMDAwLA0KIDB4MDAwMSwNCkBAIC0zMTIsMjIgKzMxMCwxMCBAQA0KIDB4
MDJEOQ0KIH07DQogDQotc3RhdGljDQotew0KLSAgc2NoZW1lX25hbWUgPSAiODg1OV8zIjsNCi0g
IHNjaGVtZV9kZXNjcmlwdGlvbiA9ICJJU08tODg1OS0zIChMYXRpbi0zIGNoYXJhY3RlciBzZXQp
IjsNCi0gIGxvb2t1cF90YWJsZSA9IGxvb2t1cF90YWJsZV84ODU5XzM7DQotfQ0KLQ0KLS8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqLw0KLQ0KLS8qDQotICogQ29uc3RydWN0b3JzDQotICovDQogcHVibGljDQog
RGVjb2Rlcjg4NTlfMyhJbnB1dFN0cmVhbSBpbikNCiB7DQotICBzdXBlcihpbik7DQorICBzdXBl
cihpbiwgIjg4NTlfMyIsIGxvb2t1cF90YWJsZV84ODU5XzMpOw0KIH0NCiANCiB9IC8vIGNsYXNz
IERlY29kZXI4ODU5XzMNCkluZGV4OiBnbnUvamF2YS9pby9kZWNvZGUvRGVjb2Rlcjg4NTlfNC5q
YXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9n
bnUvamF2YS9pby9kZWNvZGUvRGVjb2Rlcjg4NTlfNC5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNp
b24gMS4zDQpkaWZmIC11IC1yMS4zIERlY29kZXI4ODU5XzQuamF2YQ0KLS0tIGdudS9qYXZhL2lv
L2RlY29kZS9EZWNvZGVyODg1OV80LmphdmEJMjIgSmFuIDIwMDIgMjI6MjY6NTcgLTAwMDAJMS4z
DQorKysgZ251L2phdmEvaW8vZGVjb2RlL0RlY29kZXI4ODU5XzQuamF2YQkyMyBBcHIgMjAwNCAy
MjoyNjo0MyAtMDAwMA0KQEAgLTEsNSArMSw1IEBADQogLyogRGVjb2Rlcjg4NTlfNC5qYXZhIC0t
IERlY29kZXIgZm9yIElTTy1MYXRpbi00IENoYXJhY3RlciBzZXQNCi0gICBDb3B5cmlnaHQgKEMp
IDE5OTggRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQorICAgQ29weXJpZ2h0IChDKSAx
OTk4LCAyMDA0IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KIA0KIFRoaXMgZmlsZSBp
cyBwYXJ0IG9mIEdOVSBDbGFzc3BhdGguDQogDQpAQCAtNDEsNyArNDEsNyBAQA0KIGltcG9ydCBq
YXZhLmlvLklucHV0U3RyZWFtOw0KIA0KIC8qKg0KLSAgKiBUaGlzIGNsYXNzIGRlY29kZXMgYnl0
ZXMgaW4gSVNPLTg4NTktMyAoTGF0aW4tNCkgZm9ybWF0IHRvIFVuaWNvZGUuDQorICAqIFRoaXMg
Y2xhc3MgZGVjb2RlcyBieXRlcyBpbiBJU08tODg1OS00IChMYXRpbi00KSBmb3JtYXQgdG8gVW5p
Y29kZS4NCiAgICoNCiAgICogQHZlcnNpb24gMC4wDQogICAqDQpAQCAtNTAsMTMgKzUwLDExIEBA
DQogcHVibGljIGNsYXNzIERlY29kZXI4ODU5XzQgZXh0ZW5kcyBEZWNvZGVyRWlnaHRCaXRMb29r
dXANCiB7DQogDQotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKiovDQotDQogLyoqDQogICAqIFRoaXMgaXMgdGhl
IGxvb2t1cCB0YWJsZSBmb3IgdGhpcyBlbmNvZGluZw0KICAgKi8NCiANCi1wcm90ZWN0ZWQgc3Rh
dGljIGNoYXJbXSBsb29rdXBfdGFibGVfODg1OV80ID0geyANCitwcml2YXRlIHN0YXRpYyBmaW5h
bCBjaGFyW10gbG9va3VwX3RhYmxlXzg4NTlfNCA9IHsgDQogLy8gQmVnaW4gcmFuZ2UgdW5kZWZp
bmVkIGluIHNwZWMgZG9jdW1lbnQgSSB1c2VkDQogMHgwMDAwLA0KIDB4MDAwMSwNCkBAIC0zMTks
MjIgKzMxNywxMCBAQA0KIDB4MDJEOQ0KIH07DQogDQotc3RhdGljDQotew0KLSAgc2NoZW1lX25h
bWUgPSAiODg1OV80IjsNCi0gIHNjaGVtZV9kZXNjcmlwdGlvbiA9ICJJU08tODg1OS00IChMYXRp
bi00IGNoYXJhY3RlciBzZXQpIjsNCi0gIGxvb2t1cF90YWJsZSA9IGxvb2t1cF90YWJsZV84ODU5
XzQ7DQotfQ0KLQ0KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KLQ0KLS8qDQotICogQ29uc3RydWN0b3Jz
DQotICovDQogcHVibGljDQogRGVjb2Rlcjg4NTlfNChJbnB1dFN0cmVhbSBpbikNCiB7DQotICBz
dXBlcihpbik7DQorICBzdXBlcihpbiwgIjg4NTlfNCIsIGxvb2t1cF90YWJsZV84ODU5XzQpOw0K
IH0NCiANCiB9IC8vIGNsYXNzIERlY29kZXI4ODU5XzQNCkluZGV4OiBnbnUvamF2YS9pby9kZWNv
ZGUvRGVjb2Rlcjg4NTlfNS5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xh
c3NwYXRoL2NsYXNzcGF0aC9nbnUvamF2YS9pby9kZWNvZGUvRGVjb2Rlcjg4NTlfNS5qYXZhLHYN
CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zDQpkaWZmIC11IC1yMS4zIERlY29kZXI4ODU5XzUuamF2
YQ0KLS0tIGdudS9qYXZhL2lvL2RlY29kZS9EZWNvZGVyODg1OV81LmphdmEJMjIgSmFuIDIwMDIg
MjI6MjY6NTcgLTAwMDAJMS4zDQorKysgZ251L2phdmEvaW8vZGVjb2RlL0RlY29kZXI4ODU5XzUu
amF2YQkyMyBBcHIgMjAwNCAyMjoyNjo0MyAtMDAwMA0KQEAgLTEsNSArMSw1IEBADQogLyogRGVj
b2Rlcjg4NTlfNS5qYXZhIC0tIERlY29kZXIgZm9yIElTTy1MYXRpbi01IENoYXJhY3RlciBzZXQN
Ci0gICBDb3B5cmlnaHQgKEMpIDE5OTggRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQor
ICAgQ29weXJpZ2h0IChDKSAxOTk4LCAyMDA0IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5j
Lg0KIA0KIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBDbGFzc3BhdGguDQogDQpAQCAtNDEsNyAr
NDEsNyBAQA0KIGltcG9ydCBqYXZhLmlvLklucHV0U3RyZWFtOw0KIA0KIC8qKg0KLSAgKiBUaGlz
IGNsYXNzIGRlY29kZXMgYnl0ZXMgaW4gSVNPLTg4NTktMyAoTGF0aW4tMykgZm9ybWF0IHRvIFVu
aWNvZGUuDQorICAqIFRoaXMgY2xhc3MgZGVjb2RlcyBieXRlcyBpbiBJU08tODg1OS01IChMYXRp
bi01KSBmb3JtYXQgdG8gVW5pY29kZS4NCiAgICoNCiAgICogQHZlcnNpb24gMC4wDQogICAqDQpA
QCAtNTAsMTMgKzUwLDExIEBADQogcHVibGljIGNsYXNzIERlY29kZXI4ODU5XzUgZXh0ZW5kcyBE
ZWNvZGVyRWlnaHRCaXRMb29rdXANCiB7DQogDQotLyoqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovDQotDQogLyoq
DQogICAqIFRoaXMgaXMgdGhlIGxvb2t1cCB0YWJsZSBmb3IgdGhpcyBlbmNvZGluZw0KICAgKi8N
CiANCi1wcm90ZWN0ZWQgc3RhdGljIGNoYXJbXSBsb29rdXBfdGFibGVfODg1OV81ID0geyANCitw
cml2YXRlIHN0YXRpYyBmaW5hbCBjaGFyW10gbG9va3VwX3RhYmxlXzg4NTlfNSA9IHsgDQogLy8g
QmVnaW4gcmFuZ2UgdW5kZWZpbmVkIGluIHNwZWMgZG9jdW1lbnQgSSB1c2VkDQogMHgwMDAwLA0K
IDB4MDAwMSwNCkBAIC0zMTksMjIgKzMxNywxMCBAQA0KIDB4MDQ1Rg0KIH07DQogDQotc3RhdGlj
DQotew0KLSAgc2NoZW1lX25hbWUgPSAiODg1OV81IjsNCi0gIHNjaGVtZV9kZXNjcmlwdGlvbiA9
ICJJU08tODg1OS01IChMYXRpbi01IGNoYXJhY3RlciBzZXQpIjsNCi0gIGxvb2t1cF90YWJsZSA9
IGxvb2t1cF90YWJsZV84ODU5XzU7DQotfQ0KLQ0KLS8qKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KLQ0KLS8q
DQotICogQ29uc3RydWN0b3JzDQotICovDQogcHVibGljDQogRGVjb2Rlcjg4NTlfNShJbnB1dFN0
cmVhbSBpbikNCiB7DQotICBzdXBlcihpbik7DQorICBzdXBlcihpbiwgIjg4NTlfNSIsIGxvb2t1
cF90YWJsZV84ODU5XzUpOw0KIH0NCiANCiB9IC8vIGNsYXNzIERlY29kZXI4ODU5XzUNCkluZGV4
OiBnbnUvamF2YS9pby9kZWNvZGUvRGVjb2RlckVpZ2h0Qml0TG9va3VwLmphdmENCj09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2dudS9qYXZhL2lvL2Rl
Y29kZS9EZWNvZGVyRWlnaHRCaXRMb29rdXAuamF2YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEu
Ng0KZGlmZiAtdSAtcjEuNiBEZWNvZGVyRWlnaHRCaXRMb29rdXAuamF2YQ0KLS0tIGdudS9qYXZh
L2lvL2RlY29kZS9EZWNvZGVyRWlnaHRCaXRMb29rdXAuamF2YQkxMiBBdWcgMjAwMyAxMjoxNzoz
MSAtMDAwMAkxLjYNCisrKyBnbnUvamF2YS9pby9kZWNvZGUvRGVjb2RlckVpZ2h0Qml0TG9va3Vw
LmphdmEJMjMgQXByIDIwMDQgMjI6MjY6NDMgLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0KIC8qIERl
Y29kZXJFaWdodEJpdExvb2t1cC5qYXZhIC0tIERlY29kZXMgZWlnaHQtYml0IGVuY29kaW5ncw0K
LSAgIENvcHlyaWdodCAoQykgMTk5OCwgMjAwMSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIElu
Yy4NCisgICBDb3B5cmlnaHQgKEMpIDE5OTgsIDIwMDEsIDIwMDQgRnJlZSBTb2Z0d2FyZSBGb3Vu
ZGF0aW9uLCBJbmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIENsYXNzcGF0aC4NCiAN
CkBAIC02OCwxNyArNjgsMTggQEANCiAgICogYnl0ZSBpbiB0aGUgYXBwcm9wcmlhdGUgaW5kZXgg
c2xvdC4gIEZvciBleGFtcGxlLCB0byBjb252ZXJ0IDB4RTMgdG8NCiAgICogXHUzNzY4LCBwdXQg
XHUzNzY4IGF0IGluZGV4IDIyNyAoMHhFMykgaW4gdGhlIGxvb2t1cCB0YWJsZS4NCiAgICovDQot
cHJvdGVjdGVkIHN0YXRpYyBjaGFyW10gbG9va3VwX3RhYmxlOw0KK3ByaXZhdGUgZmluYWwgY2hh
cltdIGxvb2t1cF90YWJsZTsNCiANCiAvKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKi8NCiANCiAvKg0KICAqIENv
bnN0cnVjdG9ycw0KICAqLw0KLXB1YmxpYw0KLURlY29kZXJFaWdodEJpdExvb2t1cChJbnB1dFN0
cmVhbSBpbikNCitwcm90ZWN0ZWQNCitEZWNvZGVyRWlnaHRCaXRMb29rdXAoSW5wdXRTdHJlYW0g
aW4sIFN0cmluZyBuYW1lLCBjaGFyW10gdGFibGUpDQogew0KLSAgc3VwZXIoaW4pOw0KKyAgc3Vw
ZXIoaW4sIG5hbWUpOw0KKyAgdGhpcy5sb29rdXBfdGFibGUgPSB0YWJsZTsNCiB9DQogDQogLyoq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKiovDQpJbmRleDogZ251L2phdmEvaW8vZGVjb2RlL0RlY29kZXJVVEY4Lmph
dmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2du
dS9qYXZhL2lvL2RlY29kZS9EZWNvZGVyVVRGOC5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24g
MS40DQpkaWZmIC11IC1yMS40IERlY29kZXJVVEY4LmphdmENCi0tLSBnbnUvamF2YS9pby9kZWNv
ZGUvRGVjb2RlclVURjguamF2YQkxNiBBdWcgMjAwMyAxMzoxNjo1MyAtMDAwMAkxLjQNCisrKyBn
bnUvamF2YS9pby9kZWNvZGUvRGVjb2RlclVURjguamF2YQkyMyBBcHIgMjAwNCAyMjoyNjo0MyAt
MDAwMA0KQEAgLTEsNSArMSw1IEBADQogLyogRGVjb2RlclVURjguamF2YSAtLSBEZWNvZGVyIGZv
ciB0aGUgVVRGLTggY2hhcmFjdGVyIGVuY29kaW5nLg0KLSAgIENvcHlyaWdodCAoQykgMTk5OCwg
MjAwMyBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCisgICBDb3B5cmlnaHQgKEMpIDE5
OTgsIDIwMDMsIDIwMDQgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQogDQogVGhpcyBm
aWxlIGlzIHBhcnQgb2YgR05VIENsYXNzcGF0aC4NCiANCkBAIC01NSwxMiArNTUsNiBAQA0KIHB1
YmxpYyBjbGFzcyBEZWNvZGVyVVRGOCBleHRlbmRzIERlY29kZXINCiB7DQogDQotc3RhdGljDQot
ew0KLSAgc2NoZW1lX25hbWUgPSAiVVRGOCI7DQotICBzY2hlbWVfZGVzY3JpcHRpb24gPSAiVUNT
IFRyYW5zZm9ybWF0aW9uIEZvcm1hdCA4IChzZWUgUkZDLTIyNzkpIjsNCi19DQotDQogLyoqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKiovDQogDQogLyoNCkBAIC03MCw3ICs2NCw3IEBADQogcHVibGljDQogRGVjb2Rl
clVURjgoSW5wdXRTdHJlYW0gaW4pDQogew0KLSAgc3VwZXIoaW4pOw0KKyAgc3VwZXIoaW4sICJV
VEY4Iik7DQogfQ0KIA0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KSW5kZXg6IGdudS9qYXZhL2lvL2Vu
Y29kZS9FbmNvZGVyLmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3Bh
dGgvY2xhc3NwYXRoL2dudS9qYXZhL2lvL2VuY29kZS9FbmNvZGVyLmphdmEsdg0KcmV0cmlldmlu
ZyByZXZpc2lvbiAxLjQNCmRpZmYgLXUgLXIxLjQgRW5jb2Rlci5qYXZhDQotLS0gZ251L2phdmEv
aW8vZW5jb2RlL0VuY29kZXIuamF2YQkxNSBBdWcgMjAwMiAxOTo1ODo1MSAtMDAwMAkxLjQNCisr
KyBnbnUvamF2YS9pby9lbmNvZGUvRW5jb2Rlci5qYXZhCTIzIEFwciAyMDA0IDIyOjI2OjQzIC0w
MDAwDQpAQCAtMSw1ICsxLDUgQEANCiAvKiBFbmNvZGVyLmphdmEgLS0gQmFzZSBjbGFzcyBmb3Ig
Y2hhci0+Ynl0ZSBlbmNvZGVycw0KLSAgIENvcHlyaWdodCAoQykgMTk5OCBGcmVlIFNvZnR3YXJl
IEZvdW5kYXRpb24sIEluYy4NCisgICBDb3B5cmlnaHQgKEMpIDE5OTgsIDIwMDQgRnJlZSBTb2Z0
d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQogDQogVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIENsYXNz
cGF0aC4NCiANCkBAIC02MywxMyArNjMsNyBAQA0KICAgKiBUaGlzIGlzIHRoZSBuYW1lIG9mIHRo
ZSBjdXJyZW50IGVuY29kaW5nLiBNVVNUIGJlIG92ZXJyaWRlbiBieQ0KICAgKiBzdWJjbGFzc2Vz
Lg0KICAgKi8NCi1wcm90ZWN0ZWQgc3RhdGljIFN0cmluZyBzY2hlbWVfbmFtZSA9ICJ1bmRlZmlu
ZWQiOw0KLQ0KLS8qKg0KLSAgKiBUaGlzIGlzIGEgZGVzY3JpcHRpb24gb2YgdGhlIGN1cnJlbnQg
ZW5jb2RpbmcuICBNVVNUIGJlIG92ZXJyaWRkZW4NCi0gICogYnkgc3ViY2xhc3Nlcy4NCi0gICov
DQotcHJvdGVjdGVkIHN0YXRpYyBTdHJpbmcgc2NoZW1lX2Rlc2NyaXB0aW9uID0gInVuZGVmaW5l
ZCI7DQorcHJpdmF0ZSBmaW5hbCBTdHJpbmcgc2NoZW1lX25hbWU7DQogDQogLyoqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKiovDQogDQpAQCAtODAsNyArNzQsNyBAQA0KIC8qKg0KICAgKiBUaGlzIGlzIHRoZSA8Y29k
ZT5PdXRwdXRTdHJlYW08L2NvZGU+IGJ5dGVzIGFyZSB3cml0dGVuIHRvDQogICAqLw0KLXByb3Rl
Y3RlZCBPdXRwdXRTdHJlYW0gb3V0Ow0KK3Byb3RlY3RlZCBmaW5hbCBPdXRwdXRTdHJlYW0gb3V0
Ow0KIA0KIC8qKg0KICAgKiBUaGlzIGlzIHRoZSB2YWx1ZSB0aGF0IGlzIHN1YnN0aXR1dGVkIGZv
ciBiYWQgY2hhcmFjdGVycyB0aGF0IGNhbid0DQpAQCAtMTA0LDcgKzk4LDcgQEANCiAgICoNCiAg
ICogQHJldHVybiBUaGUgbmFtZSBvZiB0aGUgZW5jb2Rpbmcgc2NoZW1lDQogICAqLw0KLXB1Ymxp
YyBzdGF0aWMgU3RyaW5nDQorcHVibGljIFN0cmluZw0KIGdldFNjaGVtZU5hbWUoKQ0KIHsNCiAg
IHJldHVybihzY2hlbWVfbmFtZSk7DQpAQCAtMTEyLDE5ICsxMDYsNiBAQA0KIA0KIC8qKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqLw0KIA0KLS8qKg0KLSAgKiBUaGlzIG1ldGhvZCByZXR1cm5zIGEgZGVzY3JpcHRp
b24gb2YgdGhlIGVuY29kaW5nIHNjaGVtZSBpbiB1c2UNCi0gICoNCi0gICogQHBhcmFtIEEgZGVz
Y3JpcHRpb24gb2YgdGhlIGRlY29kaW5nIHNjaGVtZS4NCi0gICovDQotcHVibGljIHN0YXRpYyBT
dHJpbmcNCi1nZXRTY2hlbWVEZXNjcmlwdGlvbigpDQotew0KLSAgcmV0dXJuKHNjaGVtZV9kZXNj
cmlwdGlvbik7DQotfQ0KLQ0KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KLQ0KIC8qDQogICogQ29uc3Ry
dWN0b3JzDQogICovDQpAQCAtMTMzLDEyICsxMTQsMTQgQEANCiAgICogVGhpcyBtZXRob2QgaW5p
dGlhbGl6ZXMgYSBuZXcgPGNvZGU+RW5jb2RlcjwvY29kZT4gdG8gd3JpdGUgdG8gdGhlDQogICAq
IHNwZWNpZmllZCA8Y29kZT5PdXRwdXRTdHJlYW08L2NvZGU+Lg0KICAgKg0KKyAgKiBAcGFyYW0g
bmFtZSBUaGUgY2hhcmFjdGVyIHNjaGVtZSBuYW1lDQogICAqIEBwYXJhbSBvdXQgVGhlIDxjb2Rl
Pk91dHB1dFN0cmVhbTwvY29kZT4gdG8gcmVhZCBmcm9tDQogICAqLw0KLXB1YmxpYw0KLUVuY29k
ZXIoT3V0cHV0U3RyZWFtIG91dCkNCitwcm90ZWN0ZWQNCitFbmNvZGVyKE91dHB1dFN0cmVhbSBv
dXQsIFN0cmluZyBuYW1lKQ0KIHsNCiAgIHRoaXMub3V0ID0gb3V0Ow0KKyAgdGhpcy5zY2hlbWVf
bmFtZSA9IG5hbWU7DQogfQ0KIA0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KSW5kZXg6IGdudS9qYXZh
L2lvL2VuY29kZS9FbmNvZGVyODg1OV8xLmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zz
cm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2dudS9qYXZhL2lvL2VuY29kZS9FbmNvZGVyODg1OV8x
LmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjQNCmRpZmYgLXUgLXIxLjQgRW5jb2Rlcjg4
NTlfMS5qYXZhDQotLS0gZ251L2phdmEvaW8vZW5jb2RlL0VuY29kZXI4ODU5XzEuamF2YQk5IEZl
YiAyMDAyIDAzOjI4OjE2IC0wMDAwCTEuNA0KKysrIGdudS9qYXZhL2lvL2VuY29kZS9FbmNvZGVy
ODg1OV8xLmphdmEJMjMgQXByIDIwMDQgMjI6MjY6NDMgLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0K
IC8qIEVuY29kZXI4ODU5XzEuamF2YSAtLSBFbmNvZGVyIGZvciBJU08tTGF0aW4tMSBDaGFyYWN0
ZXIgc2V0DQotICAgQ29weXJpZ2h0IChDKSAxOTk4IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwg
SW5jLg0KKyAgIENvcHlyaWdodCAoQykgMTk5OCwgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRp
b24sIEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAg
LTU2LDcgKzU2LDcgQEANCiAgICogVGhpcyBpcyB0aGUgbG9va3VwIHRhYmxlIGZvciB0aGlzIGVu
Y29kaW5nDQogICAqLw0KIA0KLXByb3RlY3RlZCBzdGF0aWMgY2hhcltdIGxvb2t1cF90YWJsZV84
ODU5XzEgPSB7IA0KK3ByaXZhdGUgc3RhdGljIGZpbmFsIGNoYXJbXSBsb29rdXBfdGFibGVfODg1
OV8xID0geyANCiAweDAwMDAsDQogMHgwMDAxLA0KIDB4MDAwMiwNCkBAIC0zMTUsMjQgKzMxNSwx
MCBAQA0KIDB4MDBGRg0KIH07DQogDQotc3RhdGljDQotew0KLSAgc2NoZW1lX25hbWUgPSAiODg1
OV8xIjsNCi0gIHNjaGVtZV9kZXNjcmlwdGlvbiA9ICJJU08tODg1OS0xIChMYXRpbi0xIGNoYXJh
Y3RlciBzZXQpIjsNCi0gIGxvb2t1cF90YWJsZSA9IGxvb2t1cF90YWJsZV84ODU5XzE7DQotICBF
bmNvZGVyRWlnaHRCaXRMb29rdXAubG9hZFRhYmxlKCk7DQotICAvLyBGSVhNRSBleHBsaWNpdCBz
dXBlciBjbGFzcyBpcyB3b3JrYXJvdW5kIGZvciBqaWtlczEuMTVhIGFuZCBvcnAgMS4wLjkNCi19
DQotDQotLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKiovDQotDQotLyoNCi0gKiBDb25zdHJ1Y3RvcnMNCi0gKi8N
CiBwdWJsaWMNCiBFbmNvZGVyODg1OV8xKE91dHB1dFN0cmVhbSBvdXQpDQogew0KLSAgc3VwZXIo
b3V0KTsNCisgIHN1cGVyKG91dCwgIjg4NTlfMSIsIGxvb2t1cF90YWJsZV84ODU5XzEpOw0KIH0N
CiANCiB9IC8vIGNsYXNzIEVuY29kZXI4ODU5XzENCkluZGV4OiBnbnUvamF2YS9pby9lbmNvZGUv
RW5jb2Rlcjg4NTlfMi5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3Nw
YXRoL2NsYXNzcGF0aC9nbnUvamF2YS9pby9lbmNvZGUvRW5jb2Rlcjg4NTlfMi5qYXZhLHYNCnJl
dHJpZXZpbmcgcmV2aXNpb24gMS40DQpkaWZmIC11IC1yMS40IEVuY29kZXI4ODU5XzIuamF2YQ0K
LS0tIGdudS9qYXZhL2lvL2VuY29kZS9FbmNvZGVyODg1OV8yLmphdmEJOSBGZWIgMjAwMiAwMzoy
ODoxNiAtMDAwMAkxLjQNCisrKyBnbnUvamF2YS9pby9lbmNvZGUvRW5jb2Rlcjg4NTlfMi5qYXZh
CTIzIEFwciAyMDA0IDIyOjI2OjQzIC0wMDAwDQpAQCAtMSw1ICsxLDUgQEANCiAvKiBFbmNvZGVy
ODg1OV8yLmphdmEgLS0gRW5jb2RlciBmb3IgSVNPLUxhdGluLTIgQ2hhcmFjdGVyIHNldA0KLSAg
IENvcHlyaWdodCAoQykgMTk5OCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCisgICBD
b3B5cmlnaHQgKEMpIDE5OTgsIDIwMDQgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQog
DQogVGhpcyBmaWxlIGlzIHBhcnQgb2YgR05VIENsYXNzcGF0aC4NCiANCkBAIC01Niw3ICs1Niw3
IEBADQogICAqIFRoaXMgaXMgdGhlIGxvb2t1cCB0YWJsZSBmb3IgdGhpcyBlbmNvZGluZw0KICAg
Ki8NCiANCi1wcm90ZWN0ZWQgc3RhdGljIGNoYXJbXSBsb29rdXBfdGFibGVfODg1OV8yID0geyAN
Citwcml2YXRlIHN0YXRpYyBmaW5hbCBjaGFyW10gbG9va3VwX3RhYmxlXzg4NTlfMiA9IHsgDQog
Ly8gU3RhcnQgb2YgcmFuZ2UgdW5kZWZpbmVkIGluIHRoZSBzcGVjIGZpbGUgSSB1c2VkLg0KIDB4
MDAwMCwNCiAweDAwMDEsDQpAQCAtMzE5LDI0ICszMTksMTAgQEANCiAweDAyRDkNCiB9Ow0KIA0K
LXN0YXRpYw0KLXsNCi0gIHNjaGVtZV9uYW1lID0gIjg4NTlfMiI7DQotICBzY2hlbWVfZGVzY3Jp
cHRpb24gPSAiSVNPLTg4NTktMiAoTGF0aW4tMiBjaGFyYWN0ZXIgc2V0KSI7DQotICBsb29rdXBf
dGFibGUgPSBsb29rdXBfdGFibGVfODg1OV8yOw0KLSAgRW5jb2RlckVpZ2h0Qml0TG9va3VwLmxv
YWRUYWJsZSgpOw0KLSAgLy8gRklYTUUgZXhwbGljaXQgc3VwZXIgY2xhc3MgaXMgd29ya2Fyb3Vu
ZCBmb3IgamlrZXMxLjE1YSBhbmQgb3JwIDEuMC45DQotfQ0KLQ0KLS8qKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
Lw0KLQ0KLS8qDQotICogQ29uc3RydWN0b3JzDQotICovDQogcHVibGljDQogRW5jb2Rlcjg4NTlf
MihPdXRwdXRTdHJlYW0gb3V0KQ0KIHsNCi0gIHN1cGVyKG91dCk7DQorICBzdXBlcihvdXQsICI4
ODU5XzIiLCBsb29rdXBfdGFibGVfODg1OV8yKTsNCiB9DQogDQogfSAvLyBjbGFzcyBFbmNvZGVy
ODg1OV8yDQpJbmRleDogZ251L2phdmEvaW8vZW5jb2RlL0VuY29kZXI4ODU5XzMuamF2YQ0KPT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvZ251L2phdmEv
aW8vZW5jb2RlL0VuY29kZXI4ODU5XzMuamF2YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNA0K
ZGlmZiAtdSAtcjEuNCBFbmNvZGVyODg1OV8zLmphdmENCi0tLSBnbnUvamF2YS9pby9lbmNvZGUv
RW5jb2Rlcjg4NTlfMy5qYXZhCTkgRmViIDIwMDIgMDM6Mjg6MTYgLTAwMDAJMS40DQorKysgZ251
L2phdmEvaW8vZW5jb2RlL0VuY29kZXI4ODU5XzMuamF2YQkyMyBBcHIgMjAwNCAyMjoyNjo0MyAt
MDAwMA0KQEAgLTEsNSArMSw1IEBADQogLyogRW5jb2Rlcjg4NTlfMy5qYXZhIC0tIEVuY29kZXIg
Zm9yIElTTy1MYXRpbi0zIENoYXJhY3RlciBzZXQNCi0gICBDb3B5cmlnaHQgKEMpIDE5OTggRnJl
ZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuDQorICAgQ29weXJpZ2h0IChDKSAxOTk4LCAyMDA0
IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KIA0KIFRoaXMgZmlsZSBpcyBwYXJ0IG9m
IEdOVSBDbGFzc3BhdGguDQogDQpAQCAtNTYsNyArNTYsNyBAQA0KICAgKiBUaGlzIGlzIHRoZSBs
b29rdXAgdGFibGUgZm9yIHRoaXMgZW5jb2RpbmcNCiAgICovDQogDQotcHJvdGVjdGVkIHN0YXRp
YyBjaGFyW10gbG9va3VwX3RhYmxlXzg4NTlfMyA9IHsgDQorcHJpdmF0ZSBzdGF0aWMgZmluYWwg
Y2hhcltdIGxvb2t1cF90YWJsZV84ODU5XzMgPSB7IA0KIC8vIEJlZ2luIHJhbmdlIHVuZGVmaW5l
ZCBpbiBzcGVjIGRvY3VtZW50IEkgdXNlZA0KIDB4MDAwMCwNCiAweDAwMDEsDQpAQCAtMzEyLDI0
ICszMTIsMTMgQEANCiAweDAyRDkNCiB9Ow0KIA0KLXN0YXRpYw0KLXsNCi0gIHNjaGVtZV9uYW1l
ID0gIjg4NTlfMyI7DQotICBzY2hlbWVfZGVzY3JpcHRpb24gPSAiSVNPLTg4NTktMyAoTGF0aW4t
MyBjaGFyYWN0ZXIgc2V0KSI7DQotICBsb29rdXBfdGFibGUgPSBsb29rdXBfdGFibGVfODg1OV8z
Ow0KLSAgRW5jb2RlckVpZ2h0Qml0TG9va3VwLmxvYWRUYWJsZSgpOw0KLSAgLy8gRklYTUUgZXhw
bGljaXQgc3VwZXIgY2xhc3MgaXMgd29ya2Fyb3VuZCBmb3IgamlrZXMxLjE1YSBhbmQgb3JwIDEu
MC45DQotfQ0KLQ0KLS8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KLQ0KIC8qDQogICogQ29uc3RydWN0b3Jz
DQogICovDQogcHVibGljDQogRW5jb2Rlcjg4NTlfMyhPdXRwdXRTdHJlYW0gb3V0KQ0KIHsNCi0g
IHN1cGVyKG91dCk7DQorICBzdXBlcihvdXQsICI4ODU5XzMiLCBsb29rdXBfdGFibGVfODg1OV8z
KTsNCiB9DQogDQogfSAvLyBjbGFzcyBFbmNvZGVyODg1OV8zDQpJbmRleDogZ251L2phdmEvaW8v
ZW5jb2RlL0VuY29kZXI4ODU5XzQuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290
L2NsYXNzcGF0aC9jbGFzc3BhdGgvZ251L2phdmEvaW8vZW5jb2RlL0VuY29kZXI4ODU5XzQuamF2
YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMw0KZGlmZiAtdSAtcjEuMyBFbmNvZGVyODg1OV80
LmphdmENCi0tLSBnbnUvamF2YS9pby9lbmNvZGUvRW5jb2Rlcjg4NTlfNC5qYXZhCTIyIEphbiAy
MDAyIDIyOjI2OjU3IC0wMDAwCTEuMw0KKysrIGdudS9qYXZhL2lvL2VuY29kZS9FbmNvZGVyODg1
OV80LmphdmEJMjMgQXByIDIwMDQgMjI6MjY6NDMgLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0KIC8q
IEVuY29kZXI4ODU5XzQuamF2YSAtLSBFbmNvZGVyIGZvciBJU08tTGF0aW4tNCBDaGFyYWN0ZXIg
c2V0DQotICAgQ29weXJpZ2h0IChDKSAxOTk4IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5j
Lg0KKyAgIENvcHlyaWdodCAoQykgMTk5OCwgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24s
IEluYy4NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTQx
LDcgKzQxLDcgQEANCiBpbXBvcnQgamF2YS5pby5PdXRwdXRTdHJlYW07DQogDQogLyoqDQotICAq
IFRoaXMgY2xhc3MgZGVjb2RlcyBieXRlcyBpbiBJU08tODg1OS0zIChMYXRpbi00KSBmb3JtYXQg
dG8gVW5pY29kZS4NCisgICogVGhpcyBjbGFzcyBkZWNvZGVzIGJ5dGVzIGluIElTTy04ODU5LTQg
KExhdGluLTQpIGZvcm1hdCB0byBVbmljb2RlLg0KICAgKg0KICAgKiBAdmVyc2lvbiAwLjANCiAg
ICoNCkBAIC01Niw3ICs1Niw3IEBADQogICAqIFRoaXMgaXMgdGhlIGxvb2t1cCB0YWJsZSBmb3Ig
dGhpcyBlbmNvZGluZw0KICAgKi8NCiANCi1wcm90ZWN0ZWQgc3RhdGljIGNoYXJbXSBsb29rdXBf
dGFibGVfODg1OV80ID0geyANCitwcml2YXRlIHN0YXRpYyBmaW5hbCBjaGFyW10gbG9va3VwX3Rh
YmxlXzg4NTlfNCA9IHsgDQogLy8gQmVnaW4gcmFuZ2UgdW5kZWZpbmVkIGluIHNwZWMgZG9jdW1l
bnQgSSB1c2VkDQogMHgwMDAwLA0KIDB4MDAwMSwNCkBAIC0zMTksMjIgKzMxOSwxMCBAQA0KIDB4
MDJEOQ0KIH07DQogDQotc3RhdGljDQotew0KLSAgc2NoZW1lX25hbWUgPSAiODg1OV80IjsNCi0g
IHNjaGVtZV9kZXNjcmlwdGlvbiA9ICJJU08tODg1OS00IChMYXRpbi00IGNoYXJhY3RlciBzZXQp
IjsNCi0gIGxvb2t1cF90YWJsZSA9IGxvb2t1cF90YWJsZV84ODU5XzQ7DQotfQ0KLQ0KLS8qKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqLw0KLQ0KLS8qDQotICogQ29uc3RydWN0b3JzDQotICovDQogcHVibGljDQog
RW5jb2Rlcjg4NTlfNChPdXRwdXRTdHJlYW0gb3V0KQ0KIHsNCi0gIHN1cGVyKG91dCk7DQorICBz
dXBlcihvdXQsICI4ODU5XzQiLCBsb29rdXBfdGFibGVfODg1OV80KTsNCiB9DQogDQogfSAvLyBj
bGFzcyBFbmNvZGVyODg1OV80DQpJbmRleDogZ251L2phdmEvaW8vZW5jb2RlL0VuY29kZXI4ODU5
XzUuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3Bh
dGgvZ251L2phdmEvaW8vZW5jb2RlL0VuY29kZXI4ODU5XzUuamF2YSx2DQpyZXRyaWV2aW5nIHJl
dmlzaW9uIDEuMw0KZGlmZiAtdSAtcjEuMyBFbmNvZGVyODg1OV81LmphdmENCi0tLSBnbnUvamF2
YS9pby9lbmNvZGUvRW5jb2Rlcjg4NTlfNS5qYXZhCTIyIEphbiAyMDAyIDIyOjI2OjU3IC0wMDAw
CTEuMw0KKysrIGdudS9qYXZhL2lvL2VuY29kZS9FbmNvZGVyODg1OV81LmphdmEJMjMgQXByIDIw
MDQgMjI6MjY6NDMgLTAwMDANCkBAIC0xLDUgKzEsNSBAQA0KIC8qIEVuY29kZXI4ODU5XzUuamF2
YSAtLSBFbmNvZGVyIGZvciBJU08tTGF0aW4tNSBDaGFyYWN0ZXIgc2V0DQotICAgQ29weXJpZ2h0
IChDKSAxOTk4IEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAo
QykgMTk5OCwgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZp
bGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTQxLDcgKzQxLDcgQEANCiBpbXBv
cnQgamF2YS5pby5PdXRwdXRTdHJlYW07DQogDQogLyoqDQotICAqIFRoaXMgY2xhc3MgZGVjb2Rl
cyBieXRlcyBpbiBJU08tODg1OS0zIChMYXRpbi0zKSBmb3JtYXQgdG8gVW5pY29kZS4NCisgICog
VGhpcyBjbGFzcyBkZWNvZGVzIGJ5dGVzIGluIElTTy04ODU5LTUgKExhdGluLTUpIGZvcm1hdCB0
byBVbmljb2RlLg0KICAgKg0KICAgKiBAdmVyc2lvbiAwLjANCiAgICoNCkBAIC01Niw3ICs1Niw3
IEBADQogICAqIFRoaXMgaXMgdGhlIGxvb2t1cCB0YWJsZSBmb3IgdGhpcyBlbmNvZGluZw0KICAg
Ki8NCiANCi1wcm90ZWN0ZWQgc3RhdGljIGNoYXJbXSBsb29rdXBfdGFibGVfODg1OV81ID0geyAN
Citwcml2YXRlIHN0YXRpYyBmaW5hbCBjaGFyW10gbG9va3VwX3RhYmxlXzg4NTlfNSA9IHsgDQog
Ly8gQmVnaW4gcmFuZ2UgdW5kZWZpbmVkIGluIHNwZWMgZG9jdW1lbnQgSSB1c2VkDQogMHgwMDAw
LA0KIDB4MDAwMSwNCkBAIC0zMTksMjIgKzMxOSwxMCBAQA0KIDB4MDQ1Rg0KIH07DQogDQotc3Rh
dGljDQotew0KLSAgc2NoZW1lX25hbWUgPSAiODg1OV81IjsNCi0gIHNjaGVtZV9kZXNjcmlwdGlv
biA9ICJJU08tODg1OS01IChMYXRpbi01IGNoYXJhY3RlciBzZXQpIjsNCi0gIGxvb2t1cF90YWJs
ZSA9IGxvb2t1cF90YWJsZV84ODU5XzU7DQotfQ0KLQ0KLS8qKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KLQ0K
LS8qDQotICogQ29uc3RydWN0b3JzDQotICovDQogcHVibGljDQogRW5jb2Rlcjg4NTlfNShPdXRw
dXRTdHJlYW0gb3V0KQ0KIHsNCi0gIHN1cGVyKG91dCk7DQorICBzdXBlcihvdXQsICI4ODU5XzUi
LCBsb29rdXBfdGFibGVfODg1OV81KTsNCiB9DQogDQogfSAvLyBjbGFzcyBFbmNvZGVyODg1OV81
DQpJbmRleDogZ251L2phdmEvaW8vZW5jb2RlL0VuY29kZXJFaWdodEJpdExvb2t1cC5qYXZhDQo9
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9nbnUvamF2
YS9pby9lbmNvZGUvRW5jb2RlckVpZ2h0Qml0TG9va3VwLmphdmEsdg0KcmV0cmlldmluZyByZXZp
c2lvbiAxLjYNCmRpZmYgLXUgLXIxLjYgRW5jb2RlckVpZ2h0Qml0TG9va3VwLmphdmENCi0tLSBn
bnUvamF2YS9pby9lbmNvZGUvRW5jb2RlckVpZ2h0Qml0TG9va3VwLmphdmEJMTIgQXVnIDIwMDMg
MTI6MTc6MzAgLTAwMDAJMS42DQorKysgZ251L2phdmEvaW8vZW5jb2RlL0VuY29kZXJFaWdodEJp
dExvb2t1cC5qYXZhCTIzIEFwciAyMDA0IDIyOjI2OjQzIC0wMDAwDQpAQCAtMSw1ICsxLDUgQEAN
CiAvKiBFbmNvZGVyRWlnaHRCaXRMb29rdXAuamF2YSAtLSBFbmNvZGVzIGVpZ2h0LWJpdCBlbmNv
ZGluZ3MNCi0gICBDb3B5cmlnaHQgKEMpIDE5OTggRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJ
bmMuDQorICAgQ29weXJpZ2h0IChDKSAxOTk4LCAyMDA0IEZyZWUgU29mdHdhcmUgRm91bmRhdGlv
biwgSW5jLg0KIA0KIFRoaXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBDbGFzc3BhdGguDQogDQpAQCAt
NjMsMTkgKzYzLDEyIEBADQogICogQ2xhc3MgVmFyaWFibGVzDQogICovDQogIA0KLS8qKg0KLSAg
KiBUaGlzIGlzIHRoZSBsb29rdXAgdGFibGUuICBTdWJjbGFzc2VzIG11c3QgYWxsb2NhdGUgYSAy
NTUgYnl0ZSBjaGFyDQotICAqIGFycmF5IGFuZCBwdXQgZWFjaCBVbmljb2RlIGNoYXJhY3RlciBp
bnRvIHRoZSBzbG90IGNvcnJlc3BvbmRpbmcgdG8NCi0gICogd2hlcmUgaXQgaXMgZW5jb2RlZC4g
IEZvciBleGFtcGxlLCBpZiBcdTM3NjggY29ycmVzcG9uZHMgdG8gMHhFMywNCi0gICogcHV0IFwz
NzY4IGF0IGluZGV4IDI3NyAoMHhFMykgaW4gdGhlIGxvb2t1cCB0YWJsZS4NCi0gICovDQotcHJv
dGVjdGVkIHN0YXRpYyBjaGFyW10gbG9va3VwX3RhYmxlOw0KIA0KIC8qKg0KICAgKiBUaGlzIGlz
IHRoZSBzZWNvbmQgZ2VuZXJhdGlvbiBsb29rdXAgdGFibGUgdGhhdCBpcyBsb2FkZWQgd2hlbiB0
aGUNCiAgICogY2xhc3MgaXMgbG9hZGVkIGFuZCBpcyB3aGVyZSB0aGUgZW5jb2RpbmcgYWN0dWFs
bHkgdGFrZXMgcGxhY2UuDQogICAqLw0KLXByaXZhdGUgc3RhdGljIGJ5dGVbXSBlbmNvZGluZ190
YWJsZTsgLyogY2hhbmdlZCB0aGlzIGZyb20gY2hhcltdIHRvIGJ5dGVbXSAqLw0KK3ByaXZhdGUg
ZmluYWwgYnl0ZVtdIGVuY29kaW5nX3RhYmxlOyAvKiBjaGFuZ2VkIHRoaXMgZnJvbSBjaGFyW10g
dG8gYnl0ZVtdICovDQogDQogLyoqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovDQogDQpAQCAtODgsOCArODEsOCBA
QA0KICAgKiBpbnRvIGEgbGFyZ2VyIGVuY29kZXIgdGFibGUuICBZZXMsIHRoaXMgaXMgc2xvdywg
YnV0IGl0IGlzIG9ubHkgZG9uZQ0KICAgKiB0aGUgZmlyc3QgdGltZSB0aGUgY2xhc3MgaXMgYWNj
ZXNzZWQuDQogICAqLw0KLXByb3RlY3RlZCBzdGF0aWMgdm9pZA0KLWxvYWRUYWJsZSgpDQorcHJp
dmF0ZSBieXRlW10NCitsb2FkVGFibGUoY2hhcltdIGxvb2t1cF90YWJsZSkNCiB7DQogICAvKiBk
ZXRlcm1pbmUgcmVxdWlyZWQgc2l6ZSBvZiBlbmNvZGluZ190YWJsZTogKi8NCiAgIGludCBtYXgg
PSAwOyANCkBAIC05OSwxNiArOTIsMTcgQEANCiAgICAgICBtYXggPSAoYyA+IG1heCkgPyBjIDog
bWF4Ow0KICAgICB9DQogDQotICBlbmNvZGluZ190YWJsZSA9IG5ldyBieXRlW21heCsxXTsNCisg
IGJ5dGVbXSB0YWJsZSA9IG5ldyBieXRlW21heCsxXTsNCiANCiAgIGZvciAoaW50IGkgPSAwOyBp
IDwgbG9va3VwX3RhYmxlLmxlbmd0aDsgaSsrKQ0KICAgICB7DQogICAgICAgaW50IGMgPSBsb29r
dXBfdGFibGVbaV07IA0KICAgICAgIGlmIChjICE9IDApIA0KIAl7DQotCSAgZW5jb2RpbmdfdGFi
bGVbY10gPSAoYnl0ZSlpOw0KKwkgIHRhYmxlW2NdID0gKGJ5dGUpaTsNCiAJfQ0KICAgICB9DQor
ICByZXR1cm4gdGFibGU7DQogfQ0KIA0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0KQEAgLTExNiwxMCAr
MTEwLDExIEBADQogLyoNCiAgKiBDb25zdHJ1Y3RvcnMNCiAgKi8NCi1wdWJsaWMNCi1FbmNvZGVy
RWlnaHRCaXRMb29rdXAoT3V0cHV0U3RyZWFtIG91dCkNCitwcm90ZWN0ZWQNCitFbmNvZGVyRWln
aHRCaXRMb29rdXAoT3V0cHV0U3RyZWFtIG91dCwgU3RyaW5nIG5hbWUsIGNoYXJbXSB0YWJsZSkN
CiB7DQotICBzdXBlcihvdXQpOw0KKyAgc3VwZXIob3V0LCBuYW1lKTsNCisgIGVuY29kaW5nX3Rh
YmxlID0gbG9hZFRhYmxlKHRhYmxlKTsNCiB9DQogDQogLyoqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKiovDQpAQCAt
MTk1LDUgKzE5MCw1IEBADQogICBvdXQud3JpdGUoYmJ1Zik7DQogfQ0KIA0KLX0gLy8gY2xhc3Mg
RGVjb2RlckVpZ2h0Qml0TG9va3VwDQorfSAvLyBjbGFzcyBFbmNvZGVyRWlnaHRCaXRMb29rdXAN
CiANCkluZGV4OiBnbnUvamF2YS9pby9lbmNvZGUvRW5jb2RlclVURjguamF2YQ0KPT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvZ251L2phdmEvaW8vZW5j
b2RlL0VuY29kZXJVVEY4LmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjYNCmRpZmYgLXUg
LXIxLjYgRW5jb2RlclVURjguamF2YQ0KLS0tIGdudS9qYXZhL2lvL2VuY29kZS9FbmNvZGVyVVRG
OC5qYXZhCTE4IEphbiAyMDAzIDIyOjQ5OjI4IC0wMDAwCTEuNg0KKysrIGdudS9qYXZhL2lvL2Vu
Y29kZS9FbmNvZGVyVVRGOC5qYXZhCTIzIEFwciAyMDA0IDIyOjI2OjQzIC0wMDAwDQpAQCAtMSw1
ICsxLDUgQEANCiAvKiBFbmNvZGVyVVRGOC5qYXZhIC0tIEVuY29kaW5nIGNsYXNzIGZvciB0aGUg
VVRGLTggc2NoZW1lDQotICAgQ29weXJpZ2h0IChDKSAxOTk4LCAyMDAyLCAyMDAzIEZyZWUgU29m
dHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykgMTk5OCwgMjAwMiwgMjAw
MywgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZpbGUgaXMg
cGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTUzLDEyICs1Myw2IEBADQogcHVibGljIGNs
YXNzIEVuY29kZXJVVEY4IGV4dGVuZHMgRW5jb2Rlcg0KIHsNCiANCi1zdGF0aWMNCi17DQotICBz
Y2hlbWVfbmFtZSA9ICJVVEY4IjsNCi0gIHNjaGVtZV9kZXNjcmlwdGlvbiA9ICJVQ1MgVHJhbnNm
b3JtYXRpb24gRm9ybWF0IDggKHNlZSBSRkMtMjI3OSkiOw0KLX0NCi0NCiAvKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKi8NCiANCiAvKg0KQEAgLTY4LDcgKzYyLDcgQEANCiBwdWJsaWMNCiBFbmNvZGVyVVRGOChP
dXRwdXRTdHJlYW0gb3V0KQ0KIHsNCi0gIHN1cGVyKG91dCk7DQorICBzdXBlcihvdXQsICJVVEY4
Iik7DQogfQ0KIA0KIC8qKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq
KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLw0K

--=-VJSYtjOlvq286fP8RMzd--

--=-dIIR7n0wek2YfoD8q5KE
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)

iD8DBQBAiZqExVhZCJWr9QwRAn/cAJ40A4CT2PILTWSg69YEBJIr1laqsACcCgsh
LghW1SxbM1/tHcaaq4nchKY=
=yP0K
-----END PGP SIGNATURE-----

--=-dIIR7n0wek2YfoD8q5KE--




From MAILER-DAEMON Fri Apr 23 23:52:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BHEDd-00029g-3T
	for mharc-commit-classpath@gnu.org; Fri, 23 Apr 2004 23:52:45 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BHEDY-000232-Nr
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 23:52:40 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BHECz-0001hB-Va
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 23:52:37 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BHECz-0001gn-J6
	for commit-classpath@gnu.org; Fri, 23 Apr 2004 23:52:05 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id A49486235A
	for <commit-classpath@gnu.org>; Sat, 24 Apr 2004 03:52: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 45435-08 for <commit-classpath@gnu.org>;
	Sat, 24 Apr 2004 03:52:04 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-74-46.adsl.solnet.ch [212.41.74.46])
	by mail01.solnet.ch (Postfix) with ESMTP id 918CC622C3
	for <commit-classpath@gnu.org>; Sat, 24 Apr 2004 03:52:03 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 30099BB404; Sat, 24 Apr 2004 05:49:54 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040424034954.30099BB404@reali.dnsalias.net>
Date: Sat, 24 Apr 2004 05:49:54 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040424 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 24 Apr 2004 03:52:42 -0000




From MAILER-DAEMON Sat Apr 24 23:52:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BHah0-0007Ab-W1
	for mharc-commit-classpath@gnu.org; Sat, 24 Apr 2004 23:52:34 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BHagx-00077Y-D6
	for commit-classpath@gnu.org; Sat, 24 Apr 2004 23:52:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BHagQ-0006iX-2t
	for commit-classpath@gnu.org; Sat, 24 Apr 2004 23:52:29 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BHagP-0006h4-NA
	for commit-classpath@gnu.org; Sat, 24 Apr 2004 23:51:57 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id E5C3662263
	for <commit-classpath@gnu.org>; Sun, 25 Apr 2004 03:51:56 +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 99294-06 for <commit-classpath@gnu.org>;
	Sun, 25 Apr 2004 03:51:56 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-74-46.adsl.solnet.ch [212.41.74.46])
	by mail01.solnet.ch (Postfix) with ESMTP id CCD7C6225E
	for <commit-classpath@gnu.org>; Sun, 25 Apr 2004 03:51:55 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 10BCCBB4A2; Sun, 25 Apr 2004 05:49:43 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040425034943.10BCCBB4A2@reali.dnsalias.net>
Date: Sun, 25 Apr 2004 05:49:43 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040425 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 25 Apr 2004 03:52:32 -0000




From MAILER-DAEMON Sun Apr 25 11:13:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BHlK1-00007H-RA
	for mharc-commit-classpath@gnu.org; Sun, 25 Apr 2004 11:13:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BHlJz-000073-Mi
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 11:13:31 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BHlJy-00006j-AK
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 11:13:30 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BHlJx-00006b-RE
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 11:13:29 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BHlJs-0004Op-00
	for <commit-classpath@gnu.org>; Sun, 25 Apr 2004 17:13:24 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-byu3lxQ6+gL9VL8gRv+9"
Message-Id: <1082906005.27234.1433.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Sun, 25 Apr 2004 17:13:26 +0200
Subject: Make FileChannelImpl.read(byte[]) less blocking
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 25 Apr 2004 15:13:32 -0000


--=-byu3lxQ6+gL9VL8gRv+9
Content-Type: multipart/mixed; boundary="=-qJlBEx0pjeOlN9yK5gsO"


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

Hi,

The following patch makes the native JNU FileChannelImpl.read(byte[],
int, int) return as soon as at least some part of the given byte buffer
has been filled. This also includes a small patch from Stephen Crawley
(patch #2951 in Savannah) that I rediscovered during testing. Only the
read version was applied since the write version was already correct.
(Sorry for not applying this earlier Stephen. It would also have saved
 me some time...)

2004-04-25  Stephen Crawley  <crawley@dstc.edu.au>
            Mark Wielaard  <mark@klomp.org>

    * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
    (Java_gnu_java_nio_channels_FileChannelImpl_read___3BII):
    Fill buffer with a  do-while bytes_read < 1 loop.
    Check for length =3D=3D 0.

This makes sure that Mauve test FileInputStream.read: empty byte[] read
PASSes and that the following program terminates correctly (it hangs
with the current code):

import java.io.*;

public class T2
{
  public static void main(String[] args) throws Exception
  {
    Reader r =3D new InputStreamReader(System.in);
    BufferedReader br =3D new BufferedReader(r);
    String line =3D br.readLine();
    System.out.println(line);
  }
}

Comments? Objections?

Cheers,

Mark

--=-qJlBEx0pjeOlN9yK5gsO
Content-Disposition: inline; filename=FileChannelImpl.patch
Content-Type: text/x-patch; name=FileChannelImpl.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IG5hdGl2ZS9qbmkvamF2YS1uaW8vZ251X2phdmFfbmlvX2NoYW5uZWxzX0ZpbGVDaGFu
bmVsSW1wbC5jDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNz
cGF0aC9uYXRpdmUvam5pL2phdmEtbmlvL2dudV9qYXZhX25pb19jaGFubmVsc19GaWxlQ2hhbm5l
bEltcGwuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuNQ0KZGlmZiAtdSAtcjEuNSBnbnVfamF2
YV9uaW9fY2hhbm5lbHNfRmlsZUNoYW5uZWxJbXBsLmMNCi0tLSBuYXRpdmUvam5pL2phdmEtbmlv
L2dudV9qYXZhX25pb19jaGFubmVsc19GaWxlQ2hhbm5lbEltcGwuYwkxMiBBcHIgMjAwNCAxNDoz
ODo1NSAtMDAwMAkxLjUNCisrKyBuYXRpdmUvam5pL2phdmEtbmlvL2dudV9qYXZhX25pb19jaGFu
bmVsc19GaWxlQ2hhbm5lbEltcGwuYwkyNSBBcHIgMjAwNCAxNTowOToxNCAtMDAwMA0KQEAgLTU0
OSw4ICs1NDksMTIgQEANCiAgICAgICByZXR1cm4oLTEpOw0KICAgICB9DQogDQorICAvKiBNdXN0
IHJldHVybiAwIGlmIGFuIGF0dGVtcHQgaXMgbWFkZSB0byByZWFkIDAgYnl0ZXMuICovDQorICBp
ZiAobGVuZ3RoID09IDApDQorICAgIHJldHVybiAwOw0KKw0KICAgYnl0ZXNfcmVhZCA9IDA7DQot
ICB3aGlsZSAoYnl0ZXNfcmVhZCA8IGxlbmd0aCkNCisgIGRvDQogICAgIHsNCiAgICAgICBUQVJH
RVRfTkFUSVZFX0ZJTEVfUkVBRChuYXRpdmVfZmQsIChidWZwdHIgKyBvZmZzZXQgKyBieXRlc19y
ZWFkKSwgKGxlbmd0aCAtIGJ5dGVzX3JlYWQpLCBuLCByZXN1bHQpOw0KICAgICAgIGlmICgocmVz
dWx0ID09IFRBUkdFVF9OQVRJVkVfT0spICYmIChuID09IDApKQ0KQEAgLTU3MSw2ICs1NzUsNyBA
QA0KICAgICAgICAgfQ0KICAgICAgIGJ5dGVzX3JlYWQgKz0gbjsNCiAgICAgfQ0KKyAgd2hpbGUg
KGJ5dGVzX3JlYWQgPCAxKTsNCiANCiAgICgqZW52KS0+UmVsZWFzZUJ5dGVBcnJheUVsZW1lbnRz
KGVudiwgYnVmZmVyLCBidWZwdHIsIDApOw0KICAgcmV0dXJuIENPTlZFUlRfU1NJWkVfVF9UT19K
SU5UKGJ5dGVzX3JlYWQpOw0K

--=-qJlBEx0pjeOlN9yK5gsO--

--=-byu3lxQ6+gL9VL8gRv+9
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)

iD8DBQBAi9WUxVhZCJWr9QwRAl6VAJ45t5vQycEj1LvyU833CfGAP2rnMQCfaiUj
2JDOzbn31wAMveafizdxW3E=
=I7iz
-----END PGP SIGNATURE-----

--=-byu3lxQ6+gL9VL8gRv+9--




From MAILER-DAEMON Sun Apr 25 11:21:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BHlS3-0008Qr-7h
	for mharc-commit-classpath@gnu.org; Sun, 25 Apr 2004 11:21:51 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BHlRz-0008Iv-CX
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 11:21:47 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BHlRQ-0007JN-Po
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 11:21:43 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BHlRQ-0007JI-DU
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 11:21:12 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-149.ewetel.net
	[80.228.95.149])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3PFLAnV025572;
	Sun, 25 Apr 2004 17:21:10 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BHlS0-0001PH-00; Sun, 25 Apr 2004 17:21:48 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 25 Apr 2004 17:20:49 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_Rd9iAGacrCQcXnl"
Message-Id: <200404251720.49947.konqueror@gmx.de>
X-CheckCompat: OK
Cc: graydon@redhat.com
Subject: Patch: java.awt.FileDialog
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 25 Apr 2004 15:21:49 -0000


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

Hi list,


I commited the attache patch to explicitely import java.io.Serializable.


Michael 


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

	* java/awt/FileDialog.java: Import java.io.Serializable explicitetly.


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

Index: java/awt/FileDialog.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/FileDialog.java,v
retrieving revision 1.9
diff -u -r1.9 FileDialog.java
--- java/awt/FileDialog.java	7 Jan 2004 16:54:35 -0000	1.9
+++ java/awt/FileDialog.java	25 Apr 2004 15:13:11 -0000
@@ -41,6 +41,7 @@
 import java.awt.peer.FileDialogPeer;
 import java.awt.peer.DialogPeer;
 import java.io.FilenameFilter;
+import java.io.Serializable;
 
 /**
   * This class implements a file selection dialog box widget.
@@ -48,7 +49,7 @@
   * @author Aaron M. Renn (arenn@urbanophile.com)
   * @author Tom Tromey <tromey@redhat.com>
   */
-public class FileDialog extends Dialog implements java.io.Serializable
+public class FileDialog extends Dialog implements Serializable
 {
 
 /*

--Boundary-00=_Rd9iAGacrCQcXnl--




From MAILER-DAEMON Sun Apr 25 12:17:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BHmKF-0004rg-7l
	for mharc-commit-classpath@gnu.org; Sun, 25 Apr 2004 12:17:51 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BHmKC-0004pb-MB
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 12:17:48 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BHmK8-0004i1-Pa
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 12:17:45 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BHmK7-0004fw-Rl
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 12:17:44 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BHmK2-0004Yp-00
	for <commit-classpath@gnu.org>; Sun, 25 Apr 2004 18:17:38 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-rB6VQ9zgV/Sj66FE5KpZ"
Message-Id: <1082909860.27234.1441.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Sun, 25 Apr 2004 18:17:40 +0200
Subject: Retry ServerSocket.accept (java-net.c _accept) on EINTR
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 25 Apr 2004 16:17:49 -0000


--=-rB6VQ9zgV/Sj66FE5KpZ
Content-Type: multipart/mixed; boundary="=-SB67rJ5cZy17CckAXNn1"


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

Hi,

This fixes a long standing bug were accept() would throw a IOException
when the system call got interrupted. This happens for example with VMs
like jamvm which uses signals to tell all threads to suspend or sablevm
which you can send SIGQUIT to get a stacktrace of the current thread.

2004-04-25  Mark Wielaard  <mark@klomp.org>

       * native/jni/java-net/javanet.c (_javanet_accept): Retry when we get
       EINTR.

Committed.

Cheers,

Mark

--=-SB67rJ5cZy17CckAXNn1
Content-Disposition: inline; filename=javanet.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=javanet.patch; charset=ISO-8859-1

SW5kZXg6IG5hdGl2ZS9qbmkvamF2YS1uZXQvamF2YW5ldC5jDQo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmls
ZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9uYXRpdmUvam5pL2phdmEtbmV0L2phdmFu
ZXQuYyx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTcNCmRpZmYgLXUgLXIxLjE3IGphdmFuZXQu
Yw0KLS0tIG5hdGl2ZS9qbmkvamF2YS1uZXQvamF2YW5ldC5jCTIxIEFwciAyMDA0IDExOjAzOjAw
IC0wMDAwCTEuMTcNCisrKyBuYXRpdmUvam5pL2phdmEtbmV0L2phdmFuZXQuYwkyNSBBcHIgMjAw
NCAxNjoxMjoyOSAtMDAwMA0KQEAgLTc4OSwxMiArNzg5LDE3IEBADQogICAgIH0NCiANCiAgIC8q
IEFjY2VwdCB0aGUgY29ubmVjdGlvbiAqLw0KLSAgLyoqKioqKiogRG8gd2UgbmVlZCB0byBsb29r
IGZvciBFSU5UUj8gKi8NCi0gIFRBUkdFVF9OQVRJVkVfTkVUV09SS19TT0NLRVRfQUNDRVBUKGZk
LG5ld2ZkLHJlc3VsdCk7DQotICBpZiAocmVzdWx0ICE9IFRBUkdFVF9OQVRJVkVfT0spDQorICB3
aGlsZSAocmVzdWx0ICE9IFRBUkdFVF9OQVRJVkVfT0spDQogICAgIHsNCi0gICAgICAgSkNMX1Ro
cm93RXhjZXB0aW9uKGVudiwgSU9fRVhDRVBUSU9OLCAiSW50ZXJuYWwgZXJyb3I6IF9qYXZhbmV0
X2FjY2VwdCgpOiAiKTsNCi0gICAgICAgcmV0dXJuOw0KKyAgICAgIFRBUkdFVF9OQVRJVkVfTkVU
V09SS19TT0NLRVRfQUNDRVBUKGZkLG5ld2ZkLHJlc3VsdCk7DQorICAgICAgaWYgKHJlc3VsdCAh
PSBUQVJHRVRfTkFUSVZFX09LDQorCSAgJiYgKFRBUkdFVF9OQVRJVkVfTEFTVF9FUlJPUigpDQor
CSAgICAgICE9IFRBUkdFVF9OQVRJVkVfRVJST1JfSU5URVJSVVBUX0ZVTkNUSU9OX0NBTEwpKQ0K
Kwl7DQorCSAgSkNMX1Rocm93RXhjZXB0aW9uKGVudiwgSU9fRVhDRVBUSU9OLA0KKwkJCSAgICAg
IkludGVybmFsIGVycm9yOiBfamF2YW5ldF9hY2NlcHQoKTogIik7DQorCSAgcmV0dXJuOw0KKwl9
DQogICAgIH0NCiANCiAgIC8qIFBvcHVsYXRlIGluc3RhbmNlIHZhcmlhYmxlcyAqLyANCg==

--=-SB67rJ5cZy17CckAXNn1--

--=-rB6VQ9zgV/Sj66FE5KpZ
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)

iD8DBQBAi+SixVhZCJWr9QwRAl87AJ4xYM9N3kR3Lh1qIr40HqgOvm+g7ACghAgd
xpoXgFojZYP7bLbhSqLvk1U=
=bplw
-----END PGP SIGNATURE-----

--=-rB6VQ9zgV/Sj66FE5KpZ--




From MAILER-DAEMON Sun Apr 25 14:51:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BHoiU-000077-Sz
	for mharc-commit-classpath@gnu.org; Sun, 25 Apr 2004 14:51:02 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BHoiS-00006X-8s
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 14:51:00 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BHohw-0008Pu-Eb
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 14:50:59 -0400
Received: from [209.225.28.229] (helo=mxsf29.cluster1.charter.net)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BHohw-0008PY-3O
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 14:50:28 -0400
Received: from InterJet.dellroad.org (public.cpe.mvllo.al.charter.com
	[24.196.20.72])
	by mxsf29.cluster1.charter.net (8.12.11/8.12.11) with ESMTP id
	i3PIj4RX002829; Sun, 25 Apr 2004 14:45:05 -0400 (EDT)
Received: from arch20m.dellroad.org (arch20m.dellroad.org [10.2.2.20])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id NAA35917;
	Sun, 25 Apr 2004 13:34:02 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.6) with ESMTP id i3PIY1OR004836; 
	Sun, 25 Apr 2004 13:34:02 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i3PIY1JU004835;
	Sun, 25 Apr 2004 13:34:01 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404251834.i3PIY1JU004835@arch20m.dellroad.org>
In-Reply-To: <1082909860.27234.1441.camel@elsschot.wildebeest.org>
To: Mark Wielaard <mark@klomp.org>
Date: Sun, 25 Apr 2004 13:34:01 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Cc: commit-classpath@gnu.org
Subject: Re: Retry ServerSocket.accept (java-net.c _accept) on EINTR
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 25 Apr 2004 18:51:00 -0000

Mark Wielaard wrote:
> This fixes a long standing bug were accept() would throw a IOException
> when the system call got interrupted. This happens for example with VMs
> like jamvm which uses signals to tell all threads to suspend or sablevm
> which you can send SIGQUIT to get a stacktrace of the current thread.
> 
> 2004-04-25  Mark Wielaard  <mark@klomp.org>
> 
>        * native/jni/java-net/javanet.c (_javanet_accept): Retry when we get
>        EINTR.

Hmm.. I wonder how many other instances of this bug there are.

E.g., connect(2), read(2), write(2), open(2), close(2), etc... can
all return EINTR if interrupted by a signal (often depends on the
situation of course).

For system calls that don't normally block (like read(2) from a
normal file), this would be very unlikely but in theory there's
nothing preventing a well-timed signal from causing EINR, though
in practice it probably depends on the O/S whether this can actually
happen.

If some O/S does allow this, then we possibly have lots of very
rare race condition bugs of this form...

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Sun Apr 25 18:55:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BHsWC-0007Sf-Uh
	for mharc-commit-classpath@gnu.org; Sun, 25 Apr 2004 18:54:36 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BHsVx-0007Bn-B4
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 18:54:21 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BHsVF-0006Sl-G8
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 18:53:40 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BHsV8-0006Cz-9G
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 18:53:30 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BHsV0-0005f8-00; Mon, 26 Apr 2004 00:53:22 +0200
From: Mark Wielaard <mark@klomp.org>
To: Archie Cobbs <archie@dellroad.org>
In-Reply-To: <200404251834.i3PIY1JU004835@arch20m.dellroad.org>
References: <200404251834.i3PIY1JU004835@arch20m.dellroad.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-Y54ZgVsMSt+BDD4h4VTP"
Message-Id: <1082933604.27234.1518.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Mon, 26 Apr 2004 00:53:24 +0200
Cc: commit-classpath@gnu.org
Subject: Re: Retry ServerSocket.accept (java-net.c _accept) on EINTR
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 25 Apr 2004 22:54:34 -0000


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

Hi,

On Sun, 2004-04-25 at 20:34, Archie Cobbs wrote:
> Hmm.. I wonder how many other instances of this bug there are.
>=20
> E.g., connect(2), read(2), write(2), open(2), close(2), etc... can
> all return EINTR if interrupted by a signal (often depends on the
> situation of course).
>=20
> For system calls that don't normally block (like read(2) from a
> normal file), this would be very unlikely but in theory there's
> nothing preventing a well-timed signal from causing EINR, though
> in practice it probably depends on the O/S whether this can actually
> happen.
>=20
> If some O/S does allow this, then we possibly have lots of very
> rare race condition bugs of this form...

Unfortunately we probably have some more of these bugs. But we do check
this now for java-net receive() and accept() and the FileChannelImpl
methods in java-nio for read() and write(). We really need an audit for
this issue throughout all of the JNI/C code. Maybe the target-native
layer can help here by always restarting a system call automatically
when errno is EINTR? On the other hand, the target-native layer seems to
obscure these kind of issues and it might be an idea to do things more
directly by just autoconfiscating[1] the complete JNI source and getting
rid of the target-native layer.

I good source of inspiration is the CNI implementation of the runtime
specific code in libgcj. They seem to have designed their system calls
from the start with this in mind.

Cheers,

Mark

[1] http://sources.redhat.com/autobook/autobook/autobook_237.html

--=-Y54ZgVsMSt+BDD4h4VTP
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)

iD8DBQBAjEFjxVhZCJWr9QwRAg8OAJ9Sejc5ABnnQ14777uVCkxJ/l2qoACdG5Ch
6uZ1UhilLcdMi9Z7s30SPGQ=
=rB9b
-----END PGP SIGNATURE-----

--=-Y54ZgVsMSt+BDD4h4VTP--




From MAILER-DAEMON Sun Apr 25 23:58:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BHxG5-0006Z9-FM
	for mharc-commit-classpath@gnu.org; Sun, 25 Apr 2004 23:58:17 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BHxFu-0006Qw-8O
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 23:58:06 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BHx9V-0004Au-MV
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 23:52:01 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BHx9T-00048m-Au
	for commit-classpath@gnu.org; Sun, 25 Apr 2004 23:51:27 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 5175062217
	for <commit-classpath@gnu.org>; Mon, 26 Apr 2004 03:51:26 +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 57000-10 for <commit-classpath@gnu.org>;
	Mon, 26 Apr 2004 03:51:25 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-81-16.adsl.solnet.ch [212.41.81.16])
	by mail01.solnet.ch (Postfix) with ESMTP id 3677E62235
	for <commit-classpath@gnu.org>; Mon, 26 Apr 2004 03:51:25 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 09863BB51A; Mon, 26 Apr 2004 05:49:11 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040426034911.09863BB51A@reali.dnsalias.net>
Date: Mon, 26 Apr 2004 05:49:11 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040426 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 26 Apr 2004 03:58:09 -0000




From MAILER-DAEMON Mon Apr 26 05:36:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BI2XC-00066b-7w
	for mharc-commit-classpath@gnu.org; Mon, 26 Apr 2004 05:36:18 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BI2X1-00060x-7U
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 05:36:07 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BI2WN-0005MO-T9
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 05:36:05 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BI2WN-0005Kw-95
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 05:35:27 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BI2WS-00031q-2U
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 05:35:32 -0400
From: "Chris Burdess" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8657
User-Agent: Mozilla/5.0 (X11; U; Linux ppc; en-US;
	rv:1.6) Gecko/20040414 Galeon/1.3.13 (Debian package 1.3.13-4)
X-Apparently-From: 212.42.171.92
X-Copy-To: Array
Message-Id: <E1BI2WS-00031q-2U@savannah.gnu.org>
Date: Mon, 26 Apr 2004 05:35:32 -0400
Subject: [bugs #8657] inetilb: APOP authentication broken [PATCH]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 26 Apr 2004 09:36:07 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.

/**************************************************************************/
[bugs #8657] Latest Modifications:

Changes by: 
		Chris Burdess <dog@bluezoo.org>
'Date: 
		Mon 04/26/04 at 09:35 (Europe/Paris)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
         Assigned to | None                      | dog
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
I've applied this patch.

The application using the POP3Connection should fall back to using login() if apop() fails and the user accepts transmission of cleartext passwords.






/**************************************************************************/
[bugs #8657] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8657>
Project: classpath
Submitted by: Steve Haslam
On: Thu 04/22/04 at 16:10

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  dog
Status:  Closed
Platform Version:  None


Summary:  inetilb: APOP authentication broken [PATCH]

Original Submission:  I had to apply a patch (attached) to gnu.inet.pop3.POP3Connection to get APOP authentication to work. The default setup tries to use APOP, fails, and throws an undetailed AuthenticationFailedException :|

Should the POP3Connection fall back to using USER to log in if no APOP timestamp was available?


Follow-up Comments
------------------


-------------------------------------------------------
Date: Mon 04/26/04 at 09:35         By: dog
I've applied this patch.

The application using the POP3Connection should fall back to using login() if apop() fails and the user accepts transmission of cleartext passwords.






File Attachments
-------------------

-------------------------------------------------------
Date: Thu 04/22/04 at 16:10  Name: apop.patch  Size: 812KB   By: araqnid
Patch for POP3Connection.java
http://savannah.gnu.org/bugs/download.php?item_id=8657&amp;item_file_id=1221






For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8657>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Mon Apr 26 17:00:49 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIDCL-0004Re-6k
	for mharc-commit-classpath@gnu.org; Mon, 26 Apr 2004 16:59:29 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIDBd-0003xN-CK
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 16:58:45 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIDAu-00039F-CE
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 16:58:33 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIDAU-0002jE-Rk
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 16:57:35 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-128.ewetel.net
	[80.228.94.128])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3QKvSpc024721
	for <commit-classpath@gnu.org>; Mon, 26 Apr 2004 22:57:29 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BIDB6-0001A0-00
	for <commit-classpath@gnu.org>; Mon, 26 Apr 2004 22:58:12 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 26 Apr 2004 22:57:08 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_keXjADK85xNVQSP"
Message-Id: <200404262257.08430.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: VMFile commit
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 26 Apr 2004 20:59:25 -0000


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

Hi list,


I commited the VMFile patch now. I choosed the VM prefix because there 
seems to be no real line where to divide VM classed from other classes. 
It always depends on the VM.


Michael


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

	* java/io/File.java: Moved all native methods to the new class
	VMFile and removed the "Internal" suffix.
	* vm/reference/java/io/VMFile.java: New file.
	* vm/reference/java/io/Makefile.am (EXTRA_DIST): Added VMFile.java.
	* include/java_io_File.h: Removed.
	* include/java_io_VMFile.h: New file.
	* include/Makefile.am: Generate java_io_VMFile.h.
	* native/jni/java-io/java_io_File.c: Moved all methods to
	java_io_VMFile.c and renamed them accordingly.
	* native/jni/java-io/java_io_VMFile.c: New file.
	* native/jni/java-io/Makefile.am: Removed java_io_File.c and added
	java_io_VMFile.c to build.

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

Index: java/io/File.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/File.java,v
retrieving revision 1.42
diff -u -r1.42 File.java
--- java/io/File.java	20 Apr 2004 16:29:11 -0000	1.42
+++ java/io/File.java	26 Apr 2004 20:48:23 -0000
@@ -41,7 +41,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import gnu.classpath.Configuration;
+
 import gnu.java.io.PlatformHelper;
 
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
@@ -92,49 +92,12 @@
    */
   public static final char pathSeparatorChar = pathSeparator.charAt(0);
 
-  static boolean caseSensitive;
-  
-  static
-  {
-    if (Configuration.INIT_LOAD_LIBRARY)
-      {
-        System.loadLibrary("javaio");
-      }
-    
-    // FIXME: We support only caseSensitive filesystems currently.
-    caseSensitive = true;
-  }
-  
   /**
    * This is the path to the file set when the object is created.  It
    * may be an absolute or relative path name.
    */
   private String path;
 
-  /*
-   * This native method does the actual check of whether or not a file
-   * is a plain file or not.  It also handles the existence check to
-   * eliminate the overhead of a call to exists()
-   */
-  private native boolean isFileInternal(String path);
-
-  /*
-   * This method does the actual check of whether or not a file is a
-   * directory or not.  It also handle the existence check to eliminate
-   * the overhead of a call to exists()
-   */
-  private native boolean isDirectoryInternal(String path);
-
-  /**
-   * This native method checks file permissions for reading
-   */
-  private synchronized native boolean canReadInternal(String path);
-
-  /**
-   * This native method checks file permissions for writing
-   */
-  private synchronized native boolean canWriteInternal(String path);
-
   /**
    * This method tests whether or not the current thread is allowed to
    * to read the file pointed to by this object.  This will be true if and
@@ -154,7 +117,7 @@
     if (!exists())
       return false;
 
-    return canReadInternal(path);
+    return VMFile.canRead(path);
   }
 
   /**
@@ -177,11 +140,11 @@
     checkWrite();
      
     // Test for existence.  This is required by the spec
-    if (!existsInternal(path))
+    if (! VMFile.exists(path))
       return false;
 
-    if (!isDirectoryInternal(path))
-      return canWriteInternal(path);
+    if (!VMFile.isDirectory(path))
+      return VMFile.canWrite(path);
     else
       try
         {
@@ -221,14 +184,8 @@
   public boolean createNewFile() throws IOException
   {
     checkWrite();
-    return createInternal(path);
+    return VMFile.create(path);
   }
- 
-  /*
-   * This native method handles the actual deleting of the file
-   */
-  private native boolean deleteInternal(String path);
-
   /**
    * This method deletes the file represented by this object.  If this file
    * is a directory, it must be empty in order for the delete to succeed.
@@ -245,7 +202,7 @@
     if (s != null)
       s.checkDelete(path);
     
-    return deleteInternal(path);
+    return VMFile.delete(path);
   }
 
   /**
@@ -270,17 +227,12 @@
     
     File other = (File) obj;
 
-    if (caseSensitive)
+    if (VMFile.caseSensitive)
       return path.equals(other.path);
     else
       return path.equalsIgnoreCase(other.path);
   }
 
-  /*
-   * This native method does the actual checking of file existence.
-   */
-  private native boolean existsInternal(String path);
-
   /**
    * This method tests whether or not the file represented by the object
    * actually exists on the filesystem.
@@ -292,7 +244,7 @@
   public boolean exists()
   {
     checkRead();
-    return existsInternal(path);
+    return VMFile.exists(path);
   }
 
   /**
@@ -439,14 +391,7 @@
    */
   public String getName()
   {
-    int pos = PlatformHelper.lastIndexOfSeparator(path);
-    if (pos == -1)
-      return path;
-
-    if (PlatformHelper.endWithSeparator(path))
-      return "";
-
-    return path.substring(pos + separator.length());
+  	return VMFile.getName(path);
   }
 
   /**
@@ -506,7 +451,7 @@
    */
   public int hashCode()
   {
-    if (caseSensitive)
+    if (VMFile.caseSensitive)
       return path.hashCode() ^ 1234321;
     else
       return path.toLowerCase().hashCode() ^ 1234321;
@@ -539,7 +484,7 @@
   public boolean isDirectory()
   {
     checkRead();
-    return isDirectoryInternal(path); 
+    return VMFile.isDirectory(path); 
   }
 
   /**
@@ -555,7 +500,7 @@
   public boolean isFile()
   {
     checkRead();
-    return isFileInternal(path);
+    return VMFile.isFile(path);
   }
 
   /**
@@ -571,17 +516,9 @@
    */
   public boolean isHidden()
   {
-    // FIXME: this only works on UNIX
-    return getName().startsWith(".");
+    return VMFile.isHidden(path);
   }
 
-  /*
-   * This native method does the actual work of getting the last file
-   * modification time.  It also does the existence check to avoid the
-   * overhead of a call to exists()
-   */
-  private native long lastModifiedInternal(String path);
-
   /**
    * This method returns the last modification time of this file.  The
    * time value returned is an abstract value that should not be interpreted
@@ -598,15 +535,9 @@
   public long lastModified()
   {
     checkRead();
-    return lastModifiedInternal(path);
+    return VMFile.lastModified(path);
   }
 
-  /*
-   * This native method actually determines the length of the file and
-   * handles the existence check
-   */
-  private native long lengthInternal(String path);
-
   /**
    * This method returns the length of the file represented by this object,
    * or 0 if the specified file does not exist.
@@ -618,15 +549,9 @@
   public long length()
   {
     checkRead();
-    return lengthInternal(path);
+    return VMFile.length(path);
   }
 
-  /*
-   * This native function actually produces the list of file in this
-   * directory
-   */
-  private native String[] listInternal(String dirname);
-
   /**
    * This method returns a array of <code>String</code>'s representing the
    * list of files is then directory represented by this object.  If this
@@ -665,7 +590,7 @@
     if (! dir.exists() || ! dir.isDirectory())
       return null;
     
-    String files[] = listInternal(list_path);
+    String files[] = VMFile.list(list_path);
     
     // Check if an error occured in listInternal().
     if (files == null)
@@ -864,11 +789,6 @@
     return new URL("file", "", abspath.replace(separatorChar, '/'));
   }
 
-  /*
-   * This native method actually creates the directory
-   */
-  private native boolean mkdirInternal(String path);
-
   /**
    * This method creates a directory for the path represented by this object.
    *
@@ -880,7 +800,7 @@
   public boolean mkdir()
   {
     checkWrite();
-    return mkdirInternal(PlatformHelper.removeTailSeparator(path));
+    return VMFile.mkdir(PlatformHelper.removeTailSeparator(path));
   }
 
   /**
@@ -912,11 +832,6 @@
   }
 
   /**
-   * This method is used to create a temporary file
-   */
-  private static native boolean createInternal(String name) throws IOException;
-
-  /**
    * This method creates a temporary file in the specified directory.  If 
    * the directory name is null, then this method uses the system temporary 
    * directory. The files created are guaranteed not to currently exist and 
@@ -958,10 +873,10 @@
           throw new IOException("Cannot determine system temporary directory"); 
 	
         directory = new File(dirname);
-        if (!directory.existsInternal(directory.path))
+        if (! VMFile.exists(directory.path))
           throw new IOException("System temporary directory "
                                 + directory.getName() + " does not exist.");
-        if (!directory.isDirectoryInternal(directory.path))
+        if (! VMFile.isDirectory(directory.path))
           throw new IOException("System temporary directory "
                                 + directory.getName()
                                 + " is not really a directory.");
@@ -991,7 +906,7 @@
             String filename = prefix + System.currentTimeMillis() + suffix;
             file = new File(directory, filename);
           }
-        while (file.existsInternal(file.path));
+        while (VMFile.exists(file.path));
       }
     else
       {
@@ -1008,7 +923,7 @@
             String filename = prefix + java.lang.Integer.toHexString(n) + suffix;
             file = new File(directory, filename);
           }
-        while (file.existsInternal(file.path));
+        while (VMFile.exists(file.path));
       }
 
     // Verify that we are allowed to create this file
@@ -1018,15 +933,10 @@
 
     // Now create the file and return our file object
     // XXX - FIXME race condition.
-    createInternal(file.getAbsolutePath()); 
+    VMFile.create(file.getAbsolutePath()); 
     return file;
   }
 
-  /*
-   * This native method sets the permissions to make the file read only.
-   */
-  private native boolean setReadOnlyInternal(String path);
-
   /**
    * This method sets the file represented by this object to be read only.
    * A read only file or directory cannot be modified.  Please note that 
@@ -1047,10 +957,10 @@
     checkWrite();
 
     // Test for existence.
-    if (!existsInternal(path))
+    if (! VMFile.exists(path))
       return false;
 
-    return setReadOnlyInternal(path);
+    return VMFile.setReadOnly(path);
   }
 
   /**
@@ -1066,9 +976,7 @@
    */
   public static File[] listRoots()
   {
-    File[] roots = new File[1];
-    roots[0] = new File("/");
-    return roots;
+    return VMFile.listRoots();
   }
 
   /**
@@ -1138,7 +1046,7 @@
         return 0;
       }
     
-    if (caseSensitive)
+    if (VMFile.caseSensitive)
       return p1.compareTo(p2);
     else
       return p1.compareToIgnoreCase(p2);
@@ -1170,11 +1078,6 @@
     return compareTo((File) obj);
   }
 
-  /*
-   * This native method actually performs the rename.
-   */
-  private native boolean renameToInternal(String target, String dest);
-
   /**
    * This method renames the file represented by this object to the path
    * of the file represented by the argument <code>File</code>.
@@ -1192,14 +1095,9 @@
     checkWrite();
     dest.checkWrite();
     // Call our native rename method
-    return renameToInternal(path, dest.path);
+    return VMFile.renameTo(path, dest.path);
   }
 
-  /*
-   * This method does the actual setting of the modification time.
-   */
-  private native boolean setLastModifiedInternal(String path, long time);
- 
   /**
    * This method sets the modification time on the file to the specified
    * value.  This is specified as the number of seconds since midnight
@@ -1222,7 +1120,7 @@
       throw new IllegalArgumentException("Negative modification time: " + time);
 
     checkWrite();
-    return setLastModifiedInternal(path, time);
+    return VMFile.setLastModified(path, time);
   }
 
   private void checkWrite()
Index: vm/reference/java/io/VMFile.java
===================================================================
RCS file: vm/reference/java/io/VMFile.java
diff -N vm/reference/java/io/VMFile.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ vm/reference/java/io/VMFile.java	26 Apr 2004 20:48:23 -0000
@@ -0,0 +1,194 @@
+/* VMFile.java -- Class for methods natively accessing files
+   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 java.io;
+
+import gnu.classpath.Configuration;
+import gnu.java.io.PlatformHelper;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+final class VMFile
+{
+	static boolean caseSensitive;
+	
+	static
+	{
+	  if (Configuration.INIT_LOAD_LIBRARY)
+		{
+		  System.loadLibrary("javaio");
+		}
+    
+		// FIXME: We support only caseSensitive filesystems currently.
+		caseSensitive = true;
+	}
+  
+  /*
+   * This native method does the actual work of getting the last file
+   * modification time.  It also does the existence check to avoid the
+   * overhead of a call to exists()
+   */
+  static native long lastModified(String path);
+
+  /*
+   * This native method sets the permissions to make the file read only.
+   */
+  static native boolean setReadOnly(String path);
+
+  /**
+   * This method is used to create a temporary file
+   */
+  static native boolean create(String path) throws IOException;
+
+  /*
+   * This native function actually produces the list of file in this
+   * directory
+   */
+  static native String[] list(String dirpath);
+
+  /*
+   * This native method actually performs the rename.
+   */
+  static native boolean renameTo(String targetpath, String destpath);
+
+  /*
+   * This native method actually determines the length of the file and
+   * handles the existence check
+   */
+  static native long length(String path);
+
+  /*
+   * This native method does the actual checking of file existence.
+   */
+  static native boolean exists(String path);
+
+  /*
+   * This native method handles the actual deleting of the file
+   */
+  static native boolean delete(String path);
+
+  /*
+   * This method does the actual setting of the modification time.
+   */
+  static native boolean setLastModified(String path, long time);
+
+  /*
+   * This native method actually creates the directory
+   */
+  static native boolean mkdir(String dirpath);
+
+  /*
+   * This native method does the actual check of whether or not a file
+   * is a plain file or not.  It also handles the existence check to
+   * eliminate the overhead of a call to exists()
+   */
+  static native boolean isFile(String path);
+
+  /**
+   * This native method checks file permissions for writing
+   */
+  static synchronized native boolean canWrite(String path);
+
+  /**
+   * This native method checks file permissions for reading
+   */
+  static synchronized native boolean canRead(String path);
+
+  /*
+   * This method does the actual check of whether or not a file is a
+   * directory or not.  It also handle the existence check to eliminate
+   * the overhead of a call to exists()
+   */
+  static native boolean isDirectory(String dirpath);
+
+  /**
+   * This method returns an array of filesystem roots.  Some operating systems
+   * have volume oriented filesystem.  This method provides a mechanism for
+   * determining which volumes exist.  GNU systems use a single hierarchical
+   * filesystem, so will have only one "/" filesystem root.
+   *
+   * @return An array of <code>File</code> objects for each filesystem root
+   * available.
+   *
+   * @since 1.2
+   */
+  static File[] listRoots()
+  {
+	File[] roots = new File[1];
+	roots[0] = new File("/");
+	return roots;
+  }
+
+  /**
+   * This method tests whether or not this file represents a "hidden" file.
+   * On GNU systems, a file is hidden if its name begins with a "."
+   * character.  Files with these names are traditionally not shown with
+   * directory listing tools.
+   *
+   * @return <code>true</code> if the file is hidden, <code>false</code>
+   * otherwise.
+   *
+   * @since 1.2
+   */
+  static boolean isHidden(String path)
+  {
+	// FIXME: this only works on UNIX
+	return getName(path).startsWith(".");
+  }
+
+  /**
+   * This method returns the name of the file.  This is everything in the
+   * complete path of the file after the last instance of the separator
+   * string.
+   *
+   * @return The file name
+   */
+  static String getName(String path)
+  {
+	int pos = PlatformHelper.lastIndexOfSeparator(path);
+	if (pos == -1)
+	  return path;
+	
+	if (PlatformHelper.endWithSeparator(path))
+	  return "";
+	
+	return path.substring(pos + File.separator.length());
+  }
+}
Index: vm/reference/java/io/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/vm/reference/java/io/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- vm/reference/java/io/Makefile.am	17 Jan 2003 16:45:29 -0000	1.1
+++ vm/reference/java/io/Makefile.am	26 Apr 2004 20:48:23 -0000
@@ -1,4 +1,5 @@
 # used by automake to generate Makefile.in
 
 EXTRA_DIST = \
+VMFile.java \
 VMObjectStreamClass.java
Index: include/java_io_File.h
===================================================================
RCS file: include/java_io_File.h
diff -N include/java_io_File.h
--- include/java_io_File.h	30 Jul 2003 16:47:19 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,32 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-
-#ifndef __java_io_File__
-#define __java_io_File__
-
-#include <jni.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_isFileInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_isDirectoryInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_canReadInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_canWriteInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_deleteInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_existsInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jlong JNICALL Java_java_io_File_lastModifiedInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jlong JNICALL Java_java_io_File_lengthInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jobjectArray JNICALL Java_java_io_File_listInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_mkdirInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_createInternal (JNIEnv *env, jclass, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_setReadOnlyInternal (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_renameToInternal (JNIEnv *env, jobject, jstring, jstring);
-extern JNIEXPORT jboolean JNICALL Java_java_io_File_setLastModifiedInternal (JNIEnv *env, jobject, jstring, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __java_io_File__ */
Index: include/java_io_VMFile.h
===================================================================
RCS file: include/java_io_VMFile.h
diff -N include/java_io_VMFile.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/java_io_VMFile.h	26 Apr 2004 20:48:23 -0000
@@ -0,0 +1,32 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __java_io_VMFile__
+#define __java_io_VMFile__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT jlong JNICALL Java_java_io_VMFile_lastModified (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_setReadOnly (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_create (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jobjectArray JNICALL Java_java_io_VMFile_list (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_renameTo (JNIEnv *env, jclass, jstring, jstring);
+extern JNIEXPORT jlong JNICALL Java_java_io_VMFile_length (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_exists (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_delete (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_setLastModified (JNIEnv *env, jclass, jstring, jlong);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_mkdir (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isFile (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canWrite (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_canRead (JNIEnv *env, jclass, jstring);
+extern JNIEXPORT jboolean JNICALL Java_java_io_VMFile_isDirectory (JNIEnv *env, jclass, jstring);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_io_VMFile__ */
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- include/Makefile.am	18 Apr 2004 15:41:17 -0000	1.15
+++ include/Makefile.am	26 Apr 2004 20:48:23 -0000
@@ -42,8 +42,8 @@
 $(top_srcdir)/include/gnu_java_nio_PipeImpl.h \
 $(top_srcdir)/include/gnu_java_nio_SelectorImpl.h \
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h \
-$(top_srcdir)/include/java_io_File.h \
 $(top_srcdir)/include/java_io_ObjectInputStream.h \
+$(top_srcdir)/include/java_io_VMFile.h \
 $(top_srcdir)/include/java_io_VMObjectStreamClass.h \
 $(top_srcdir)/include/java_lang_Double.h \
 $(top_srcdir)/include/java_lang_Math.h \
@@ -137,10 +137,10 @@
 	$(JAVAH) -o $@ gnu.java.nio.PipeImpl
 $(top_srcdir)/include/gnu_java_nio_SelectorImpl.h: $(top_srcdir)/gnu/java/nio/SelectorImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.SelectorImpl
-$(top_srcdir)/include/java_io_File.h: $(top_srcdir)/java/io/File.java
-	$(JAVAH) -o $@ java.io.File
 $(top_srcdir)/include/java_io_ObjectInputStream.h: $(top_srcdir)/java/io/ObjectInputStream.java
 	$(JAVAH) -o $@ java.io.ObjectInputStream
+$(top_srcdir)/include/java_io_VMFile.h: ../vm/current/java/io/VMFile.java
+	$(JAVAH) -o $@ java.io.VMFile
 $(top_srcdir)/include/java_io_VMObjectStreamClass.h: ../vm/current/java/io/VMObjectStreamClass.java
 	$(JAVAH) -o $@ java.io.VMObjectStreamClass
 $(top_srcdir)/include/java_lang_Double.h: $(top_srcdir)/java/lang/Double.java
Index: native/jni/java-io/java_io_File.c
===================================================================
RCS file: native/jni/java-io/java_io_File.c
diff -N native/jni/java-io/java_io_File.c
--- native/jni/java-io/java_io_File.c	9 Apr 2004 14:04:50 -0000	1.13
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,702 +0,0 @@
-/* File.c - Native methods for java.io.File class
-   Copyright (C) 1998, 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. */
-
-/* do not move; needed here because of some macro definitions */
-#include <config.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <jni.h>
-#include <jcl.h>
-
-#include "target_native.h"
-#ifndef WITHOUT_FILESYSTEM
-  #include "target_native_file.h"
-#endif
-#include "target_native_math_int.h"
-
-#include "javaio.h"
-
-#include "java_io_File.h"
-
-/*************************************************************************/
-
-/*
- * Method to create an empty file.
- *
- * Class:     java_io_File
- * Method:    createInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_createInternal(JNIEnv *env, jclass clazz, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        fd;
-  int        result;
-
-  filename = JCL_jstring_to_cstring(env, name);
-  if (filename == NULL)
-    {
-      return(0);
-    }
-
-  TARGET_NATIVE_FILE_OPEN_CREATE(filename,fd,result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      /* XXX ??? NYI */
-      if (errno != EEXIST)
-        JCL_ThrowException(env,
-                           "java/io/IOException",
-                           TARGET_NATIVE_LAST_ERROR_STRING());
-      return(0);
-    }
-  TARGET_NATIVE_FILE_CLOSE(fd,result);
-
-  return(1);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method checks to see if we have read permission on a file.
- *
- * Class:     java_io_File
- * Method:    canReadInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_canReadInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        fd;
-  int        result;
-
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(0);
-    }
- 
-  /* The lazy man's way out.  We actually do open the file for reading
-     briefly to verify it can be done */  
-  TARGET_NATIVE_FILE_OPEN_READ(filename,fd,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-  if (result != TARGET_NATIVE_OK)
-    {
-      return(0);
-    }
-  TARGET_NATIVE_FILE_CLOSE(fd,result);
-
-  return(1);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}  
-
-/*************************************************************************/
-
-/*
- * This method checks to see if we have write permission on a file.
- *
- * Class:     java_io_File
- * Method:    canWriteInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_canWriteInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        fd;
-  int        result;
-
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(0);
-    }
- 
-  /* The lazy man's way out.  We actually do open the file for writing
-     briefly to verify it can be done */  
-  TARGET_NATIVE_FILE_OPEN_READWRITE(filename,fd,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-  if (result != TARGET_NATIVE_OK)
-    {
-      return(0);
-    }
-  TARGET_NATIVE_FILE_CLOSE(fd,result);
-
-  return(1);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}  
-
-/*************************************************************************/
-
-/*
- * This method makes a file read only.
- *
- * Class:     java_io_File
- * Method:    setReadOnlyInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_setReadOnlyInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        result;
-
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(0);
-    }
-
-  TARGET_NATIVE_FILE_SET_MODE_READONLY(filename,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  return ((result == TARGET_NATIVE_OK)?1:0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}  
-
-/*************************************************************************/
-
-/*
- * This method checks to see if a file exists.
- *
- * Class:     java_io_File
- * Method:    existsInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_existsInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        result;
-  
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(0);
-    }
- 
-  TARGET_NATIVE_FILE_EXISTS(filename,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  return ((result == TARGET_NATIVE_OK)?1:0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method checks to see if a file is a "plain" file; that is, not
- * a directory, pipe, etc.
- *
- * Class:     java_io_File
- * Method:    isFileInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_isFileInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        result;
-  
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(0);
-    }
-
-  TARGET_NATIVE_FILE_IS_FILE(filename,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  return ((result == TARGET_NATIVE_OK)?1:0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method checks to see if a file is a directory or not.
- *
- * Class:     java_io_File
- * Method:    isDirectoryInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_isDirectoryInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        result;
-  
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(0);
-    }
-
-  TARGET_NATIVE_FILE_IS_DIRECTORY(filename,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  return ((result == TARGET_NATIVE_OK)?1:0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method returns the length of the file.
- *
- * Class:     java_io_File
- * Method:    lengthInternal
- * Signature: (Ljava/lang/String;)J
- */
-
-JNIEXPORT jlong JNICALL
-Java_java_io_File_lengthInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        tmpfd;
-  jlong      length;
-  int        result;
-  
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-    }
- 
-  /* open file for reading, get size and close file */
-  TARGET_NATIVE_FILE_OPEN_READ(filename,tmpfd,result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-    }
-  TARGET_NATIVE_FILE_SIZE(tmpfd,length,result);  
-  if (result != TARGET_NATIVE_OK)
-    {
-      TARGET_NATIVE_FILE_CLOSE(tmpfd,result);
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-    }
-  TARGET_NATIVE_FILE_CLOSE(tmpfd,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  return ((result == TARGET_NATIVE_OK)?length:TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method returns the modification date of the file.
- *
- * Class:     java_io_File
- * Method:    lastModifiedInternal
- * Signature: (Ljava/lang/String;)J
- */
-
-JNIEXPORT jlong JNICALL
-Java_java_io_File_lastModifiedInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  jlong      mtime;
-  int        result;
- 
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-    }
- 
-  TARGET_NATIVE_FILE_GET_LAST_MODIFIED(filename,mtime,result);
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  return ((result == TARGET_NATIVE_OK)?mtime:TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method sets the modification date of the file.
- *
- * Class:     java_io_File
- * Method:    setLastModifiedInternal
- * Signature: (Ljava/lang/String;J)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_setLastModifiedInternal(JNIEnv *env, jobject obj,
-                                          jstring name, jlong newtime)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        result;
-  
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(0);
-    }
- 
-  TARGET_NATIVE_FILE_SET_LAST_MODIFIED(filename,newtime,result); 
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  return ((result == TARGET_NATIVE_OK)?1:0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method deletes a file (actually a name for a file - additional
- * links could exist).
- *
- * Class:     java_io_File
- * Method:    deleteInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_deleteInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *filename;
-  int        result;
-  
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  filename = (*env)->GetStringUTFChars(env, name, 0);
-  if (filename == NULL)
-    {
-      return(0);
-    }
- 
-  TARGET_NATIVE_FILE_DELETE(filename,result); 
-  (*env)->ReleaseStringUTFChars(env, name, filename);
-
-  return ((result == TARGET_NATIVE_OK)?1:0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method creates a directory.
- *
- * Class:     java_io_File
- * Method:    mkdirInternal
- * Signature: (Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_mkdirInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *pathname;
-  int        result;
-  
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  pathname = (*env)->GetStringUTFChars(env, name, 0);
-  if (pathname == NULL)
-    {
-      return(0);
-    }
- 
-  TARGET_NATIVE_FILE_MAKE_DIR(pathname,result);
-  (*env)->ReleaseStringUTFChars(env, name, pathname);
-
-  return ((result == TARGET_NATIVE_OK)?1:0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method renames a (link to a) file.
- *
- * Class:     java_io_File
- * Method:    renameToInternal
- * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
- */
-
-JNIEXPORT jboolean JNICALL
-Java_java_io_File_renameToInternal(JNIEnv *env, jobject obj, jstring t, jstring d)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const char *old_filename, *new_filename;
-  int        result;
-  
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  old_filename = (*env)->GetStringUTFChars(env, t, 0);
-  if (old_filename == NULL)
-    {
-      return(0);
-    }
-
-  new_filename = (*env)->GetStringUTFChars(env, d, 0);
-  if (new_filename == NULL)
-    {
-      (*env)->ReleaseStringUTFChars(env, t, old_filename);
-      return(0);
-    }
- 
-  TARGET_NATIVE_FILE_RENAME(old_filename,new_filename,result);
-  (*env)->ReleaseStringUTFChars(env, d, new_filename);
-  (*env)->ReleaseStringUTFChars(env, t, old_filename);
-
-  return ((result == TARGET_NATIVE_OK)?1:0);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
-/*************************************************************************/
-
-/*
- * This method returns an array of String representing all the files
- * in a directory except "." and "..".
- *
- * Class:     java_io_File
- * Method:    listInternal
- * Signature: (Ljava/lang/String;)[Ljava/lang/String;
- */
-
-JNIEXPORT jobjectArray JNICALL
-Java_java_io_File_listInternal(JNIEnv *env, jobject obj, jstring name)
-{
-#ifndef WITHOUT_FILESYSTEM
-  const int REALLOC_SIZE = 10;
-
-  const char        *dirname;
-  int               result;
-  char              **filelist;
-  void              *handle;
-  const char        *filename;
-  unsigned long int filelist_count,max_filelist_count;
-  char              **tmp_filelist;
-  jclass            str_clazz;
-  jobjectArray      filearray;
-  unsigned long int i;
-  jstring           str;
-
-  /* Don't use the JCL convert function because it throws an exception
-     on failure */
-  dirname = (*env)->GetStringUTFChars(env, name, 0);
-  if (dirname == NULL)
-    {
-      return(0);
-    }
-
-  /* open directory for reading */
-  TARGET_NATIVE_FILE_OPEN_DIR(dirname,handle,result);
-
-  (*env)->ReleaseStringUTFChars(env, name, dirname);
-
-  if (result != TARGET_NATIVE_OK)
-    {
-      return(0);
-    }
-
-  /* allocate filelist */
-  filelist = (char **)JCL_malloc(env, sizeof(char *) * REALLOC_SIZE);
-  if (filelist==NULL)
-    {
-      TARGET_NATIVE_FILE_CLOSE_DIR(handle,result);
-      return(0);
-    }
-  filelist_count=0;
-  max_filelist_count=REALLOC_SIZE;
-
-  /* read the files from the directory */
-  TARGET_NATIVE_FILE_READ_DIR(handle,filename,result);
-  while (result == TARGET_NATIVE_OK)
-    {
-      if ((strcmp(filename, ".")!=0) && (strcmp(filename, "..")!=0))
-        {
-          /* allocate more memory if necessary */
-          if (filelist_count >= max_filelist_count)
-            {
-              tmp_filelist = (char**)JCL_realloc(env,
-                                                 filelist,
-                                                 (max_filelist_count + REALLOC_SIZE) * sizeof(char*));
-              if (tmp_filelist==NULL)
-                {
-                  for (i = 0; i < filelist_count; i++)
-                    {
-                      JCL_free(env,filelist[i]);
-                    }
-                  JCL_free(env,filelist);
-                  TARGET_NATIVE_FILE_CLOSE_DIR(handle,result);
-                  return(0);
-                }
-              filelist           = tmp_filelist;
-              max_filelist_count += REALLOC_SIZE;
-            }
-
-            /* save entry in list (avoid strdup, because it is not ANSI C, thus difficult to port) */
-            filelist[filelist_count]=(char*)JCL_malloc(env,strlen(filename)+1);
-            assert(filelist[filelist_count]!=NULL);
-            strcpy(filelist[filelist_count],filename);
-            filelist_count++;
-          }
-
-      /* read next directory entry */
-      TARGET_NATIVE_FILE_READ_DIR(handle,filename,result);
-    }
-
-  /* close directory */
-  TARGET_NATIVE_FILE_CLOSE_DIR(handle,result); 
-
-  /* put the list of files into a Java String array and return it */
-  str_clazz = (*env)->FindClass(env, "java/lang/String"); 
-  if (str_clazz==NULL)
-    {
-      for (i = 0; i < filelist_count; i++)
-        {
-          JCL_free(env,filelist[i]);
-        }
-      JCL_free(env,filelist);
-      return(0);
-    }
-  filearray = (*env)->NewObjectArray(env, filelist_count, str_clazz, 0);
-  if (filearray==NULL)
-    {
-      for (i = 0; i < filelist_count; i++)
-        {
-          JCL_free(env,filelist[i]);
-        }
-      JCL_free(env,filelist);
-      return(0);
-    }
-  for (i = 0; i < filelist_count; i++)
-    {
-      /* create new string */
-      str = (*env)->NewStringUTF(env, filelist[i]);
-      if (str==NULL) 
-        {
-          /* We don't clean up everything here, but if this failed,
-              something serious happened anyway */
-          for (i = 0; i < filelist_count; i++)
-            {
-              JCL_free(env,filelist[i]);
-            }
-          JCL_free(env,filelist);
-          return(0);
-        }
-
-      /* save into array */
-      (*env)->SetObjectArrayElement(env, filearray, i, str);
-
-      /* delete local reference */
-      (*env)->DeleteLocalRef(env, str);
-    }
-
-  /* free resources */
-  for (i = 0; i < filelist_count; i++)
-    {
-      JCL_free(env,filelist[i]);
-    }
-  JCL_free(env,filelist);
-
-  return(filearray);
-#else /* not WITHOUT_FILESYSTEM */
-  return(0);
-#endif /* not WITHOUT_FILESYSTEM */
-}
-
Index: native/jni/java-io/java_io_VMFile.c
===================================================================
RCS file: native/jni/java-io/java_io_VMFile.c
diff -N native/jni/java-io/java_io_VMFile.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-io/java_io_VMFile.c	26 Apr 2004 20:48:23 -0000
@@ -0,0 +1,702 @@
+/* java_io_VMFile.c - Native methods for java.io.File class
+   Copyright (C) 1998, 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. */
+
+/* do not move; needed here because of some macro definitions */
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <jni.h>
+#include <jcl.h>
+
+#include "target_native.h"
+#ifndef WITHOUT_FILESYSTEM
+  #include "target_native_file.h"
+#endif
+#include "target_native_math_int.h"
+
+#include "javaio.h"
+
+#include "java_io_VMFile.h"
+
+/*************************************************************************/
+
+/*
+ * Method to create an empty file.
+ *
+ * Class:     java_io_VMFile
+ * Method:    create
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_create(JNIEnv *env, jclass clazz, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        fd;
+  int        result;
+
+  filename = JCL_jstring_to_cstring(env, name);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+
+  TARGET_NATIVE_FILE_OPEN_CREATE(filename,fd,result);
+  if (result != TARGET_NATIVE_OK)
+    {
+      /* XXX ??? NYI */
+      if (errno != EEXIST)
+        JCL_ThrowException(env,
+                           "java/io/IOException",
+                           TARGET_NATIVE_LAST_ERROR_STRING());
+      return(0);
+    }
+  TARGET_NATIVE_FILE_CLOSE(fd,result);
+
+  return(1);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method checks to see if we have read permission on a file.
+ *
+ * Class:     java_io_VMFile
+ * Method:    canRead
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_canRead(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        fd;
+  int        result;
+
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+ 
+  /* The lazy man's way out.  We actually do open the file for reading
+     briefly to verify it can be done */  
+  TARGET_NATIVE_FILE_OPEN_READ(filename,fd,result);
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+  if (result != TARGET_NATIVE_OK)
+    {
+      return(0);
+    }
+  TARGET_NATIVE_FILE_CLOSE(fd,result);
+
+  return(1);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}  
+
+/*************************************************************************/
+
+/*
+ * This method checks to see if we have write permission on a file.
+ *
+ * Class:     java_io_VMFile
+ * Method:    canWrite
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_canWrite(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        fd;
+  int        result;
+
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+ 
+  /* The lazy man's way out.  We actually do open the file for writing
+     briefly to verify it can be done */  
+  TARGET_NATIVE_FILE_OPEN_READWRITE(filename,fd,result);
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+  if (result != TARGET_NATIVE_OK)
+    {
+      return(0);
+    }
+  TARGET_NATIVE_FILE_CLOSE(fd,result);
+
+  return(1);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}  
+
+/*************************************************************************/
+
+/*
+ * This method makes a file read only.
+ *
+ * Class:     java_io_VMFile
+ * Method:    setReadOnly
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_setReadOnly(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        result;
+
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+
+  TARGET_NATIVE_FILE_SET_MODE_READONLY(filename,result);
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+
+  return ((result == TARGET_NATIVE_OK)?1:0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}  
+
+/*************************************************************************/
+
+/*
+ * This method checks to see if a file exists.
+ *
+ * Class:     java_io_VMFile
+ * Method:    exists
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_exists(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        result;
+  
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+ 
+  TARGET_NATIVE_FILE_EXISTS(filename,result);
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+
+  return ((result == TARGET_NATIVE_OK)?1:0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method checks to see if a file is a "plain" file; that is, not
+ * a directory, pipe, etc.
+ *
+ * Class:     java_io_VMFile
+ * Method:    isFile
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_isFile(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        result;
+  
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+
+  TARGET_NATIVE_FILE_IS_FILE(filename,result);
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+
+  return ((result == TARGET_NATIVE_OK)?1:0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method checks to see if a file is a directory or not.
+ *
+ * Class:     java_io_VMFile
+ * Method:    isDirectory
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_isDirectory(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        result;
+  
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+
+  TARGET_NATIVE_FILE_IS_DIRECTORY(filename,result);
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+
+  return ((result == TARGET_NATIVE_OK)?1:0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method returns the length of the file.
+ *
+ * Class:     java_io_VMFile
+ * Method:    length
+ * Signature: (Ljava/lang/String;)J
+ */
+
+JNIEXPORT jlong JNICALL
+Java_java_io_VMFile_length(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        tmpfd;
+  jlong      length;
+  int        result;
+  
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+    }
+ 
+  /* open file for reading, get size and close file */
+  TARGET_NATIVE_FILE_OPEN_READ(filename,tmpfd,result);
+  if (result != TARGET_NATIVE_OK)
+    {
+      return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+    }
+  TARGET_NATIVE_FILE_SIZE(tmpfd,length,result);  
+  if (result != TARGET_NATIVE_OK)
+    {
+      TARGET_NATIVE_FILE_CLOSE(tmpfd,result);
+      return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+    }
+  TARGET_NATIVE_FILE_CLOSE(tmpfd,result);
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+
+  return ((result == TARGET_NATIVE_OK)?length:TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method returns the modification date of the file.
+ *
+ * Class:     java_io_VMFile
+ * Method:    lastModified
+ * Signature: (Ljava/lang/String;)J
+ */
+
+JNIEXPORT jlong JNICALL
+Java_java_io_VMFile_lastModified(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  jlong      mtime;
+  int        result;
+ 
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+    }
+ 
+  TARGET_NATIVE_FILE_GET_LAST_MODIFIED(filename,mtime,result);
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+
+  return ((result == TARGET_NATIVE_OK)?mtime:TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(TARGET_NATIVE_MATH_INT_INT64_CONST_0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method sets the modification date of the file.
+ *
+ * Class:     java_io_VMFile
+ * Method:    setLastModified
+ * Signature: (Ljava/lang/String;J)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_setLastModified(JNIEnv *env, jobject obj,
+                                          jstring name, jlong newtime)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        result;
+  
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+ 
+  TARGET_NATIVE_FILE_SET_LAST_MODIFIED(filename,newtime,result); 
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+
+  return ((result == TARGET_NATIVE_OK)?1:0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method deletes a file (actually a name for a file - additional
+ * links could exist).
+ *
+ * Class:     java_io_VMFile
+ * Method:    delete
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_delete(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *filename;
+  int        result;
+  
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  filename = (*env)->GetStringUTFChars(env, name, 0);
+  if (filename == NULL)
+    {
+      return(0);
+    }
+ 
+  TARGET_NATIVE_FILE_DELETE(filename,result); 
+  (*env)->ReleaseStringUTFChars(env, name, filename);
+
+  return ((result == TARGET_NATIVE_OK)?1:0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method creates a directory.
+ *
+ * Class:     java_io_VMFile
+ * Method:    mkdir
+ * Signature: (Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_mkdir(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *pathname;
+  int        result;
+  
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  pathname = (*env)->GetStringUTFChars(env, name, 0);
+  if (pathname == NULL)
+    {
+      return(0);
+    }
+ 
+  TARGET_NATIVE_FILE_MAKE_DIR(pathname,result);
+  (*env)->ReleaseStringUTFChars(env, name, pathname);
+
+  return ((result == TARGET_NATIVE_OK)?1:0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method renames a (link to a) file.
+ *
+ * Class:     java_io_VMFile
+ * Method:    renameTo
+ * Signature: (Ljava/lang/String;Ljava/lang/String;)Z
+ */
+
+JNIEXPORT jboolean JNICALL
+Java_java_io_VMFile_renameTo(JNIEnv *env, jobject obj, jstring t, jstring d)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const char *old_filename, *new_filename;
+  int        result;
+  
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  old_filename = (*env)->GetStringUTFChars(env, t, 0);
+  if (old_filename == NULL)
+    {
+      return(0);
+    }
+
+  new_filename = (*env)->GetStringUTFChars(env, d, 0);
+  if (new_filename == NULL)
+    {
+      (*env)->ReleaseStringUTFChars(env, t, old_filename);
+      return(0);
+    }
+ 
+  TARGET_NATIVE_FILE_RENAME(old_filename,new_filename,result);
+  (*env)->ReleaseStringUTFChars(env, d, new_filename);
+  (*env)->ReleaseStringUTFChars(env, t, old_filename);
+
+  return ((result == TARGET_NATIVE_OK)?1:0);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
+/*************************************************************************/
+
+/*
+ * This method returns an array of String representing all the files
+ * in a directory except "." and "..".
+ *
+ * Class:     java_io_VMFile
+ * Method:    list
+ * Signature: (Ljava/lang/String;)[Ljava/lang/String;
+ */
+
+JNIEXPORT jobjectArray JNICALL
+Java_java_io_VMFile_list(JNIEnv *env, jobject obj, jstring name)
+{
+#ifndef WITHOUT_FILESYSTEM
+  const int REALLOC_SIZE = 10;
+
+  const char        *dirname;
+  int               result;
+  char              **filelist;
+  void              *handle;
+  const char        *filename;
+  unsigned long int filelist_count,max_filelist_count;
+  char              **tmp_filelist;
+  jclass            str_clazz;
+  jobjectArray      filearray;
+  unsigned long int i;
+  jstring           str;
+
+  /* Don't use the JCL convert function because it throws an exception
+     on failure */
+  dirname = (*env)->GetStringUTFChars(env, name, 0);
+  if (dirname == NULL)
+    {
+      return(0);
+    }
+
+  /* open directory for reading */
+  TARGET_NATIVE_FILE_OPEN_DIR(dirname,handle,result);
+
+  (*env)->ReleaseStringUTFChars(env, name, dirname);
+
+  if (result != TARGET_NATIVE_OK)
+    {
+      return(0);
+    }
+
+  /* allocate filelist */
+  filelist = (char **)JCL_malloc(env, sizeof(char *) * REALLOC_SIZE);
+  if (filelist==NULL)
+    {
+      TARGET_NATIVE_FILE_CLOSE_DIR(handle,result);
+      return(0);
+    }
+  filelist_count=0;
+  max_filelist_count=REALLOC_SIZE;
+
+  /* read the files from the directory */
+  TARGET_NATIVE_FILE_READ_DIR(handle,filename,result);
+  while (result == TARGET_NATIVE_OK)
+    {
+      if ((strcmp(filename, ".")!=0) && (strcmp(filename, "..")!=0))
+        {
+          /* allocate more memory if necessary */
+          if (filelist_count >= max_filelist_count)
+            {
+              tmp_filelist = (char**)JCL_realloc(env,
+                                                 filelist,
+                                                 (max_filelist_count + REALLOC_SIZE) * sizeof(char*));
+              if (tmp_filelist==NULL)
+                {
+                  for (i = 0; i < filelist_count; i++)
+                    {
+                      JCL_free(env,filelist[i]);
+                    }
+                  JCL_free(env,filelist);
+                  TARGET_NATIVE_FILE_CLOSE_DIR(handle,result);
+                  return(0);
+                }
+              filelist           = tmp_filelist;
+              max_filelist_count += REALLOC_SIZE;
+            }
+
+            /* save entry in list (avoid strdup, because it is not ANSI C, thus difficult to port) */
+            filelist[filelist_count]=(char*)JCL_malloc(env,strlen(filename)+1);
+            assert(filelist[filelist_count]!=NULL);
+            strcpy(filelist[filelist_count],filename);
+            filelist_count++;
+          }
+
+      /* read next directory entry */
+      TARGET_NATIVE_FILE_READ_DIR(handle,filename,result);
+    }
+
+  /* close directory */
+  TARGET_NATIVE_FILE_CLOSE_DIR(handle,result); 
+
+  /* put the list of files into a Java String array and return it */
+  str_clazz = (*env)->FindClass(env, "java/lang/String"); 
+  if (str_clazz==NULL)
+    {
+      for (i = 0; i < filelist_count; i++)
+        {
+          JCL_free(env,filelist[i]);
+        }
+      JCL_free(env,filelist);
+      return(0);
+    }
+  filearray = (*env)->NewObjectArray(env, filelist_count, str_clazz, 0);
+  if (filearray==NULL)
+    {
+      for (i = 0; i < filelist_count; i++)
+        {
+          JCL_free(env,filelist[i]);
+        }
+      JCL_free(env,filelist);
+      return(0);
+    }
+  for (i = 0; i < filelist_count; i++)
+    {
+      /* create new string */
+      str = (*env)->NewStringUTF(env, filelist[i]);
+      if (str==NULL) 
+        {
+          /* We don't clean up everything here, but if this failed,
+              something serious happened anyway */
+          for (i = 0; i < filelist_count; i++)
+            {
+              JCL_free(env,filelist[i]);
+            }
+          JCL_free(env,filelist);
+          return(0);
+        }
+
+      /* save into array */
+      (*env)->SetObjectArrayElement(env, filearray, i, str);
+
+      /* delete local reference */
+      (*env)->DeleteLocalRef(env, str);
+    }
+
+  /* free resources */
+  for (i = 0; i < filelist_count; i++)
+    {
+      JCL_free(env,filelist[i]);
+    }
+  JCL_free(env,filelist);
+
+  return(filearray);
+#else /* not WITHOUT_FILESYSTEM */
+  return(0);
+#endif /* not WITHOUT_FILESYSTEM */
+}
+
Index: native/jni/java-io/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/Makefile.am,v
retrieving revision 1.15
diff -u -r1.15 Makefile.am
--- native/jni/java-io/Makefile.am	12 Apr 2004 14:38:55 -0000	1.15
+++ native/jni/java-io/Makefile.am	26 Apr 2004 20:48:23 -0000
@@ -2,8 +2,8 @@
 
 libjavaio_la_SOURCES = 	javaio.h \
 			javaio.c \
-			java_io_File.c \
 			java_io_ObjectInputStream.c \
+			java_io_VMFile.c \
 			java_io_VMObjectStreamClass.c
 
 libjavaio_la_LDFLAGS = @CLASSPATH_MODULE@ 

--Boundary-00=_keXjADK85xNVQSP--




From MAILER-DAEMON Mon Apr 26 17:17:52 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIDQP-0005FW-CT
	for mharc-commit-classpath@gnu.org; Mon, 26 Apr 2004 17:14:01 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIDQ2-00051Y-Nk
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 17:13:38 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIDOi-0003os-Ba
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 17:12:48 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIDOg-0003mm-3X
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 17:12:14 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-128.ewetel.net
	[80.228.94.128])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3QLC9B5014966
	for <commit-classpath@gnu.org>; Mon, 26 Apr 2004 23:12:09 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BIDPI-0001HH-00
	for <commit-classpath@gnu.org>; Mon, 26 Apr 2004 23:12:53 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 26 Apr 2004 23:11:48 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_UsXjA8O6m5bCjIU"
Message-Id: <200404262311.48693.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.print - new classes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 26 Apr 2004 21:13:43 -0000


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

Hi list,


I just commited the attached patch to implement more of javax.print.


Michael


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

	* javax/print/CancelablePrintJob.java,
	javax/print/Doc.java,
	javax/print/DocFlavor.java,
	javax/print/DocPrintJob.java,
	javax/print/FlavorException.java,
	javax/print/PrintException.java,
	javax/print/PrintService.java,
	javax/print/ServiceUIFactory.java: New files.
	* javax/print/Makefile.am (EXTRA_DIST): Added all new files.


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

Index: javax/print/CancelablePrintJob.java
===================================================================
RCS file: javax/print/CancelablePrintJob.java
diff -N javax/print/CancelablePrintJob.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/CancelablePrintJob.java	26 Apr 2004 21:07:55 -0000
@@ -0,0 +1,52 @@
+/* CancelablePrintJob.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.print;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface CancelablePrintJob extends DocPrintJob
+{
+  /**
+   * Cancel print job.
+   *
+   * @exception PrintException if an error occured
+   */
+  void cancel() throws PrintException;
+}
Index: javax/print/Doc.java
===================================================================
RCS file: javax/print/Doc.java
diff -N javax/print/Doc.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/Doc.java	26 Apr 2004 21:07:55 -0000
@@ -0,0 +1,87 @@
+/* Doc.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.print;
+
+import java.io.InputStream;
+import java.io.Reader;
+import javax.print.attribute.DocAttributeSet;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface Doc
+{
+  /**
+   * Returns a set of attributes applying to this document.
+   * 
+   * @return the attributes
+   */
+  DocAttributeSet getAttributes();
+
+  /**
+   * Returns the flavor in which this document will provide its print data.
+   *  
+   * @return the document flavor for printing
+   */
+  DocFlavor getDocFlavor();
+
+  /**
+   * Returns the print data of this document represented in a format that supports
+   * the document flavor.
+   * 
+   * @return the print data
+   */
+  Object getPrintData();
+
+  /**
+   * Returns a <code>Reader</code> object for extracting character print data
+   * from this document.
+   * 
+   * @return the <code>Reader</code> object
+   */
+  Reader getReaderForText();
+
+  /**
+   * Returns an <code>InputStream</code> object for extracting byte print data
+   * from this document.
+   * 
+   * @return the <code>InputStream</code> object
+   */
+  InputStream getStreamForBytes();
+}
\ No newline at end of file
Index: javax/print/DocFlavor.java
===================================================================
RCS file: javax/print/DocFlavor.java
diff -N javax/print/DocFlavor.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/DocFlavor.java	26 Apr 2004 21:07:55 -0000
@@ -0,0 +1,151 @@
+/* Doc.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.print;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class DocFlavor implements Cloneable, Serializable
+{
+  public static final String hostEncoding = "US-ASCII";
+
+  private String mediaSubtype;
+  private String mediaType;
+  private String className;
+  private HashMap params = new HashMap();
+  
+  public DocFlavor(String mimeType, String className)
+  {
+    if (mimeType == null || className == null)
+      throw new NullPointerException();
+
+    parseMimeType(mimeType);
+    this.className = className;
+  }
+
+  private void parseMimeType(String mimeType)
+  {
+    // FIXME: This method is know to be not completely correct, but it works for now.
+    
+    int pos = mimeType.indexOf(';');
+
+    if (pos != -1)
+      {
+	String tmp = mimeType.substring(pos + 2);
+	mimeType = mimeType.substring(0, pos);
+	pos = tmp.indexOf('=');
+	params.put(tmp.substring(0, pos), tmp.substring(pos + 1));
+      }
+
+    pos = mimeType.indexOf('/');
+
+    if (pos == -1)
+      throw new IllegalArgumentException();
+
+    mediaType = mimeType.substring(0, pos);
+    mediaSubtype = mimeType.substring(pos + 1);
+  }
+  
+  public boolean equals(Object obj)
+  {
+    if (! (obj instanceof DocFlavor))
+      return false;
+
+    DocFlavor tmp = (DocFlavor) obj;
+
+    return (getMimeType().equals(tmp.getMimeType())
+	    && getRepresentationClassName().equals(tmp.getRepresentationClassName()));
+  }
+
+  public String getMediaSubtype()
+  {
+    return mediaSubtype;
+  }
+
+  public String getMediaType()
+  {
+    return mediaType;
+  }
+
+  public String getMimeType()
+  {
+    // FIXME: Check if this algorithm is correct.
+    
+    String mimeType = getMediaType() + "/" + getMediaSubtype();
+    Iterator it = params.entrySet().iterator();
+
+    while (it.hasNext())
+      {
+	Map.Entry entry = (Map.Entry) it.next();
+	mimeType += "; " + entry.getKey() + "=\"" + entry.getValue() + "\"";
+      }
+
+    return mimeType;
+  }
+
+  public String getParameter(String paramName)
+  {
+    if (paramName == null)
+      throw new NullPointerException();
+    
+    return (String) params.get(paramName); 
+  }
+
+  public String getRepresentationClassName()
+  {
+    return className;
+  }
+
+  public int hashCode()
+  {
+    return ((mediaType.hashCode()
+	     * mediaSubtype.hashCode()
+	     * className.hashCode()) ^ params.hashCode());
+  }
+
+  public String toString()
+  {
+    return getMimeType();
+  }
+}
Index: javax/print/DocPrintJob.java
===================================================================
RCS file: javax/print/DocPrintJob.java
diff -N javax/print/DocPrintJob.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/DocPrintJob.java	26 Apr 2004 21:07:55 -0000
@@ -0,0 +1,104 @@
+/* DocPrintJob.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.print;
+
+import javax.print.attribute.PrintJobAttributeSet;
+import javax.print.attribute.PrintRequestAttributeSet;
+import javax.print.event.PrintJobAttributeListener;
+import javax.print.event.PrintJobListener;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface DocPrintJob
+{
+  /**
+   * Registers a listener for changes in the specified attributes.
+   * 
+   * @param listener the listener to add
+   * @param attributes the attributes to observe
+   */
+  void addPrintJobAttributeListener(PrintJobAttributeListener listener,
+				    PrintJobAttributeSet attributes);
+
+  /**
+   * Registers a listener for events occuring during this print job.
+   * 
+   * @param listener the listener to add
+   */
+  void addPrintJobListener(PrintJobListener listener);
+
+  /**
+   * Returns the print job's attributes.
+   * 
+   * @return the attributes of this print job
+   */
+  PrintJobAttributeSet getAttributes();
+
+  /**
+   * Returns the <code>PrintService</code> object this print job is bound to.
+   * 
+   * @return the print service
+   */
+  PrintService getPrintService();
+
+  /**
+   * Prints a document with the specified print job attributes.
+   * 
+   * @param doc the document to print
+   * @param attributes the attributes to use
+   * 
+   * @throws PrintException if an error occurs
+   */
+  void print(Doc doc, PrintRequestAttributeSet attributes) throws PrintException;
+
+  /**
+   * De-registers an attribute listener.
+   * 
+   * @param listener the listener to remove
+   */
+  void removePrintJobAttributeListener(PrintJobAttributeListener listener);
+
+  /**
+   * De-registers a print job listener.
+   * 
+   * @param listener the listener to remove
+   */
+  void removePrintJobListener(PrintJobListener listener);
+}
\ No newline at end of file
Index: javax/print/FlavorException.java
===================================================================
RCS file: javax/print/FlavorException.java
diff -N javax/print/FlavorException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/FlavorException.java	26 Apr 2004 21:07:55 -0000
@@ -0,0 +1,52 @@
+/* FlavorException.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.print;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface FlavorException
+{
+  /**
+   * Returns the unsupported document flavors.
+   * 
+   * @return the unsupported document flavors
+   */
+  DocFlavor[] getUnsupportedFlavors();
+}
\ No newline at end of file
Index: javax/print/PrintException.java
===================================================================
RCS file: javax/print/PrintException.java
diff -N javax/print/PrintException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/PrintException.java	26 Apr 2004 21:07:55 -0000
@@ -0,0 +1,84 @@
+/* PrintException.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.print;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PrintException extends Exception
+{
+  /**
+   * Construct a print exception.
+   */
+  public PrintException()
+  {
+    super();
+  }
+
+  /**
+   * Construct a print exception.
+   * 
+   * @param e chained exception
+   */
+  public PrintException(Exception e)
+  {
+    super(e);
+  }
+
+  /**
+   * Construct a print exception.
+   * 
+   * @param s detailed message, or null for no message
+   */
+  public PrintException(String s)
+  {
+    super(s);
+  }
+
+  /**
+   * Construct a print exception.
+   * 
+   * @param s detailed message, or null for no message
+   * @param e chained exception
+   */
+  public PrintException(String s, Exception e)
+  {
+    super(s, e);
+  }
+}
\ No newline at end of file
Index: javax/print/PrintService.java
===================================================================
RCS file: javax/print/PrintService.java
diff -N javax/print/PrintService.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/PrintService.java	26 Apr 2004 21:07:55 -0000
@@ -0,0 +1,226 @@
+/* PrintService.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.print;
+
+import javax.print.attribute.Attribute;
+import javax.print.attribute.AttributeSet;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.PrintServiceAttributeSet;
+import javax.print.event.PrintServiceAttributeListener;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface PrintService
+{
+  /**
+   * Returns a new print job capable to handle all supported document flavors.
+   * 
+   * @return the new print job
+   */
+  DocPrintJob createPrintJob();
+  
+  /**
+   * Determines if two services refer to the same underlying service.
+   * 
+   * @param obj the service to check against
+   * 
+   * @return <code>true</code> if both services refer to the sam underlying
+   * service, <code>false</code> otherwise
+   */
+  boolean equals(Object obj);
+  
+  /**
+   * Returns the value of a single specified attribute.
+   * 
+   * @param category the category of a <code>PrintServiceAttribute</code>
+   * 
+   * @return the value of the attribute
+   * 
+   * @throws NullPointerException if category is null
+   * @throws IllegalArgumentException if category is not a class that
+   * implements <code>PrintServiceAttribute</code>
+   */
+  PrintServiceAttribute getAttribute(Class category);
+  
+  /**
+   * Returns all attributes of this printer service
+   * 
+   * @return all attributes of this print service
+   */
+  PrintServiceAttributeSet getAttributes();
+
+  /**
+   * Returns the service's default value for a given attribute.
+   * 
+   * @param category the category of the attribute
+   * 
+   * @return the default value
+   * 
+   * @throws NullPointerException if <code>category</code> is null
+   * @throws IllegalArgumentException if <code>category</code> is a class
+   * not implementing <code>Attribute</code> 
+   */
+  Object getDefaultAttributeValue(Class category);
+  
+  /**
+   * Returns the name of this print service.
+   * 
+   * @return the name
+   */
+  String getName();
+  
+  /**
+   * Returns a factory for UI components.
+   * 
+   * @return the factory
+   */
+  ServiceUIFactory getServiceUIFactory();
+  
+  /**
+   * Returns all supported attribute categories.
+   * 
+   * @return an array of all supported attribute categories
+   */
+  Class[] getSupportedAttributeCategories();
+  
+  /**
+   * Returns all supported attribute values a client can use when setting up
+   * a print job with this service.
+   * 
+   * @param category the attribute category to test
+   * @param flavor the document flavor to use, or null
+   * @param attributes set of printing attributes for a supposed job, or null
+   * 
+   * @return object indicating supported values for <code>category</code>,
+   * or null if this print service doesnt support specifying doc-level or
+   * job-level attribute in a print request.
+   * 
+   * @throws NullPointerException if <code>category</code> is null
+   * @throws IllegalArgumentException if <code>category</code> is a class not
+   * implementing <code>Attribute</code>, or if <code>flavor</code> is not
+   * supported
+   */
+  Object getSupportedAttributeValues(Class category, DocFlavor flavor, AttributeSet attributes);
+  
+  /**
+   * Returns an array of all supproted document flavors.
+   * 
+   * @return the supported document flavors
+   */
+  DocFlavor[] getSupportedDocFlavors();
+  
+  /**
+   * Returns all attributes that are unsupported for a print request in the
+   * context of a particular document flavor.
+   * 
+   * @param flavor document flavor to test, or null
+   * @param attributes set of printing attributes for a supposed job
+   * 
+   * @return null if this <code>PrintService</code> supports the print request
+   * specification, else the unsupported attributes
+   * 
+   * @throws IllegalArgumentException if <code>flavor</code> is unsupported
+   */
+  AttributeSet getUnsupportedAttributes(DocFlavor flavor, AttributeSet attributes);
+  
+  /**
+   * Returns a hashcode for this printer service.
+   * 
+   * @return the hashcode
+   */
+  int hashCode();
+  
+  /**
+   * Determines a given attribute category is supported or not.
+   * 
+   * @param category the category to check
+   * 
+   * @return <code>true</code> if <code>category</code> is supported,
+   * <code>false</code> otherwise
+   * 
+   * @throws NullPointerException if <code>category</code> is null
+   * @throws IllegalArgumentException if <code>category</code> is a class not
+   * implementing <code>Attribute</code>.
+   */
+  boolean isAttributeCategorySupported(Class category);
+  
+  /**
+   * Determines a given attribute value is supported when creating a print job
+   * for this print service.
+   * 
+   * @param attrval the attribute value to check
+   * @param flavor the document flavor to use, or null
+   * @param attributes set of printing attributes to use, or null
+   * 
+   * @return <code>true</code> if the attribute value is supported,
+   * <code>false</code> otherwise
+   * 
+   * @throws NullPointerException if <code>attrval</code> is null
+   * @throws IllegalArgumentException if <code>flavor</code> is not supported
+   * by this print service
+   */
+  boolean isAttributeValueSupported(Attribute attrval, DocFlavor flavor, AttributeSet attributes);
+  
+  /**
+   * Determines a given document flavor is supported or not.
+   * 
+   * @param flavor the document flavor to check
+   * 
+   * @return <code>true</code> if <code>flavor</code> is supported,
+   * <code>false</code> otherwise
+   * 
+   * @throws NullPointerException if <code>flavor</code> is null
+   */
+  boolean isDocFlavorSupported(DocFlavor flavor);
+  
+  /**
+   * Registers a print service attribute listener to this print service.
+   * 
+   * @param listener the listener to add
+   */
+  void addPrintServiceAttributeListener(PrintServiceAttributeListener listener);
+  
+  /**
+   * De-registers a print service attribute listener from this print service.
+   * 
+   * @param listener the listener to remove
+   */
+  void removePrintServiceAttributeListener(PrintServiceAttributeListener listener);
+}
Index: javax/print/ServiceUIFactory.java
===================================================================
RCS file: javax/print/ServiceUIFactory.java
diff -N javax/print/ServiceUIFactory.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/ServiceUIFactory.java	26 Apr 2004 21:07:55 -0000
@@ -0,0 +1,89 @@
+/* ServiceUIFactory.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.print;
+
+/**
+ * @author Michael Koch
+ */
+public abstract class ServiceUIFactory
+{
+  public static int ABOUT_UIROLE = 1;
+  public static int ADMIN_UIROLE = 2;
+  public static int MAIN_UIROLE = 3;
+  public static int RESERVED_UIROLE = 99;
+
+  public static String DIALOG_UIROLE = "java.awt.Dialog";
+  public static String JCOMPONENT_UIROLE = "javax.swing.JComponent";
+  public static String JDIALOG_UIROLE = "javax.swing.JDialog";
+  public static String PANEL_UIROLE = "java.awt.Panel";
+
+  /**
+   * Constructs a <code>ServiceUIFactory</code> object.
+   */
+  public ServiceUIFactory()
+  {
+  	// Do nothing here.
+  }
+
+  /**
+   * Returns an UI object which may be cast to the requested UI type.
+   * 
+   * @param role the role requested. Must be one of the standard roles
+   * or a private role supported by this factory
+   * @param ui type in which the role is requested
+   * 
+   * @return the UI role or null of this role is not supported by this factory
+   * 
+   * @throws IllegalArgumentException if <code>role</code> is neither one of
+   * the standard ones nor a private one supported by this factory
+   */
+  public abstract Object getUI(int role, String ui);
+
+  /**
+   * Returns the UI types supported by this factory for an UI role.
+   * 
+   * @param role the role to be looked up
+   * 
+   * @return an array of UI types
+   * 
+   * @throws IllegalArgumentException if <code>role</code> is neither one of
+   * the standard ones nor a private one supported by this factory
+   */
+  public abstract String[] getUIClassNamesForRole(int role);
+}
\ No newline at end of file
Index: javax/print/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- javax/print/Makefile.am	29 Apr 2003 09:44:33 -0000	1.1
+++ javax/print/Makefile.am	26 Apr 2004 21:07:55 -0000
@@ -1,3 +1,14 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 SUBDIRS = attribute
+
+EXTRA_DIST =
+CancelablePrintJob.java \
+Doc.java \
+DocFlavor.java \
+DonPrintJob.java \
+FlavorException.java \
+PrintException.java \
+PrintService.java \
+ServiceUIFactory.java
+

--Boundary-00=_UsXjA8O6m5bCjIU--




From MAILER-DAEMON Mon Apr 26 17:44:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIDti-00045a-FT
	for mharc-commit-classpath@gnu.org; Mon, 26 Apr 2004 17:44:18 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIDtf-00042v-1u
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 17:44:15 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIDt7-0003d9-7M
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 17:44:13 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIDkh-0008S9-G0
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 17:34:59 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-128.ewetel.net
	[80.228.94.128])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3QLYtB5029234
	for <commit-classpath@gnu.org>; Mon, 26 Apr 2004 23:34:56 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BIDlM-0001IZ-00
	for <commit-classpath@gnu.org>; Mon, 26 Apr 2004 23:35:40 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 26 Apr 2004 23:34:35 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_rBYjAaB3DPFmiMr"
Message-Id: <200404262334.35768.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.print.event - new files
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 26 Apr 2004 21:44:16 -0000


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

Hi list,


I just commited the attached patch to add javax.print.event 
implementation.


Michael
 

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

	* javax/print/event/PrintEvent.java,
	javax/print/event/PrintJobAdapter.java,
	javax/print/event/PrintJobAttributeEvent.java,
	javax/print/event/PrintJobAttributeListener.java,
	javax/print/event/PrintJobEvent.java,
	javax/print/event/PrintJobListener.java,
	javax/print/event/PrintServiceAttributeEvent.java,
	javax/print/event/PrintServiceAttributeListener.java,
	javax/print/event/Makefile.am: New files.
	* configure.ac: Generate javax/print/event/Makefile.
	* javax/print/Makefile.am (SUBDIRS): Added event.


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

Index: javax/print/event/PrintEvent.java
===================================================================
RCS file: javax/print/event/PrintEvent.java
diff -N javax/print/event/PrintEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/PrintEvent.java	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,67 @@
+/* PrintEvent.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.print.event;
+
+import java.util.EventObject;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PrintEvent extends EventObject
+{
+  /**
+   * Constructs a <code>PrintEvent</code> object.
+   * 
+   * @param source the source of this event
+   */
+  public PrintEvent(Object source)
+  {
+    super(source);
+  }
+
+  /**
+   * Returns a string representation of this object.
+   * 
+   * @return the string representation
+   */
+  public String toString()
+  {
+    return "PrintEvent on " + getSource().toString();
+  }
+}
Index: javax/print/event/PrintJobAdapter.java
===================================================================
RCS file: javax/print/event/PrintJobAdapter.java
diff -N javax/print/event/PrintJobAdapter.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/PrintJobAdapter.java	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,117 @@
+/* PrintJobAdapter.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.print.event;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public abstract class PrintJobAdapter
+  implements PrintJobListener
+{
+  /**
+   * Constructs a <code>PrintJobAdapter</code> object.
+   */
+  public PrintJobAdapter()
+  {
+    // Do nothing here.
+  }
+  
+  /**
+   * Called to notify the client that all data has bin successfully transferred
+   * to the print service.
+   * 
+   * <p>The default implementation does nothing</p>
+   */
+  public void printDataTransferCompleted(PrintJobEvent event)
+  {
+    // Do nothing here.
+  }
+
+  /**
+   * Called to notify the client that a print job was canceled.
+   * 
+   * <p>The default implementation does nothing</p>
+   */
+  public void printJobCanceled(PrintJobEvent event)
+  {
+    // Do nothing here.
+  }
+
+  /**
+   * Called to notify the client that a print job was successfully completed.
+   * 
+   * <p>The default implementation does nothing</p>
+   */
+  public void printJobCompleted(PrintJobEvent event)
+  {
+    // Do nothing here.
+  }
+
+  /**
+   * Called to notify the client that a print job failed to complete
+   * successfully.
+   * 
+   * <p>The default implementation does nothing</p>
+   */
+  public void printJobFailed(PrintJobEvent event)
+  {
+    // Do nothing here.
+  }
+
+  /**
+   * Called to notify the client that no more job events will be send.
+   * 
+   * <p>The default implementation does nothing</p>
+   */
+  public void printJobNoMoreEvents(PrintJobEvent event)
+  {
+    // Do nothing here.
+  }
+
+  /**
+   * Called to notify the client that a problem occured during printing
+   * but the user may be able to fix it.
+   * 
+   * <p>The default implementation does nothing</p>
+   */
+  public void printJobRequiresAttention(PrintJobEvent event)
+  {
+    // Do nothing here.
+  }
+}
Index: javax/print/event/PrintJobAttributeEvent.java
===================================================================
RCS file: javax/print/event/PrintJobAttributeEvent.java
diff -N javax/print/event/PrintJobAttributeEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/PrintJobAttributeEvent.java	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,85 @@
+/* PrintJobAttributeEvent.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.print.event;
+
+import javax.print.DocPrintJob;
+import javax.print.attribute.PrintJobAttributeSet;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PrintJobAttributeEvent extends PrintEvent
+{
+  private static final long serialVersionUID = -6534469883874742101L;
+  
+  private PrintJobAttributeSet attributes;
+  
+  /**
+   * Constructs a <code>PrintJobAttributeEvent</code> object.
+   * 
+   * @param source the source of this event
+   * @param attributes the attribute changes being reported
+   */
+  public PrintJobAttributeEvent(DocPrintJob source,
+                                PrintJobAttributeSet attributes)
+  {
+    super(source);
+    this.attributes = attributes;
+  }
+
+  /**
+   * Returns the print job generating this event.
+   * 
+   * @return the print job
+   */
+  public DocPrintJob getPrintJob()
+  {
+    return (DocPrintJob) getSource();
+  }
+
+  /**
+   * Returns the attributes that changed and their new values.
+   * 
+   * @return the changes attributes
+   */
+  public PrintJobAttributeSet getAttributes()
+  {
+    return attributes;
+  }
+}
Index: javax/print/event/PrintJobAttributeListener.java
===================================================================
RCS file: javax/print/event/PrintJobAttributeListener.java
diff -N javax/print/event/PrintJobAttributeListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/PrintJobAttributeListener.java	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,52 @@
+/* PrintJobAttributeListener.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.print.event;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface PrintJobAttributeListener
+{
+  /**
+   * Notifies the listener of an attribute change.
+   * 
+   * @param event the event
+   */
+  void attributeUpdate(PrintJobAttributeEvent event);
+}
Index: javax/print/event/PrintJobEvent.java
===================================================================
RCS file: javax/print/event/PrintJobEvent.java
diff -N javax/print/event/PrintJobEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/PrintJobEvent.java	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,90 @@
+/* PrintEvent.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.print.event;
+
+import javax.print.DocPrintJob;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PrintJobEvent extends PrintEvent
+{
+  private static final long serialVersionUID = -1711656903622072997L;
+
+  public static final int DATA_TRANSFER_COMPLETE = 106;
+  public static final int JOB_CANCELED = 101;
+  public static final int JOB_COMPLETE = 102;
+  public static final int JOB_FAILED = 103;
+  public static final int NO_MORE_EVENTS = 105;
+  public static final int REQUIRES_ATTENTION = 104;
+  
+  private int reason;
+  
+  /**
+   * Constructs a <code>PrintJobEvent</code> object.
+   * 
+   * @param source the source generating this event
+   * @param reason the reason for this event
+   */
+  public PrintJobEvent(DocPrintJob source, int reason)
+  {
+    super(source);
+    this.reason = reason;
+  }
+
+  /**
+   * Returns the reason for this event.
+   * 
+   * @return the reason
+   */
+  public int getPrintEventType()
+  {
+    return reason;
+  }
+
+  /**
+   * Returns the print job that generated this event.
+   * 
+   * @return the print job
+   */ 
+  public DocPrintJob getPrintJob()
+  {
+    return (DocPrintJob) getSource();
+  }
+}
Index: javax/print/event/PrintJobListener.java
===================================================================
RCS file: javax/print/event/PrintJobListener.java
diff -N javax/print/event/PrintJobListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/PrintJobListener.java	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,87 @@
+/* PrintJobListener.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.print.event;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de) */
+public interface PrintJobListener
+{
+  /**
+   * Notifies the listener that all data has been successfully transferred
+   * to the print service.
+   * 
+   * @param event the event
+   */
+  void printDataTransferCompleted(PrintJobEvent event);
+  
+  /**
+   * Notifies the listener that a print job got canceled.
+   * 
+   * @param event the event
+   */
+  void printJobCanceled(PrintJobEvent event);
+  
+  /**
+   * Notifies the listener that a print job has completed.
+   * 
+   * @param event the event
+   */
+  void printJobCompleted(PrintJobEvent event);
+  
+  /**
+   * Notifies the listener that a print job has failed to complete.
+   * 
+   * @param event the event.
+   */
+  void printJobFailed(PrintJobEvent event);
+  
+  /**
+   * Notifies the listener that no more events will be delivered.
+   * 
+   * @param event the event
+   */
+  void printJobNoMoreEvents(PrintJobEvent event);
+  
+  /**
+   * Notifies the listener that an error occured and the user might be able to fix it.
+   * 
+   * @param event the event
+   */
+  void printJobRequiresAttention(PrintJobEvent event);
+}
Index: javax/print/event/PrintServiceAttributeEvent.java
===================================================================
RCS file: javax/print/event/PrintServiceAttributeEvent.java
diff -N javax/print/event/PrintServiceAttributeEvent.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/PrintServiceAttributeEvent.java	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,83 @@
+/* PrintServiceAttributeEvent.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.print.event;
+
+import javax.print.PrintService;
+import javax.print.attribute.PrintServiceAttributeSet;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PrintServiceAttributeEvent extends PrintEvent
+{
+  private PrintServiceAttributeSet attributes;
+  
+  /**
+   * Constructs a <code>PrintServiceAttributeEvent</code> object.
+   * 
+   * @param source the source of this event
+   * @param attributes the attribute changes being reported
+   */
+  public PrintServiceAttributeEvent(PrintService source,
+                                    PrintServiceAttributeSet attributes)
+  {
+    super(source);
+    this.attributes = attributes;
+  }
+
+  /**
+   * Returns the print service that generated this event.
+   * 
+   * @return the print service
+   */
+  public PrintService getPrintService()
+  {
+    return (PrintService) getSource();
+  }
+
+  /**
+   * Returns the changed attributes this event reports.
+   * 
+   * @return the changed attributes
+   */
+  public PrintServiceAttributeSet getAttributes()
+  {
+    return attributes;
+  }
+}
Index: javax/print/event/PrintServiceAttributeListener.java
===================================================================
RCS file: javax/print/event/PrintServiceAttributeListener.java
diff -N javax/print/event/PrintServiceAttributeListener.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/PrintServiceAttributeListener.java	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,52 @@
+/* PrintServiceAttributeListener.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.print.event;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface PrintServiceAttributeListener
+{
+  /**
+   * Notifies the listener that some attributes have changed.
+   * 
+   * @param event the event
+   */
+  void attributeUpdate(PrintServiceAttributeEvent event);
+}
Index: javax/print/event/Makefile.am
===================================================================
RCS file: javax/print/event/Makefile.am
diff -N javax/print/event/Makefile.am
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/event/Makefile.am	26 Apr 2004 21:30:25 -0000
@@ -0,0 +1,12 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+EXTRA_DIST = \
+PrintEvent.java \
+PrintJobAdapter.java \
+PrintJobAttributeEvent.java \
+PrintJobAttributeListener.java \
+PrintJobEvent.java \
+PrintJobListener.java \
+PrintServiceAttributeEvent.java \
+PrintServiceAttributeListener.java
+
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.21
diff -u -r1.21 configure.ac
--- configure.ac	23 Apr 2004 22:06:23 -0000	1.21
+++ configure.ac	26 Apr 2004 21:30:25 -0000
@@ -59,7 +59,7 @@
 dnl GTK native peer (enabled by default)
 dnl -----------------------------------------------------------
 AC_ARG_ENABLE([gtk-peer],
-              [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [default=yes])],
+              [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers,disabled by --disable-jni [default=yes])],
               [case "${enableval}" in
                 yes) COMPILE_GTK_PEER=yes ;;
                 no) COMPILE_GTK_PEER=no ;;
@@ -395,6 +395,7 @@
 javax/naming/spi/Makefile
 javax/print/Makefile
 javax/print/attribute/Makefile
+javax/print/event/Makefile
 javax/rmi/Makefile
 javax/rmi/CORBA/Makefile
 javax/security/Makefile
Index: javax/print/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- javax/print/Makefile.am	26 Apr 2004 21:08:22 -0000	1.2
+++ javax/print/Makefile.am	26 Apr 2004 21:30:25 -0000
@@ -1,8 +1,8 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = attribute
+SUBDIRS = attribute event
 
-EXTRA_DIST =
+EXTRA_DIST = \
 CancelablePrintJob.java \
 Doc.java \
 DocFlavor.java \

--Boundary-00=_rBYjAaB3DPFmiMr--




From MAILER-DAEMON Mon Apr 26 23:55:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIJgV-0000Fu-0l
	for mharc-commit-classpath@gnu.org; Mon, 26 Apr 2004 23:55:03 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIJgQ-0000Eo-Vw
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 23:54:58 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIJfu-00008i-Qq
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 23:54:57 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIJf8-0008K8-To
	for commit-classpath@gnu.org; Mon, 26 Apr 2004 23:53:39 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 58B9862235
	for <commit-classpath@gnu.org>; Tue, 27 Apr 2004 03:53: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 61275-06 for <commit-classpath@gnu.org>;
	Tue, 27 Apr 2004 03:53:37 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-81-16.adsl.solnet.ch [212.41.81.16])
	by mail01.solnet.ch (Postfix) with ESMTP id 38AD46222D
	for <commit-classpath@gnu.org>; Tue, 27 Apr 2004 03:53:37 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id E0D76BB5C7; Tue, 27 Apr 2004 05:51:22 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040427035122.E0D76BB5C7@reali.dnsalias.net>
Date: Tue, 27 Apr 2004 05:51:22 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040427 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 27 Apr 2004 03:55:00 -0000




From MAILER-DAEMON Tue Apr 27 03:15:14 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIMoD-0004JY-G6
	for mharc-commit-classpath@gnu.org; Tue, 27 Apr 2004 03:15:13 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIMo3-0004Gc-7L
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 03:15:03 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIMnW-00043n-JF
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 03:15:01 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIMnV-00043Z-VA
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 03:14:30 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-007.ewetel.net
	[80.228.95.7])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3R7ERB5001220
	for <commit-classpath@gnu.org>; Tue, 27 Apr 2004 09:14:28 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BIMoD-0007KW-00
	for <commit-classpath@gnu.org>; Tue, 27 Apr 2004 09:15:13 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 27 Apr 2004 09:14:07 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_/ggjAV0b00BOxrA"
Message-Id: <200404270914.07471.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.print.attribute.standard - javadoc fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 27 Apr 2004 07:15:04 -0000


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

Hi list,


I just commited the attached patch to fix 
javax.print.attribute.standard.


Michael


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

	* javax/print/attribute/standard/Copies.java,
	javax/print/attribute/standard/DateTimeAtCompleted.java,
	javax/print/attribute/standard/DateTimeAtCreation.java,
	javax/print/attribute/standard/DateTimeAtProcessing.java,
	javax/print/attribute/standard/DocumentName.java,
	javax/print/attribute/standard/JobHoldUntil.java,
	javax/print/attribute/standard/JobImpressions.java,
	javax/print/attribute/standard/JobImpressionsCompleted.java,
	javax/print/attribute/standard/JobKOctets.java,
	javax/print/attribute/standard/JobKOctetsProcessed.java,
	javax/print/attribute/standard/JobMediaSheets.java,
	javax/print/attribute/standard/JobMediaSheetsCompleted.java,
	javax/print/attribute/standard/JobMessageFromOperator.java,
	javax/print/attribute/standard/JobName.java,
	javax/print/attribute/standard/JobOriginatingUserName.java,
	javax/print/attribute/standard/JobPriority.java,
	javax/print/attribute/standard/JobPrioritySupported.java,
	javax/print/attribute/standard/NumberOfDocuments.java,
	javax/print/attribute/standard/NumberOfInterveningJobs.java,
	javax/print/attribute/standard/NumberUp.java,
	javax/print/attribute/standard/OutputDeviceAssigned.java,
	javax/print/attribute/standard/PagesPerMinute.java,
	javax/print/attribute/standard/PagesPerMinuteColor.java:
	Fixed @return tag all over.


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

Index: javax/print/attribute/standard/Copies.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/Copies.java,v
retrieving revision 1.1
diff -u -r1.1 Copies.java
--- javax/print/attribute/standard/Copies.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/Copies.java	27 Apr 2004 07:08:28 -0000
@@ -69,7 +69,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/DateTimeAtCompleted.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/DateTimeAtCompleted.java,v
retrieving revision 1.1
diff -u -r1.1 DateTimeAtCompleted.java
--- javax/print/attribute/standard/DateTimeAtCompleted.java	7 Jan 2004 10:18:27 -0000	1.1
+++ javax/print/attribute/standard/DateTimeAtCompleted.java	27 Apr 2004 07:08:28 -0000
@@ -63,7 +63,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/DateTimeAtCreation.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/DateTimeAtCreation.java,v
retrieving revision 1.1
diff -u -r1.1 DateTimeAtCreation.java
--- javax/print/attribute/standard/DateTimeAtCreation.java	7 Jan 2004 10:18:27 -0000	1.1
+++ javax/print/attribute/standard/DateTimeAtCreation.java	27 Apr 2004 07:08:28 -0000
@@ -63,7 +63,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/DateTimeAtProcessing.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/DateTimeAtProcessing.java,v
retrieving revision 1.1
diff -u -r1.1 DateTimeAtProcessing.java
--- javax/print/attribute/standard/DateTimeAtProcessing.java	7 Jan 2004 10:18:27 -0000	1.1
+++ javax/print/attribute/standard/DateTimeAtProcessing.java	27 Apr 2004 07:08:28 -0000
@@ -63,7 +63,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/DocumentName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/DocumentName.java,v
retrieving revision 1.1
diff -u -r1.1 DocumentName.java
--- javax/print/attribute/standard/DocumentName.java	9 Jan 2004 11:32:09 -0000	1.1
+++ javax/print/attribute/standard/DocumentName.java	27 Apr 2004 07:08:28 -0000
@@ -63,7 +63,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobHoldUntil.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobHoldUntil.java,v
retrieving revision 1.1
diff -u -r1.1 JobHoldUntil.java
--- javax/print/attribute/standard/JobHoldUntil.java	9 Jan 2004 11:32:09 -0000	1.1
+++ javax/print/attribute/standard/JobHoldUntil.java	27 Apr 2004 07:08:28 -0000
@@ -64,7 +64,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobImpressions.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobImpressions.java,v
retrieving revision 1.1
diff -u -r1.1 JobImpressions.java
--- javax/print/attribute/standard/JobImpressions.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/JobImpressions.java	27 Apr 2004 07:08:28 -0000
@@ -69,7 +69,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobImpressionsCompleted.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobImpressionsCompleted.java,v
retrieving revision 1.1
diff -u -r1.1 JobImpressionsCompleted.java
--- javax/print/attribute/standard/JobImpressionsCompleted.java	7 Jan 2004 10:18:27 -0000	1.1
+++ javax/print/attribute/standard/JobImpressionsCompleted.java	27 Apr 2004 07:08:28 -0000
@@ -68,7 +68,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobKOctets.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobKOctets.java,v
retrieving revision 1.1
diff -u -r1.1 JobKOctets.java
--- javax/print/attribute/standard/JobKOctets.java	7 Jan 2004 10:18:27 -0000	1.1
+++ javax/print/attribute/standard/JobKOctets.java	27 Apr 2004 07:08:28 -0000
@@ -69,7 +69,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobKOctetsProcessed.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobKOctetsProcessed.java,v
retrieving revision 1.2
diff -u -r1.2 JobKOctetsProcessed.java
--- javax/print/attribute/standard/JobKOctetsProcessed.java	10 Jan 2004 22:16:26 -0000	1.2
+++ javax/print/attribute/standard/JobKOctetsProcessed.java	27 Apr 2004 07:08:28 -0000
@@ -68,7 +68,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobMediaSheets.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobMediaSheets.java,v
retrieving revision 1.1
diff -u -r1.1 JobMediaSheets.java
--- javax/print/attribute/standard/JobMediaSheets.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/JobMediaSheets.java	27 Apr 2004 07:08:28 -0000
@@ -69,7 +69,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobMediaSheetsCompleted.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobMediaSheetsCompleted.java,v
retrieving revision 1.2
diff -u -r1.2 JobMediaSheetsCompleted.java
--- javax/print/attribute/standard/JobMediaSheetsCompleted.java	10 Jan 2004 22:16:26 -0000	1.2
+++ javax/print/attribute/standard/JobMediaSheetsCompleted.java	27 Apr 2004 07:08:28 -0000
@@ -68,7 +68,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobMessageFromOperator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobMessageFromOperator.java,v
retrieving revision 1.1
diff -u -r1.1 JobMessageFromOperator.java
--- javax/print/attribute/standard/JobMessageFromOperator.java	9 Jan 2004 11:32:09 -0000	1.1
+++ javax/print/attribute/standard/JobMessageFromOperator.java	27 Apr 2004 07:08:28 -0000
@@ -63,7 +63,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobName.java,v
retrieving revision 1.1
diff -u -r1.1 JobName.java
--- javax/print/attribute/standard/JobName.java	9 Jan 2004 11:32:09 -0000	1.1
+++ javax/print/attribute/standard/JobName.java	27 Apr 2004 07:08:28 -0000
@@ -64,7 +64,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobOriginatingUserName.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobOriginatingUserName.java,v
retrieving revision 1.1
diff -u -r1.1 JobOriginatingUserName.java
--- javax/print/attribute/standard/JobOriginatingUserName.java	9 Jan 2004 11:32:09 -0000	1.1
+++ javax/print/attribute/standard/JobOriginatingUserName.java	27 Apr 2004 07:08:28 -0000
@@ -63,7 +63,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobPriority.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobPriority.java,v
retrieving revision 1.1
diff -u -r1.1 JobPriority.java
--- javax/print/attribute/standard/JobPriority.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/JobPriority.java	27 Apr 2004 07:08:28 -0000
@@ -66,7 +66,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/JobPrioritySupported.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/JobPrioritySupported.java,v
retrieving revision 1.1
diff -u -r1.1 JobPrioritySupported.java
--- javax/print/attribute/standard/JobPrioritySupported.java	7 Jan 2004 10:18:27 -0000	1.1
+++ javax/print/attribute/standard/JobPrioritySupported.java	27 Apr 2004 07:08:28 -0000
@@ -65,7 +65,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/NumberOfDocuments.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/NumberOfDocuments.java,v
retrieving revision 1.1
diff -u -r1.1 NumberOfDocuments.java
--- javax/print/attribute/standard/NumberOfDocuments.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/NumberOfDocuments.java	27 Apr 2004 07:08:28 -0000
@@ -68,7 +68,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/NumberOfInterveningJobs.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/NumberOfInterveningJobs.java,v
retrieving revision 1.1
diff -u -r1.1 NumberOfInterveningJobs.java
--- javax/print/attribute/standard/NumberOfInterveningJobs.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/NumberOfInterveningJobs.java	27 Apr 2004 07:08:28 -0000
@@ -68,7 +68,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/NumberUp.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/NumberUp.java,v
retrieving revision 1.1
diff -u -r1.1 NumberUp.java
--- javax/print/attribute/standard/NumberUp.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/NumberUp.java	27 Apr 2004 07:08:28 -0000
@@ -68,7 +68,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/OutputDeviceAssigned.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/OutputDeviceAssigned.java,v
retrieving revision 1.2
diff -u -r1.2 OutputDeviceAssigned.java
--- javax/print/attribute/standard/OutputDeviceAssigned.java	10 Jan 2004 22:16:26 -0000	1.2
+++ javax/print/attribute/standard/OutputDeviceAssigned.java	27 Apr 2004 07:08:28 -0000
@@ -63,7 +63,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/PagesPerMinute.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/PagesPerMinute.java,v
retrieving revision 1.1
diff -u -r1.1 PagesPerMinute.java
--- javax/print/attribute/standard/PagesPerMinute.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/PagesPerMinute.java	27 Apr 2004 07:08:28 -0000
@@ -68,7 +68,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {
Index: javax/print/attribute/standard/PagesPerMinuteColor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/PagesPerMinuteColor.java,v
retrieving revision 1.1
diff -u -r1.1 PagesPerMinuteColor.java
--- javax/print/attribute/standard/PagesPerMinuteColor.java	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/PagesPerMinuteColor.java	27 Apr 2004 07:08:28 -0000
@@ -68,7 +68,7 @@
    *
    * @param obj the object to test
    *
-   * @returns true if both objects are equal, false otherwise.
+   * @return true if both objects are equal, false otherwise.
    */
   public boolean equals(Object obj)
   {

--Boundary-00=_/ggjAV0b00BOxrA--




From MAILER-DAEMON Tue Apr 27 08:42:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIRqG-00037x-5I
	for mharc-commit-classpath@gnu.org; Tue, 27 Apr 2004 08:37:40 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIROV-0007fy-Rx
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 08:08:59 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIRJ3-0006YN-PO
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 08:03:53 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIRJ2-0006YD-R1
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 08:03:20 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-95-007.ewetel.net
	[80.228.95.7])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3RC3FnV021678
	for <commit-classpath@gnu.org>; Tue, 27 Apr 2004 14:03:16 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BIRJi-0007yx-00
	for <commit-classpath@gnu.org>; Tue, 27 Apr 2004 14:04:02 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 27 Apr 2004 14:02:54 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_uvkjAPIYiAPNYYZ"
Message-Id: <200404271402.54976.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.print - more new stuff and some fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 27 Apr 2004 12:37:34 -0000


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

Hi list,


I just commited more stuff to javax.print and some fixes for it.


Michael


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

	* javax/print/Doc.java
	(getPrintData): Throws IOException.
	(getReaderForText): Likewise.
	(getStreamForBytes): Likewise.
	* javax/print/DocFlavor.java:
	Fixed filename in copyright.
	(serialVersionUID): New field.
	* javax/print/ServiceUIFactory.java:
	Made all constants final.
	* javax/print/AttributeException.java
	javax/print/MultiDoc.java
	javax/print/MultiDocPrintJob.java
	javax/print/MultiDocPrintService.java
	javax/print/StreamPrintService.java
	javax/print/URIException.java: New files.
	* javax/print/Makefile.am
	(EXTRA_DIST): Added all new files.


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

Index: javax/print/Doc.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/Doc.java,v
retrieving revision 1.1
diff -u -r1.1 Doc.java
--- javax/print/Doc.java	26 Apr 2004 21:08:22 -0000	1.1
+++ javax/print/Doc.java	27 Apr 2004 11:57:17 -0000
@@ -38,8 +38,10 @@
 
 package javax.print;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+
 import javax.print.attribute.DocAttributeSet;
 
 /**
@@ -66,22 +68,28 @@
    * the document flavor.
    * 
    * @return the print data
+   * 
+   * @throws IOException if an error occurs
    */
-  Object getPrintData();
+  Object getPrintData() throws IOException;
 
   /**
    * Returns a <code>Reader</code> object for extracting character print data
    * from this document.
    * 
    * @return the <code>Reader</code> object
+   * 
+   * @throws IOException if an error occurs
    */
-  Reader getReaderForText();
+  Reader getReaderForText() throws IOException;
 
   /**
    * Returns an <code>InputStream</code> object for extracting byte print data
    * from this document.
    * 
    * @return the <code>InputStream</code> object
+   * 
+   * @throws IOException if an error occurs
    */
-  InputStream getStreamForBytes();
+  InputStream getStreamForBytes() throws IOException;
 }
Index: javax/print/DocFlavor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/DocFlavor.java,v
retrieving revision 1.1
diff -u -r1.1 DocFlavor.java
--- javax/print/DocFlavor.java	26 Apr 2004 21:08:22 -0000	1.1
+++ javax/print/DocFlavor.java	27 Apr 2004 11:57:17 -0000
@@ -1,4 +1,4 @@
-/* Doc.java --
+/* DocFlavor.java --
    Copyright (C) 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
@@ -48,6 +48,8 @@
  */
 public class DocFlavor implements Cloneable, Serializable
 {
+  private static final long serialVersionUID = -4512080796965449721L;
+  
   public static final String hostEncoding = "US-ASCII";
 
   private String mediaSubtype;
Index: javax/print/ServiceUIFactory.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/ServiceUIFactory.java,v
retrieving revision 1.1
diff -u -r1.1 ServiceUIFactory.java
--- javax/print/ServiceUIFactory.java	26 Apr 2004 21:08:22 -0000	1.1
+++ javax/print/ServiceUIFactory.java	27 Apr 2004 11:57:17 -0000
@@ -43,15 +43,15 @@
  */
 public abstract class ServiceUIFactory
 {
-  public static int ABOUT_UIROLE = 1;
-  public static int ADMIN_UIROLE = 2;
-  public static int MAIN_UIROLE = 3;
-  public static int RESERVED_UIROLE = 99;
+  public static final int ABOUT_UIROLE = 1;
+  public static final int ADMIN_UIROLE = 2;
+  public static final int MAIN_UIROLE = 3;
+  public static final int RESERVED_UIROLE = 99;
 
-  public static String DIALOG_UIROLE = "java.awt.Dialog";
-  public static String JCOMPONENT_UIROLE = "javax.swing.JComponent";
-  public static String JDIALOG_UIROLE = "javax.swing.JDialog";
-  public static String PANEL_UIROLE = "java.awt.Panel";
+  public static final String DIALOG_UI = "java.awt.Dialog";
+  public static final String JCOMPONENT_UI = "javax.swing.JComponent";
+  public static final String JDIALOG_UI = "javax.swing.JDialog";
+  public static final String PANEL_UI = "java.awt.Panel";
 
   /**
    * Constructs a <code>ServiceUIFactory</code> object.
Index: javax/print/AttributeException.java
===================================================================
RCS file: javax/print/AttributeException.java
diff -N javax/print/AttributeException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/AttributeException.java	27 Apr 2004 11:57:17 -0000
@@ -0,0 +1,63 @@
+/* CancelablePrintJob.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.print;
+
+import javax.print.attribute.Attribute;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface AttributeException
+{
+  /**
+   * Returns the unsupported printing attribute classes for a print service
+   * that does not support them.
+   * 
+   * @return array of unsupported attribute classes, or null
+   */
+  Class[] getUnsupportedAttributes();
+  
+  /**
+   * Returns the unsupported values of printing attributes for a print service
+   * that does not support them.
+   *   
+   * @return array of unsupperted attribute values, or null
+   */
+  Attribute[] getUnsupportedValues();
+}
Index: javax/print/MultiDoc.java
===================================================================
RCS file: javax/print/MultiDoc.java
diff -N javax/print/MultiDoc.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/MultiDoc.java	27 Apr 2004 11:57:17 -0000
@@ -0,0 +1,66 @@
+/* MultiDoc.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.print;
+
+import java.io.IOException;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface MultiDoc
+{
+  /**
+   * Returns the current document.
+   * 
+   * @return the current document
+   * 
+   * @throws IOException if an error occurs
+   */
+  Doc getDoc() throws IOException;
+
+  /**
+   * Returns the next <code>MultiDoc</code> object.
+   * 
+   * @return the next <code>MultiDoc</code> object
+   * 
+   * @throws IOException if an error occurs
+   */
+  MultiDoc next() throws IOException;
+}
\ No newline at end of file
Index: javax/print/MultiDocPrintJob.java
===================================================================
RCS file: javax/print/MultiDocPrintJob.java
diff -N javax/print/MultiDocPrintJob.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/MultiDocPrintJob.java	27 Apr 2004 11:57:17 -0000
@@ -0,0 +1,60 @@
+/* MultiDocPrintJob.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.print;
+
+import javax.print.attribute.PrintRequestAttributeSet;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface MultiDocPrintJob extends DocPrintJob
+{
+  /**
+   * Request a print of a <code>MultiDoc</code> object.
+   * 
+   * @param multiDoc the document to print
+   * @param attributes the printing attributes to apply
+   * 
+   * @throws PrintExeption if an error occurs
+   */
+  void print(MultiDoc multiDoc, PrintRequestAttributeSet attributes)
+    throws PrintException;
+}
+ 
\ No newline at end of file
Index: javax/print/MultiDocPrintService.java
===================================================================
RCS file: javax/print/MultiDocPrintService.java
diff -N javax/print/MultiDocPrintService.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/MultiDocPrintService.java	27 Apr 2004 11:57:17 -0000
@@ -0,0 +1,53 @@
+/* MultiDocPrintService.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.print;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface MultiDocPrintService extends PrintService
+{
+  /**
+   * Create a job that can print a <code>MultiDoc</code> object.
+   * 
+   * @return the new print job
+   */
+  MultiDocPrintJob createMultiDocPrintJob();
+}
\ No newline at end of file
Index: javax/print/StreamPrintService.java
===================================================================
RCS file: javax/print/StreamPrintService.java
diff -N javax/print/StreamPrintService.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/StreamPrintService.java	27 Apr 2004 11:57:17 -0000
@@ -0,0 +1,97 @@
+/* StreamPrintService.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.print;
+
+import java.io.OutputStream;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public abstract class StreamPrintService implements PrintService
+{
+  private boolean disposed;
+  private OutputStream out;
+  
+  /**
+   * Constructs a <code>StreamPrintService</code> object.
+   * 
+   * @param out the <code>OutputStream</code> to use
+   */
+  protected StreamPrintService(OutputStream out)
+  {
+    this.out = out;
+  }
+
+  /**
+   * Dispose this <code>StreamPrintService</code> object.
+   */
+  public void dispose()
+  {
+    disposed = true;
+  }
+
+  /**
+   * Returns the document format emited by this print service.
+   * 
+   * @return the document format
+   */
+  public abstract String getOutputFormat();
+
+  /**
+   * Returns the <code>OutputStream</code> of this object.
+   * 
+   * @return the <code>OutputStream</code>
+   */
+  public OutputStream getOutputStream()
+  {
+    return out;
+  }
+
+  /**
+   * Determines if this <code>StreamPrintService</code> object is disposed.
+   * 
+   * @return <code>true</code> if disposed already,
+   * otherwise <code>false</code>
+   */
+  public boolean isDisposed()
+  {
+    return disposed;
+  }
+}
\ No newline at end of file
Index: javax/print/URIException.java
===================================================================
RCS file: javax/print/URIException.java
diff -N javax/print/URIException.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/URIException.java	27 Apr 2004 11:57:17 -0000
@@ -0,0 +1,65 @@
+/* URIException.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.print;
+
+import java.net.URI;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public interface URIException
+{
+  int URIInaccessible = 1;
+  int URIOtherProblem = -1;
+  int URISchemeNotSupported = 2;
+  
+  /**
+   * Returns the reason for this exception.
+   * 
+   * @return the reason
+   */
+  int getReason();
+  
+  /**
+   * Returns the unsupported <code>URI</code> for this exception.
+   * 
+   * @return the unsupported <code>URI</code>.
+   */
+  URI getUnsupportedURI();
+}
Index: javax/print/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- javax/print/Makefile.am	26 Apr 2004 21:31:04 -0000	1.3
+++ javax/print/Makefile.am	27 Apr 2004 11:57:17 -0000
@@ -3,12 +3,18 @@
 SUBDIRS = attribute event
 
 EXTRA_DIST = \
+AttributeException.java \
 CancelablePrintJob.java \
 Doc.java \
 DocFlavor.java \
 DonPrintJob.java \
 FlavorException.java \
+MultiDoc.java \
+MultiDocPrintJob.java \
+MultiDocPrintService.java \
 PrintException.java \
 PrintService.java \
-ServiceUIFactory.java
+ServiceUIFactory.java \
+StreamPrintService.java \
+URIException.java
 

--Boundary-00=_uvkjAPIYiAPNYYZ--




From MAILER-DAEMON Tue Apr 27 19:03:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIbbt-0003ju-Fz
	for mharc-commit-classpath@gnu.org; Tue, 27 Apr 2004 19:03:29 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIbbM-0003NA-6j
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 19:02:56 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIbaP-0002hS-Hm
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 19:02:29 -0400
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by monty-python.gnu.org with smtp (Exim 4.30) id 1BIbaO-0002fX-Ht
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 19:01:56 -0400
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id a6dfcf98_989e_11d8_9193_00304811e8c8_1343;
	Tue, 27 Apr 2004 18:00:17 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i3RN1rPI003773
	for <commit-classpath@gnu.org>; Tue, 27 Apr 2004 18:01:53 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i3RN1qg8003772
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 18:01:52 -0500 (CDT)
	(envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404272301.i3RN1qg8003772@arch20m.dellroad.org>
To: commit-classpath@gnu.org
Date: Tue, 27 Apr 2004 18:01:52 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Subject: Committed VMProcess.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 27 Apr 2004 23:03:27 -0000

FYI,

Committed VMProcess.java:

    2004-04-27  Archie Cobbs  <archie@dellroad.org>

	    * include/Makefile.am: add java_lang_VMProcess.h
	    * include/java_lang_VMProcess.h: new file
	    * include/java_lang_VMRuntime.h: regenerate
	    * native/jni/java-lang/Makefile.am: add java_lang_VMProcess.c
	    * native/jni/java-lang/java_lang_VMProcess.c: new file
	    * vm/reference/java/lang/Makefile.am: add VMProcess.java
	    * vm/reference/java/lang/VMProcess.java: new file
	    * vm/reference/java/lang/VMRuntime.java (exec): use VMProcess

-Archie

P.S. Why don't we have automatic CVS commit emails like most projects?
     It seems redundant to have to send them to the list manually.

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com



From MAILER-DAEMON Tue Apr 27 19:30:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIbwu-00074B-PY
	for mharc-commit-classpath@gnu.org; Tue, 27 Apr 2004 19:25:12 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIbwQ-0006jy-In
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 19:24:42 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIbw2-0006ON-7n
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 19:24:20 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIbvK-0005qP-6Y
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 19:23:34 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BIbv5-0005Ia-00; Wed, 28 Apr 2004 01:23:19 +0200
From: Mark Wielaard <mark@klomp.org>
To: Archie Cobbs <archie@dellroad.org>
In-Reply-To: <200404272301.i3RN1qg8003772@arch20m.dellroad.org>
References: <200404272301.i3RN1qg8003772@arch20m.dellroad.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-55CdpxR6hFuYaB9m7rhB"
Message-Id: <1083108204.1471.48.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Wed, 28 Apr 2004 01:23:24 +0200
Cc: commit-classpath@gnu.org
Subject: Re: Committed VMProcess.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 27 Apr 2004 23:25:09 -0000


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

Hi,

On Wed, 2004-04-28 at 01:01, Archie Cobbs wrote:
> Committed VMProcess.java:

Thanks.

> P.S. Why don't we have automatic CVS commit emails like most projects?
>      It seems redundant to have to send them to the list manually.

This is a Savannah bug which is being actively worked on:
http://savannah.gnu.org/support/?func=3Ddetailitem&item_id=3D102705
I got some advise from Karl Berry about setting up something temporarily
on some remote host for getting something similar to the automatic
commit messages till this is solved. Will look into that.

But I still want to see (proposed) patches posted to the list (we can
setup a separate patch-discussion list for this) so people are informed
about what was intended to be checked in and what was actually checked
in.

For example in this case your final patch was slightly different from
what was posted and discussed before (since we discussed some of this
off-list). It would have been good if you had posted the complete
patch/diff and said what was different and why. Having the full patch in
an email makes it so much easier to review then just the ChangeLog
entry. (Not that it matters that much for this particular patch, but in
general it is a good idea.)

Cheers,

Mark

--=-55CdpxR6hFuYaB9m7rhB
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)

iD8DBQBAjutsxVhZCJWr9QwRAugTAJ4xhP1II1DTvHJiRa/VhQujs8gWYgCgkDNa
i7a4Om/yDWMjdfW8ZuzqxTg=
=yHIQ
-----END PGP SIGNATURE-----

--=-55CdpxR6hFuYaB9m7rhB--




From MAILER-DAEMON Tue Apr 27 23:51:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIg6l-0000TL-El
	for mharc-commit-classpath@gnu.org; Tue, 27 Apr 2004 23:51:39 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIg6i-0000R9-LW
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 23:51:36 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIg6B-0000F5-VN
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 23:51:35 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIg6B-000092-ME
	for commit-classpath@gnu.org; Tue, 27 Apr 2004 23:51:03 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 8179C622A1
	for <commit-classpath@gnu.org>; Wed, 28 Apr 2004 03:50:51 +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 80145-04 for <commit-classpath@gnu.org>;
	Wed, 28 Apr 2004 03:50:50 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-81-16.adsl.solnet.ch [212.41.81.16])
	by mail01.solnet.ch (Postfix) with ESMTP id 6984C622D8
	for <commit-classpath@gnu.org>; Wed, 28 Apr 2004 03:50:50 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 55C28BB65B; Wed, 28 Apr 2004 05:48:35 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040428034835.55C28BB65B@reali.dnsalias.net>
Date: Wed, 28 Apr 2004 05:48:35 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040428 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 28 Apr 2004 03:51:37 -0000




From MAILER-DAEMON Wed Apr 28 03:40:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIjgT-0006yD-22
	for mharc-commit-classpath@gnu.org; Wed, 28 Apr 2004 03:40:45 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIjgQ-0006vk-1i
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 03:40:42 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIjft-0006ku-J6
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 03:40:40 -0400
Received: from [212.227.126.177] (helo=moutng.kundenserver.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIjWl-0004aC-Tb
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 03:30:44 -0400
Received: from [212.227.126.208] (helo=mrelayng.kundenserver.de)
	by moutng.kundenserver.de with esmtp (Exim 3.35 #1)
	id 1BIjWf-0003xb-00
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 09:30:37 +0200
Received: from [212.126.196.45] (helo=aicas.com)
	by mrelayng.kundenserver.de with asmtp (TLSv1:RC4-MD5:128)
	(Exim 3.35 #1) id 1BIjWf-0005VH-00
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 09:30:37 +0200
Message-ID: <408F5D9B.9050705@aicas.com>
Date: Wed, 28 Apr 2004 09:30:35 +0200
From: =?ISO-8859-1?Q?Ingo_Pr=F6tel?= <proetel@aicas.com>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.6) Gecko/20040113
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath@gnu.org
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 8bit
X-Provags-ID: kundenserver.de abuse@kundenserver.de
	auth:ebd3e0372cc3ac236a2e2611be1a8528
Subject: FYI: commited patches
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 28 Apr 2004 07:40:43 -0000

Hi,

I commited the following patches:

2004-04-28  Ingo Proetel  <proetel@aicas.com>

	* java/awt/image/ColorModel.java (getRGBdefault): Default ColorModel has
         32 bit pixels not 8 bit pixels.
	(isCompatibleRaster): Added javadoc comment.

2004-04-28  Ingo Proetel  <proetel@aicas.com>

	* java/awt/image/ComponentSampleModel.java (setDataSamples):Do not reset
	scanline stride.

2004-04-28  Ingo Proetel  <proetel@aicas.com>

	* java/awt/ColorPaintContext.java (<init>): Added ColorModel to signature.
	(getColorModel): Return the actual color model.
	(getRaster): Implemented.
	(ColorRaster): New inner class.
	* java/awt/SystemColor.java (createContext): Use ColorModel when creating
	a PaintContext.
	* java/awt/Color.java (<init>): Make exception more verbose.
	(createContext): Use ColorModel when creating a PaintContext.

ingo

-- 
Ingo Prötel                                          proetel@aicas.com
aicas GmbH                                        http://www.aicas.com
Haid-und-Neu-Str. 18                        phone   +49 721 663 968-32
76131 Karlsruhe                             fax     +49 721 663 968-93
Germany



From MAILER-DAEMON Wed Apr 28 15:22:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIucn-00011Z-9H
	for mharc-commit-classpath@gnu.org; Wed, 28 Apr 2004 15:21:41 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIucI-0000aA-BT
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 15:21:10 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIuXo-00067m-OX
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 15:17:04 -0400
Received: from [213.228.0.169] (helo=postfix3-2.free.fr)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIuXH-0005pP-B7
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 15:15:59 -0400
Received: from kaffe.org (cachan-3-82-66-125-112.fbx.proxad.net
	[82.66.125.112])
	by postfix3-2.free.fr (Postfix) with ESMTP id 2488FC70B
	for <commit-classpath@gnu.org>; Wed, 28 Apr 2004 21:15:56 +0200 (CEST)
Message-ID: <409002EB.9060803@kaffe.org>
Date: Wed, 28 Apr 2004 21:15:55 +0200
From: Guilhem Lavaux <guilhem@kaffe.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4) Gecko/20030630
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: commit-classpath@gnu.org
X-Enigmail-Version: 0.76.1.0
X-Enigmail-Supports: pgp-inline, pgp-mime
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Subject: FYI: java.text updates
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 28 Apr 2004 19:21:38 -0000

Hi,

Without any furious replies from classpath's developers ;). I am 
checking in the following patches into the CVS. They have been sent to 
the mailing list on the 2004-04-10 and 2004-04-11.

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

	* gnu/java/text/FormatBuffer.java,
	gnu/java/text/AttributedFormatBuffer.java,
	gnu/java/text/StringFormatBuffer.java: New classes to implement
	attributed iterators in java.text.

	* gnu/java/text/FormatCharacterIterator.java: Moved
	from java/text as it is an internal class.

	* gnu/java/text/Makefile.am: Added new files to EXTRA_DIST.

	* java/text/Makefile.am: Removed moved classes from EXTRA_DIST.
	
2004-04-28  Guilhem Lavaux <guilhem@kaffe.org>

	* java/text/MessageFormat.java:
	(class Field): New class.
	(formatToCharacterIterator): New method.
	(format): Use formatInternal now.
	(formatInternal): New method. String formatter should
	be done here (with attributes). Attributes merging supported.
	(parse): More documentation.
	(getFormatsByArgumentIndex): New method.
	(setFormatByArgumentIndex): New method.
	(setFormatsByArgumentIndex): New method.

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

	* java/text/SimpleDateFormat.java:
	(formatWithAttribute): New method. It implements
	the formatting process with attributes.
	(format): Use formatWithAttribute.
	(formatToCharacterIterator): New method. Use
	formatWithAttribute.

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

	* java/text/DecimalFormat.java
	(scanFix): Build attribute array. Fixed error reporting.
	(applyPatternWithSymbols): Store attributes for the prefix and
	suffix.
	(formatInternal): New method. Changed the way the string is
	computed. Implemented attributes. Cleant up rounding in
	exponential notation.
	(format): Use formatInternal.
	(formatToCharacterIterator): New method.
	(exponentRound, negativePrefixRanges, positivePrefixRanges,
	negativePrefixAttrs, positivePrefixAttrs, negativeSuffixRanges,
	positiveSuffixRanges, negativeSuffixAttrs, positiveSuffixAttrs):
	New fields.

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

	* java/text/Format.java: Updated importations. Removed unnecessary
	classes.

Cheers,

Guilhem.




From MAILER-DAEMON Wed Apr 28 17:42:33 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIwp7-0003ww-9e
	for mharc-commit-classpath@gnu.org; Wed, 28 Apr 2004 17:42:33 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIwp3-0003vH-NR
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 17:42:29 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIwoV-0003nb-Ml
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 17:42:26 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BIwoV-0003nF-1K
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 17:41:55 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-228.ewetel.net
	[80.228.94.228])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3SLfoB5017901
	for <commit-classpath@gnu.org>; Wed, 28 Apr 2004 23:41:50 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BIwpI-0002i1-00
	for <commit-classpath@gnu.org>; Wed, 28 Apr 2004 23:42:44 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 28 Apr 2004 23:41:30 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_KUCkADm+cNye2Wa"
Message-Id: <200404282341.30786.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: jni.h.in
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 28 Apr 2004 21:42:31 -0000


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

Hi list,


I commited the attached patch now after the discussion. It fixes the 
return type from const jbyte * to const char * for GetStringUTFChars 
for C and C++ code.


Michael


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

	* include/jni.h.in (GetStringUTFChars):
	Made it return const char * instead of const jbyte *.


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

Index: include/jni.h.in
===================================================================
RCS file: /cvsroot/classpath/classpath/include/jni.h.in,v
retrieving revision 1.7
diff -u -r1.7 jni.h.in
--- include/jni.h.in	29 Mar 2004 07:07:26 -0000	1.7
+++ include/jni.h.in	28 Apr 2004 21:32:49 -0000
@@ -1,5 +1,5 @@
 /* jni.h
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -392,7 +392,7 @@
   void     (JNICALL *ReleaseStringChars)           (JNIEnv *, jstring, const jchar *);              /* 166 */
   jstring  (JNICALL *NewStringUTF)                 (JNIEnv *, const char *);                        /* 167 */
   jsize    (JNICALL *GetStringUTFLength)           (JNIEnv *, jstring);                             /* 168 */
-  const jbyte * (JNICALL *GetStringUTFChars)       (JNIEnv *, jstring, jboolean *);                 /* 169 */
+  const char * (JNICALL *GetStringUTFChars)       (JNIEnv *, jstring, jboolean *);                 /* 169 */
   void     (JNICALL *ReleaseStringUTFChars)        (JNIEnv *, jstring, const char *);               /* 170 */
   jsize    (JNICALL *GetArrayLength)               (JNIEnv *, jarray);                              /* 171 */
   jarray   (JNICALL *NewObjectArray)               (JNIEnv *, jsize, jclass, jobject);              /* 172 */
@@ -1157,7 +1157,7 @@
   jsize GetStringUTFLength (jstring val0)
   { return p->GetStringUTFLength (this, val0); }
 
-  const jbyte * GetStringUTFChars (jstring val0, jboolean * val1)
+  const char * GetStringUTFChars (jstring val0, jboolean * val1)
   { return p->GetStringUTFChars (this, val0, val1); }
 
   void ReleaseStringUTFChars (jstring val0, const char * val1)

--Boundary-00=_KUCkADm+cNye2Wa--



From MAILER-DAEMON Wed Apr 28 19:56:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BIyuU-0008Q0-NG
	for mharc-commit-classpath@gnu.org; Wed, 28 Apr 2004 19:56:14 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BIyuQ-0008Oh-50
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 19:56:10 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BIyqj-0007VC-7F
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 19:52:52 -0400
Received: from [207.189.223.52] (helo=email3.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BIyqa-0007UA-Q1
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 19:52:12 -0400
Received: (qmail 31905 invoked from network); 29 Apr 2004 00:11:11 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email3.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 29 Apr 2004 00:11:11 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 7CF964F8739; Wed, 28 Apr 2004 17:39:29 -0600 (MDT)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Place me on a BUFFER counter while you BELITTLE several BELLHOPS
	in the Trianon Room!!  Let me one of your SUBSIDIARIES!
Date: 28 Apr 2004 17:39:29 -0600
Message-ID: <871xm7fz9q.fsf@fleche.redhat.com>
Lines: 69
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: more minor cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 28 Apr 2004 23:56:11 -0000

More minor cleanups from Eclipse.

Tom

2004-04-28  Tom Tromey  <tromey@redhat.com>

	* java/io/ObjectStreamField.java: Cleaned up imports.
	* javax/imageio/stream/ImageInputStream.java: Removed unused import.
	* java/io/BufferedReader.java (skip): Removed unused
	variable.

Index: java/io/BufferedReader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/BufferedReader.java,v
retrieving revision 1.23
diff -u -r1.23 BufferedReader.java
--- java/io/BufferedReader.java	12 Mar 2004 16:19:40 -0000	1.23
+++ java/io/BufferedReader.java	28 Apr 2004 23:39:31 -0000
@@ -533,12 +533,13 @@
 	// skip the '\n' for us).  By doing this, we'll have to back up pos.
 	// That's easier than trying to keep track of whether we've skipped
 	// one element or not.
-	int ch;
 	if (pos > limit)
-	  if ((ch = read()) < 0)
-	    return 0;
-	  else
-	    --pos; 
+	  {
+	    if (read() < 0)
+	      return 0;
+	    else
+	      --pos; 
+	  }
 
 	int avail = limit - pos;
 
Index: java/io/ObjectStreamField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/ObjectStreamField.java,v
retrieving revision 1.16
diff -u -r1.16 ObjectStreamField.java
--- java/io/ObjectStreamField.java	8 Apr 2004 15:04:37 -0000	1.16
+++ java/io/ObjectStreamField.java	28 Apr 2004 23:39:31 -0000
@@ -39,8 +39,8 @@
 package java.io;
 
 import gnu.java.lang.reflect.TypeSignature;
+
 import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 
Index: javax/imageio/stream/ImageInputStream.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/imageio/stream/ImageInputStream.java,v
retrieving revision 1.1
diff -u -r1.1 ImageInputStream.java
--- javax/imageio/stream/ImageInputStream.java	13 Apr 2004 13:54:14 -0000	1.1
+++ javax/imageio/stream/ImageInputStream.java	28 Apr 2004 23:39:33 -0000
@@ -39,7 +39,6 @@
 package javax.imageio.stream;
 
 import java.io.DataInput;
-import java.io.EOFException;
 import java.io.IOException;
 import java.nio.ByteOrder;
 



From MAILER-DAEMON Wed Apr 28 21:26:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJ0K8-00051l-2x
	for mharc-commit-classpath@gnu.org; Wed, 28 Apr 2004 21:26:48 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJ0DV-0003jZ-Fr
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 21:19:57 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJ0Cs-0003cD-Ka
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 21:19:49 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJ0Ba-0003IT-6C
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 21:17:58 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJ0Bd-0004ne-Cf
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 21:18:01 -0400
From: "Tom Tromey" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8731
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4.2) Gecko/20040308
X-Apparently-From: 207.189.214.203
X-Copy-To: Array
Message-Id: <E1BJ0Bd-0004ne-Cf@savannah.gnu.org>
Date: Wed, 28 Apr 2004 21:18:01 -0400
Subject: [bugs #8731] inetlib handler classes have wrong names
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 01:26:46 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.




/**************************************************************************/
[bugs #8731] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8731>
Project: classpath
Submitted by: Tom Tromey
On: Thu 04/29/04 at 01:18

Severity:  1 - None
Resolution:  None
Assigned to:  None
Status:  Open
Platform Version:  None


Summary:  inetlib handler classes have wrong names

Original Submission:  The classes in the inetlib protocol handler packages
don't have the names expected by the classpath core code.
E.g., where inetlib has NNTPConnection, Classpath
expects just "Connection".
Until this change is made, inetlib classes can't be used
directly by classpath as protocol handlers.












For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8731>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Wed Apr 28 23:53:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJ2bd-0005tv-Be
	for mharc-commit-classpath@gnu.org; Wed, 28 Apr 2004 23:53:01 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJ2bW-0005pT-Ie
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 23:52:54 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJ2aw-0005P1-6v
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 23:52:49 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJ2av-0005IN-Qy
	for commit-classpath@gnu.org; Wed, 28 Apr 2004 23:52:17 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id 70CCF62277
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 03:52:06 +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 81721-07 for <commit-classpath@gnu.org>;
	Thu, 29 Apr 2004 03:52:05 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-86-233.adsl.solnet.ch
	[212.41.86.233])
	by mail01.solnet.ch (Postfix) with ESMTP id 580CA621E1
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 03:52:05 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 7B492BB726; Thu, 29 Apr 2004 05:49:48 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040429034948.7B492BB726@reali.dnsalias.net>
Date: Thu, 29 Apr 2004 05:49:48 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040429 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 03:52:59 -0000




From MAILER-DAEMON Thu Apr 29 01:42:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJ4J6-0006dB-VC
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 01:42:00 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJ4J2-0006Z0-9E
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 01:41:56 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJ4IQ-0005yS-1v
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 01:41:49 -0400
Received: from [207.189.223.52] (helo=email3.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJ4IO-0005vk-Pi
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 01:41:16 -0400
Received: (qmail 6192 invoked from network); 29 Apr 2004 06:01:45 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email3.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 29 Apr 2004 06:01:45 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id EC4744F8739; Wed, 28 Apr 2004 23:29:50 -0600 (MDT)
To: Mark Wielaard <mark@klomp.org>
References: <1082906005.27234.1433.camel@elsschot.wildebeest.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: I will SHAVE and buy JELL-O and bring my MARRIAGE MANUAL!!
Date: 28 Apr 2004 23:29:50 -0600
In-Reply-To: <1082906005.27234.1433.camel@elsschot.wildebeest.org>
Message-ID: <87fzane4hd.fsf@fleche.redhat.com>
Lines: 16
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: commit-classpath@gnu.org
Subject: Re: Make FileChannelImpl.read(byte[]) less blocking
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 29 Apr 2004 05:41:57 -0000

>>>>> "Mark" == Mark Wielaard <mark@klomp.org> writes:

Mark> 2004-04-25  Stephen Crawley  <crawley@dstc.edu.au>
Mark>             Mark Wielaard  <mark@klomp.org>
Mark>     * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
Mark>     (Java_gnu_java_nio_channels_FileChannelImpl_read___3BII):
Mark>     Fill buffer with a  do-while bytes_read < 1 loop.
Mark>     Check for length == 0.

Mark> Comments? Objections?

I didn't see a reply to this.  IMO this looks correct.  I/O code like
this always has to take into consideration the possibility of short
reads.

Tom



From MAILER-DAEMON Thu Apr 29 02:49:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJ5Mj-0001kf-PL
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 02:49:49 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJ5Me-0001dL-9n
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 02:49:44 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJ5M1-0001F9-6e
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 02:49:36 -0400
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJ5M0-0001ED-LO
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 02:49:04 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i3T6n2Mo013490
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 08:49:03 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJ5Ms-0000bF-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 08:49:58 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 08:48:43 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_LVKkAFIyKXpXf+4"
Message-Id: <200404290848.43993.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: fixing compiler warnings all over jni code
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 06:49:47 -0000


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

Hi list,


I just commited the attached patch to fix some warnings when compiling 
our JNI code. It mainly fixes jbyte* -> char* (from the recent fix in 
jni.h) and some dumb return statements.


Michael


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

	* native/jni/java-io/java_io_VMObjectStreamClass.c
	(getFieldReference): Use char* for strings, not jbyte*.
	* native/jni/java-lang/java_lang_VMProcess.c
	(copy_string): Likewise.
	* native/jni/java-lang/java_lang_VMSystem.c:
	Include jcl.h for JCL_FindClass definition.
	* native/jni/java-nio/gnu_java_nio_NIOServerSocket.c
	(getPlainSocketImpl): Return NULL.
	* native/jni/java-nio/java_nio_DirectByteBufferImpl.c
	(getImpl): Don't return anything.
	(adjustAddress): Return NULL.


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

Index: native/jni/java-io/java_io_VMObjectStreamClass.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/java_io_VMObjectStreamClass.c,v
retrieving revision 1.7
diff -u -r1.7 java_io_VMObjectStreamClass.c
--- native/jni/java-io/java_io_VMObjectStreamClass.c	22 Apr 2004 08:02:58 -0000	1.7
+++ native/jni/java-io/java_io_VMObjectStreamClass.c	29 Apr 2004 06:41:00 -0000
@@ -111,8 +111,8 @@
   jclass declaringClass;
   jclass typeClass;
   jfieldID fid;
-  const jbyte *field_name;
-  const jbyte *type_name;
+  const char *field_name;
+  const char *type_name;
   size_t type_len;
   jmethodID mid;
   jstring name;
Index: native/jni/java-lang/java_lang_VMProcess.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMProcess.c,v
retrieving revision 1.1
diff -u -r1.1 java_lang_VMProcess.c
--- native/jni/java-lang/java_lang_VMProcess.c	27 Apr 2004 22:56:05 -0000	1.1
+++ native/jni/java-lang/java_lang_VMProcess.c	29 Apr 2004 06:41:01 -0000
@@ -65,7 +65,7 @@
 copy_string(JNIEnv *env, jobject string)
 {
   char errbuf[64];
-  const jbyte *utf;
+  const char *utf;
   jclass clazz;
   char *copy;
 
Index: native/jni/java-lang/java_lang_VMSystem.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMSystem.c,v
retrieving revision 1.5
diff -u -r1.5 java_lang_VMSystem.c
--- native/jni/java-lang/java_lang_VMSystem.c	29 Mar 2004 07:07:27 -0000	1.5
+++ native/jni/java-lang/java_lang_VMSystem.c	29 Apr 2004 06:41:01 -0000
@@ -36,6 +36,9 @@
 exception statement from your version. */
 
 #include "java_lang_VMSystem.h"
+
+#include <jcl.h>
+
 #include <sys/time.h>
 #include <stdlib.h>
 
Index: native/jni/java-nio/gnu_java_nio_NIOServerSocket.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_NIOServerSocket.c,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_nio_NIOServerSocket.c
--- native/jni/java-nio/gnu_java_nio_NIOServerSocket.c	29 Mar 2004 07:07:39 -0000	1.3
+++ native/jni/java-nio/gnu_java_nio_NIOServerSocket.c	29 Apr 2004 06:41:01 -0000
@@ -49,4 +49,5 @@
 Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, jclass class)
 {
   JCL_ThrowException (env, IO_EXCEPTION, "gnu.java.nio.NIOServerSocket.getPlainSocketImpl(): not implemented");
+  return NULL;
 }
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.7
diff -u -r1.7 java_nio_DirectByteBufferImpl.c
--- native/jni/java-nio/java_nio_DirectByteBufferImpl.c	12 Apr 2004 14:38:55 -0000	1.7
+++ native/jni/java-nio/java_nio_DirectByteBufferImpl.c	29 Apr 2004 06:41:01 -0000
@@ -77,7 +77,6 @@
   (JNIEnv *env, jclass clazz, jobject address, jint index, jbyteArray dst_buffer, jint dst_offset, jint dst_len)
 {
   JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.getImpl(): not implemented");
-  return 0;
 }
 
 JNIEXPORT void JNICALL
@@ -90,4 +89,5 @@
 Java_java_nio_DirectByteBufferImpl_adjustAddress (JNIEnv *env, jclass class, jobject address, jint offset)
 {
   JCL_ThrowException (env, IO_EXCEPTION, "java.nio.DirectByteBufferImpl.adjustAddress(): not implemented");
+  return NULL;
 }

--Boundary-00=_LVKkAFIyKXpXf+4--



From MAILER-DAEMON Thu Apr 29 02:55:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJ5Rl-0003Ts-EX
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 02:55:01 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJ5Rj-0003Tc-3X
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 02:54:59 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJ5RC-0003Jx-8d
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 02:54:58 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJ5RB-0003Jj-RX
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 02:54:25 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3T6sNpc028468
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 08:54:24 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJ5S3-0000bb-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 08:55:19 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 08:54:05 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_NaKkAq+1CghrOYJ"
Message-Id: <200404290854.05267.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: fix for C89 in gtk paar
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 06:54:59 -0000


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

Hi list,


I just commited the attached patch to fix variable declaration for C89.


Michael


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

	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
	(create): Declare variable on top of function.


--Boundary-00=_NaKkAq+1CghrOYJ
Content-Type: text/x-diff;
  charset="us-ascii";
  name="gtk.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="gtk.diff"

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,v
retrieving revision 1.10
diff -u -r1.10 gnu_java_awt_peer_gtk_GtkMenuPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c	17 Apr 2004 23:24:47 -0000	1.10
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c	29 Apr 2004 06:52:31 -0000
@@ -93,7 +93,7 @@
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create
   (JNIEnv *env, jobject obj, jstring label)
 {
-  GtkWidget *menu_title, *menu;
+  GtkWidget *menu_title, *menu, *toplevel;
   const char *str;
 
   /* Create global reference and save it for future use */
@@ -113,7 +113,7 @@
   gtk_menu_item_set_submenu (GTK_MENU_ITEM (menu_title), menu);
 
   /* Allow this menu to grab the pointer. */
-  GtkWidget *toplevel = gtk_widget_get_toplevel (menu);
+  toplevel = gtk_widget_get_toplevel (menu);
   if (GTK_IS_WINDOW (toplevel))
     {
       gtk_window_group_add_window (global_gtk_window_group,

--Boundary-00=_NaKkAq+1CghrOYJ--



From MAILER-DAEMON Thu Apr 29 03:04:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJ5ab-0001vC-5o
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 03:04:09 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJ5Zp-0000pb-GC
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 03:03:21 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJ5Yx-0008Bg-Io
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 03:03:00 -0400
Received: from [212.6.122.151] (helo=mail5.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJ5Yu-00085I-K7
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 03:02:24 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail5.ewetel.de (8.12.1/8.12.9) with ESMTP id i3T72KII024405
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 09:02:20 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJ5Zk-0000i3-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 09:03:16 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 09:02:01 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_phKkASDQjJ6SYhu"
Message-Id: <200404290902.01695.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.swing - import clean ups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 07:04:02 -0000


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

Hi list,


I just commited the attached patch to fix the import statements all over 
Swing.


Michael


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

	* javax/swing/AbstractButton.java,
	javax/swing/ActionMap.java,
	javax/swing/DefaultButtonModel.java,
	javax/swing/DefaultListModel.java,
	javax/swing/ImageIcon.java,
	javax/swing/JComboBox.java,
	javax/swing/JComponent.java,
	javax/swing/JFrame.java,
	javax/swing/JInternalFrame.java,
	javax/swing/JMenuBar.java,
	javax/swing/JMenuItem.java,
	javax/swing/JOptionPane.java,
	javax/swing/JProgressBar.java,
	javax/swing/JRootPane.java,
	javax/swing/JScrollBar.java,
	javax/swing/JScrollPane.java,
	javax/swing/JSeparator.java,
	javax/swing/JSlider.java,
	javax/swing/JTabbedPane.java,
	javax/swing/JTable.java,
	javax/swing/JTextField.java,
	javax/swing/JToolBar.java,
	javax/swing/JToolTip.java,
	javax/swing/JTree.java,
	javax/swing/JViewport.java,
	javax/swing/JWindow.java,
	javax/swing/KeyStroke.java,
	javax/swing/LookAndFeel.java,
	javax/swing/SwingUtilities.java,
	javax/swing/Timer.java,
	javax/swing/ToolTipManager.java,
	javax/swing/UIDefaults.java,
	javax/swing/ViewportLayout.java,
	javax/swing/border/TitledBorder.java,
	javax/swing/filechooser/FileSystemView.java,
	javax/swing/plaf/basic/BasicButtonListener.java,
	javax/swing/plaf/basic/BasicButtonUI.java,
	javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java,
	javax/swing/plaf/basic/BasicGraphicsUtils.java,
	javax/swing/plaf/basic/BasicLabelUI.java,
	javax/swing/plaf/basic/BasicMenuItemUI.java,
	javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,
	javax/swing/plaf/basic/BasicRootPaneUI.java,
	javax/swing/plaf/basic/BasicScrollBarUI.java,
	javax/swing/plaf/basic/BasicScrollPaneUI.java,
	javax/swing/plaf/basic/BasicSliderUI.java,
	javax/swing/plaf/basic/BasicTabbedPaneUI.java,
	javax/swing/plaf/basic/BasicToggleButtonUI.java,
	javax/swing/table/JTableHeader.java,
	javax/swing/table/TableColumn.java,
	javax/swing/text/AbstractDocument.java,
	javax/swing/text/DefaultCaret.java,
	javax/swing/text/StyledEditorKit.java,
	javax/swing/tree/DefaultTreeCellEditor.java:
	Clean ip imports.


--Boundary-00=_phKkASDQjJ6SYhu
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.12
diff -u -r1.12 AbstractButton.java
--- javax/swing/AbstractButton.java	27 Feb 2004 11:41:40 -0000	1.12
+++ javax/swing/AbstractButton.java	29 Apr 2004 06:59:15 -0000
@@ -37,8 +37,6 @@
 
 package javax.swing;
 
-import java.awt.AWTEvent;
-import java.awt.AWTEventMulticaster;
 import java.awt.Graphics;
 import java.awt.Image;
 import java.awt.Insets;
@@ -51,12 +49,10 @@
 import java.awt.event.FocusListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
-import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.io.Serializable;
-import java.util.Vector;
 import java.util.EventListener;
+
 import javax.accessibility.AccessibleAction;
 import javax.accessibility.AccessibleIcon;
 import javax.accessibility.AccessibleRelationSet;
Index: javax/swing/ActionMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ActionMap.java,v
retrieving revision 1.3
diff -u -r1.3 ActionMap.java
--- javax/swing/ActionMap.java	9 Jan 2004 10:19:16 -0000	1.3
+++ javax/swing/ActionMap.java	29 Apr 2004 06:59:15 -0000
@@ -42,7 +42,6 @@
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
Index: javax/swing/DefaultButtonModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/DefaultButtonModel.java,v
retrieving revision 1.7
diff -u -r1.7 DefaultButtonModel.java
--- javax/swing/DefaultButtonModel.java	14 Feb 2004 21:42:56 -0000	1.7
+++ javax/swing/DefaultButtonModel.java	29 Apr 2004 06:59:15 -0000
@@ -37,15 +37,13 @@
 
 package javax.swing;
 
-import java.awt.AWTEvent;
-import java.awt.AWTEventMulticaster;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.io.Serializable;
 import java.util.EventListener;
-import java.util.Vector;
+
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.EventListenerList;
Index: javax/swing/DefaultListModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/DefaultListModel.java,v
retrieving revision 1.6
diff -u -r1.6 DefaultListModel.java
--- javax/swing/DefaultListModel.java	19 Mar 2004 21:22:24 -0000	1.6
+++ javax/swing/DefaultListModel.java	29 Apr 2004 06:59:16 -0000
@@ -1,5 +1,5 @@
 /* DefaultListModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 package javax.swing;
 
 import java.util.Enumeration;
-import java.util.NoSuchElementException;
 import java.util.Vector;
 
 /**
Index: javax/swing/ImageIcon.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ImageIcon.java,v
retrieving revision 1.5
diff -u -r1.5 ImageIcon.java
--- javax/swing/ImageIcon.java	17 Apr 2004 23:24:46 -0000	1.5
+++ javax/swing/ImageIcon.java	29 Apr 2004 06:59:16 -0000
@@ -1,5 +1,5 @@
 /* ImageIcon.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,12 +41,7 @@
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Image;
-import java.awt.MediaTracker;
 import java.awt.Toolkit;
-import java.io.Serializable;
-import java.net.URL;
-import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleContext;
 
 public class ImageIcon implements Icon
 {
Index: javax/swing/JComboBox.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComboBox.java,v
retrieving revision 1.6
diff -u -r1.6 JComboBox.java
--- javax/swing/JComboBox.java	27 Jan 2004 18:10:03 -0000	1.6
+++ javax/swing/JComboBox.java	29 Apr 2004 06:59:16 -0000
@@ -48,13 +48,12 @@
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.util.Vector;
+
 import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleAction;
+import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleSelection;
-import javax.swing.event.MenuEvent;
-import javax.swing.event.MenuListener;
 import javax.swing.event.ListDataEvent;
 import javax.swing.event.ListDataListener;
 import javax.swing.event.PopupMenuListener;
Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.14
diff -u -r1.14 JComponent.java
--- javax/swing/JComponent.java	17 Apr 2004 23:24:46 -0000	1.14
+++ javax/swing/JComponent.java	29 Apr 2004 06:59:16 -0000
@@ -38,7 +38,6 @@
 
 package javax.swing;
 
-import java.awt.AWTEvent;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -55,7 +54,6 @@
 import java.awt.event.ContainerListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.awt.image.ImageObserver;
 import java.awt.peer.LightweightPeer;
@@ -65,17 +63,16 @@
 import java.io.Serializable;
 import java.util.EventListener;
 import java.util.Hashtable;
-import java.util.Vector;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleExtendedComponent;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleStateSet;
+import javax.swing.border.Border;
 import javax.swing.event.AncestorListener;
 import javax.swing.event.EventListenerList;
-import javax.swing.border.Border;
-import javax.swing.plaf.ComponentUI;
 import javax.swing.event.SwingPropertyChangeSupport;
+import javax.swing.plaf.ComponentUI;
 
 /**
  * Every component in swing inherits from this class (JLabel, JButton, etc).
@@ -946,7 +943,7 @@
 	public void reshape(int x, int y, int w, int h)
 	{
 		///      Moves and resizes this component.
-		super.reshape(x,y,w,h);
+		setBounds(x,y,w,h);
 	}
 
 	public void revalidate()
Index: javax/swing/JFrame.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JFrame.java,v
retrieving revision 1.10
diff -u -r1.10 JFrame.java
--- javax/swing/JFrame.java	15 Apr 2004 11:34:24 -0000	1.10
+++ javax/swing/JFrame.java	29 Apr 2004 06:59:16 -0000
@@ -45,10 +45,10 @@
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
 import java.awt.LayoutManager;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
+
 import javax.accessibility.AccessibleContext;
 
 /**
Index: javax/swing/JInternalFrame.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JInternalFrame.java,v
retrieving revision 1.3
diff -u -r1.3 JInternalFrame.java
--- javax/swing/JInternalFrame.java	19 Jun 2003 16:21:39 -0000	1.3
+++ javax/swing/JInternalFrame.java	29 Apr 2004 06:59:16 -0000
@@ -1,5 +1,5 @@
 /* JInternalFrame.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,9 +38,6 @@
 
 package javax.swing;
 
-import java.awt.Component;
-import java.awt.Container;
-import javax.accessibility.Accessible;
 
 public class JInternalFrame extends JComponent
 /*implements Accessible, WindowConstants, RootPaneContainer*/
Index: javax/swing/JMenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuBar.java,v
retrieving revision 1.3
diff -u -r1.3 JMenuBar.java
--- javax/swing/JMenuBar.java	8 Jun 2003 11:20:07 -0000	1.3
+++ javax/swing/JMenuBar.java	29 Apr 2004 06:59:16 -0000
@@ -1,5 +1,5 @@
 /* JMenuBar.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,10 +38,6 @@
 
 package javax.swing;
 
-import java.awt.Component;
-import java.awt.event.KeyEvent;
-import java.awt.event.MouseEvent;
-import javax.accessibility.Accessible;
 
 public class JMenuBar extends JComponent
 {
Index: javax/swing/JMenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JMenuItem.java,v
retrieving revision 1.3
diff -u -r1.3 JMenuItem.java
--- javax/swing/JMenuItem.java	17 Apr 2004 23:24:46 -0000	1.3
+++ javax/swing/JMenuItem.java	29 Apr 2004 06:59:16 -0000
@@ -1,5 +1,5 @@
 /* JMenuItem.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,15 +41,14 @@
 import java.awt.Component;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
-import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
-import javax.swing.UIManager;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.MenuDragMouseEvent;
Index: javax/swing/JOptionPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JOptionPane.java,v
retrieving revision 1.6
diff -u -r1.6 JOptionPane.java
--- javax/swing/JOptionPane.java	14 Feb 2004 21:42:56 -0000	1.6
+++ javax/swing/JOptionPane.java	29 Apr 2004 06:59:16 -0000
@@ -1,5 +1,5 @@
 /* JOptionPane.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,7 +42,7 @@
 import java.awt.Component;
 import java.awt.Dialog;
 import java.awt.Frame;
-import javax.accessibility.Accessible;
+
 import javax.accessibility.AccessibleContext;
 import javax.swing.plaf.OptionPaneUI;
 
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JProgressBar.java,v
retrieving revision 1.5
diff -u -r1.5 JProgressBar.java
--- javax/swing/JProgressBar.java	17 Apr 2004 23:24:46 -0000	1.5
+++ javax/swing/JProgressBar.java	29 Apr 2004 06:59:16 -0000
@@ -38,8 +38,7 @@
 package javax.swing;
 
 import java.awt.Graphics;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
@@ -47,7 +46,6 @@
 import javax.accessibility.AccessibleValue;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
 import javax.swing.plaf.ProgressBarUI;
 
 
Index: javax/swing/JRootPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JRootPane.java,v
retrieving revision 1.7
diff -u -r1.7 JRootPane.java
--- javax/swing/JRootPane.java	14 Feb 2004 21:42:56 -0000	1.7
+++ javax/swing/JRootPane.java	29 Apr 2004 06:59:16 -0000
@@ -1,5 +1,5 @@
 /* JRootPane.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,10 +43,6 @@
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.LayoutManager;
-import java.awt.LayoutManager2;
-import java.io.Serializable;
-import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleComponent;
 
 /**
  * This class is where JComponents are added to.
Index: javax/swing/JScrollBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JScrollBar.java,v
retrieving revision 1.5
diff -u -r1.5 JScrollBar.java
--- javax/swing/JScrollBar.java	17 Apr 2004 23:24:46 -0000	1.5
+++ javax/swing/JScrollBar.java	29 Apr 2004 06:59:16 -0000
@@ -41,16 +41,14 @@
 import java.awt.Dimension;
 import java.awt.event.AdjustmentEvent;
 import java.awt.event.AdjustmentListener;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleStateSet;
 import javax.accessibility.AccessibleValue;
-import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
-import javax.swing.plaf.ProgressBarUI;
 import javax.swing.plaf.ScrollBarUI;
 
 
Index: javax/swing/JScrollPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JScrollPane.java,v
retrieving revision 1.6
diff -u -r1.6 JScrollPane.java
--- javax/swing/JScrollPane.java	19 Mar 2004 21:22:24 -0000	1.6
+++ javax/swing/JScrollPane.java	29 Apr 2004 06:59:17 -0000
@@ -40,17 +40,16 @@
 
 import java.awt.Component;
 import java.awt.ComponentOrientation;
-import java.awt.LayoutManager;
 import java.awt.Insets;
+import java.awt.LayoutManager;
 import java.awt.Point;
 import java.awt.Rectangle;
 
-import javax.swing.border.Border;
 import javax.accessibility.Accessible;
+import javax.swing.border.Border;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.ScrollPaneUI;
-import javax.swing.plaf.UIResource;
 
 /**
  * <table>
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JSeparator.java,v
retrieving revision 1.4
diff -u -r1.4 JSeparator.java
--- javax/swing/JSeparator.java	19 Mar 2004 21:22:24 -0000	1.4
+++ javax/swing/JSeparator.java	29 Apr 2004 06:59:17 -0000
@@ -37,8 +37,6 @@
 
 package javax.swing;
 
-import java.io.IOException;
-import java.io.ObjectOutputStream;
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
Index: javax/swing/JSlider.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JSlider.java,v
retrieving revision 1.6
diff -u -r1.6 JSlider.java
--- javax/swing/JSlider.java	19 Apr 2004 14:34:14 -0000	1.6
+++ javax/swing/JSlider.java	29 Apr 2004 06:59:17 -0000
@@ -37,16 +37,14 @@
 
 package javax.swing;
 
-import java.awt.ComponentOrientation;
-import java.awt.MenuContainer;
 import java.awt.Dimension;
+import java.awt.MenuContainer;
 import java.awt.image.ImageObserver;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.Dictionary;
 import java.util.Enumeration;
 import java.util.Hashtable;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
@@ -54,7 +52,6 @@
 import javax.accessibility.AccessibleValue;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
 import javax.swing.plaf.SliderUI;
 
 
Index: javax/swing/JTabbedPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTabbedPane.java,v
retrieving revision 1.8
diff -u -r1.8 JTabbedPane.java
--- javax/swing/JTabbedPane.java	17 Apr 2004 23:24:46 -0000	1.8
+++ javax/swing/JTabbedPane.java	29 Apr 2004 06:59:17 -0000
@@ -44,15 +44,13 @@
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
 import java.util.Vector;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
 import javax.accessibility.AccessibleSelection;
-import javax.accessibility.AccessibleStateSet;
-import javax.accessibility.AccessibleValue;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
 import javax.swing.plaf.TabbedPaneUI;
 import javax.swing.plaf.UIResource;
 
Index: javax/swing/JTable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTable.java,v
retrieving revision 1.5
diff -u -r1.5 JTable.java
--- javax/swing/JTable.java	8 Jun 2003 14:43:06 -0000	1.5
+++ javax/swing/JTable.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* JTable.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,25 +38,21 @@
 
 package javax.swing;
 
-import java.awt.Color;
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Rectangle;
-import java.util.Hashtable;
 import java.util.Vector;
+
 import javax.accessibility.Accessible;
-import javax.swing.event.ChangeEvent;
 import javax.swing.event.CellEditorListener;
+import javax.swing.event.ChangeEvent;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableColumnModelEvent;
 import javax.swing.event.TableColumnModelListener;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
-import javax.swing.table.JTableHeader;
-import javax.swing.table.TableModel;
-import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableColumnModel;
+import javax.swing.table.TableModel;
 
 public class JTable extends JComponent
   implements TableModelListener, Scrollable, TableColumnModelListener,
Index: javax/swing/JTextField.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTextField.java,v
retrieving revision 1.7
diff -u -r1.7 JTextField.java
--- javax/swing/JTextField.java	8 Jun 2003 11:20:07 -0000	1.7
+++ javax/swing/JTextField.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* JTextField.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,9 +40,8 @@
 
 import java.awt.event.ActionListener;
 import java.util.Vector;
+
 import javax.accessibility.AccessibleStateSet;
-import javax.swing.text.Document;
-import javax.swing.text.JTextComponent;
 
 public class JTextField extends JEditorPane
 {
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JToolBar.java,v
retrieving revision 1.3
diff -u -r1.3 JToolBar.java
--- javax/swing/JToolBar.java	10 Jan 2004 21:08:56 -0000	1.3
+++ javax/swing/JToolBar.java	29 Apr 2004 06:59:18 -0000
@@ -37,14 +37,14 @@
 
 package javax.swing;
 
-import java.awt.Dimension;
 import java.awt.Component;
-import java.awt.Container;
+import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleRole;
Index: javax/swing/JToolTip.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JToolTip.java,v
retrieving revision 1.4
diff -u -r1.4 JToolTip.java
--- javax/swing/JToolTip.java	8 Jun 2003 11:43:14 -0000	1.4
+++ javax/swing/JToolTip.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* JToolTip.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,7 +39,6 @@
 package javax.swing;
 
 import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleContext;
 
 public class JToolTip extends JComponent implements Accessible
 {
Index: javax/swing/JTree.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JTree.java,v
retrieving revision 1.5
diff -u -r1.5 JTree.java
--- javax/swing/JTree.java	14 Feb 2004 21:42:56 -0000	1.5
+++ javax/swing/JTree.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* JTree.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,23 +40,10 @@
 
 import java.awt.Dimension;
 import java.awt.Rectangle;
-import java.io.Serializable;
-import java.util.Hashtable;
-import java.util.Vector;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
-import javax.swing.event.TreeModelEvent;
-import javax.swing.event.TreeModelListener;
-import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
 import javax.swing.plaf.TreeUI;
-import javax.swing.tree.DefaultTreeSelectionModel;
-import javax.swing.tree.TreeCellEditor;
-import javax.swing.tree.TreeCellRenderer;
-import javax.swing.tree.TreeModel;
-import javax.swing.tree.TreeNode;
-import javax.swing.tree.TreePath;
-import javax.swing.tree.TreeSelectionModel;
 
 public class JTree extends JComponent implements Scrollable, Accessible
 {
Index: javax/swing/JViewport.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JViewport.java,v
retrieving revision 1.6
diff -u -r1.6 JViewport.java
--- javax/swing/JViewport.java	1 Apr 2004 23:09:05 -0000	1.6
+++ javax/swing/JViewport.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* JViewport.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,15 +39,12 @@
 package javax.swing;
 
 import java.awt.Component;
-import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
-import java.awt.Image;
 import java.awt.Insets;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.image.ImageObserver;
-import javax.accessibility.Accessible;
+
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.plaf.ViewportUI;
Index: javax/swing/JWindow.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JWindow.java,v
retrieving revision 1.7
diff -u -r1.7 JWindow.java
--- javax/swing/JWindow.java	25 Jun 2003 13:00:01 -0000	1.7
+++ javax/swing/JWindow.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* JWindow.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.
 
@@ -44,11 +44,11 @@
 import java.awt.Dimension;
 import java.awt.Frame;
 import java.awt.Graphics;
-import java.awt.GraphicsConfiguration;
 import java.awt.LayoutManager;
 import java.awt.Window;
 import java.awt.event.KeyEvent;
 import java.awt.event.WindowEvent;
+
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 
Index: javax/swing/KeyStroke.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/KeyStroke.java,v
retrieving revision 1.6
diff -u -r1.6 KeyStroke.java
--- javax/swing/KeyStroke.java	8 Jun 2003 11:20:07 -0000	1.6
+++ javax/swing/KeyStroke.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* KeyStroke.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,7 +37,6 @@
 
 package javax.swing;
 
-import java.awt.AWTKeyStroke;
 import java.awt.event.KeyEvent;
 import java.io.Serializable;
 
Index: javax/swing/LookAndFeel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/LookAndFeel.java,v
retrieving revision 1.4
diff -u -r1.4 LookAndFeel.java
--- javax/swing/LookAndFeel.java	8 Jun 2003 11:20:07 -0000	1.4
+++ javax/swing/LookAndFeel.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* LookAndFeel.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,7 +38,6 @@
 
 package javax.swing;
 
-import java.awt.Component;
 import javax.swing.text.JTextComponent;
 
 public abstract class LookAndFeel
Index: javax/swing/SwingUtilities.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/SwingUtilities.java,v
retrieving revision 1.9
diff -u -r1.9 SwingUtilities.java
--- javax/swing/SwingUtilities.java	19 Mar 2004 21:22:24 -0000	1.9
+++ javax/swing/SwingUtilities.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* SwingUtilities.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,7 +41,6 @@
 import java.awt.Component;
 import java.awt.ComponentOrientation;
 import java.awt.Container;
-import java.awt.EventQueue;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
@@ -51,11 +50,8 @@
 import java.awt.Shape;
 import java.awt.Toolkit;
 import java.awt.Window;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import java.lang.reflect.InvocationTargetException;
-import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleStateSet;
 
 
 /**
Index: javax/swing/Timer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/Timer.java,v
retrieving revision 1.6
diff -u -r1.6 Timer.java
--- javax/swing/Timer.java	19 Mar 2004 21:22:24 -0000	1.6
+++ javax/swing/Timer.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* Timer.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,7 +42,7 @@
 import java.awt.event.ActionListener;
 import java.io.Serializable;
 import java.util.EventListener;
-import java.util.Vector;
+
 import javax.swing.event.EventListenerList;
 
 public class Timer implements Serializable
Index: javax/swing/ToolTipManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ToolTipManager.java,v
retrieving revision 1.2
diff -u -r1.2 ToolTipManager.java
--- javax/swing/ToolTipManager.java	10 Jan 2004 21:08:57 -0000	1.2
+++ javax/swing/ToolTipManager.java	29 Apr 2004 06:59:18 -0000
@@ -37,7 +37,6 @@
 
 package javax.swing;
 
-import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
Index: javax/swing/UIDefaults.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/UIDefaults.java,v
retrieving revision 1.9
diff -u -r1.9 UIDefaults.java
--- javax/swing/UIDefaults.java	19 Mar 2004 21:22:24 -0000	1.9
+++ javax/swing/UIDefaults.java	29 Apr 2004 06:59:18 -0000
@@ -1,5 +1,5 @@
 /* UIDefaults.java -- database for all settings and interface bindings.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -44,17 +44,16 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.lang.reflect.Method;
-import java.lang.reflect.Constructor;
+import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
 import java.util.LinkedList;
+import java.util.ListIterator;
 import java.util.Locale;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.Set;
+
 import javax.swing.border.Border;
 import javax.swing.plaf.ComponentUI;
 
Index: javax/swing/ViewportLayout.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/ViewportLayout.java,v
retrieving revision 1.4
diff -u -r1.4 ViewportLayout.java
--- javax/swing/ViewportLayout.java	19 Mar 2004 21:22:24 -0000	1.4
+++ javax/swing/ViewportLayout.java	29 Apr 2004 06:59:18 -0000
@@ -67,7 +67,7 @@
           return null;
 	}
 	public void layoutContainer(Container parent) {
-          if (parent.countComponents() == 1)
+          if (parent.getComponentCount() == 1)
             {
               // This should usually be true, but if it's not it is
               // probably nicer if we do not panic.
Index: javax/swing/border/TitledBorder.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/border/TitledBorder.java,v
retrieving revision 1.5
diff -u -r1.5 TitledBorder.java
--- javax/swing/border/TitledBorder.java	12 Jun 2003 12:19:50 -0000	1.5
+++ javax/swing/border/TitledBorder.java	29 Apr 2004 06:59:19 -0000
@@ -1,5 +1,5 @@
 /* TitledBorder.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,8 +45,8 @@
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Insets;
-import java.awt.Rectangle;
 import java.awt.Shape;
+
 import javax.swing.UIManager;
 
 
Index: javax/swing/filechooser/FileSystemView.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/filechooser/FileSystemView.java,v
retrieving revision 1.2
diff -u -r1.2 FileSystemView.java
--- javax/swing/filechooser/FileSystemView.java	8 Jun 2003 12:14:56 -0000	1.2
+++ javax/swing/filechooser/FileSystemView.java	29 Apr 2004 06:59:19 -0000
@@ -1,5 +1,5 @@
 /* FileSystemView.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,7 +40,6 @@
 
 import java.io.File;
 import java.io.IOException;
-import javax.swing.Icon;
 
 /**
  * FileSystemView
Index: javax/swing/plaf/basic/BasicButtonListener.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicButtonListener.java,v
retrieving revision 1.2
diff -u -r1.2 BasicButtonListener.java
--- javax/swing/plaf/basic/BasicButtonListener.java	19 Mar 2004 21:22:24 -0000	1.2
+++ javax/swing/plaf/basic/BasicButtonListener.java	29 Apr 2004 06:59:19 -0000
@@ -45,13 +45,12 @@
 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.JComponent;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import javax.swing.JComponent;
 
 public class BasicButtonListener
   implements MouseListener, MouseMotionListener, FocusListener, 
Index: javax/swing/plaf/basic/BasicButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicButtonUI.java,v
retrieving revision 1.8
diff -u -r1.8 BasicButtonUI.java
--- javax/swing/plaf/basic/BasicButtonUI.java	19 Mar 2004 21:22:24 -0000	1.8
+++ javax/swing/plaf/basic/BasicButtonUI.java	29 Apr 2004 06:59:19 -0000
@@ -44,15 +44,9 @@
 import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
-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 java.awt.Stroke;
+
 import javax.swing.AbstractButton;
 import javax.swing.ButtonModel;
 import javax.swing.Icon;
@@ -60,7 +54,6 @@
 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;
 
Index: javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicCheckBoxMenuItemUI.java
--- javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java	17 Apr 2004 23:24:46 -0000	1.1
+++ javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java	29 Apr 2004 06:59:19 -0000
@@ -39,8 +39,6 @@
 
 import java.awt.event.MouseEvent;
 
-import javax.swing.AbstractButton;
-import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import javax.swing.MenuElement;
Index: javax/swing/plaf/basic/BasicGraphicsUtils.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicGraphicsUtils.java,v
retrieving revision 1.8
diff -u -r1.8 BasicGraphicsUtils.java
--- javax/swing/plaf/basic/BasicGraphicsUtils.java	19 Mar 2004 21:22:24 -0000	1.8
+++ javax/swing/plaf/basic/BasicGraphicsUtils.java	29 Apr 2004 06:59:19 -0000
@@ -45,11 +45,9 @@
 import java.awt.Graphics2D;
 import java.awt.Insets;
 import java.awt.Rectangle;
-
 import java.awt.font.FontRenderContext;
 import java.awt.font.LineMetrics;
 import java.awt.font.TextLayout;
-
 import java.awt.geom.Rectangle2D;
 
 import javax.swing.AbstractButton;
Index: javax/swing/plaf/basic/BasicLabelUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicLabelUI.java,v
retrieving revision 1.6
diff -u -r1.6 BasicLabelUI.java
--- javax/swing/plaf/basic/BasicLabelUI.java	19 Mar 2004 21:22:24 -0000	1.6
+++ javax/swing/plaf/basic/BasicLabelUI.java	29 Apr 2004 06:59:19 -0000
@@ -46,10 +46,10 @@
 import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+
 import javax.swing.Icon;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
-import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
Index: javax/swing/plaf/basic/BasicMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicMenuItemUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicMenuItemUI.java
--- javax/swing/plaf/basic/BasicMenuItemUI.java	17 Apr 2004 23:24:46 -0000	1.1
+++ javax/swing/plaf/basic/BasicMenuItemUI.java	29 Apr 2004 06:59:20 -0000
@@ -37,43 +37,28 @@
 
 package javax.swing.plaf.basic;
 
-import java.awt.AWTKeyStroke;
-import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.FontMetrics;
 import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Insets;
 import java.awt.Rectangle;
-import java.awt.Stroke;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.awt.event.FocusListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-
 import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
 
 import javax.swing.AbstractButton;
 import javax.swing.ButtonModel;
 import javax.swing.Icon;
 import javax.swing.JComponent;
-import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenuItem;
-import javax.swing.JRadioButtonMenuItem;
 import javax.swing.KeyStroke;
 import javax.swing.MenuElement;
 import javax.swing.MenuSelectionManager;
 import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
 import javax.swing.event.MenuDragMouseEvent;
 import javax.swing.event.MenuDragMouseListener;
 import javax.swing.event.MenuKeyEvent;
Index: javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicRadioButtonMenuItemUI.java
--- javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java	17 Apr 2004 23:24:46 -0000	1.1
+++ javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java	29 Apr 2004 06:59:20 -0000
@@ -38,15 +38,13 @@
 package javax.swing.plaf.basic;
 
 import java.awt.event.MouseEvent;
-import javax.swing.AbstractButton;
-import javax.swing.Icon;
+
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
-import javax.swing.UIDefaults;
-import javax.swing.UIManager;
 import javax.swing.MenuElement;
 import javax.swing.MenuSelectionManager;
-
+import javax.swing.UIDefaults;
+import javax.swing.UIManager;
 import javax.swing.plaf.ComponentUI;
 
 
Index: javax/swing/plaf/basic/BasicRootPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicRootPaneUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicRootPaneUI.java
--- javax/swing/plaf/basic/BasicRootPaneUI.java	14 Feb 2004 21:42:56 -0000	1.1
+++ javax/swing/plaf/basic/BasicRootPaneUI.java	29 Apr 2004 06:59:20 -0000
@@ -1,5 +1,5 @@
 /* BasicPanelUI.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,9 +38,9 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.RootPaneUI;
 
 
 public class BasicRootPaneUI extends RootPaneUI
Index: javax/swing/plaf/basic/BasicScrollBarUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicScrollBarUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicScrollBarUI.java
--- javax/swing/plaf/basic/BasicScrollBarUI.java	19 Mar 2004 21:22:24 -0000	1.1
+++ javax/swing/plaf/basic/BasicScrollBarUI.java	29 Apr 2004 06:59:20 -0000
@@ -41,8 +41,6 @@
 import java.awt.Component;
 import java.awt.Container;
 import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.LayoutManager;
@@ -56,6 +54,7 @@
 import java.awt.event.MouseMotionListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+
 import javax.swing.BoundedRangeModel;
 import javax.swing.Icon;
 import javax.swing.JButton;
Index: javax/swing/plaf/basic/BasicScrollPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicScrollPaneUI.java,v
retrieving revision 1.5
diff -u -r1.5 BasicScrollPaneUI.java
--- javax/swing/plaf/basic/BasicScrollPaneUI.java	19 Mar 2004 21:22:24 -0000	1.5
+++ javax/swing/plaf/basic/BasicScrollPaneUI.java	29 Apr 2004 06:59:20 -0000
@@ -40,8 +40,8 @@
 
 import java.awt.Dimension;
 import java.awt.Graphics;
+
 import javax.swing.JComponent;
-import javax.swing.JScrollBar;
 import javax.swing.JScrollPane;
 import javax.swing.ScrollPaneLayout;
 import javax.swing.plaf.ComponentUI;
Index: javax/swing/plaf/basic/BasicSliderUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicSliderUI.java,v
retrieving revision 1.1
diff -u -r1.1 BasicSliderUI.java
--- javax/swing/plaf/basic/BasicSliderUI.java	19 Mar 2004 21:22:24 -0000	1.1
+++ javax/swing/plaf/basic/BasicSliderUI.java	29 Apr 2004 06:59:22 -0000
@@ -40,7 +40,6 @@
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.ComponentOrientation;
-import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Insets;
@@ -54,22 +53,20 @@
 import java.awt.event.ComponentListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.util.Dictionary;
 import java.util.Enumeration;
-import javax.swing.JButton;
+
+import javax.swing.BoundedRangeModel;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
 import javax.swing.JSlider;
-import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.Timer;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
-import javax.swing.BoundedRangeModel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.MouseInputAdapter;
Index: javax/swing/plaf/basic/BasicTabbedPaneUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicTabbedPaneUI.java,v
retrieving revision 1.5
diff -u -r1.5 BasicTabbedPaneUI.java
--- javax/swing/plaf/basic/BasicTabbedPaneUI.java	17 Apr 2004 23:24:46 -0000	1.5
+++ javax/swing/plaf/basic/BasicTabbedPaneUI.java	29 Apr 2004 06:59:22 -0000
@@ -47,10 +47,7 @@
 import java.awt.Insets;
 import java.awt.LayoutManager;
 import java.awt.Point;
-import java.awt.Polygon;
 import java.awt.Rectangle;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
@@ -59,15 +56,13 @@
 import java.awt.event.MouseListener;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.lang.Exception;
+
 import javax.swing.Icon;
-import javax.swing.JButton;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.JViewport;
 import javax.swing.KeyStroke;
-import javax.swing.SingleSelectionModel;
 import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.UIDefaults;
@@ -78,8 +73,6 @@
 import javax.swing.plaf.PanelUI;
 import javax.swing.plaf.TabbedPaneUI;
 import javax.swing.plaf.UIResource;
-import javax.swing.plaf.ViewportUI;
-import javax.swing.plaf.basic.BasicGraphicsUtils;
 import javax.swing.text.View;
 
 
Index: javax/swing/plaf/basic/BasicToggleButtonUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicToggleButtonUI.java,v
retrieving revision 1.6
diff -u -r1.6 BasicToggleButtonUI.java
--- javax/swing/plaf/basic/BasicToggleButtonUI.java	14 Feb 2004 21:42:56 -0000	1.6
+++ javax/swing/plaf/basic/BasicToggleButtonUI.java	29 Apr 2004 06:59:22 -0000
@@ -38,10 +38,6 @@
 
 package javax.swing.plaf.basic;
 
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.Rectangle;
-import javax.swing.AbstractButton;
 import javax.swing.JComponent;
 import javax.swing.plaf.ComponentUI;
 
Index: javax/swing/table/JTableHeader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/JTableHeader.java,v
retrieving revision 1.2
diff -u -r1.2 JTableHeader.java
--- javax/swing/table/JTableHeader.java	27 Jan 2004 18:04:03 -0000	1.2
+++ javax/swing/table/JTableHeader.java	29 Apr 2004 06:59:22 -0000
@@ -1,5 +1,5 @@
 /* JTableHeader.java
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,27 +38,8 @@
 
 package javax.swing.table;
 
-import java.awt.Color;
-import java.awt.Cursor;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.Point;
-import java.awt.Rectangle;
-import java.awt.event.FocusListener;
-import java.util.Locale;
-import javax.accessibility.Accessible;
-import javax.accessibility.AccessibleComponent;
-import javax.accessibility.AccessibleContext;
-import javax.accessibility.AccessibleRole;
-import javax.accessibility.AccessibleStateSet;
 import javax.swing.JComponent;
 import javax.swing.JTable;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.TableColumnModelEvent;
-import javax.swing.event.TableColumnModelListener;
-import javax.swing.plaf.TableHeaderUI;
 
 public class JTableHeader extends JComponent
 {
Index: javax/swing/table/TableColumn.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/TableColumn.java,v
retrieving revision 1.4
diff -u -r1.4 TableColumn.java
--- javax/swing/table/TableColumn.java	8 Jun 2003 12:14:56 -0000	1.4
+++ javax/swing/table/TableColumn.java	29 Apr 2004 06:59:22 -0000
@@ -218,9 +218,10 @@
 	 * @param oldValue TODO
 	 * @param newValue TODO
 	 */
-	private void firePropertyChange(String property, boolean oldValue, boolean newValue) {
+	private void firePropertyChange(String property, boolean oldValue, boolean newValue)
+	{
 		firePropertyChange(property, new Boolean(oldValue), new Boolean(newValue));
-	} // firePropertyChange()
+	}
 
 	/**
 	 * setModelIndex
Index: javax/swing/text/AbstractDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/AbstractDocument.java,v
retrieving revision 1.5
diff -u -r1.5 AbstractDocument.java
--- javax/swing/text/AbstractDocument.java	10 Jan 2004 21:08:57 -0000	1.5
+++ javax/swing/text/AbstractDocument.java	29 Apr 2004 06:59:22 -0000
@@ -41,9 +41,9 @@
 import java.util.Enumeration;
 import java.util.EventListener;
 import java.util.Vector;
+
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
-import javax.swing.event.EventListenerList;
 import javax.swing.event.UndoableEditEvent;
 import javax.swing.event.UndoableEditListener;
 import javax.swing.tree.TreeNode;
Index: javax/swing/text/DefaultCaret.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/DefaultCaret.java,v
retrieving revision 1.4
diff -u -r1.4 DefaultCaret.java
--- javax/swing/text/DefaultCaret.java	10 Jan 2004 21:08:57 -0000	1.4
+++ javax/swing/text/DefaultCaret.java	29 Apr 2004 06:59:22 -0000
@@ -41,16 +41,12 @@
 import java.awt.Graphics;
 import java.awt.Point;
 import java.awt.Rectangle;
-import java.awt.Shape;
-import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-import java.util.EventListener;
 import java.util.Vector;
+
 import javax.swing.event.ChangeListener;
-import javax.swing.event.EventListenerList;
 
 
 public class DefaultCaret extends Rectangle implements Caret, FocusListener, MouseListener, MouseMotionListener
Index: javax/swing/text/StyledEditorKit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/StyledEditorKit.java,v
retrieving revision 1.3
diff -u -r1.3 StyledEditorKit.java
--- javax/swing/text/StyledEditorKit.java	10 Jan 2004 21:08:57 -0000	1.3
+++ javax/swing/text/StyledEditorKit.java	29 Apr 2004 06:59:22 -0000
@@ -41,11 +41,8 @@
 import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
 import java.io.Serializable;
-import java.io.Writer;
+
 import javax.swing.Action;
 import javax.swing.JEditorPane;
 import javax.swing.event.CaretEvent;
Index: javax/swing/tree/DefaultTreeCellEditor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/tree/DefaultTreeCellEditor.java,v
retrieving revision 1.2
diff -u -r1.2 DefaultTreeCellEditor.java
--- javax/swing/tree/DefaultTreeCellEditor.java	8 Jun 2003 12:14:56 -0000	1.2
+++ javax/swing/tree/DefaultTreeCellEditor.java	29 Apr 2004 06:59:22 -0000
@@ -1,5 +1,5 @@
 /* DefaultTreeCellEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -50,12 +50,12 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.EventObject;
+
 import javax.swing.Icon;
 import javax.swing.JTextField;
 import javax.swing.JTree;
 import javax.swing.border.Border;
 import javax.swing.event.CellEditorListener;
-import javax.swing.event.EventListenerList;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 

--Boundary-00=_phKkASDQjJ6SYhu--



From MAILER-DAEMON Thu Apr 29 05:22:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJ7kh-00025a-WF
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 05:22:44 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJ7ke-00023P-IU
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 05:22:40 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJ7kc-00021a-2k
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 05:22:38 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJ7kb-00020f-IB
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 05:22:37 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJ7kT-0002oF-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 11:22:29 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-REhc9iyrU7aL201ozVgQ"
Message-Id: <1083230555.24004.52.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Thu, 29 Apr 2004 11:22:35 +0200
Subject: FYI: Fixup Makefile.am EXTRA_DIST lists
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 09:22:41 -0000


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

Hi,

Fixed the following EXTRA_DIST Makefile.am lists to get make distcheck
working again.

2004-04-29  Mark Wielaard  <mark@klomp.org>

       * gnu/java/lang/Makefile.am (EXTRA_DIST): Removed
       ClassLoaderHelper.java.
       * javax/print/Makefile.am (EXTRA_DIST): Fixed DonPrintJob.java typo
       by DocPrintJob.java.

Committed.

Cheers,

Mark

Index: gnu/java/lang/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/gnu/java/lang/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- gnu/java/lang/Makefile.am   6 Oct 2002 20:34:16 -0000       1.6
+++ gnu/java/lang/Makefile.am   29 Apr 2004 09:21:26 -0000
@@ -6,6 +6,5 @@
 ArrayHelper.java \
 CharData.java \
 ClassHelper.java \
-ClassLoaderHelper.java \
 MainThread.java \
 SystemClassLoader.java
Index: javax/print/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/javax/print/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- javax/print/Makefile.am     27 Apr 2004 11:59:36 -0000      1.4
+++ javax/print/Makefile.am     29 Apr 2004 09:21:26 -0000
@@ -7,7 +7,7 @@
 CancelablePrintJob.java \
 Doc.java \
 DocFlavor.java \
-DonPrintJob.java \
+DocPrintJob.java \
 FlavorException.java \
 MultiDoc.java \
 MultiDocPrintJob.java \
@@ -17,4 +17,3 @@
 ServiceUIFactory.java \
 StreamPrintService.java \
 URIException.java
-


--=-REhc9iyrU7aL201ozVgQ
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)

iD8DBQBAkMlaxVhZCJWr9QwRAs2lAJ96iTs9vHL4JKrqLa8FYNHu+SKv0ACgpG90
Yk5V4K0qBwR3KnrGo7LWHGI=
=5XFk
-----END PGP SIGNATURE-----

--=-REhc9iyrU7aL201ozVgQ--




From MAILER-DAEMON Thu Apr 29 06:42:41 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJ904-00060T-Ol
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 06:42:40 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJ8zw-0005z6-FQ
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 06:42:32 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJ8zO-0005sj-J6
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 06:42:30 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJ8zM-0005cY-1v
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 06:41:56 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3TAdnQ4020421
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 12:39:50 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJ8yE-000199-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 12:40:46 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 12:39:28 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_itNkAdB2vpy+iPx"
Message-Id: <200404291239.30527.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.print.attribute.standard - new classes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 10:42:33 -0000


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

Hi list,


I just commited the attached patch to add all missing classes in  
javax.print.attribute.standard.


Michael


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

	* javax/print/attribute/standard/ColorSupported.java,
	javax/print/attribute/standard/Compression.java,
	javax/print/attribute/standard/CopiesSupported.java,
	javax/print/attribute/standard/Fidelity.java,
	javax/print/attribute/standard/Finishings.java,
	javax/print/attribute/standard/JobImpressionsSupported.java,
	javax/print/attribute/standard/JobKOctetsSupported.java,
	javax/print/attribute/standard/JobMediaSheetsSupported.java,
	javax/print/attribute/standard/JobSheets.java,
	javax/print/attribute/standard/JobState.java,
	javax/print/attribute/standard/JobStateReason.java,
	javax/print/attribute/standard/JobStateReasons.java,
	javax/print/attribute/standard/Media.java,
	javax/print/attribute/standard/MediaSizeName.java,
	javax/print/attribute/standard/MultipleDocumentHandling.java,
	javax/print/attribute/standard/NumberUpSupported.java,
	javax/print/attribute/standard/OrientationRequested.java,
	javax/print/attribute/standard/PDLOverrideSupported.java,
	javax/print/attribute/standard/PageRanges.java,
	javax/print/attribute/standard/PresentationDirection.java,
	javax/print/attribute/standard/PrintQuality.java,
	javax/print/attribute/standard/PrinterIsAcceptingJobs.java,
	javax/print/attribute/standard/PrinterMoreInfo.java,
	javax/print/attribute/standard/PrinterMoreInfoManufacturer.java,
	javax/print/attribute/standard/PrinterResolution.java,
	javax/print/attribute/standard/PrinterState.java,
	javax/print/attribute/standard/PrinterStateReason.java,
	javax/print/attribute/standard/PrinterStateReasons.java,
	javax/print/attribute/standard/PrinterURI.java,
	javax/print/attribute/standard/ReferenceUriSchemesSupported.java,
	javax/print/attribute/standard/Severity.java,
	javax/print/attribute/standard/SheetCollate.java,
	javax/print/attribute/standard/Sides.java: New files.
	* javax/print/attribute/standard/Makefile.am
	(EXTRA_DIST): Added new files.


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

Index: javax/print/attribute/standard/ColorSupported.java
===================================================================
RCS file: javax/print/attribute/standard/ColorSupported.java
diff -N javax/print/attribute/standard/ColorSupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/ColorSupported.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,82 @@
+/* ColorSupported.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintServiceAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class ColorSupported extends EnumSyntax
+  implements PrintServiceAttribute
+{
+  public static final ColorSupported NOT_SUPPORTED = new ColorSupported(0);
+  public static final ColorSupported SUPPORTED = new ColorSupported(1);
+
+  /**
+   * Constructs a <code>ColorSupported</code> object.
+   * 
+   * @param value the value
+   */
+  protected ColorSupported(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>ColorSupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return ColorSupported.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "color-supported";
+  }
+}
Index: javax/print/attribute/standard/Compression.java
===================================================================
RCS file: javax/print/attribute/standard/Compression.java
diff -N javax/print/attribute/standard/Compression.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/Compression.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,84 @@
+/* Compression.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.EnumSyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class Compression extends EnumSyntax
+  implements DocAttribute
+{
+  public static final Compression NONE = new Compression(0);
+  public static final Compression DEFLATE = new Compression(1);
+  public static final Compression GZIP = new Compression(2);
+  public static final Compression COMPRESS = new Compression(3);
+
+  /**
+   * Constructs a <code>Compression</code> object.
+   * 
+   * @param value that value
+   */
+  protected Compression(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>Compression</code> itself
+   */
+  public final Class getCategory()
+  {
+    return Compression.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "compression";
+  }
+}
Index: javax/print/attribute/standard/CopiesSupported.java
===================================================================
RCS file: javax/print/attribute/standard/CopiesSupported.java
diff -N javax/print/attribute/standard/CopiesSupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/CopiesSupported.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,85 @@
+/* CopiesSupported.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.print.attribute.standard;
+
+import javax.print.attribute.SetOfIntegerSyntax;
+import javax.print.attribute.SupportedValuesAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class CopiesSupported extends SetOfIntegerSyntax
+  implements SupportedValuesAttribute
+{
+  /**
+   * Constructs a <code>CopiesSupported</code> object.
+   */
+  public CopiesSupported(int member)
+  {
+    super(member);
+  }
+
+  /**
+   * Constructs a <code>CopiesSupported</code> object.
+   */
+  public CopiesSupported(int lowerBound, int upperBound)
+  {
+    super(lowerBound, upperBound);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>CopiesSupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return CopiesSupported.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "copies-supported";
+  }
+}
Index: javax/print/attribute/standard/Fidelity.java
===================================================================
RCS file: javax/print/attribute/standard/Fidelity.java
diff -N javax/print/attribute/standard/Fidelity.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/Fidelity.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,83 @@
+/* Fidelity.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class Fidelity extends EnumSyntax
+  implements PrintJobAttribute, PrintRequestAttribute
+{
+  public static final Fidelity FIDELITY_TRUE = new Fidelity(0);
+  public static final Fidelity FIDELITY_FALSE = new Fidelity(1);
+
+  /**
+   * Constructs a <code>Fidelity</code> object.
+   * 
+   * @param value the value
+   */
+  protected Fidelity(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>Fidelity</code> itself
+   */
+  public final Class getCategory()
+  {
+    return Fidelity.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "fidelity";
+  }
+}
Index: javax/print/attribute/standard/Finishings.java
===================================================================
RCS file: javax/print/attribute/standard/Finishings.java
diff -N javax/print/attribute/standard/Finishings.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/Finishings.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,100 @@
+/* Finishings.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class Finishings extends EnumSyntax
+  implements DocAttribute, PrintJobAttribute, PrintRequestAttribute
+{
+  public static final Finishings NONE = new Finishings(0);
+  public static final Finishings STAPLE = new Finishings(1);
+  public static final Finishings COVER = new Finishings(2);
+  public static final Finishings BIND = new Finishings(3);
+  public static final Finishings SADDLE_STITCH = new Finishings(4);
+  public static final Finishings EDGE_STITCH = new Finishings(5);
+  public static final Finishings STAPLE_TOP_LEFT = new Finishings(6);
+  public static final Finishings STAPLE_BOTTOM_LEFT = new Finishings(7);
+  public static final Finishings STAPLE_TOP_RIGHT = new Finishings(8);
+  public static final Finishings STAPLE_BOTTOM_RIGHT = new Finishings(9);
+  public static final Finishings EDGE_STITCH_LEFT = new Finishings(10);
+  public static final Finishings EDGE_STITCH_TOP = new Finishings(11);
+  public static final Finishings EDGE_STITCH_RIGHT = new Finishings(12);
+  public static final Finishings EDGE_STITCH_BOTTOM = new Finishings(13);
+  public static final Finishings STAPLE_DUAL_LEFT = new Finishings(14);
+  public static final Finishings STAPLE_DUAL_TOP = new Finishings(15);
+  public static final Finishings STAPLE_DUAL_RIGHT = new Finishings(16);
+  public static final Finishings STAPLE_DUAL_BOTTOM = new Finishings(17);
+
+  /**
+   * Constructs a <code>Finishings</code> object.
+   * 
+   * @param value the value
+   */
+  protected Finishings(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>Finishings</code> itself
+   */
+  public final Class getCategory()
+  {
+    return Finishings.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "finishings";
+  }
+}
Index: javax/print/attribute/standard/JobImpressionsSupported.java
===================================================================
RCS file: javax/print/attribute/standard/JobImpressionsSupported.java
diff -N javax/print/attribute/standard/JobImpressionsSupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobImpressionsSupported.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,77 @@
+/* JobImpressionsSupported.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.print.attribute.standard;
+
+import javax.print.attribute.SetOfIntegerSyntax;
+import javax.print.attribute.SupportedValuesAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class JobImpressionsSupported extends SetOfIntegerSyntax
+  implements SupportedValuesAttribute
+{
+  /**
+   * Constructs a <code>JobImpressionsSupported</code> object.
+   */
+  public JobImpressionsSupported(int lowerBound, int upperBound)
+  {
+    super(lowerBound, upperBound);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobImpressionsSupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobImpressionsSupported.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "job-impressions-supported";
+  }
+}
Index: javax/print/attribute/standard/JobKOctetsSupported.java
===================================================================
RCS file: javax/print/attribute/standard/JobKOctetsSupported.java
diff -N javax/print/attribute/standard/JobKOctetsSupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobKOctetsSupported.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,77 @@
+/* JobKOctetsSupported.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.print.attribute.standard;
+
+import javax.print.attribute.SetOfIntegerSyntax;
+import javax.print.attribute.SupportedValuesAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class JobKOctetsSupported extends SetOfIntegerSyntax
+  implements SupportedValuesAttribute
+{
+  /**
+   * Constructs a <code>JobKOctetsSupported</code> object.
+   */
+  public JobKOctetsSupported(int lowerBound, int upperBound)
+  {
+    super(lowerBound, upperBound);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>ColorSupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobKOctetsSupported.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "job-k-octets-supported";
+  }
+}
Index: javax/print/attribute/standard/JobMediaSheetsSupported.java
===================================================================
RCS file: javax/print/attribute/standard/JobMediaSheetsSupported.java
diff -N javax/print/attribute/standard/JobMediaSheetsSupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobMediaSheetsSupported.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,77 @@
+/* JobMediaSheetsSupported.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.print.attribute.standard;
+
+import javax.print.attribute.SetOfIntegerSyntax;
+import javax.print.attribute.SupportedValuesAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class JobMediaSheetsSupported extends SetOfIntegerSyntax
+  implements SupportedValuesAttribute
+{
+  /**
+   * Constructs a <code>JobMediaSheetsSupported</code> object.
+   */
+  public JobMediaSheetsSupported(int lowerBound, int upperBound)
+  {
+    super(lowerBound, upperBound);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobMediaSheetsSupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobMediaSheetsSupported.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "job-media-sheets-supported";
+  }
+}
Index: javax/print/attribute/standard/JobSheets.java
===================================================================
RCS file: javax/print/attribute/standard/JobSheets.java
diff -N javax/print/attribute/standard/JobSheets.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobSheets.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,81 @@
+/* JobSheets.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class JobSheets extends EnumSyntax
+  implements PrintJobAttribute, PrintRequestAttribute
+{
+  public static final JobSheets NONE = new JobSheets(0);
+  public static final JobSheets STANDARD = new JobSheets(1);
+
+  /**
+   * Constructs a <code>JobSheets</code> object.
+   */
+  protected JobSheets(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobSheets</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobSheets.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "job-sheets";
+  }
+}
Index: javax/print/attribute/standard/JobState.java
===================================================================
RCS file: javax/print/attribute/standard/JobState.java
diff -N javax/print/attribute/standard/JobState.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobState.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,86 @@
+/* JobState.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class JobState extends EnumSyntax
+  implements PrintJobAttribute
+{
+  public static final JobState UNKNOWN = new JobState(0);
+  public static final JobState PENDING = new JobState(1);
+  public static final JobState PENDING_HELD = new JobState(2);
+  public static final JobState PROCESSING = new JobState(3);
+  public static final JobState PROCESSING_STOPPED = new JobState(4);
+  public static final JobState CANCELED = new JobState(5);
+  public static final JobState ABORTED = new JobState(6);
+  public static final JobState COMPLETED = new JobState(7);
+
+  /**
+   * Constructs a <code>JobState</code> object.
+   */
+  protected JobState(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobState</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobState.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "job-state";
+  }
+}
Index: javax/print/attribute/standard/JobStateReason.java
===================================================================
RCS file: javax/print/attribute/standard/JobStateReason.java
diff -N javax/print/attribute/standard/JobStateReason.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobStateReason.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,79 @@
+/* JobStateReason.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.print.attribute.standard;
+
+import javax.print.attribute.Attribute;
+import javax.print.attribute.EnumSyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class JobStateReason extends EnumSyntax
+  implements Attribute
+{
+  public static final JobStateReason ABORTED_BY_SYSTEM = new JobStateReason(1);
+
+  /**
+   * Constructs a <code>JobStateReason</code> object.
+   */
+  protected JobStateReason(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobStateReason</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobStateReason.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "job-state-reason";
+  }
+}
Index: javax/print/attribute/standard/JobStateReasons.java
===================================================================
RCS file: javax/print/attribute/standard/JobStateReasons.java
diff -N javax/print/attribute/standard/JobStateReasons.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobStateReasons.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,69 @@
+/* JobStateReasons.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.print.attribute.standard;
+
+import java.util.HashSet;
+import javax.print.attribute.PrintJobAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class JobStateReasons extends HashSet
+  implements PrintJobAttribute
+{
+	/**
+	 * Returns category of this class.
+	 *
+	 * @return the class <code>ColorSupported</code> itself
+	 */
+  public final Class getCategory()
+  {
+    return JobStateReasons.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "job-state-reasons";
+  }
+}
Index: javax/print/attribute/standard/Media.java
===================================================================
RCS file: javax/print/attribute/standard/Media.java
diff -N javax/print/attribute/standard/Media.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/Media.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,79 @@
+/* Media.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public abstract class Media extends EnumSyntax
+  implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
+{
+	/**
+	 * Constructs a <code>Media</code> object.
+	 */
+  protected Media(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>Media</code> itself
+   */
+  public final Class getCategory()
+  {
+    return Media.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "media";
+  }
+}
Index: javax/print/attribute/standard/MediaSizeName.java
===================================================================
RCS file: javax/print/attribute/standard/MediaSizeName.java
diff -N javax/print/attribute/standard/MediaSizeName.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/MediaSizeName.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,133 @@
+/* MediaSizeName.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.print.attribute.standard;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class MediaSizeName extends Media
+{
+  public static final MediaSizeName ISO_A0 = new MediaSizeName(0);
+  public static final MediaSizeName ISO_A1 = new MediaSizeName(1);
+  public static final MediaSizeName ISO_A2 = new MediaSizeName(2);
+  public static final MediaSizeName ISO_A3 = new MediaSizeName(3);
+  public static final MediaSizeName ISO_A4 = new MediaSizeName(4);
+  public static final MediaSizeName ISO_A5 = new MediaSizeName(5);
+  public static final MediaSizeName ISO_A6 = new MediaSizeName(6);
+  public static final MediaSizeName ISO_A7 = new MediaSizeName(7);
+  public static final MediaSizeName ISO_A8 = new MediaSizeName(8);
+  public static final MediaSizeName ISO_A9 = new MediaSizeName(9);
+  public static final MediaSizeName ISO_A10 = new MediaSizeName(10);
+  public static final MediaSizeName ISO_B0 = new MediaSizeName(11);
+  public static final MediaSizeName ISO_B1 = new MediaSizeName(12);
+  public static final MediaSizeName ISO_B2 = new MediaSizeName(13);
+  public static final MediaSizeName ISO_B3 = new MediaSizeName(14);
+  public static final MediaSizeName ISO_B4 = new MediaSizeName(15);
+  public static final MediaSizeName ISO_B5 = new MediaSizeName(16);
+  public static final MediaSizeName ISO_B6 = new MediaSizeName(17);
+  public static final MediaSizeName ISO_B7 = new MediaSizeName(18);
+  public static final MediaSizeName ISO_B8 = new MediaSizeName(19);
+  public static final MediaSizeName ISO_B9 = new MediaSizeName(20);
+  public static final MediaSizeName ISO_B10 = new MediaSizeName(21);
+  public static final MediaSizeName JIS_B0 = new MediaSizeName(22);
+  public static final MediaSizeName JIS_B1 = new MediaSizeName(23);
+  public static final MediaSizeName JIS_B2 = new MediaSizeName(24);
+  public static final MediaSizeName JIS_B3 = new MediaSizeName(25);
+  public static final MediaSizeName JIS_B4 = new MediaSizeName(26);
+  public static final MediaSizeName JIS_B5 = new MediaSizeName(27);
+  public static final MediaSizeName JIS_B6 = new MediaSizeName(28);
+  public static final MediaSizeName JIS_B7 = new MediaSizeName(29);
+  public static final MediaSizeName JIS_B8 = new MediaSizeName(30);
+  public static final MediaSizeName JIS_B9 = new MediaSizeName(31);
+  public static final MediaSizeName JIS_B10 = new MediaSizeName(32);
+  public static final MediaSizeName ISO_C0 = new MediaSizeName(33);
+  public static final MediaSizeName ISO_C1 = new MediaSizeName(34);
+  public static final MediaSizeName ISO_C2 = new MediaSizeName(35);
+  public static final MediaSizeName ISO_C3 = new MediaSizeName(36);
+  public static final MediaSizeName ISO_C4 = new MediaSizeName(37);
+  public static final MediaSizeName ISO_C5 = new MediaSizeName(38);
+  public static final MediaSizeName ISO_C6 = new MediaSizeName(39);
+  public static final MediaSizeName NA_LETTER = new MediaSizeName(40);
+  public static final MediaSizeName NA_LEGAL = new MediaSizeName(41);
+  public static final MediaSizeName EXECUTIVE = new MediaSizeName(42);
+  public static final MediaSizeName LEDGER = new MediaSizeName(43);
+  public static final MediaSizeName TABLOID = new MediaSizeName(44);
+  public static final MediaSizeName INVOICE = new MediaSizeName(45);
+  public static final MediaSizeName FOLIO = new MediaSizeName(46);
+  public static final MediaSizeName QUARTO = new MediaSizeName(47);
+  public static final MediaSizeName JAPANESE_POSTCARD = new MediaSizeName(48);
+  public static final MediaSizeName JAPANESE_DOUBLE_POSTCARD =
+    new MediaSizeName(49);
+  public static final MediaSizeName A = new MediaSizeName(50);
+  public static final MediaSizeName B = new MediaSizeName(51);
+  public static final MediaSizeName C = new MediaSizeName(52);
+  public static final MediaSizeName D = new MediaSizeName(53);
+  public static final MediaSizeName E = new MediaSizeName(54);
+  public static final MediaSizeName ISO_DESIGNATED_LONG =
+    new MediaSizeName(55);
+  public static final MediaSizeName ITALY_ENVELOPE = new MediaSizeName(56);
+  public static final MediaSizeName MONARCH_ENVELOPE = new MediaSizeName(57);
+  public static final MediaSizeName PERSONAL_ENVELOPE = new MediaSizeName(58);
+  public static final MediaSizeName NA_NUMBER_9_ENVELOPE =
+    new MediaSizeName(59);
+  public static final MediaSizeName NA_NUMBER_10_ENVELOPE =
+    new MediaSizeName(60);
+  public static final MediaSizeName NA_NUMBER_11_ENVELOPE =
+    new MediaSizeName(61);
+  public static final MediaSizeName NA_NUMBER_12_ENVELOPE =
+    new MediaSizeName(62);
+  public static final MediaSizeName NA_NUMBER_14_ENVELOPE =
+    new MediaSizeName(63);
+  public static final MediaSizeName NA_6X9_ENVELOPE = new MediaSizeName(64);
+  public static final MediaSizeName NA_7X9_ENVELOPE = new MediaSizeName(65);
+  public static final MediaSizeName NA_9X11_ENVELOPE = new MediaSizeName(66);
+  public static final MediaSizeName NA_9X12_ENVELOPE = new MediaSizeName(67);
+  public static final MediaSizeName NA_10X13_ENVELOPE = new MediaSizeName(68);
+  public static final MediaSizeName NA_10X14_ENVELOPE = new MediaSizeName(69);
+  public static final MediaSizeName NA_10X15_ENVELOPE = new MediaSizeName(70);
+  public static final MediaSizeName NA_5X7 = new MediaSizeName(71);
+  public static final MediaSizeName NA_8X10 = new MediaSizeName(72);
+
+  /**
+   * Constructs a <code>MediaSizeName</code> object.
+   */
+  protected MediaSizeName(int value)
+  {
+    super(value);
+  }
+}
Index: javax/print/attribute/standard/MultipleDocumentHandling.java
===================================================================
RCS file: javax/print/attribute/standard/MultipleDocumentHandling.java
diff -N javax/print/attribute/standard/MultipleDocumentHandling.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/MultipleDocumentHandling.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,81 @@
+/* MultipleDocumentHandling.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class MultipleDocumentHandling extends EnumSyntax
+  implements PrintJobAttribute, PrintRequestAttribute
+{
+  public static final MultipleDocumentHandling SEPARATE_DOCUMENTS_COLLATED_COPIES =
+    new MultipleDocumentHandling(2);
+
+    /**
+     * Constructs a <code>MultipleDocumentHandling</code> object.
+     */
+  protected MultipleDocumentHandling(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>MultipleDocumentHandling</code> itself
+   */
+  public final Class getCategory()
+  {
+    return MultipleDocumentHandling.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "multiple-document-handling";
+  }
+}
Index: javax/print/attribute/standard/NumberUpSupported.java
===================================================================
RCS file: javax/print/attribute/standard/NumberUpSupported.java
diff -N javax/print/attribute/standard/NumberUpSupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/NumberUpSupported.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,93 @@
+/* NumberUpSupported.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.print.attribute.standard;
+
+import javax.print.attribute.SetOfIntegerSyntax;
+import javax.print.attribute.SupportedValuesAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class NumberUpSupported extends SetOfIntegerSyntax
+  implements SupportedValuesAttribute
+{
+  /**
+   * Constructs a <code>NumberUp</code> object.
+   */
+  public NumberUpSupported(int member)
+  {
+    super(member);
+  }
+
+  /**
+   * Constructs a <code>NumberUp</code> object.
+   */
+  public NumberUpSupported(int[][] members)
+  {
+    super(members);
+  }
+
+  /**
+   * Constructs a <code>NumberUp</code> object.
+   */
+  public NumberUpSupported(int lowerBound, int upperBound)
+  {
+    super(lowerBound, upperBound);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>NumberUpSupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return NumberUpSupported.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "number-up-supported";
+  }
+}
Index: javax/print/attribute/standard/OrientationRequested.java
===================================================================
RCS file: javax/print/attribute/standard/OrientationRequested.java
diff -N javax/print/attribute/standard/OrientationRequested.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/OrientationRequested.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,88 @@
+/* OrientationRequested.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class OrientationRequested extends EnumSyntax
+  implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
+{
+  public static final OrientationRequested PORTRAIT =
+    new OrientationRequested(0);
+  public static final OrientationRequested LANDSCAPE =
+    new OrientationRequested(1);
+  public static final OrientationRequested REVERSE_LANDSCAPE =
+    new OrientationRequested(2);
+  public static final OrientationRequested REVERSE_PORTRAIT =
+    new OrientationRequested(3);
+
+    /**
+     * Constructs a <code>OrientationRequested</code> object.
+     */
+  protected OrientationRequested(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>OrientationRequested</code> itself
+   */
+  public final Class getCategory()
+  {
+    return OrientationRequested.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "orientation-requested";
+  }
+}
Index: javax/print/attribute/standard/PDLOverrideSupported.java
===================================================================
RCS file: javax/print/attribute/standard/PDLOverrideSupported.java
diff -N javax/print/attribute/standard/PDLOverrideSupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PDLOverrideSupported.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,82 @@
+/* PDLOverrideSupported.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintServiceAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PDLOverrideSupported extends EnumSyntax
+  implements PrintServiceAttribute
+{
+  public static final PDLOverrideSupported NOT_ATTEMPTED =
+    new PDLOverrideSupported(0);
+  public static final PDLOverrideSupported ATTEMPTED =
+    new PDLOverrideSupported(0);
+
+  /**
+   * Constructs a <code>PDLOverrideSupported</code> object.
+   */
+  protected PDLOverrideSupported(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PDLOverrideSupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PDLOverrideSupported.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "pdl-override-supported";
+  }
+}
Index: javax/print/attribute/standard/PageRanges.java
===================================================================
RCS file: javax/print/attribute/standard/PageRanges.java
diff -N javax/print/attribute/standard/PageRanges.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PageRanges.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,95 @@
+/* PageRanges.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+import javax.print.attribute.SetOfIntegerSyntax;
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class PageRanges extends SetOfIntegerSyntax
+  implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
+{
+  /**
+   * Constructs a <code>PageRanges</code> object.
+   */
+  public PageRanges(int member)
+  {
+    super(member);
+  }
+
+  /**
+   * Constructs a <code>PageRanges</code> object.
+   */
+  public PageRanges(int[][] members)
+  {
+    super(members);
+  }
+
+  /**
+   * Constructs a <code>PageRanges</code> object.
+   */
+  public PageRanges(int lowerBound, int upperBound)
+  {
+    super(lowerBound, upperBound);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PageRanges</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PageRanges.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "page-ranges";
+  }
+}
Index: javax/print/attribute/standard/PresentationDirection.java
===================================================================
RCS file: javax/print/attribute/standard/PresentationDirection.java
diff -N javax/print/attribute/standard/PresentationDirection.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PresentationDirection.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,95 @@
+/* PresentationDirection.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class PresentationDirection extends EnumSyntax
+  implements PrintRequestAttribute, PrintJobAttribute
+{
+  public static final PresentationDirection TOBOTTOM_TORIGHT =
+    new PresentationDirection(0);
+  public static final PresentationDirection TOBOTTOM_TOLEFT =
+    new PresentationDirection(1);
+  public static final PresentationDirection TOTOP_TORIGHT =
+    new PresentationDirection(2);
+  public static final PresentationDirection TOTOP_TOLEFT =
+    new PresentationDirection(3);
+  public static final PresentationDirection TORIGHT_TOBOTTOM =
+    new PresentationDirection(4);
+  public static final PresentationDirection TORIGHT_TOTOP =
+    new PresentationDirection(5);
+  public static final PresentationDirection TOLEFT_TOBOTTOM =
+    new PresentationDirection(6);
+  public static final PresentationDirection TOLEFT_TOTOP =
+    new PresentationDirection(7);
+
+  /**
+   * Constructs a <code>PresentationDirection</code> object.
+   */
+  private PresentationDirection(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PresentationDirection</code> itself
+   */
+  public Class getCategory()
+  {
+    return PresentationDirection.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public String getName()
+  {
+    return "presentation-direction";
+  }
+}
Index: javax/print/attribute/standard/PrintQuality.java
===================================================================
RCS file: javax/print/attribute/standard/PrintQuality.java
diff -N javax/print/attribute/standard/PrintQuality.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrintQuality.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,83 @@
+/* PrintQuality.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PrintQuality extends EnumSyntax
+  implements DocAttribute, PrintJobAttribute, PrintRequestAttribute
+{
+  public static final PrintQuality DRAFT = new PrintQuality(0);
+  public static final PrintQuality NORMAL = new PrintQuality(1);
+  public static final PrintQuality HIGH = new PrintQuality(2);
+
+  /**
+   * Constructs a <code>PrintQuality</code> object.
+   */
+  protected PrintQuality(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrintQuality</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PrintQuality.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "print-quality"
+   */
+  public final String getName()
+  {
+    return "print-quality";
+  }
+}
Index: javax/print/attribute/standard/PrinterIsAcceptingJobs.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterIsAcceptingJobs.java
diff -N javax/print/attribute/standard/PrinterIsAcceptingJobs.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterIsAcceptingJobs.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,82 @@
+/* PrinterIsAcceptingJobs.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintServiceAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PrinterIsAcceptingJobs extends EnumSyntax
+  implements PrintServiceAttribute
+{
+  public static final PrinterIsAcceptingJobs NOT_ACCEPTING_JOBS =
+    new PrinterIsAcceptingJobs(0);
+  public static final PrinterIsAcceptingJobs ACCEPTING_JOBS =
+    new PrinterIsAcceptingJobs(1);
+
+  /**
+   * Constructs a <code>PrinterIsAcceptingJobs</code> object.
+   */
+  protected PrinterIsAcceptingJobs(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterIsAcceptingJobs</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PrinterIsAcceptingJobs.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public final String getName()
+  {
+    return "printer-is-accepting-jobs";
+  }
+}
Index: javax/print/attribute/standard/PrinterMoreInfo.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterMoreInfo.java
diff -N javax/print/attribute/standard/PrinterMoreInfo.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterMoreInfo.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,78 @@
+/* PrinterMoreInfo.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.print.attribute.standard;
+
+import java.net.URI;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.URISyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class PrinterMoreInfo extends URISyntax
+  implements PrintServiceAttribute
+{
+  /**
+   * Constructs a <code>PrinterMoreInfo</code> object.
+   */
+  public PrinterMoreInfo(URI uri)
+  {
+    super(uri);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterMoreInfo</code> itself
+   */
+  public Class getCategory()
+  {
+    return PrinterMoreInfo.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public String getName()
+  {
+    return "printer-more-info";
+  }
+}
Index: javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
diff -N javax/print/attribute/standard/PrinterMoreInfoManufacturer.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterMoreInfoManufacturer.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,78 @@
+/* PrinterMoreInfoManufacturer.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.print.attribute.standard;
+
+import java.net.URI;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.URISyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class PrinterMoreInfoManufacturer extends URISyntax
+  implements PrintServiceAttribute
+{
+  /**
+   * Constructs a <code>PrinterMoreInfoManufacturer</code> object.
+   */
+  public PrinterMoreInfoManufacturer(URI uri)
+  {
+    super(uri);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterMoreInfoManufacturer</code> itself
+   */
+  public Class getCategory()
+  {
+    return PrinterMoreInfoManufacturer.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public String getName()
+  {
+    return "printer-more-info-manufacturer";
+  }
+}
Index: javax/print/attribute/standard/PrinterResolution.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterResolution.java
diff -N javax/print/attribute/standard/PrinterResolution.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterResolution.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,80 @@
+/* PrinterMoreInfoManufacturer.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+import javax.print.attribute.ResolutionSyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class PrinterResolution extends ResolutionSyntax
+  implements DocAttribute, PrintJobAttribute, PrintRequestAttribute
+{
+  /**
+   * Constructs a <code>PrinterResolution</code> object.
+   */
+  public PrinterResolution(int crossFeedResolution, int feedResolution,
+                           int units)
+  {
+    super(crossFeedResolution, feedResolution, units);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterResolution</code> itself
+   */
+  public Class getCategory()
+  {
+    return PrinterResolution.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public String getName()
+  {
+    return "printer-resolution";
+  }
+}
Index: javax/print/attribute/standard/PrinterState.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterState.java
diff -N javax/print/attribute/standard/PrinterState.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterState.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,82 @@
+/* PrinterState.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.print.attribute.standard;
+
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintServiceAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class PrinterState extends EnumSyntax
+  implements PrintServiceAttribute
+{
+  public static final PrinterState UNKNOWN = new PrinterState(0);
+  public static final PrinterState IDLE = new PrinterState(1);
+  public static final PrinterState PROCESSING = new PrinterState(2);
+  public static final PrinterState STOPPED = new PrinterState(3);
+
+  /**
+   * Constructs a <code>PrinterState</code> object.
+   */
+  protected PrinterState(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterState</code> itself
+   */
+  public Class getCategory()
+  {
+    return PrinterState.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public String getName()
+  {
+    return "printer-state";
+  }
+}
Index: javax/print/attribute/standard/PrinterStateReason.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterStateReason.java
diff -N javax/print/attribute/standard/PrinterStateReason.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterStateReason.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,138 @@
+/* PrinterStateReason.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.print.attribute.standard;
+
+import javax.print.attribute.Attribute;
+import javax.print.attribute.EnumSyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class PrinterStateReason extends EnumSyntax
+  implements Attribute
+{
+  public static final PrinterStateReason OTHER = new PrinterStateReason(0);
+  public static final PrinterStateReason MEDIA_NEEDED =
+    new PrinterStateReason(1);
+  public static final PrinterStateReason MEDIA_JAM = new PrinterStateReason(2);
+  public static final PrinterStateReason MOVING_TO_PAUSED =
+    new PrinterStateReason(3);
+  public static final PrinterStateReason PAUSED = new PrinterStateReason(4);
+  public static final PrinterStateReason SHUTDOWN = new PrinterStateReason(5);
+  public static final PrinterStateReason CONNECTING_TO_DEVICE =
+    new PrinterStateReason(6);
+  public static final PrinterStateReason TIMED_OUT = new PrinterStateReason(7);
+  public static final PrinterStateReason STOPPING = new PrinterStateReason(8);
+  public static final PrinterStateReason STOPPED_PARTLY =
+    new PrinterStateReason(9);
+  public static final PrinterStateReason TONER_LOW =
+    new PrinterStateReason(10);
+  public static final PrinterStateReason TONER_EMPTY =
+    new PrinterStateReason(11);
+  public static final PrinterStateReason SPOOL_AREA_FULL =
+    new PrinterStateReason(12);
+  public static final PrinterStateReason COVER_OPEN =
+    new PrinterStateReason(13);
+  public static final PrinterStateReason INTERLOCK_OPEN =
+    new PrinterStateReason(14);
+  public static final PrinterStateReason DOOR_OPEN =
+    new PrinterStateReason(15);
+  public static final PrinterStateReason INPUT_TRAY_MISSING =
+    new PrinterStateReason(16);
+  public static final PrinterStateReason MEDIA_LOW =
+    new PrinterStateReason(17);
+  public static final PrinterStateReason MEDIA_EMPTY =
+    new PrinterStateReason(18);
+  public static final PrinterStateReason OUTPUT_TRAY_MISSING =
+    new PrinterStateReason(19);
+  public static final PrinterStateReason OUTPUT_AREA_ALMOST_FULL =
+    new PrinterStateReason(20);
+  public static final PrinterStateReason OUTPUT_AREA_FULL =
+    new PrinterStateReason(21);
+  public static final PrinterStateReason MARKER_SUPPLY_LOW =
+    new PrinterStateReason(22);
+  public static final PrinterStateReason MARKER_SUPPLY_EMPTY =
+    new PrinterStateReason(23);
+  public static final PrinterStateReason MARKER_WASTE_ALMOST_FULL =
+    new PrinterStateReason(24);
+  public static final PrinterStateReason MARKER_WASTE_FULL =
+    new PrinterStateReason(25);
+  public static final PrinterStateReason FUSER_OVER_TEMP =
+    new PrinterStateReason(26);
+  public static final PrinterStateReason FUSER_UNDER_TEMP =
+    new PrinterStateReason(27);
+  public static final PrinterStateReason OPC_NEAR_EOL =
+    new PrinterStateReason(28);
+  public static final PrinterStateReason OPC_LIFE_OVER =
+    new PrinterStateReason(29);
+  public static final PrinterStateReason DEVELOPER_LOW =
+    new PrinterStateReason(30);
+  public static final PrinterStateReason DEVELOPER_EMPTY =
+    new PrinterStateReason(31);
+  public static final PrinterStateReason INTERPRETER_RESOURCE_UNAVAILABLE =
+    new PrinterStateReason(32);
+
+  /**
+   * Constructs a <code>PrinterStateReason</code> object.
+   */
+  protected PrinterStateReason(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrintStateReason</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PrinterStateReason.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "printer-state-reason"
+   */
+  public final String getName()
+  {
+    return "printer-state-reason";
+  }
+}
Index: javax/print/attribute/standard/PrinterStateReasons.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterStateReasons.java
diff -N javax/print/attribute/standard/PrinterStateReasons.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterStateReasons.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,69 @@
+/* PrinterStateReasons.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.print.attribute.standard;
+
+import java.util.HashMap;
+import javax.print.attribute.PrintServiceAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class PrinterStateReasons extends HashMap
+  implements PrintServiceAttribute
+{
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrintStateReasons</code> itself
+   */
+  public Class getCategory()
+  {
+    return PrinterStateReasons.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "printer-state-reasons"
+   */
+  public String getName()
+  {
+    return "printer-state-reasons";
+  }
+}
Index: javax/print/attribute/standard/PrinterURI.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterURI.java
diff -N javax/print/attribute/standard/PrinterURI.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterURI.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,78 @@
+/* PrinterURI.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.print.attribute.standard;
+
+import java.net.URI;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.URISyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class PrinterURI extends URISyntax
+  implements PrintServiceAttribute
+{
+  /**
+   * Constructs a <code>PrinterURI</code> object.
+   */
+  public PrinterURI(URI uri)
+  {
+    super(uri);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterURI</code> itself
+   */
+  public Class getCategory()
+  {
+    return PrinterURI.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "printer-uri"
+   */
+  public String getName()
+  {
+    return "printer-uri";
+  }
+}
Index: javax/print/attribute/standard/ReferenceUriSchemesSupported.java
===================================================================
RCS file: javax/print/attribute/standard/ReferenceUriSchemesSupported.java
diff -N javax/print/attribute/standard/ReferenceUriSchemesSupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/ReferenceUriSchemesSupported.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,94 @@
+/* ReferenceUriSchemesSupported.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.print.attribute.standard;
+
+import javax.print.attribute.Attribute;
+import javax.print.attribute.EnumSyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public class ReferenceUriSchemesSupported extends EnumSyntax
+  implements Attribute
+{
+  public static final ReferenceUriSchemesSupported FTP =
+    new ReferenceUriSchemesSupported(0);
+  public static final ReferenceUriSchemesSupported HTTP =
+    new ReferenceUriSchemesSupported(1);
+  public static final ReferenceUriSchemesSupported HTTPS =
+    new ReferenceUriSchemesSupported(2);
+  public static final ReferenceUriSchemesSupported GOPHER =
+    new ReferenceUriSchemesSupported(3);
+  public static final ReferenceUriSchemesSupported NEWS =
+    new ReferenceUriSchemesSupported(4);
+  public static final ReferenceUriSchemesSupported NNTP =
+    new ReferenceUriSchemesSupported(5);
+  public static final ReferenceUriSchemesSupported WAIS =
+    new ReferenceUriSchemesSupported(6);
+  public static final ReferenceUriSchemesSupported FILE =
+    new ReferenceUriSchemesSupported(7);
+
+    /**
+     * Constructs a <code>ReferenceUriSchemeSupported</code> object.
+     */
+  protected ReferenceUriSchemesSupported(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>ReferenceUriSchemesSupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return ReferenceUriSchemesSupported.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "reference-uri-schemes-supported"
+   */
+  public final String getName()
+  {
+    return "reference-uri-schemes-supported";
+  }
+}
Index: javax/print/attribute/standard/Severity.java
===================================================================
RCS file: javax/print/attribute/standard/Severity.java
diff -N javax/print/attribute/standard/Severity.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/Severity.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,81 @@
+/* Severity.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.print.attribute.standard;
+
+import javax.print.attribute.Attribute;
+import javax.print.attribute.EnumSyntax;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class Severity extends EnumSyntax
+  implements Attribute
+{
+  public static final Severity REPORT = new Severity(0);
+  public static final Severity WARNING = new Severity(1);
+  public static final Severity ERROR = new Severity(2);
+
+  /**
+   * Constructs a <code>Severity</code> object.
+   */
+  protected Severity(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>Severity</code> itself
+   */
+  public Class getCategory()
+  {
+    return Severity.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "severity"
+   */
+  public String getName()
+  {
+    return "severity";
+  }
+}
Index: javax/print/attribute/standard/SheetCollate.java
===================================================================
RCS file: javax/print/attribute/standard/SheetCollate.java
diff -N javax/print/attribute/standard/SheetCollate.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/SheetCollate.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,79 @@
+/* SheetCollate.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class SheetCollate extends EnumSyntax
+  implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
+{
+  public static final SheetCollate UNCOLLATED = new SheetCollate(0);
+  public static final SheetCollate COLLATED = new SheetCollate(1);
+
+  protected SheetCollate(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>SheetCollate</code> itself
+   */
+  public Class getCategory()
+  {
+    return SheetCollate.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "sheet-collate"
+   */
+  public String getName()
+  {
+    return "sheet-collate";
+  }
+}
Index: javax/print/attribute/standard/Sides.java
===================================================================
RCS file: javax/print/attribute/standard/Sides.java
diff -N javax/print/attribute/standard/Sides.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/Sides.java	29 Apr 2004 10:31:24 -0000
@@ -0,0 +1,87 @@
+/* Sides.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.print.attribute.standard;
+
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.EnumSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public final class Sides extends EnumSyntax
+  implements DocAttribute, PrintRequestAttribute, PrintJobAttribute
+{
+  public static final Sides ONE_SIDED = new Sides(0);
+  public static final Sides TWO_SIDED_LONG_EDGE = new Sides(1);
+  public static final Sides TWO_SIDED_SHORT_EDGE = new Sides(2);
+  public static final Sides DUPLEX = new Sides(3);
+  public static final Sides TUMBLE = new Sides(4);
+
+  /**
+   * Creates a <code>Sides</code> object.
+   *
+   * @param value the number of sides
+   */
+  protected Sides(int value)
+  {
+    super(value);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>Sides</code> itself
+   */
+  public Class getCategory()
+  {
+    return Sides.class;
+  }
+
+  /**
+   * Returns the name of this attribute.
+   *
+   * @return the name
+   */
+  public String getName()
+  {
+    return "sides";
+  }
+}
Index: javax/print/attribute/standard/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- javax/print/attribute/standard/Makefile.am	9 Jan 2004 11:32:09 -0000	1.3
+++ javax/print/attribute/standard/Makefile.am	29 Apr 2004 10:31:24 -0000
@@ -1,11 +1,16 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 EXTRA_DIST = \
+ColorSupported.java \
+Compression.java \
 Copies.java \
+CopiesSupported.java \
 DateTimeAtCompleted.java \
 DateTimeAtCreation.java \
 DateTimeAtProcessing.java \
 DocumentName.java \
+Fidelity.java \
+Finishings.java \
 JobHoldUntil.java \
 JobImpressions.java \
 JobImpressionsCompleted.java \
@@ -18,17 +23,42 @@
 JobOriginatingUserName.java \
 JobPriority.java \
 JobPrioritySupported.java \
+JobSheets.java \
+JobState.java \
+JobStateReason.java \
+JobStateReasons.java \
+Media.java \
+MediaSizeName.java \
+MultipleDocumentHandling.java \
 NumberOfDocuments.java \
 NumberOfInterveningJobs.java \
 NumberUp.java \
+NumberUpSupported.java \
+OrientationRequested.java \
 OutputDeviceAssigned.java \
 PagesPerMinute.java \ \
 PagesPerMinuteColor.java \
+PageRanges.java \
+PDLOverrideSupported.java \
+PresentationDirection.java \
 PrinterInfo.java \
+PrinterIsAcceptingJobs.java \
 PrinterLocation.java \
 PrinterMakeAndModel.java \
 PrinterMessageFromOperator.java \
+PrinterMoreInfo.java \
+PrinterMoreInfoManufacturer.java \
 PrinterName.java \
+PrinterResolution.java \
+PrinterState.java \
+PrinterStateReason.java \
+PrinterStateReasons.java \
+PrinterURI.java \
+PrintQuality.java \
 QueuedJobCount.java \
+ReferenceUriSchemeSupported.java \
 RequestingUserName.java \
+Severity.java \
+SheetCollate.java \
+Sides.java \
 package.html

--Boundary-00=_itNkAdB2vpy+iPx--



From MAILER-DAEMON Thu Apr 29 09:23:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJB2U-0000Ou-Fr
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 08:53:18 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJAzR-0008VU-2R
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 08:50:09 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJAVJ-0004Ru-En
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 08:19:32 -0400
Received: from [212.6.122.151] (helo=mail5.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJ9nr-0006yT-1x
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 07:34:07 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail5.ewetel.de (8.12.1/8.12.9) with ESMTP id i3TBXxII014467
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 13:33:59 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJ9oe-0001Ht-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 13:34:56 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 13:33:38 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_SgOkA1dIAWNd7UK"
Message-Id: <200404291333.40456.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.print.DocFlavor
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 12:53:13 -0000


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

Hi list,


I just commited the attached patch to implement the missing stuff in 
javax.print.DocFlavor.


Michael


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

	* javax/print/DocFlavor.java:
	Implemented all flavor classes.


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

Index: javax/print/DocFlavor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/DocFlavor.java,v
retrieving revision 1.2
diff -u -r1.2 DocFlavor.java
--- javax/print/DocFlavor.java	27 Apr 2004 11:59:36 -0000	1.2
+++ javax/print/DocFlavor.java	29 Apr 2004 11:32:08 -0000
@@ -48,6 +48,130 @@
  */
 public class DocFlavor implements Cloneable, Serializable
 {
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class BYTE_ARRAY
+    extends DocFlavor
+  {
+    public static final BYTE_ARRAY AUTOSENSE = new BYTE_ARRAY("application/octet-stream");
+    public static final BYTE_ARRAY GIF = new BYTE_ARRAY("image/gif");
+    public static final BYTE_ARRAY JPEG = new BYTE_ARRAY("image/jpeg");
+    public static final BYTE_ARRAY PCL = new BYTE_ARRAY("application/vnd.hp-PCL");
+    public static final BYTE_ARRAY PDF = new BYTE_ARRAY("application/pdf");
+    public static final BYTE_ARRAY PNG = new BYTE_ARRAY("image/png");
+    public static final BYTE_ARRAY POSTSCRIPT = new BYTE_ARRAY("application/postscript");
+    public static final BYTE_ARRAY TEXT_HTML_HOST = new BYTE_ARRAY("text/html");
+    public static final BYTE_ARRAY TEXT_HTML_US_ASCII = new BYTE_ARRAY("text/html; charset=us-ascii");
+    public static final BYTE_ARRAY TEXT_HTML_UTF_16 = new BYTE_ARRAY("text/html; charset=utf-16");
+    public static final BYTE_ARRAY TEXT_HTML_UTF_16BE = new BYTE_ARRAY("text/html; charset=utf-16be");
+    public static final BYTE_ARRAY TEXT_HTML_UTF_16LE = new BYTE_ARRAY("text/html; charset=utf-16le");
+    public static final BYTE_ARRAY TEXT_HTML_UTF_8 = new BYTE_ARRAY("text/html; charset=utf-8");
+    public static final BYTE_ARRAY TEXT_PLAIN_HOST = new BYTE_ARRAY("text/plain");
+    public static final BYTE_ARRAY TEXT_PLAIN_US_ASCII = new BYTE_ARRAY("text/plain; charset=us-ascii");
+    public static final BYTE_ARRAY TEXT_PLAIN_UTF_16 = new BYTE_ARRAY("text/plain; charset=utf-16");
+    public static final BYTE_ARRAY TEXT_PLAIN_UTF_16BE = new BYTE_ARRAY("text/plain; charset=utf-16be");
+    public static final BYTE_ARRAY TEXT_PLAIN_UTF_16LE = new BYTE_ARRAY("text/plain; charset=utf-16le");
+    public static final BYTE_ARRAY TEXT_PLAIN_UTF_8 = new BYTE_ARRAY("text/plain; charset=utf-8");
+    
+    public BYTE_ARRAY(String mimeType)
+    {
+      super(mimeType, "[B");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class CHAR_ARRAY
+    extends DocFlavor
+  {
+    public CHAR_ARRAY(String mimeType)
+    {
+      super(mimeType, "[C");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class INPUT_STREAM
+    extends DocFlavor
+  {
+    public static final INPUT_STREAM AUTOSENSE = new INPUT_STREAM("application/octet-stream");
+    public static final INPUT_STREAM GIF = new INPUT_STREAM("image/gif");
+    public static final INPUT_STREAM JPEG = new INPUT_STREAM("image/jpeg");
+    public static final INPUT_STREAM PCL = new INPUT_STREAM("application/vnd.hp-PCL");
+    public static final INPUT_STREAM PDF = new INPUT_STREAM("application/pdf");
+    public static final INPUT_STREAM PNG = new INPUT_STREAM("image/png");
+    public static final INPUT_STREAM POSTSCRIPT = new INPUT_STREAM("application/postscript");
+    public static final INPUT_STREAM TEXT_HTML_HOST = new INPUT_STREAM("text/html");
+    public static final INPUT_STREAM TEXT_HTML_US_ASCII = new INPUT_STREAM("text/html; charset=us-ascii");
+    public static final INPUT_STREAM TEXT_HTML_UTF_16 = new INPUT_STREAM("text/html; charset=utf-16");
+    public static final INPUT_STREAM TEXT_HTML_UTF_16BE = new INPUT_STREAM("text/html; charset=utf-16be");
+    public static final INPUT_STREAM TEXT_HTML_UTF_16LE = new INPUT_STREAM("text/html; charset=utf-16le");
+    public static final INPUT_STREAM TEXT_HTML_UTF_8 = new INPUT_STREAM("text/html; charset=utf-8");
+    public static final INPUT_STREAM TEXT_PLAIN_HOST = new INPUT_STREAM("text/plain");
+    public static final INPUT_STREAM TEXT_PLAIN_US_ASCII = new INPUT_STREAM("text/plain; charset=us-ascii");
+    public static final INPUT_STREAM TEXT_PLAIN_UTF_16 = new INPUT_STREAM("text/plain; charset=utf-16");
+    public static final INPUT_STREAM TEXT_PLAIN_UTF_16BE = new INPUT_STREAM("text/plain; charset=utf-16be");
+    public static final INPUT_STREAM TEXT_PLAIN_UTF_16LE = new INPUT_STREAM("text/plain; charset=utf-16le");
+    public static final INPUT_STREAM TEXT_PLAIN_UTF_8 = new INPUT_STREAM("text/plain; charset=utf-8");
+    
+    public INPUT_STREAM(String mimeType)
+    {
+      super(mimeType, "java.io.InputStream");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class READER
+    extends DocFlavor
+  {
+    public READER(String mimeType)
+    {
+      super(mimeType, "java.io.Reader");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class SERVICE_FORMATTED
+    extends DocFlavor
+  {
+    public SERVICE_FORMATTED(String className)
+    {
+      super("application/x-java-jvm-local-objectref", className);
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class STRING
+    extends DocFlavor
+  {
+    public STRING(String mimeType)
+    {
+      super(mimeType, "java.lang.String");
+    }
+  }
+  
+  /**
+   * @author Michael Koch (konqueror@gmx.de)
+   */
+  public static class URL
+    extends DocFlavor
+  {
+    public URL(String mimeType)
+    {
+      super(mimeType, "java.net.URL");
+    }
+  }
+  
   private static final long serialVersionUID = -4512080796965449721L;
   
   public static final String hostEncoding = "US-ASCII";

--Boundary-00=_SgOkA1dIAWNd7UK--



From MAILER-DAEMON Thu Apr 29 10:08:18 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJBbC-0007Qb-8h
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 09:29:10 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJBaT-0007Fs-Qc
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 09:28:25 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJB4Z-0000Yj-8e
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 08:55:58 -0400
Received: from [212.6.122.105] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJAyg-0008Ra-EQ
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 08:49:22 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i3TCnKQ4015806
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 14:49:21 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJAzZ-0001QQ-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 14:50:17 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 14:49:00 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_8mPkAffb3KgFxIN"
Message-Id: <200404291449.01390.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: javax.print.PrintServiceLookup
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 13:29:07 -0000


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

Hi list,


I just commited the attached patch to introduce 
javax.print.PrintServiceLookup. Its not complete yet but this is that 
last class missing to make JIPSI compilable with jikes+classpath.


Michael


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

	* javax/print/PrintServiceLookup.java: New file.
	* javax/print/Makefile.am (EXTRA_DIST):
	Added PrintServiceLookup.java.


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

Index: javax/print/PrintServiceLookup.java
===================================================================
RCS file: javax/print/PrintServiceLookup.java
diff -N javax/print/PrintServiceLookup.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/PrintServiceLookup.java	29 Apr 2004 12:45:41 -0000
@@ -0,0 +1,76 @@
+/* PrintServiceLookup.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.print;
+
+import javax.print.attribute.AttributeSet;
+
+
+/**
+ * @author Michael Koch (konqueror@gmx.de)
+ */
+public abstract class PrintServiceLookup
+{
+  /**
+   * Constructs a <code>PrintServiceLookup</code> object.
+   */
+  public PrintServiceLookup()
+  {
+  	// Do nothing here
+  }
+  
+  /**
+   * Not called direclty by applications.
+   */
+  public abstract PrintService getDefaultPrintService();
+
+  /**
+   * Not called direclty by applications.
+   */
+  public abstract MultiDocPrintService[] getMultiDocPrintServices(DocFlavor[] flavors, AttributeSet attributes);
+
+  /**
+   * Not called direclty by applications.
+   */
+  public abstract PrintService[] getPrintServices();
+
+  /**
+   * Not called direclty by applications.
+   */
+  public abstract PrintService[] getPrintServices(DocFlavor flavor, AttributeSet attributes);
+}
Index: javax/print/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- javax/print/Makefile.am	29 Apr 2004 09:23:11 -0000	1.5
+++ javax/print/Makefile.am	29 Apr 2004 12:45:41 -0000
@@ -14,6 +14,7 @@
 MultiDocPrintService.java \
 PrintException.java \
 PrintService.java \
+PrintServiceLookup.java \
 ServiceUIFactory.java \
 StreamPrintService.java \
 URIException.java

--Boundary-00=_8mPkAffb3KgFxIN--



From MAILER-DAEMON Thu Apr 29 11:27:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJDRI-0006Yq-4N
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 11:27:04 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJDRF-0006Xr-0I
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 11:27:01 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJCkS-0005YB-GL
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 10:43:19 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJCkR-0005XR-JF
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 10:42:47 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3TEgjB5016913
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 16:42:45 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJClK-0001gj-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 16:43:42 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 16:42:24 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_RRRkA7M+nuMYmkZ"
Message-Id: <200404291642.25732.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: several fixes in native NIO code
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 15:27:02 -0000


--Boundary-00=_RRRkA7M+nuMYmkZ
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
X-MIME-Autoconverted: from 8bit to quoted-printable by mail4.ewetel.de id
	i3TEgjB5016913

Hi list,


I just commited the attached patch to added 4 missing native methods of=20
java.nio.MappedByteBufferImpl and to fix a typo in=20
gnu_java_nio_channels_FileChannelImpl.c. Thanks to Ingo Pr=F6tel from=20
Aicas for reporting.


Michael


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

	* include/java_nio_MappedByteBufferImpl.h:
	New file.
	* include/Makefile.am:
	Generate java_nio_MappedByteBufferImpl.h.
	* native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
	(implTruncate): Fixed typo.
	* native/jni/java-nio/java_nio_MappedByteBufferImpl.c:
	New file.
	* native/jni/java-nio/Makefile.am:
	Compile java_nio_MappedByteBufferImpl.c.


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

Index: include/java_nio_MappedByteBufferImpl.h
===================================================================
RCS file: include/java_nio_MappedByteBufferImpl.h
diff -N include/java_nio_MappedByteBufferImpl.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/java_nio_MappedByteBufferImpl.h	29 Apr 2004 14:36:10 -0000
@@ -0,0 +1,22 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __java_nio_MappedByteBufferImpl__
+#define __java_nio_MappedByteBufferImpl__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_unmapImpl (JNIEnv *env, jobject);
+extern JNIEXPORT jboolean JNICALL Java_java_nio_MappedByteBufferImpl_isLoadedImpl (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_loadImpl (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_java_nio_MappedByteBufferImpl_forceImpl (JNIEnv *env, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_nio_MappedByteBufferImpl__ */
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.17
diff -u -r1.17 Makefile.am
--- include/Makefile.am	27 Apr 2004 22:56:05 -0000	1.17
+++ include/Makefile.am	29 Apr 2004 14:36:10 -0000
@@ -56,6 +56,7 @@
 $(top_srcdir)/include/java_net_InetAddress.h \
 $(top_srcdir)/include/java_net_NetworkInterface.h \
 $(top_srcdir)/include/java_nio_DirectByteBufferImpl.h \
+$(top_srcdir)/include/java_nio_MappedByteBufferImpl.h \
 $(top_srcdir)/include/java_util_TimeZone.h
 
 if CREATE_JNI_HEADERS
@@ -166,6 +167,8 @@
 	$(JAVAH) -o $@ java.net.NetworkInterface
 $(top_srcdir)/include/java_nio_DirectByteBufferImpl.h: $(top_srcdir)/java/nio/DirectByteBufferImpl.java
 	$(JAVAH) -o $@ java.nio.DirectByteBufferImpl
+$(top_srcdir)/include/java_nio_MappedByteBufferImpl.h: $(top_srcdir)/java/nio/MappedByteBufferImpl.java
+	$(JAVAH) -o $@ java.nio.MappedByteBufferImpl
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio/channels/FileChannelImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.channels.FileChannelImpl
 $(top_srcdir)/include/java_util_TimeZone.h: $(top_srcdir)/java/util/TimeZone.java
Index: native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_nio_channels_FileChannelImpl.c
--- native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	29 Apr 2004 08:44:08 -0000	1.6
+++ native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	29 Apr 2004 14:36:10 -0000
@@ -479,7 +479,7 @@
       JCL_ThrowException(env, "java/lang/UnsupportedOperationException",
         "not implemented - can't shorten files on this platform");
       */
-      JCL_ThrowException(env, IOException,
+      JCL_ThrowException(env, IO_EXCEPTION,
                          "Unable to shorten file length");
 #endif /* HAVE_FTRUNCATE */
     }
Index: native/jni/java-nio/java_nio_MappedByteBufferImpl.c
===================================================================
RCS file: native/jni/java-nio/java_nio_MappedByteBufferImpl.c
diff -N native/jni/java-nio/java_nio_MappedByteBufferImpl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-nio/java_nio_MappedByteBufferImpl.c	29 Apr 2004 14:36:10 -0000
@@ -0,0 +1,72 @@
+/* java_nio_MappedByteBufferImpl.c - Native methods for MappedByteBufferImpl
+   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 "java_nio_MappedByteBufferImpl.h"
+
+#define IO_EXCEPTION "java/io/IOException"
+
+JNIEXPORT void JNICALL
+Java_java_nio_MappedByteBufferImpl_unmapImpl (JNIEnv *env, jclass class)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.MappedByteBufferImpl.unmapImpl(): not implemented");
+}
+
+JNIEXPORT jboolean JNICALL
+Java_java_nio_MappedByteBufferImpl_isLoadedImpl (JNIEnv *env, jclass class)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.MappedByteBufferImpl.isLoadedImpl(): not implemented");
+  return 0;
+}
+
+JNIEXPORT void JNICALL
+Java_java_nio_MappedByteBufferImpl_loadImpl (JNIEnv *env, jclass clazz)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.MappedByteBufferImpl.loadImpl(): not implemented");
+}
+
+JNIEXPORT void JNICALL
+Java_java_nio_MappedByteBufferImpl_forceImpl (JNIEnv *env, jclass class)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.MappedByteBufferImpl.forceImpl(): not implemented");
+}
+
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- native/jni/java-nio/Makefile.am	18 Apr 2004 15:41:17 -0000	1.6
+++ native/jni/java-nio/Makefile.am	29 Apr 2004 14:36:10 -0000
@@ -4,7 +4,8 @@
 			gnu_java_nio_PipeImpl.c \
 			gnu_java_nio_SelectorImpl.c \
 			gnu_java_nio_channels_FileChannelImpl.c \
-			java_nio_DirectByteBufferImpl.c
+			java_nio_DirectByteBufferImpl.c \
+			java_nio_MappedByteBufferImpl.c
 
 libjavanio_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo

--Boundary-00=_RRRkA7M+nuMYmkZ--



From MAILER-DAEMON Thu Apr 29 12:23:32 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJEJw-00024t-4g
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 12:23:32 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJEJq-00022F-16
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 12:23:26 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJEJE-0001s9-QP
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 12:23:20 -0400
Received: from [207.189.223.52] (helo=email3.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJDjZ-0002u7-R5
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 11:45:57 -0400
Received: (qmail 23043 invoked from network); 29 Apr 2004 16:06:28 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email3.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 29 Apr 2004 16:06:28 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 36B324F82AF; Thu, 29 Apr 2004 09:34:29 -0600 (MDT)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: On SECOND thought, maybe I'll heat up some BAKED BEANS and
	watch REGIS PHILBIN..  It's GREAT to be ALIVE!!
Date: 29 Apr 2004 09:34:28 -0600
Message-ID: <8765bier23.fsf@fleche.redhat.com>
Lines: 69
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: 3 more minor cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 29 Apr 2004 16:23:27 -0000

This cleans up a few more imports and removes a couple of unused
fields.

Tom

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2133
diff -u -r1.2133 ChangeLog
--- ChangeLog	29 Apr 2004 14:37:05 -0000	1.2133
+++ ChangeLog	29 Apr 2004 15:43:50 -0000
@@ -1,3 +1,9 @@
+2004-04-29  Tom Tromey  <tromey@redhat.com>
+
+	* java/text/AttributedString.java: Cleaned up imports.
+	* java/util/zip/Deflater.java (strategy): Removed.
+	* java/util/zip/DeflaterEngine.java (buffer): Removed.
+
 2004-04-29  Michael Koch  <konqueror@gmx.de>
 
 	* include/java_nio_MappedByteBufferImpl.h:
Index: java/text/AttributedString.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/AttributedString.java,v
retrieving revision 1.7
diff -u -r1.7 AttributedString.java
--- java/text/AttributedString.java	23 Apr 2004 16:03:10 -0000	1.7
+++ java/text/AttributedString.java	29 Apr 2004 15:44:12 -0000
@@ -40,7 +40,6 @@
 
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Map;
Index: java/util/zip/Deflater.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/Deflater.java,v
retrieving revision 1.4
diff -u -r1.4 Deflater.java
--- java/util/zip/Deflater.java	4 Feb 2004 07:53:45 -0000	1.4
+++ java/util/zip/Deflater.java	29 Apr 2004 15:44:12 -0000
@@ -146,9 +146,6 @@
   /** should we include a header. */
   private boolean noHeader;
 
-  /** Compression strategy. */
-  private int strategy;
-
   /** The current state. */
   private int state;
 
Index: java/util/zip/DeflaterEngine.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/zip/DeflaterEngine.java,v
retrieving revision 1.5
diff -u -r1.5 DeflaterEngine.java
--- java/util/zip/DeflaterEngine.java	5 Jul 2002 21:28:07 -0000	1.5
+++ java/util/zip/DeflaterEngine.java	29 Apr 2004 15:44:12 -0000
@@ -41,7 +41,6 @@
   private final static int TOO_FAR = 4096;
 
   private int ins_h;
-  private byte[] buffer;
 
   /**
    * Hashtable, hashing three characters to an index for window, so



From MAILER-DAEMON Thu Apr 29 12:52:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJEg5-0000Ac-4y
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 12:46:25 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJENA-0002xz-Ve
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 12:26:52 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJDsi-00054o-5B
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 11:55:55 -0400
Received: from [207.174.178.92] (helo=email2.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJDsh-00054D-Ka
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 11:55:23 -0400
Received: (qmail 18449 invoked from network); 29 Apr 2004 15:58:43 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email2.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <commit-classpath@gnu.org>; 29 Apr 2004 15:58:43 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 135404F82AF; Thu, 29 Apr 2004 09:44:02 -0600 (MDT)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Look!  A ladder!  Maybe it leads to heaven, or a sandwich!
Date: 29 Apr 2004 09:44:01 -0600
Message-ID: <87wu3ydc1q.fsf@fleche.redhat.com>
Lines: 67
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: eclipse support files
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 29 Apr 2004 16:46:22 -0000

Mark said it was ok to check these in provided I maintain them.  And,
as stated earlier, if this causes too much trouble we can always
remove them again.

So, here are the eclipse support files.  I'll send a note about
setting up to use Eclipse; perhaps we can make a little news item.

Tom

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2134
diff -u -r1.2134 ChangeLog
--- ChangeLog	29 Apr 2004 15:47:26 -0000	1.2134
+++ ChangeLog	29 Apr 2004 15:51:26 -0000
@@ -1,5 +1,10 @@
 2004-04-29  Tom Tromey  <tromey@redhat.com>
 
+	* .classpath: New file.
+	* .project: New file.
+
+2004-04-29  Tom Tromey  <tromey@redhat.com>
+
 	* java/text/AttributedString.java: Cleaned up imports.
 	* java/util/zip/Deflater.java (strategy): Removed.
 	* java/util/zip/DeflaterEngine.java (buffer): Removed.
Index: .classpath
===================================================================
RCS file: .classpath
diff -N .classpath
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .classpath	29 Apr 2004 15:50:57 -0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+    <classpathentry
+        excluding="external/jaxp/source/|vm/reference/|compat/|test/|external/jaxp/tests/|testsuite/|**/Test.java|**/TestAWT.java|gnu/javax/swing/|**/SliderTest.java"
+        kind="src" path=""/>
+    <classpathentry kind="src" path="external/jaxp/source"/>
+    <classpathentry kind="src" path="vm/reference"/>
+    <classpathentry kind="output" path="bin"/>
+</classpath>
Index: .project
===================================================================
RCS file: .project
diff -N .project
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .project	29 Apr 2004 15:50:57 -0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>classpath</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>



From MAILER-DAEMON Thu Apr 29 14:26:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJGEw-0006F3-HU
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 14:26:30 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJGEp-0006Cc-Lu
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:26:23 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJGBV-00052n-TZ
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:23:30 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJGAj-0004pG-5Z
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:22:09 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3TIM3nV005253
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 20:22:03 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJFwM-0002EB-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 20:07:18 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 20:05:59 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_HQUkAGovCWLo92s"
Message-Id: <200404292006.00030.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: fix for bug #8413
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 18:26:25 -0000


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

Hi list,


I just commited the attached patch to fix bug #8413. This fix is backed 
by a new mauve test. so it should be correct.


Michael


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

	* java/nio/ByteBuffer.java,
	java/nio/CharBuffer.java,
	java/nio/DoubleBuffer.java,
	java/nio/FloatBuffer.java,
	java/nio/IntBuffer.java,
	java/nio/LongBuffer.java,
	java/nio/ShortBuffer.java:
	(compareTo): Fixed bogus implementation in all buffer classes.


--Boundary-00=_HQUkAGovCWLo92s
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.19
diff -u -r1.19 ByteBuffer.java
--- java/nio/ByteBuffer.java	17 Feb 2004 21:44:54 -0000	1.19
+++ java/nio/ByteBuffer.java	29 Apr 2004 17:59:32 -0000
@@ -293,32 +293,27 @@
    */
   public int compareTo (Object obj)
   {
-    ByteBuffer a = (ByteBuffer) obj;
+    ByteBuffer other = (ByteBuffer) obj;
 
-    if (a.remaining () != remaining ())
-      return 1;
-
-    if (! hasArray () ||
-        ! a.hasArray ())
+    int num = Math.min(remaining(), other.remaining());
+    int pos_this = position();
+    int pos_other = other.position();
+    
+    for (int count = 0; count < num; count++)
       {
-        return 1;
+        byte a = get(pos_this++);
+	byte b = other.get(pos_other++);
+      	 
+	if (a == b)
+	  continue;
+      	   
+	if (a < b)
+	  return -1;
+      	   
+	return 1;
       }
-
-    int r = remaining ();
-    int i1 = position ();
-    int i2 = a.position ();
-
-    for (int i = 0; i < r; i++)
-      {
-        int t = (int) (get (i1) - a.get (i2));
-
-        if (t != 0)
-          {
-            return (int) t;
-          }
-      }
-
-    return 0;
+      
+    return remaining() - other.remaining();
   }
 
   /**
Index: java/nio/DoubleBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/DoubleBuffer.java,v
retrieving revision 1.14
diff -u -r1.14 DoubleBuffer.java
--- java/nio/DoubleBuffer.java	17 Feb 2004 21:44:54 -0000	1.14
+++ java/nio/DoubleBuffer.java	29 Apr 2004 17:59:32 -0000
@@ -1,5 +1,5 @@
 /* DoubleBuffer.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.
 
@@ -265,32 +265,27 @@
    */
   public int compareTo (Object obj)
   {
-    DoubleBuffer a = (DoubleBuffer) obj;
+    DoubleBuffer other = (DoubleBuffer) obj;
 
-    if (a.remaining () != remaining ())
-      return 1;
-
-    if (! hasArray () ||
-        ! a.hasArray ())
-      {
-        return 1;
-      }
-
-    int r = remaining ();
-    int i1 = position ();
-    int i2 = a.position ();
-
-    for (int i = 0; i < r; i++)
+    int num = Math.min(remaining(), other.remaining());
+    int pos_this = position();
+    int pos_other = other.position();
+    
+    for (int count = 0; count < num; count++)
       {
-        int t = (int) (get (i1) - a.get (i2));
-
-        if (t != 0)
-          {
-            return (int) t;
-          }
+	double a = get(pos_this++);
+	double b = other.get(pos_other++);
+      	 
+	if (a == b)
+	  continue;
+      	   
+	if (a < b)
+	  return -1;
+      	   
+	return 1;
       }
-
-    return 0;
+      
+    return remaining() - other.remaining();
   }
 
   /**
Index: java/nio/FloatBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/FloatBuffer.java,v
retrieving revision 1.14
diff -u -r1.14 FloatBuffer.java
--- java/nio/FloatBuffer.java	17 Feb 2004 21:44:54 -0000	1.14
+++ java/nio/FloatBuffer.java	29 Apr 2004 17:59:32 -0000
@@ -1,5 +1,5 @@
 /* FloatBuffer.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.
 
@@ -265,32 +265,27 @@
    */
   public int compareTo (Object obj)
   {
-    FloatBuffer a = (FloatBuffer) obj;
+    FloatBuffer other = (FloatBuffer) obj;
 
-    if (a.remaining () != remaining ())
-      return 1;
-
-    if (! hasArray () ||
-        ! a.hasArray ())
-      {
-        return 1;
-      }
-
-    int r = remaining ();
-    int i1 = position ();
-    int i2 = a.position ();
-
-    for (int i = 0; i < r; i++)
+    int num = Math.min(remaining(), other.remaining());
+    int pos_this = position();
+    int pos_other = other.position();
+    
+    for (int count = 0; count < num; count++)
       {
-        int t = (int) (get (i1) - a.get (i2));
-
-        if (t != 0)
-          {
-            return (int) t;
-          }
+	float a = get(pos_this++);
+	float b = other.get(pos_other++);
+      	 
+	if (a == b)
+	  continue;
+      	   
+	if (a < b)
+	  return -1;
+      	   
+	return 1;
       }
-
-    return 0;
+      
+    return remaining() - other.remaining();
   }
 
   /**
Index: java/nio/IntBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/IntBuffer.java,v
retrieving revision 1.14
diff -u -r1.14 IntBuffer.java
--- java/nio/IntBuffer.java	17 Feb 2004 21:44:54 -0000	1.14
+++ java/nio/IntBuffer.java	29 Apr 2004 17:59:32 -0000
@@ -1,5 +1,5 @@
 /* IntBuffer.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.
 
@@ -265,32 +265,27 @@
    */
   public int compareTo (Object obj)
   {
-    IntBuffer a = (IntBuffer) obj;
+    IntBuffer other = (IntBuffer) obj;
 
-    if (a.remaining () != remaining ())
-      return 1;
-
-    if (! hasArray () ||
-        ! a.hasArray ())
-      {
-        return 1;
-      }
-
-    int r = remaining ();
-    int i1 = position ();
-    int i2 = a.position ();
-
-    for (int i = 0; i < r; i++)
+    int num = Math.min(remaining(), other.remaining());
+    int pos_this = position();
+    int pos_other = other.position();
+    
+    for (int count = 0; count < num; count++)
       {
-        int t = (int) (get (i1) - a.get (i2));
-
-        if (t != 0)
-          {
-            return (int) t;
-          }
+      	 int a = get(pos_this++);
+      	 int b = other.get(pos_other++);
+      	 
+      	 if (a == b)
+      	   continue;
+      	   
+      	 if (a < b)
+      	   return -1;
+      	   
+      	 return 1;
       }
-
-    return 0;
+      
+     return remaining() - other.remaining();
   }
 
   /**
Index: java/nio/LongBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/LongBuffer.java,v
retrieving revision 1.14
diff -u -r1.14 LongBuffer.java
--- java/nio/LongBuffer.java	17 Feb 2004 21:44:54 -0000	1.14
+++ java/nio/LongBuffer.java	29 Apr 2004 17:59:32 -0000
@@ -1,5 +1,5 @@
 /* LongBuffer.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.
 
@@ -265,32 +265,27 @@
    */
   public int compareTo (Object obj)
   {
-    LongBuffer a = (LongBuffer) obj;
+    LongBuffer other = (LongBuffer) obj;
 
-    if (a.remaining () != remaining ())
-      return 1;
-
-    if (! hasArray () ||
-        ! a.hasArray ())
-      {
-        return 1;
-      }
-
-    int r = remaining ();
-    int i1 = position ();
-    int i2 = a.position ();
-
-    for (int i = 0; i < r; i++)
+    int num = Math.min(remaining(), other.remaining());
+    int pos_this = position();
+    int pos_other = other.position();
+    
+    for (int count = 0; count < num; count++)
       {
-        int t = (int) (get (i1) - a.get (i2));
-
-        if (t != 0)
-          {
-            return (int) t;
-          }
+	 long a = get(pos_this++);
+	 long b = other.get(pos_other++);
+      	 
+	 if (a == b)
+	   continue;
+      	   
+	 if (a < b)
+	   return -1;
+      	   
+	 return 1;
       }
-
-    return 0;
+      
+     return remaining() - other.remaining();
   }
 
   /**
Index: java/nio/ShortBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/ShortBuffer.java,v
retrieving revision 1.15
diff -u -r1.15 ShortBuffer.java
--- java/nio/ShortBuffer.java	17 Feb 2004 21:44:54 -0000	1.15
+++ java/nio/ShortBuffer.java	29 Apr 2004 17:59:32 -0000
@@ -1,5 +1,5 @@
 /* ShortBuffer.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.
 
@@ -265,32 +265,27 @@
    */
   public int compareTo (Object obj)
   {
-    ShortBuffer a = (ShortBuffer) obj;
+    ShortBuffer other = (ShortBuffer) obj;
 
-    if (a.remaining () != remaining ())
-      return 1;
-
-    if (! hasArray () ||
-        ! a.hasArray ())
-      {
-        return 1;
-      }
-
-    int r = remaining ();
-    int i1 = position ();
-    int i2 = a.position ();
-
-    for (int i = 0; i < r; i++)
+    int num = Math.min(remaining(), other.remaining());
+    int pos_this = position();
+    int pos_other = other.position();
+    
+    for (int count = 0; count < num; count++)
       {
-        int t = (int) (get (i1) - a.get (i2));
-
-        if (t != 0)
-          {
-            return (int) t;
-          }
+	 short a = get(pos_this++);
+	 short b = other.get(pos_other++);
+      	 
+	 if (a == b)
+	   continue;
+      	   
+	 if (a < b)
+	   return -1;
+      	   
+	 return 1;
       }
-
-    return 0;
+      
+     return remaining() - other.remaining();
   }
 
   /**
Index: java/nio/CharBuffer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/CharBuffer.java,v
retrieving revision 1.18
diff -u -r1.18 CharBuffer.java
--- java/nio/CharBuffer.java	17 Feb 2004 21:44:54 -0000	1.18
+++ java/nio/CharBuffer.java	29 Apr 2004 17:59:32 -0000
@@ -1,5 +1,5 @@
 /* CharBuffer.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.
 
@@ -310,32 +310,27 @@
    */
   public int compareTo (Object obj)
   {
-    CharBuffer a = (CharBuffer) obj;
+    CharBuffer other = (CharBuffer) obj;
 
-    if (a.remaining () != remaining ())
-      return 1;
-
-    if (! hasArray () ||
-        ! a.hasArray ())
-      {
-        return 1;
-      }
-
-    int r = remaining ();
-    int i1 = position ();
-    int i2 = a.position ();
-
-    for (int i = 0; i < r; i++)
+    int num = Math.min(remaining(), other.remaining());
+    int pos_this = position();
+    int pos_other = other.position();
+    
+    for (int count = 0; count < num; count++)
       {
-        int t = (int) (get (i1) - a.get (i2));
-
-        if (t != 0)
-          {
-            return (int) t;
-          }
+	 char a = get(pos_this++);
+	 char b = other.get(pos_other++);
+      	 
+	 if (a == b)
+	   continue;
+      	   
+	 if (a < b)
+	   return -1;
+      	   
+	 return 1;
       }
-
-    return 0;
+      
+     return remaining() - other.remaining();
   }
 
   /**

--Boundary-00=_HQUkAGovCWLo92s--



From MAILER-DAEMON Thu Apr 29 14:33:02 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJGLG-00084R-ON
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 14:33:02 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJGHk-0007Rr-6k
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:29:24 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJEjM-0000V2-6E
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 12:50:19 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJEhd-0000Jl-DO
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 12:48:01 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3TGlwB5009923
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 18:47:58 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJEiV-0001xo-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 18:48:55 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 18:47:36 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_pGTkAa0PbimBpsj"
Message-Id: <200404291847.37838.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: fixing jni method signatures
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 18:33:00 -0000


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

Hi list,


I just commited the attached patch to fix two JNI method signatures.


Michael


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

	* include/gnu_java_net_PlainSocketImpl.h
	(connect): Fixed signature of method.
	* include/gnu_java_nio_channels_FileChannelImpl.h
	(lock): Likewise.
	* native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
	(lock): Likewise.


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

Index: include/gnu_java_net_PlainSocketImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_net_PlainSocketImpl.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_net_PlainSocketImpl.h
--- include/gnu_java_net_PlainSocketImpl.h	19 Sep 2003 06:12:39 -0000	1.1
+++ include/gnu_java_net_PlainSocketImpl.h	29 Apr 2004 16:43:47 -0000
@@ -13,7 +13,7 @@
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_setOption (JNIEnv *env, jobject, jint, jobject);
 extern JNIEXPORT jobject JNICALL Java_gnu_java_net_PlainSocketImpl_getOption (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_create (JNIEnv *env, jobject, jboolean);
-extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_connect__Ljava_net_InetAddress_2I (JNIEnv *env, jobject, jobject, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_connect (JNIEnv *env, jobject, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_bind (JNIEnv *env, jobject, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_listen (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_net_PlainSocketImpl_accept (JNIEnv *env, jobject, jobject);
Index: include/gnu_java_nio_channels_FileChannelImpl.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_nio_channels_FileChannelImpl.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_nio_channels_FileChannelImpl.h
--- include/gnu_java_nio_channels_FileChannelImpl.h	8 Apr 2004 20:04:13 -0000	1.1
+++ include/gnu_java_nio_channels_FileChannelImpl.h	29 Apr 2004 16:43:47 -0000
@@ -24,7 +24,7 @@
 extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_write___3BII (JNIEnv *env, jobject, jbyteArray, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_nio_channels_FileChannelImpl_write__I (JNIEnv *env, jobject, jint);
 extern JNIEXPORT jobject JNICALL Java_gnu_java_nio_channels_FileChannelImpl_mapImpl (JNIEnv *env, jobject, jchar, jlong, jint);
-extern JNIEXPORT jboolean JNICALL Java_gnu_java_nio_channels_FileChannelImpl_lock__JJZZ (JNIEnv *env, jobject, jlong, jlong, jboolean, jboolean);
+extern JNIEXPORT jboolean JNICALL Java_gnu_java_nio_channels_FileChannelImpl_lock (JNIEnv *env, jobject, jlong, jlong, jboolean, jboolean);
 
 #ifdef __cplusplus
 }
Index: native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_nio_channels_FileChannelImpl.c
--- native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	29 Apr 2004 14:37:06 -0000	1.7
+++ native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	29 Apr 2004 16:43:47 -0000
@@ -648,7 +648,7 @@
 }
 
 JNIEXPORT jboolean JNICALL
-Java_gnu_java_nio_channels_FileChannelImpl_lock__JJZZ (JNIEnv *env, jobject obj, jlong position, jlong size, jboolean shared, jboolean wait)
+Java_gnu_java_nio_channels_FileChannelImpl_lock (JNIEnv *env, jobject obj, jlong position, jlong size, jboolean shared, jboolean wait)
 {
   JCL_ThrowException (env, IO_EXCEPTION, "java.nio.FileChannelImpl.lock(): not implemented");
   return 0;

--Boundary-00=_pGTkAa0PbimBpsj--



From MAILER-DAEMON Thu Apr 29 14:54:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJGXT-00033w-Ti
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 14:45:39 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJGIW-0007lH-GT
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:30:12 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJFxC-0000z8-QU
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:08:42 -0400
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 1BJFxC-0000x0-AE
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:08:10 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BJFuC-0006Zb-UO
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:05:04 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJFuE-0002q1-Bk
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:05:06 -0400
From: "Michael Koch" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8413
User-Agent: Mozilla/5.0 (compatible; Konqueror/3.2; Linux;
	de, de_DE@euro) (KHTML, like Gecko)
X-Apparently-From: 80.228.94.24
X-Copy-To: Array
Message-Id: <E1BJFuE-0002q1-Bk@savannah.gnu.org>
Date: Thu, 29 Apr 2004 14:05:06 -0400
Subject: [bugs #8413] IntBuffer.compareTo is non-transitive
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 18:45:37 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.

/**************************************************************************/
[bugs #8413] Latest Modifications:

Changes by: 
		Michael Koch <konqueror@gmx.de>
'Date: 
		Thu 04/29/04 at 18:05 (GMT)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
I commited a fix to cvs for all buffer classes. The new implementation is backed by a new mauve test and should be okay now. Thx for your report.






/**************************************************************************/
[bugs #8413] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8413>
Project: classpath
Submitted by: 0
On: Thu 04/01/04 at 17:01

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  None
Status:  Closed
Platform Version:  None


Summary:  IntBuffer.compareTo is non-transitive

Original Submission:  
I think I noticed a bug in the Gnu Classpath implementation of java.nio.IntBuffer while browsing CVS and I wouldn't be surprised if the same bug is present in the other buffer classes as well. FYI, I have never seen the Sun source code for the java.nio classes.

The compareTo method begins like this:

  public int compareTo (Object obj)
  {
    IntBuffer a = (IntBuffer) obj;

    if (a.remaining () != remaining ())
      return 1;

This fails transitivity. Consider two buffers a and b with different remaining sizes:

a.compareTo(b) returns 1 and b.compareTo(a) returns 1. In other words a > b and b > a. 

I have not actually written test code for this, so possibly I'm missing something. If so, I apologize. Also my apologies if this is a duplicate report. Savannah was acting up and I couldn't search the bug database. :-(

I suspect you need something like this instead:

    if (a.remaining () != remaining ()) {
        if (a.remaining() > b.remaining) return 1;
        else return -1;
  }

However, I don't yet know which case should return 1 and which one should return -1. 


Follow-up Comments
------------------


-------------------------------------------------------
Date: Thu 04/29/04 at 18:05         By: mkoch
I commited a fix to cvs for all buffer classes. The new implementation is backed by a new mauve test and should be okay now. Thx for your report.

-------------------------------------------------------
Date: Thu 04/01/04 at 17:03         By: None
I congratulate you on not requiring me to log in to submit a bug report. Betas the hell out of Apache. :-)

In case you need to contact me to ask about this. this bug was submitted by Elliotte Harold. You can reach me at elharo@metalab,unc.edu. 












For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8413>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Thu Apr 29 15:09:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJGlp-00066d-Gs
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 15:00:29 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJGWS-0002gc-He
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 14:44:36 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJFdC-0004St-Lh
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 13:48:07 -0400
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJFc9-00046o-1p
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 13:46:25 -0400
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i3THkHKG007974
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 13:46:17 -0400
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 i3THkHv03253
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 13:46:17 -0400
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
	i3THkHcU022523
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 13:46:17 -0400
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit-classpath@gnu.org
Content-Type: text/plain
Message-Id: <1083260776.22124.10.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Thu, 29 Apr 2004 13:46:17 -0400
Content-Transfer-Encoding: 7bit
Subject: Patch: FYI: fix Applet size reporting
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 19:00:27 -0000

Hi,

This patch fixes a problem with how applets report their size.  If the
applet stub is not set, then Applet should use Panel's implementation of
preferredSize and minimumSize.  I just committed this to CVS HEAD.

Tom

2004-04-29  Thomas Fitzsimmons  <fitzsim@redhat.com>

        * java/applet/Applet.java (preferredSize): Call parent's
        preferredSize if the applet stub is null.
        (minimumSize): Likewise for parent's minimumSize.


Index: java/applet/Applet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/applet/Applet.java,v
retrieving revision 1.3.36.3
diff -u -r1.3.36.3 Applet.java
--- java/applet/Applet.java     16 Mar 2004 04:43:35 -0000      1.3.36.3
+++ java/applet/Applet.java     28 Apr 2004 16:35:36 -0000
@@ -483,7 +483,7 @@
    */
   public Dimension preferredSize()
   {
-    return getDimensions ();
+    return stub == null ? super.preferredSize () : getDimensions ();
   }
 
   /**
@@ -494,7 +494,7 @@
    */
   public Dimension minimumSize()
   {
-    return getDimensions ();
+    return stub == null ? super.minimumSize () : getDimensions ();
   }
 
   /**






From MAILER-DAEMON Thu Apr 29 17:22:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJIzS-0002pH-Nj
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 17:22:42 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJIy9-0002Hi-V3
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:21:21 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJIxY-000260-DR
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:21:15 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJIxT-00025Q-08
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:20:39 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJIxW-00031I-Pe
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:20:42 -0400
From: "Michael Koch" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 7941
User-Agent: Mozilla/5.0 (compatible; Konqueror/3.2; Linux;
	de, de_DE@euro) (KHTML, like Gecko)
X-Apparently-From: 80.228.94.24
X-Copy-To: Array
Message-Id: <E1BJIxW-00031I-Pe@savannah.gnu.org>
Date: Thu, 29 Apr 2004 17:20:42 -0400
Subject: [bugs #7941] InetAddress.getByName(ip) is not instanceof
	Inet4Address
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 21:22:41 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.

/**************************************************************************/
[bugs #7941] Latest Modifications:

Changes by: 
		Michael Koch <konqueror@gmx.de>
'Date: 
		Thu 04/29/04 at 21:20 (GMT)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
I just commit a fix for this to cvs. the fix will be in the soon to be releases 0.09 version.






/**************************************************************************/
[bugs #7941] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7941>
Project: classpath
Submitted by: 0
On: Sun 02/29/04 at 13:37

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  None
Status:  Closed
Platform Version:  None


Summary:  InetAddress.getByName(ip) is not instanceof Inet4Address

Original Submission:  On Sun JRE, InetAddress.getByName("127.0.0.1") is instanceof Inet4Address. On GNU classpath it is instanceof InetAddress.
Note also, that InetAddress is defined as abstract in Java API, so no public API method should return a InetAddress instance!

Follow-up Comments
------------------


-------------------------------------------------------
Date: Thu 04/29/04 at 21:20         By: mkoch
I just commit a fix for this to cvs. the fix will be in the soon to be releases 0.09 version.












For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=7941>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Thu Apr 29 17:35:32 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJIxK-00022a-NL
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 17:20:30 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJIxD-0001yu-Le
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:20:23 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJIwd-0001qh-RB
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:20:19 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJIwc-0001qB-TP
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:19:47 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-024.ewetel.net
	[80.228.94.24])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3TLJipc004602
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 23:19:45 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJIxY-0002f9-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 23:20:44 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 29 Apr 2004 23:19:24 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_cFXkA2Ov+ZfR1tY"
Message-Id: <200404292319.25117.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: fixing #7941
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 21:20:25 -0000


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

Hi list,



I just commited the attached patch to fix bug #7941. 
InetAddress.getByName("127.0.01") did not return an object which is an 
instance of Inet4Address. It returned a simple InetAddress object.


Michael


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

	* java/net/InetAddress.java
	(static): ANY_IF should be an instance of Inet4Address.
	(InetAddress): Remove unused constructors.
	(getByName): Create instance of Inet4Address for IPv4 addresses.
	(getAllByName): Likewise.
	(getInaddrAny): Likewise.
	* java/net/Inet4Address.java
	(Inet4Address): New constructor which takes hostname_alias. route all
	other construtors through this one.
	* java/net/Inet6Address.java
	(Inet6Address): Call correct super constructor.


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

Index: java/net/InetAddress.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/InetAddress.java,v
retrieving revision 1.30
diff -u -r1.30 InetAddress.java
--- java/net/InetAddress.java	12 Apr 2004 11:09:19 -0000	1.30
+++ java/net/InetAddress.java	29 Apr 2004 21:14:53 -0000
@@ -149,7 +149,7 @@
         {
 	  // Hmmm, make one up and hope that it works.
 	  byte[] zeros = { 0, 0, 0, 0 };
-	  ANY_IF = new InetAddress(zeros);
+	  ANY_IF = new Inet4Address(zeros);
         }
     }
 
@@ -191,32 +191,7 @@
 
   /**
    * Initializes this object's addr instance variable from the passed in
-   * int array.  Note that this constructor is protected and is called
-   * only by static methods in this class.
-   *
-   * @param ipaddr The IP number of this address as an array of bytes
-   */
-  InetAddress(byte[] address)
-  {
-    this (address, null, null);
-  }
-
-  /**
-   * Initializes this object's addr instance variable from the passed in
-   * int array.  Note that this constructor is protected and is called
-   * only by static methods in this class.
-   *
-   * @param ipaddr The IP number of this address as an array of bytes
-   * @param hostname The hostname of this IP address.
-   */
-  InetAddress(byte[] address, String hostname)
-  {
-    this(address, hostname, null);
-  }
-
-  /**
-   * Initializes this object's addr instance variable from the passed in
-   * int array.  Note that this constructor is protected and is called
+   * byte array.  Note that this constructor is protected and is called
    * only by static methods in this class.
    *
    * @param ipaddr The IP number of this address as an array of bytes
@@ -636,7 +611,7 @@
     // Assume that the host string is an IP address
     byte[] address = aton(hostname);
     if (address != null)
-      return new InetAddress(address);
+      return new Inet4Address(address);
 
     // Try to resolve the host by DNS
     InetAddress[] addresses = getAllByName(hostname);
@@ -697,7 +672,7 @@
 	// canonical names of these ip's when the user asks for the hostname
 	// But do specify the host alias so if the IP returned won't
 	// reverse lookup we don't throw an exception.
-	addresses[i] = new InetAddress(iplist[i], null, hostname);
+	addresses[i] = new Inet4Address(iplist[i], null, hostname);
       }
 
     addToCache(hostname, addresses);
@@ -777,10 +752,10 @@
     if (inaddr_any == null)
       {
 	byte[] tmp = lookupInaddrAny();
-	inaddr_any = new InetAddress(tmp);
+	inaddr_any = new Inet4Address(tmp);
       }
 
-    return (inaddr_any);
+    return inaddr_any;
   }
 
   /**
Index: java/net/Inet4Address.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Inet4Address.java,v
retrieving revision 1.9
diff -u -r1.9 Inet4Address.java
--- java/net/Inet4Address.java	8 Apr 2004 17:25:02 -0000	1.9
+++ java/net/Inet4Address.java	29 Apr 2004 21:14:53 -0000
@@ -62,7 +62,19 @@
    */
   private Object writeReplace() throws ObjectStreamException
   {
-    return new InetAddress(addr, hostName);
+    return new InetAddress(addr, hostName, null);
+  }
+  
+  /**
+   * Initializes this object's addr instance variable from the passed in
+   * byte array. Note that this constructor is package-private and is called
+   * only by static methods in InetAddress.
+   * 
+   * @param addr
+   */
+  Inet4Address(byte[] addr)
+  {
+    this(addr, null, null);
   }
 
   /**
@@ -73,9 +85,24 @@
    */
   Inet4Address(byte[] addr, String host)
   {
-    super(addr, host);
+    this(addr, host, null);
   }
 
+  /**
+   * Initializes this object's addr instance variable from the passed in
+   * byte array.  Note that this constructor is protected and is called
+   * only by static methods in this class.
+   *
+   * @param addr The IP number of this address as an array of bytes
+   * @param hostname The hostname of this IP address.
+   * @param hostname_alias A backup hostname to use if hostname is null to
+   * prevent reverse lookup failures
+   */
+  Inet4Address(byte[] addr, String hostname, String hostname_alias)
+  {
+    super(addr, hostname, hostname_alias);
+  }
+  
   /**
    * Checks if the address is a multicast address
    *
Index: java/net/Inet6Address.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/Inet6Address.java,v
retrieving revision 1.6
diff -u -r1.6 Inet6Address.java
--- java/net/Inet6Address.java	8 Apr 2004 17:25:02 -0000	1.6
+++ java/net/Inet6Address.java	29 Apr 2004 21:14:53 -0000
@@ -67,7 +67,7 @@
    */
   Inet6Address(byte[] addr, String host)
   {
-    super(addr, host);
+    super(addr, host, null);
     this.ipaddress = addr;
   }
 

--Boundary-00=_cFXkA2Ov+ZfR1tY--



From MAILER-DAEMON Thu Apr 29 17:49:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJJOx-0001oo-29
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 17:49:03 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJJOu-0001oS-8J
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:49:00 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJJOt-0001o1-01
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:48:59 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJJOs-0001ni-DH
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:48:58 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJJOl-00054s-00
	for <commit-classpath@gnu.org>; Thu, 29 Apr 2004 23:48:51 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-bT9QLNvFphR59EmIMPT4"
Message-Id: <1083275335.24004.129.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Thu, 29 Apr 2004 23:48:56 +0200
Subject: [Fwd: FYI: Fix RandomAccessFile.setLenght (truncation file,
	updates file position).]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 21:49:00 -0000


--=-bT9QLNvFphR59EmIMPT4
Content-Type: multipart/mixed; boundary="=-JiHjFoOKqYC6MntDkMyi"


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

It is commit-classpath@gnu.org, not classpath-commit@gnu.org... Oops.

--=-JiHjFoOKqYC6MntDkMyi
Content-Disposition: inline
Content-Description: Forwarded message - FYI: Fix
	RandomAccessFile.setLenght (truncation file, updates file position).
Content-Type: message/rfc822

Subject: FYI: Fix RandomAccessFile.setLenght (truncation file, updates file
	position).
From: Mark Wielaard <mark@klomp.org>
To: classpath-commit@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-nzenlnIE9wo4JVTLTmPD"
Message-Id: <1083273455.24009.127.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6
Date: Thu, 29 Apr 2004 23:17:36 +0200


--=-nzenlnIE9wo4JVTLTmPD
Content-Type: multipart/mixed; boundary="=-NVmCMeempjybcDfVKd0K"


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

Hi,

This fixes a buglet in RandomAccessFile. When we set the new length of a
file we need to make sure to also set the new file postition to the new
length (end of file) when the new length is smaller then the current
file position.

2004-04-29  Mark Wielaard  <mark@klomp.org>

    * java/io/RandomAccessFile.java (setLength): Set position to new
    length when new length is smaller then current position.

There is now also an explicit Mauve test for this, which passes with
this patch (but fails without it). Committed.

Cheers,

Mark

--=-NVmCMeempjybcDfVKd0K
Content-Disposition: inline; filename=RandomAccessFile.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=RandomAccessFile.patch; charset=ISO-8859-1

SW5kZXg6IGphdmEvaW8vUmFuZG9tQWNjZXNzRmlsZS5qYXZhDQo9PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmls
ZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZhL2lvL1JhbmRvbUFjY2Vzc0ZpbGUu
amF2YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzgNCmRpZmYgLXUgLXIxLjM4IFJhbmRvbUFj
Y2Vzc0ZpbGUuamF2YQ0KLS0tIGphdmEvaW8vUmFuZG9tQWNjZXNzRmlsZS5qYXZhCTE3IEFwciAy
MDA0IDE3OjI5OjE4IC0wMDAwCTEuMzgNCisrKyBqYXZhL2lvL1JhbmRvbUFjY2Vzc0ZpbGUuamF2
YQkyOSBBcHIgMjAwNCAyMToxNzowMCAtMDAwMA0KQEAgLTE5NCwxMiArMTk0LDE0IEBADQogICB9
DQogDQogICAvKioNCi0gICAqIFRoaXMgbWV0aG9kIHNldHMgdGhlIGxlbmd0aCBvZiB0aGUgZmls
ZSB0byB0aGUgc3BlY2lmaWVkIGxlbmd0aC4gIElmDQotICAgKiB0aGUgY3VycmVudGx5IGxlbmd0
aCBvZiB0aGUgZmlsZSBpcyBsb25nZXIgdGhhbiB0aGUgc3BlY2lmaWVkIGxlbmd0aCwNCi0gICAq
IHRoZW4gdGhlIGZpbGUgaXMgdHJ1bmNhdGVkIHRvIHRoZSBzcGVjaWZpZWQgbGVuZ3RoLiAgSWYg
dGhlIGN1cnJlbnQNCi0gICAqIGxlbmd0aCBvZiB0aGUgZmlsZSBpcyBzaG9ydGVyIHRoYW4gdGhl
IHNwZWNpZmllZCBsZW5ndGgsIHRoZSBmaWxlDQotICAgKiBpcyBleHRlbmRlZCB3aXRoIGJ5dGVz
IG9mIGFuIHVuZGVmaW5lZCB2YWx1ZS4NCi0gICAqICA8cD4NCisgICAqIFRoaXMgbWV0aG9kIHNl
dHMgdGhlIGxlbmd0aCBvZiB0aGUgZmlsZSB0byB0aGUgc3BlY2lmaWVkIGxlbmd0aC4NCisgICAq
IElmIHRoZSBjdXJyZW50bHkgbGVuZ3RoIG9mIHRoZSBmaWxlIGlzIGxvbmdlciB0aGFuIHRoZSBz
cGVjaWZpZWQNCisgICAqIGxlbmd0aCwgdGhlbiB0aGUgZmlsZSBpcyB0cnVuY2F0ZWQgdG8gdGhl
IHNwZWNpZmllZCBsZW5ndGggKHRoZQ0KKyAgICogZmlsZSBwb3NpdGlvbiBpcyBzZXQgdG8gdGhl
IGVuZCBvZiBmaWxlIGluIHRoaXMgY2FzZSkuICBJZiB0aGUNCisgICAqIGN1cnJlbnQgbGVuZ3Ro
IG9mIHRoZSBmaWxlIGlzIHNob3J0ZXIgdGhhbiB0aGUgc3BlY2lmaWVkIGxlbmd0aCwNCisgICAq
IHRoZSBmaWxlIGlzIGV4dGVuZGVkIHdpdGggYnl0ZXMgb2YgYW4gdW5kZWZpbmVkIHZhbHVlICh0
aGUgZmlsZQ0KKyAgICogcG9zaXRpb24gaXMgdW5jaGFuZ2VkIGluIHRoaXMgY2FzZSkuDQorICAg
KiA8cD4NCiAgICAqIFRoZSBmaWxlIG11c3QgYmUgb3BlbiBmb3Igd3JpdGUgYWNjZXNzIGZvciB0
aGlzIG9wZXJhdGlvbiB0byBzdWNjZWVkLg0KICAgICoNCiAgICAqIEBwYXJhbSBuZXdsZW4gVGhl
IG5ldyBsZW5ndGggb2YgdGhlIGZpbGUNCkBAIC0yMDksNiArMjExLDEwIEBADQogICBwdWJsaWMg
dm9pZCBzZXRMZW5ndGggKGxvbmcgbmV3TGVuKSB0aHJvd3MgSU9FeGNlcHRpb24NCiAgIHsNCiAg
ICAgY2gudHJ1bmNhdGUgKG5ld0xlbik7DQorDQorICAgIGxvbmcgcG9zaXRpb24gPSBnZXRGaWxl
UG9pbnRlcigpOw0KKyAgICBpZiAocG9zaXRpb24gPiBuZXdMZW4pDQorICAgICAgc2VlayhuZXdM
ZW4pOw0KICAgfQ0KIA0KICAgLyoqDQo=

--=-NVmCMeempjybcDfVKd0K--

--=-nzenlnIE9wo4JVTLTmPD
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)

iD8DBQBAkXDvxVhZCJWr9QwRAiCjAKCdj8Vy/PRi58/ADLw0DmwUxzsINwCfa5Bl
b99HtD1EZb3m/PVLBJ1RkoY=
=p3Hu
-----END PGP SIGNATURE-----

--=-nzenlnIE9wo4JVTLTmPD--

--=-JiHjFoOKqYC6MntDkMyi--

--=-bT9QLNvFphR59EmIMPT4
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)

iD8DBQBAkXhHxVhZCJWr9QwRAkI4AJ0XOxEdYFtSBjUVAWx8ewgxtbsZPwCfTdBV
tsx6jP5rC+tsT5R4LolHlr8=
=PBZ+
-----END PGP SIGNATURE-----

--=-bT9QLNvFphR59EmIMPT4--




From MAILER-DAEMON Thu Apr 29 17:54:15 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJJTz-0002qV-5h
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 17:54:15 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJJTw-0002pR-7K
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:54:12 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJJSk-0002ZM-NW
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:53:30 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJJRZ-0002H4-9p
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:51:45 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJJRW-0006iy-Dq
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 17:51:42 -0400
From: "Mark Wielaard" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: patch
X-Savannah-Artifact-ID: 2951
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6) Gecko/20040413 Galeon/1.3.14 (Debian package 1.3.14a-1)
X-Apparently-From: 82.161.94.186
X-Copy-To: Array
Message-Id: <E1BJJRW-0006iy-Dq@savannah.gnu.org>
Date: Thu, 29 Apr 2004 17:51:42 -0400
Subject: [patch #2951] FileChannelImpl read/write(buff, offset,
	length) fails when buff.length == 0
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 21:54:13 -0000

This mail is an automated notification from the patch tracker
 of the project: classpath.

/**************************************************************************/
[patch #2951] Latest Modifications:

Changes by: 
		Mark Wielaard <mark@klomp.org>
'Date: 
		Thu 04/29/04 at 21:51 (Europe/Amsterdam)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
         Assigned to | None                      | mark
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Thanks. I committed a somewhat similar fix which also fixes another issue with read(byte[]).

2004-04-29  Stephen Crawley  <crawley@dstc.edu.au>
            Mark Wielaard  <mark@klomp.org>
 
        * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
        (Java_gnu_java_nio_channels_FileChannelImpl_read___3BII):
        Fill buffer with a  do-while bytes_read < 1 loop.
        Check for length == 0.







/**************************************************************************/
[patch #2951] Full Item Snapshot:

URL: <http://savannah.gnu.org/patch/?func=detailitem&item_id=2951>
Project: classpath
Submitted by: Stephen Crawley
On: Mon 04/19/04 at 15:27

Category:  None
Priority:  5 - Normal
Resolution:  Fixed
Assigned to:  mark
Originator Email:  
Status:  Closed


Summary:  FileChannelImpl read/write(buff, offset, length) fails when buff.length == 0

Original Submission:  The current native implementation of the 3 argument read 
and write methods of gnu.java.nio.channel.FileChannelImpl
throw an IOException with message "Unexpected JNI error"
when the buff argument has zero length.  This can happen
if an application tries to read or write an zero length
byte array with a File{Input,Output}Stream.  The problem
is that the native methods don't check the length arg
before making the JNI GetByteArrayElements call.  The
latter call then fails ...

The bugs are exercised by these Mauve testcases:
  gnu.testlet.java.io.FileOutputStream.write
  gnu.testlet.java.io.FileInputStream.read

The obvious fix is to have the native methods test for
length == 0 explicitly.  Suggested ChangeLog entries:

2004-04-20 Stephen Crawley <crawley@dstc.edu.au>
  * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c (Java_gnu_java_nio_channels_FileChannelImpl_read___3BII) :
  check for length == 0
  *  native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c (Java_gnu_java_nio_channels_FileChannelImpl_write___3BII)
  ditto





Follow-up Comments
------------------


-------------------------------------------------------
Date: Thu 04/29/04 at 21:51         By: mark
Thanks. I committed a somewhat similar fix which also fixes another issue with read(byte[]).

2004-04-29  Stephen Crawley  <crawley@dstc.edu.au>
            Mark Wielaard  <mark@klomp.org>
 
        * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
        (Java_gnu_java_nio_channels_FileChannelImpl_read___3BII):
        Fill buffer with a  do-while bytes_read < 1 loop.
        Check for length == 0.







File Attachments
-------------------

-------------------------------------------------------
Date: Mon 04/19/04 at 15:27  Name: diffs  Size: 1KB   By: crawley

http://savannah.gnu.org/patch/download.php?item_id=2951&amp;item_file_id=3124






For detailed info, follow this link:
<http://savannah.gnu.org/patch/?func=detailitem&item_id=2951>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Thu Apr 29 18:46:59 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJKJ1-0001jC-90
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 18:46:59 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJKIy-0001ih-GW
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:46:56 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJKIP-0001eL-Hf
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:46:52 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJKIP-0001e6-2g
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:46:21 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJKIS-0002k9-RU
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:46:24 -0400
From: "Mark Wielaard" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: patch
X-Savannah-Artifact-ID: 2485
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6) Gecko/20040413 Galeon/1.3.14 (Debian package 1.3.14a-1)
X-Apparently-From: 82.161.94.186
X-Copy-To: Array
Message-Id: <E1BJKIS-0002k9-RU@savannah.gnu.org>
Date: Thu, 29 Apr 2004 18:46:24 -0400
Subject: [patch #2485] java.util.HashMap#rehash performance improvement
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 22:46:57 -0000

This mail is an automated notification from the patch tracker
 of the project: classpath.

/**************************************************************************/
[patch #2485] Latest Modifications:

Changes by: 
		Mark Wielaard <mark@klomp.org>
'Date: 
		Thu 04/29/04 at 22:46 (Europe/Amsterdam)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Thanks. I committed the following (slightly different from your original):

2004-04-29  Mark Wielaard  <mark@klomp.org>
 
        Reported by f.haeglsperger@gmx.de [patch #2485]
        * java/util/HashMap.java (rehash): Add entry at start of bucket.


diff -u -r1.27 HashMap.java
--- java/util/HashMap.java      22 Apr 2004 11:24:39 -0000      1.27
+++ java/util/HashMap.java      29 Apr 2004 22:41:34 -0000
@@ -743,18 +743,9 @@
           {
             int idx = hash(e.key);
             HashEntry dest = buckets[idx];
-
-            if (dest != null)
-              {
-                while (dest.next != null)
-                  dest = dest.next;
-                dest.next = e;
-              }
-            else
-              buckets[idx] = e;
-
             HashEntry next = e.next;
-            e.next = null;
+            e.next = buckets[idx];
+            buckets[idx] = e;
             e = next;
           }
       }

It is actually a bit of a micro optimisation since your hash function has to be pretty for this to be noticable. But bad hash functions are not that rare so I guess this will help at least someone.

Cheers,

Mark






/**************************************************************************/
[patch #2485] Full Item Snapshot:

URL: <http://savannah.gnu.org/patch/?func=detailitem&item_id=2485>
Project: classpath
Submitted by: 0
On: Fri 01/16/04 at 20:15

Category:  None
Priority:  5 - Normal
Resolution:  Fixed
Assigned to:  mark
Originator Email:  f.haeglsperger@gmx.de
Status:  Closed


Summary:  java.util.HashMap#rehash performance improvement

Original Submission:  The entries in one bucket are stored in a linked list. On rehashing, we need to re-add every entry. Currently, we search the end of that linked list and add the entry there. Which causes O(n^2) performance in the worst case, i.e. when every entry is in the same bucket. This should really be O(n).

With the attached patch, we get rid of the loop that finds the end of the list, and instead add the entry at the beginning. This is just what addEntry() does when adding entries normally.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Thu 04/29/04 at 22:46         By: mark
Thanks. I committed the following (slightly different from your original):

2004-04-29  Mark Wielaard  <mark@klomp.org>
 
        Reported by f.haeglsperger@gmx.de [patch #2485]
        * java/util/HashMap.java (rehash): Add entry at start of bucket.


diff -u -r1.27 HashMap.java
--- java/util/HashMap.java      22 Apr 2004 11:24:39 -0000      1.27
+++ java/util/HashMap.java      29 Apr 2004 22:41:34 -0000
@@ -743,18 +743,9 @@
           {
             int idx = hash(e.key);
             HashEntry dest = buckets[idx];
-
-            if (dest != null)
-              {
-                while (dest.next != null)
-                  dest = dest.next;
-                dest.next = e;
-              }
-            else
-              buckets[idx] = e;
-
             HashEntry next = e.next;
-            e.next = null;
+            e.next = buckets[idx];
+            buckets[idx] = e;
             e = next;
           }
       }

It is actually a bit of a micro optimisation since your hash function has to be pretty for this to be noticable. But bad hash functions are not that rare so I guess this will help at least someone.

Cheers,

Mark

-------------------------------------------------------
Date: Fri 03/12/04 at 14:35         By: mark
Will take a look at this, but after 0.08.






File Attachments
-------------------

-------------------------------------------------------
Date: Fri 01/16/04 at 20:15  Name: diff.txt  Size: 619KB   By: None

http://savannah.gnu.org/patch/download.php?item_id=2485&amp;item_file_id=2526






For detailed info, follow this link:
<http://savannah.gnu.org/patch/?func=detailitem&item_id=2485>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Thu Apr 29 18:49:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJKL8-00028Y-V5
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 18:49:10 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJKL6-00027m-C3
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:49:08 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJKL5-00027S-4Z
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:49:07 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJKL4-000273-L0
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:49:06 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJKKx-0005H6-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 00:48:59 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-efdriLdbd5n9oMz0zj3z"
Message-Id: <1083278944.24001.133.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 00:49:04 +0200
Subject: FYI: Micro-optimization for HashMap.rehash()
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 22:49:09 -0000


--=-efdriLdbd5n9oMz0zj3z
Content-Type: multipart/mixed; boundary="=-MHVPiqQtnszvIC8zQXmZ"


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

Hi,

The following is a little micro-optimization for HashMap.rehash().

2004-04-29  Mark Wielaard  <mark@klomp.org>
=20
        Reported by f.haeglsperger@gmx.de [patch #2485]
        * java/util/HashMap.java (rehash): Add entry at start of bucket.

Your hash function has to be pretty for this to be noticeable. But bad
hash functions are not that rare so I guess this will help at least
someone.

Cheers,

Mark

--=-MHVPiqQtnszvIC8zQXmZ
Content-Disposition: inline; filename=HashMap.patch
Content-Type: text/x-patch; name=HashMap.patch; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0
aC9jbGFzc3BhdGgvQ2hhbmdlTG9nLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yMTQwDQpkaWZm
IC11IC1yMS4yMTQwIENoYW5nZUxvZw0KLS0tIENoYW5nZUxvZwkyOSBBcHIgMjAwNCAyMToyMTox
MCAtMDAwMAkxLjIxNDANCisrKyBDaGFuZ2VMb2cJMjkgQXByIDIwMDQgMjI6NDY6NDUgLTAwMDAN
CkBAIC0xLDUgKzEsMTAgQEANCiAyMDA0LTA0LTI5ICBNYXJrIFdpZWxhYXJkICA8bWFya0BrbG9t
cC5vcmc+DQogDQorCVJlcG9ydGVkIGJ5IGYuaGFlZ2xzcGVyZ2VyQGdteC5kZSBbcGF0Y2ggIzI0
ODVdDQorCSogamF2YS91dGlsL0hhc2hNYXAuamF2YSAocmVoYXNoKTogQWRkIGVudHJ5IGF0IHN0
YXJ0IG9mIGJ1Y2tldC4NCisNCisyMDA0LTA0LTI5ICBNYXJrIFdpZWxhYXJkICA8bWFya0BrbG9t
cC5vcmc+DQorDQogCSogamF2YS9pby9SYW5kb21BY2Nlc3NGaWxlLmphdmEgKHNldExlbmd0aCk6
IFNldCBwb3NpdGlvbiB0byBuZXcNCiAJbGVuZ3RoIHdoZW4gbmV3IGxlbmd0aCBpcyBzbWFsbGVy
IHRoZW4gY3VycmVudCBwb3NpdGlvbi4NCiANCkluZGV4OiBqYXZhL3V0aWwvSGFzaE1hcC5qYXZh
DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZh
L3V0aWwvSGFzaE1hcC5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yNw0KZGlmZiAtdSAt
cjEuMjcgSGFzaE1hcC5qYXZhDQotLS0gamF2YS91dGlsL0hhc2hNYXAuamF2YQkyMiBBcHIgMjAw
NCAxMToyNDozOSAtMDAwMAkxLjI3DQorKysgamF2YS91dGlsL0hhc2hNYXAuamF2YQkyOSBBcHIg
MjAwNCAyMjo0Njo0NSAtMDAwMA0KQEAgLTc0MywxOCArNzQzLDkgQEANCiAgICAgICAgICAgew0K
ICAgICAgICAgICAgIGludCBpZHggPSBoYXNoKGUua2V5KTsNCiAgICAgICAgICAgICBIYXNoRW50
cnkgZGVzdCA9IGJ1Y2tldHNbaWR4XTsNCi0NCi0gICAgICAgICAgICBpZiAoZGVzdCAhPSBudWxs
KQ0KLSAgICAgICAgICAgICAgew0KLSAgICAgICAgICAgICAgICB3aGlsZSAoZGVzdC5uZXh0ICE9
IG51bGwpDQotICAgICAgICAgICAgICAgICAgZGVzdCA9IGRlc3QubmV4dDsNCi0gICAgICAgICAg
ICAgICAgZGVzdC5uZXh0ID0gZTsNCi0gICAgICAgICAgICAgIH0NCi0gICAgICAgICAgICBlbHNl
DQotICAgICAgICAgICAgICBidWNrZXRzW2lkeF0gPSBlOw0KLQ0KICAgICAgICAgICAgIEhhc2hF
bnRyeSBuZXh0ID0gZS5uZXh0Ow0KLSAgICAgICAgICAgIGUubmV4dCA9IG51bGw7DQorICAgICAg
ICAgICAgZS5uZXh0ID0gYnVja2V0c1tpZHhdOw0KKyAgICAgICAgICAgIGJ1Y2tldHNbaWR4XSA9
IGU7DQogICAgICAgICAgICAgZSA9IG5leHQ7DQogICAgICAgICAgIH0NCiAgICAgICB9DQo=

--=-MHVPiqQtnszvIC8zQXmZ--

--=-efdriLdbd5n9oMz0zj3z
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)

iD8DBQBAkYZfxVhZCJWr9QwRAuCsAJ4uMH9GKBa2zs3MvQN83P5JskZEKQCeJB0W
iiGtuQ0pDzdEb08dFjjQdGM=
=Peky
-----END PGP SIGNATURE-----

--=-efdriLdbd5n9oMz0zj3z--




From MAILER-DAEMON Thu Apr 29 18:56:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJKSL-0004K5-RW
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 18:56:37 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJKS8-0004Eb-K7
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:56:24 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJKRZ-0003yd-Cb
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:56:21 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJKRY-0003y3-ES
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:55:48 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJKRZ-00031i-OA
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 18:55:49 -0400
From: "Mark Wielaard" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: patch
X-Savannah-Artifact-ID: 2680
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6) Gecko/20040413 Galeon/1.3.14 (Debian package 1.3.14a-1)
X-Apparently-From: 82.161.94.186
X-Copy-To: Array
Message-Id: <E1BJKRZ-00031i-OA@savannah.gnu.org>
Date: Thu, 29 Apr 2004 18:55:49 -0400
Subject: [patch #2680] Exception message for NoClassDefFoundError in
	VMClass.initialize()
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 22:56:27 -0000

This mail is an automated notification from the patch tracker
 of the project: classpath.

/**************************************************************************/
[patch #2680] Latest Modifications:

Changes by: 
		Mark Wielaard <mark@klomp.org>
'Date: 
		Thu 04/29/04 at 22:55 (Europe/Amsterdam)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Invalid
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
This patch is not applicable anymore since that part of VMClass has been removed for 0.09.






/**************************************************************************/
[patch #2680] Full Item Snapshot:

URL: <http://savannah.gnu.org/patch/?func=detailitem&item_id=2680>
Project: classpath
Submitted by: Stephen Crawley
On: Mon 02/23/04 at 15:54

Category:  None
Priority:  5 - Normal
Resolution:  Invalid
Assigned to:  mark
Originator Email:  
Status:  Closed


Summary:  Exception message for NoClassDefFoundError in VMClass.initialize()

Original Submission:  This patch adds a message including the name of the class
when VMClass.initialize() throws NoClassDefFoundError due
to a previously reported class initialization problem.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Thu 04/29/04 at 22:55         By: mark
This patch is not applicable anymore since that part of VMClass has been removed for 0.09.

-------------------------------------------------------
Date: Fri 03/12/04 at 13:36         By: mark
Good idea, but I didn't want to fiddle with VM classes just before the release. Sorry for not taking a look at this earlier.

Would just saying
throw new NoClassDefFoundError(getName())
be good enough?
I would expect the message of a NoClassDefFoundError to be just the Class name, but I haven't checked against any spec.






File Attachments
-------------------

-------------------------------------------------------
Date: Mon 02/23/04 at 15:54  Name: diffs  Size: 662KB   By: crawley
the patch
http://savannah.gnu.org/patch/download.php?item_id=2680&amp;item_file_id=2782






For detailed info, follow this link:
<http://savannah.gnu.org/patch/?func=detailitem&item_id=2680>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Thu Apr 29 19:42:57 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJLBA-0005pA-Sb
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 19:42:56 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJLB7-0005o9-JK
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 19:42:53 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJLB5-0005nL-A3
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 19:42:52 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJL3z-0004Uy-Fj
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 19:35:31 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJL3s-0005Ow-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 01:35:24 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-xPA4n3DoFIwhJdu8FYOE"
Message-Id: <1083281728.24007.169.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 01:35:29 +0200
Subject: FYI: Small unused variables cleanup
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 23:42:54 -0000


--=-xPA4n3DoFIwhJdu8FYOE
Content-Type: multipart/mixed; boundary="=-2b/Pej3R6FtABmuAreRX"


--=-2b/Pej3R6FtABmuAreRX
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

Here is a little patch to cleanup some issues with unused variables.

2004-04-29  Mark Wielaard  <mark@klomp.org>

	* gnu/java/awt/BitwiseXORComposite.java
	(compose(Raster, Raster, WritableRaster)): Removed unused variable
        transferType.
        * gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (minimumSize): Removed
        unused variables hScrollbarHeight and vScrollbarWidth.
        (preferredSize): Likewise.
        * gnu/java/security/provider/DSAParameters.java (engineToString):
        Removed unused call to System.getProperty("line.seperator");
        * java/security/Security.java (loadProviders): Return result.

That last issue was actually a bug.
Committed.

Cheers,

Mark

--=-2b/Pej3R6FtABmuAreRX
Content-Disposition: inline; filename=unused_variables.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=unused_variables.patch; charset=ISO-8859-1

SW5kZXg6IGdudS9qYXZhL2F3dC9CaXR3aXNlWE9SQ29tcG9zaXRlLmphdmENCj09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N
ClJDUyBmaWxlOiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2dudS9qYXZhL2F3dC9CaXR3
aXNlWE9SQ29tcG9zaXRlLmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjENCmRpZmYgLXUg
LXIxLjEgQml0d2lzZVhPUkNvbXBvc2l0ZS5qYXZhDQotLS0gZ251L2phdmEvYXd0L0JpdHdpc2VY
T1JDb21wb3NpdGUuamF2YQk2IE5vdiAyMDAzIDE3OjA5OjM1IC0wMDAwCTEuMQ0KKysrIGdudS9q
YXZhL2F3dC9CaXR3aXNlWE9SQ29tcG9zaXRlLmphdmEJMjkgQXByIDIwMDQgMjM6MTk6NDYgLTAw
MDANCkBAIC0yMzIsNyArMjMyLDcgQEANCiAgICAgICAgICAgICAgICAgICAgICAgICBXcml0YWJs
ZVJhc3RlciBkc3RPdXQpDQogICAgIHsNCiAgICAgICBpbnQgYVgsIGJYLCBkc3RYLCBhWSwgYlks
IGRzdFksIHdpZHRoLCBoZWlnaHQ7DQotICAgICAgaW50IHhvclBpeGVsLCB0cmFuc2ZlclR5cGU7
DQorICAgICAgaW50IHhvclBpeGVsOw0KICAgICAgIGludFtdIHNyY0xpbmUsIGRzdExpbmU7DQog
DQogICAgICAgYVggPSBzcmMuZ2V0TWluWCgpOw0KSW5kZXg6IGdudS9qYXZhL2F3dC9wZWVyL2d0
ay9HdGtUZXh0QXJlYVBlZXIuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2Ns
YXNzcGF0aC9jbGFzc3BhdGgvZ251L2phdmEvYXd0L3BlZXIvZ3RrL0d0a1RleHRBcmVhUGVlci5q
YXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xOA0KZGlmZiAtdSAtcjEuMTggR3RrVGV4dEFy
ZWFQZWVyLmphdmENCi0tLSBnbnUvamF2YS9hd3QvcGVlci9ndGsvR3RrVGV4dEFyZWFQZWVyLmph
dmEJMTMgSmFuIDIwMDQgMjI6Mzc6MjggLTAwMDAJMS4xOA0KKysrIGdudS9qYXZhL2F3dC9wZWVy
L2d0ay9HdGtUZXh0QXJlYVBlZXIuamF2YQkyOSBBcHIgMjAwNCAyMzoxOTo0NiAtMDAwMA0KQEAg
LTEwNSw4ICsxMDUsNiBAQA0KICAgcHVibGljIERpbWVuc2lvbiBtaW5pbXVtU2l6ZSAoaW50IHJv
d3MsIGludCBjb2xzKQ0KICAgew0KICAgICBUZXh0QXJlYSB0YSA9ICgoVGV4dEFyZWEpIGF3dENv
bXBvbmVudCk7DQotICAgIGludCBoU2Nyb2xsYmFySGVpZ2h0ID0gMDsNCi0gICAgaW50IHZTY3Jv
bGxiYXJXaWR0aCA9IDA7DQogICAgIGludCBoZWlnaHQgPSAwOw0KICAgICBpbnQgd2lkdGggPSAw
Ow0KIA0KQEAgLTEzNyw4ICsxMzUsNiBAQA0KICAgcHVibGljIERpbWVuc2lvbiBwcmVmZXJyZWRT
aXplIChpbnQgcm93cywgaW50IGNvbHMpDQogICB7DQogICAgIFRleHRBcmVhIHRhID0gKChUZXh0
QXJlYSkgYXd0Q29tcG9uZW50KTsNCi0gICAgaW50IGhTY3JvbGxiYXJIZWlnaHQgPSAwOw0KLSAg
ICBpbnQgdlNjcm9sbGJhcldpZHRoID0gMDsNCiAgICAgaW50IGhlaWdodCA9IDA7DQogICAgIGlu
dCB3aWR0aCA9IDA7DQogDQpJbmRleDogZ251L2phdmEvc2VjdXJpdHkvcHJvdmlkZXIvRFNBUGFy
YW1ldGVycy5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2Ns
YXNzcGF0aC9nbnUvamF2YS9zZWN1cml0eS9wcm92aWRlci9EU0FQYXJhbWV0ZXJzLmphdmEsdg0K
cmV0cmlldmluZyByZXZpc2lvbiAxLjQNCmRpZmYgLXUgLXIxLjQgRFNBUGFyYW1ldGVycy5qYXZh
DQotLS0gZ251L2phdmEvc2VjdXJpdHkvcHJvdmlkZXIvRFNBUGFyYW1ldGVycy5qYXZhCTIzIEFw
ciAyMDAzIDIyOjU5OjQyIC0wMDAwCTEuNA0KKysrIGdudS9qYXZhL3NlY3VyaXR5L3Byb3ZpZGVy
L0RTQVBhcmFtZXRlcnMuamF2YQkyOSBBcHIgMjAwNCAyMzoxOTo0NiAtMDAwMA0KQEAgLTE1NCw3
ICsxNTQsNiBAQA0KIA0KIHB1YmxpYyBTdHJpbmcgZW5naW5lVG9TdHJpbmcoKQ0KIHsNCi0JU3Ry
aW5nIGxpbmVTZXBhcmF0b3IgPSBTeXN0ZW0uZ2V0UHJvcGVydHkoImxpbmUuc2VwZXJhdG9yIik7
DQogCXJldHVybiAoInE6ICIgKyBxICsgIiBwOiAiICsgcCArICIgZzogIiArIGcpOw0KIH0NCiAN
CkluZGV4OiBqYXZhL3NlY3VyaXR5L1NlY3VyaXR5LmphdmENCj09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxl
OiAvY3Zzcm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmEvc2VjdXJpdHkvU2VjdXJpdHkuamF2
YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjcNCmRpZmYgLXUgLXIxLjI3IFNlY3VyaXR5Lmph
dmENCi0tLSBqYXZhL3NlY3VyaXR5L1NlY3VyaXR5LmphdmEJMiBBcHIgMjAwNCAyMToyOTozNCAt
MDAwMAkxLjI3DQorKysgamF2YS9zZWN1cml0eS9TZWN1cml0eS5qYXZhCTI5IEFwciAyMDA0IDIz
OjE5OjQ2IC0wMDAwDQpAQCAtMTUwLDcgKzE1MCw3IEBADQogCXJlc3VsdCA9IGZhbHNlOw0KICAg
ICAgIH0NCiANCi0gICAgcmV0dXJuIGZhbHNlOw0KKyAgICByZXR1cm4gcmVzdWx0Ow0KICAgfQ0K
IA0KICAgLyoqDQo=

--=-2b/Pej3R6FtABmuAreRX--

--=-xPA4n3DoFIwhJdu8FYOE
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)

iD8DBQBAkZFAxVhZCJWr9QwRAj29AJ9WH1438C9KFyz6X4fI8CAm3+dt5QCdEMVb
IVikW8LuNL62icthgra5GTo=
=3+HO
-----END PGP SIGNATURE-----

--=-xPA4n3DoFIwhJdu8FYOE--




From MAILER-DAEMON Thu Apr 29 19:59:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJLFH-0006tY-Mm
	for mharc-commit-classpath@gnu.org; Thu, 29 Apr 2004 19:47:11 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJLDE-0006TO-6P
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 19:45:04 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJLD4-0006PG-Lb
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 19:44:58 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJL2G-0004Mt-Gi
	for commit-classpath@gnu.org; Thu, 29 Apr 2004 19:33:44 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJL26-0005Oq-00; Fri, 30 Apr 2004 01:33:34 +0200
From: Mark Wielaard <mark@klomp.org>
To: Guilhem Lavaux <guilhem@kaffe.org>
In-Reply-To: <409002EB.9060803@kaffe.org>
References: <409002EB.9060803@kaffe.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-2ugwUDuX/OXLlKMc01cc"
Message-Id: <1083281619.24001.165.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 01:33:39 +0200
Cc: commit-classpath@gnu.org
Subject: Re: FYI: java.text updates
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 29 Apr 2004 23:47:10 -0000


--=-2ugwUDuX/OXLlKMc01cc
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi Guilhem,

On Wed, 2004-04-28 at 21:15, Guilhem Lavaux wrote:
> Without any furious replies from classpath's developers ;). I am=20
> checking in the following patches into the CVS. They have been sent to=20
> the mailing list on the 2004-04-10 and 2004-04-11.

Thanks. Can you also take a look at the mauve results for java.text?
Most things are the same, some FAIL are now PASS, but there are also
some PASS that are now FAIL.

-FAIL: gnu.testlet.java.text.DecimalFormat.format: pattern #.# (number 2)
+PASS: gnu.testlet.java.text.DecimalFormat.format: pattern #.# (number 2)

-FAIL: gnu.testlet.java.text.DecimalFormat.parse: pattern 0.0000E0 (number =
2)
-PASS: gnu.testlet.java.text.DecimalFormat.parse: pattern 0.0000E0 (number =
3)
+PASS: gnu.testlet.java.text.DecimalFormat.parse: pattern 0.0000E0 (number =
2)
+FAIL: gnu.testlet.java.text.DecimalFormat.parse: pattern 0.0000E0 (number =
3)

-PASS: gnu.testlet.java.text.DecimalFormat.position (number 5)
-PASS: gnu.testlet.java.text.DecimalFormat.position (number 6)
+FAIL: gnu.testlet.java.text.DecimalFormat.position (number 5)
+FAIL: gnu.testlet.java.text.DecimalFormat.position (number 6)

-FAIL: gnu.testlet.java.text.DecimalFormat.formatExp: pattern ##0.####E0 (n=
umber 2)
+PASS: gnu.testlet.java.text.DecimalFormat.formatExp: pattern ##0.####E0 (n=
umber 2)

So, in the end we have as much PASS and FAIL results but different tests
now PASS or FAIL. (In total 1021 java.text mauve tests PASS and 36 FAIL,
before and after this patch.)

Cheers,

Mark

--=-2ugwUDuX/OXLlKMc01cc
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)

iD8DBQBAkZDSxVhZCJWr9QwRAkFSAKCnw9cqr0JIMtf76sm4njeGo24QlACghIzv
zmM80bJ9JzbpbtiND7r75hs=
=BrzH
-----END PGP SIGNATURE-----

--=-2ugwUDuX/OXLlKMc01cc--




From MAILER-DAEMON Fri Apr 30 00:03:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJPFE-0003NZ-9D
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 00:03:24 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJPFA-0003M3-Op
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 00:03:20 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJPEa-00039h-Mc
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 00:03:15 -0400
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJPEa-00039b-ED
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 00:02:44 -0400
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id D8F8362238
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 04:02:43 +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 84284-05 for <commit-classpath@gnu.org>;
	Fri, 30 Apr 2004 04:02:43 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-86-233.adsl.solnet.ch
	[212.41.86.233])
	by mail01.solnet.ch (Postfix) with ESMTP id C43276221A
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 04:02:42 +0000 (GMT)
Received: by reali.dnsalias.net (Postfix, from userid 510)
	id 1958BB9C71; Fri, 30 Apr 2004 06:00:23 +0200 (CEST)
To: commit-classpath@gnu.org
Message-Id: <20040430040023.1958BB9C71@reali.dnsalias.net>
Date: Fri, 30 Apr 2004 06:00:23 +0200 (CEST)
From: konqueror@gmx.de (Michael Koch)
X-Virus-Scanned: by SolNet mail01.solnet.ch
Subject: classpath daily snapshot 20040430 SUCCESSFUL
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 04:03:22 -0000




From MAILER-DAEMON Fri Apr 30 01:58:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJR2W-0001VJ-5S
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 01:58:24 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJR2R-0001R0-4N
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 01:58:19 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJR1t-00012F-NK
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 01:58:17 -0400
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJR1t-00011x-B9
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 01:57:45 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-188.ewetel.net
	[80.228.94.188])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i3U5vgB5005688;
	Fri, 30 Apr 2004 07:57:42 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJR2o-0000Kf-00; Fri, 30 Apr 2004 07:58:42 +0200
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>, commit-classpath@gnu.org
Date: Fri, 30 Apr 2004 07:57:15 +0200
User-Agent: KMail/1.5.4
References: <1083275335.24004.129.camel@elsschot.wildebeest.org>
In-Reply-To: <1083275335.24004.129.camel@elsschot.wildebeest.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404300757.19643.konqueror@gmx.de>
X-CheckCompat: OK
Cc: 
Subject: Re: [Fwd: FYI: Fix RandomAccessFile.setLenght (truncation file,
	updates file position).]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 05:58:20 -0000

Am Donnerstag, 29. April 2004 23:48 schrieb Mark Wielaard:

@@ -209,6 +211,10 @@
   public void setLength (long newLen) throws IOException
   {
     ch.truncate (newLen);
+
+    long position = getFilePointer();
+    if (position > newLen)
+      seek(newLen);
   }
 
   /**


Areyou sure the bug isnt in FileChannelImpl.truncate(long) ? have you 
checked this ?


Michael



From MAILER-DAEMON Fri Apr 30 02:48:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJRp8-0004Px-F2
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 02:48:38 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJRp5-0004Pf-AE
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 02:48:35 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJRoX-0004L8-Cg
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 02:48:32 -0400
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 1BJRn2-00049u-Bp
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 02:46:28 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BJRn1-0006i8-Sr
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 02:46:27 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJRml-0005f3-Dh
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 02:46:11 -0400
From: "Michael Koch" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 7495
User-Agent: Mozilla/5.0 (compatible; Konqueror/3.2; Linux;
	de, de_DE@euro) (KHTML, like Gecko)
X-Apparently-From: 80.228.94.188
X-Copy-To: Array
Message-Id: <E1BJRml-0005f3-Dh@savannah.gnu.org>
Date: Fri, 30 Apr 2004 02:46:11 -0400
Subject: [bugs #7495] wrong comparison in file protocol handler
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 06:48:36 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.

/**************************************************************************/
[bugs #7495] Latest Modifications:

Changes by: 
		Michael Koch <konqueror@gmx.de>
'Date: 
		Fri 04/30/04 at 06:46 (GMT)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Invalid
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
This code was removed from gnu/java/net/protocol/file/Handler.java in revision 1.15.
So the issue should be closed.






/**************************************************************************/
[bugs #7495] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7495>
Project: classpath
Submitted by: 0
On: Wed 01/28/04 at 23:56

Severity:  5 - Average
Resolution:  Invalid
Assigned to:  mkoch
Status:  Closed
Platform Version:  None


Summary:  wrong comparison in file protocol handler

Original Submission:  cvs version 1.25 of java/net/URL.java line 514 of function getFile says: return file == null ? "" : file;
cvs version 1.13 of gnu/java/net/protocol/file/Handler.java line 141 says: boolean needContext = url.getFile() != null;
Since getFile can not return a null this appears to be an error to me.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Fri 04/30/04 at 06:46         By: mkoch
This code was removed from gnu/java/net/protocol/file/Handler.java in revision 1.15.
So the issue should be closed.

-------------------------------------------------------
Date: Fri 03/12/04 at 12:37         By: mark
Michael could you take a look at this one?












For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=7495>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Fri Apr 30 03:04:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJS4n-0007ze-2D
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 03:04:49 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJS4h-0007xI-3Q
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:04:43 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJS41-0007l0-12
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:04:32 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJS3t-0007hu-52
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:04:00 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJS3w-0006go-As
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:03:56 -0400
From: "Michael Koch" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 4357
User-Agent: Mozilla/5.0 (compatible; Konqueror/3.2; Linux;
	de, de_DE@euro) (KHTML, like Gecko)
X-Apparently-From: 80.228.94.188
X-Copy-To: Array
Message-Id: <E1BJS3w-0006go-As@savannah.gnu.org>
Date: Fri, 30 Apr 2004 03:03:56 -0400
Subject: [bugs #4357] HTTP Request Headers should be handled Case Sensitive
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 07:04:46 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.

/**************************************************************************/
[bugs #4357] Latest Modifications:

Changes by: 
		Michael Koch <konqueror@gmx.de>
'Date: 
		Fri 04/30/04 at 07:03 (GMT)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
This was fixed in java/net/URLConnection.java cvs version 1.19 and will be in 0.09 release of GNU classpath.






/**************************************************************************/
[bugs #4357] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=4357>
Project: classpath
Submitted by: Sebastian Mancke
On: Fri 07/18/03 at 16:10

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  None
Status:  Closed
Platform Version:  None


Summary:  HTTP Request Headers should be handled Case Sensitive

Original Submission:  
I think, that the GNU Classpath implementation of
the method setRequestPropertie() in
java.net.URLConnection is not korrekt.

>>>  req_props.put(key.toLowerCase(), value);

All keys are converted to lower case, 
but some web servers stand on case sensitive header keys.
(For example, the apache don't accepts 'Content-type', if I remember right)



Follow-up Comments
------------------


-------------------------------------------------------
Date: Fri 04/30/04 at 07:03         By: mkoch
This was fixed in java/net/URLConnection.java cvs version 1.19 and will be in 0.09 release of GNU classpath.












For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=4357>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Fri Apr 30 03:20:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJSJx-00036N-GR
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 03:20:29 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJSJu-00035c-Kq
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:20:26 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJSJO-0002xT-9v
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:20:25 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJSBD-0001LV-0p
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:11:27 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJSBD-0007PW-3u
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:11:27 -0400
From: "Michael Koch" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 7940
User-Agent: Mozilla/5.0 (compatible; Konqueror/3.2; Linux;
	de, de_DE@euro) (KHTML, like Gecko)
X-Apparently-From: 80.228.94.188
X-Copy-To: Array
Message-Id: <E1BJSBD-0007PW-3u@savannah.gnu.org>
Date: Fri, 30 Apr 2004 03:11:27 -0400
Subject: [bugs #7940] Ambiguous/Invalid Expression
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 07:20:27 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.

/**************************************************************************/
[bugs #7940] Latest Modifications:

Changes by: 
		Michael Koch <konqueror@gmx.de>
'Date: 
		Fri 04/30/04 at 07:11 (GMT)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Commited. This fix will be in GNU classpath 0.09.






/**************************************************************************/
[bugs #7940] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7940>
Project: classpath
Submitted by: 0
On: Sun 02/29/04 at 05:36

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  None
Status:  Closed
Platform Version:  None


Summary:  Ambiguous/Invalid Expression

Original Submission:  java/util/prefs/AbstractPreferences.java:121

Contains the following line:
  + parent == null ? "" : "not "
For clarity and or correctness a set of parenthesis should be added to properly isolate it from the surrounding context:
  + (parent == null ? "" : "not ")


Follow-up Comments
------------------


-------------------------------------------------------
Date: Fri 04/30/04 at 07:11         By: mkoch
Commited. This fix will be in GNU classpath 0.09.












For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=7940>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Fri Apr 30 03:21:14 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJSKg-0003O3-1P
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 03:21:14 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJSKX-0003Ka-HP
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:21:05 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJSJr-00034f-Ng
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:20:54 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJSBC-0001LQ-8v
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 03:11:26 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-188.ewetel.net
	[80.228.94.188])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3U7BKpc020888
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 09:11:21 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJSC5-0000Zy-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 09:12:21 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 30 Apr 2004 09:11:00 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_EwfkAACR9RxJkR+"
Message-Id: <200404300911.02001.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: bug #7940: java.util.prefs.AbstractPreferences
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 07:21:08 -0000


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

Hi list,


I just commited the attached patch to fix bug #7940.


Michael


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

	* java/util/prefs/AbstractPreferences.java
	(AbstractPreferences): Added parenthesis for clarity. Closes bug #7940.


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

Index: java/util/prefs/AbstractPreferences.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/prefs/AbstractPreferences.java,v
retrieving revision 1.7
diff -u -r1.7 AbstractPreferences.java
--- java/util/prefs/AbstractPreferences.java	21 Apr 2004 15:44:17 -0000	1.7
+++ java/util/prefs/AbstractPreferences.java	30 Apr 2004 07:08:17 -0000
@@ -119,7 +119,7 @@
             throw new IllegalArgumentException("Illegal name argument '"
                                                + name
                                                + "' (parent is "
-                                               + parent == null ? "" : "not "
+                                               + (parent == null ? "" : "not ")
                                                + "null)");
         this.parent = parent;
         this.name = name;

--Boundary-00=_EwfkAACR9RxJkR+--



From MAILER-DAEMON Fri Apr 30 04:50:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJTij-0000aW-51
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 04:50:09 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJTif-0000Z5-HK
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 04:50:05 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJTi8-0000PH-Le
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 04:50:03 -0400
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJTQ4-0003lW-8b
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 04:30:52 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-188.ewetel.net
	[80.228.94.188])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i3U8UonV015930
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 10:30:50 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJTR1-0000jN-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 10:31:51 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 30 Apr 2004 10:30:30 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_m6gkA/kPtCh7Z3L"
Message-Id: <200404301030.31337.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: java.nio.channes.Channels - adding missing native methods
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 08:50:06 -0000


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

Hi list,


I just commited the attached patch to add two missing native methods.



Michael


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

	* include/java_nio_channels_Channels.h,
	native/jni/java-nio/java_nio_channels_Channels.c:
	New files.
	* include/Makefile.am:
	Generate include/java_nio_channels_Channels.h.
	* native/jni/java-nio/Makefile.am:
	Compile java_nio_channels_Channels.c.


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

Index: include/java_nio_channels_Channels.h
===================================================================
RCS file: include/java_nio_channels_Channels.h
diff -N include/java_nio_channels_Channels.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/java_nio_channels_Channels.h	30 Apr 2004 08:28:13 -0000
@@ -0,0 +1,20 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __java_nio_channels_Channels__
+#define __java_nio_channels_Channels__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT jobject JNICALL Java_java_nio_channels_Channels_newInputStream (JNIEnv *env, jclass, jobject);
+extern JNIEXPORT jobject JNICALL Java_java_nio_channels_Channels_newOutputStream (JNIEnv *env, jclass, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __java_nio_channels_Channels__ */
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- include/Makefile.am	29 Apr 2004 14:37:06 -0000	1.18
+++ include/Makefile.am	30 Apr 2004 08:28:13 -0000
@@ -57,6 +57,7 @@
 $(top_srcdir)/include/java_net_NetworkInterface.h \
 $(top_srcdir)/include/java_nio_DirectByteBufferImpl.h \
 $(top_srcdir)/include/java_nio_MappedByteBufferImpl.h \
+$(top_srcdir)/include/java_nio_channels_Channels.h \
 $(top_srcdir)/include/java_util_TimeZone.h
 
 if CREATE_JNI_HEADERS
@@ -169,6 +170,8 @@
 	$(JAVAH) -o $@ java.nio.DirectByteBufferImpl
 $(top_srcdir)/include/java_nio_MappedByteBufferImpl.h: $(top_srcdir)/java/nio/MappedByteBufferImpl.java
 	$(JAVAH) -o $@ java.nio.MappedByteBufferImpl
+$(top_srcdir)/include/java_nio_channels_Channels.h: $(top_srcdir)/java/nio/channels/Channels.java
+	$(JAVAH) -o $@ java.nio.channels.Channels
 $(top_srcdir)/include/gnu_java_nio_channels_FileChannelImpl.h: $(top_srcdir)/gnu/java/nio/channels/FileChannelImpl.java
 	$(JAVAH) -o $@ gnu.java.nio.channels.FileChannelImpl
 $(top_srcdir)/include/java_util_TimeZone.h: $(top_srcdir)/java/util/TimeZone.java
Index: native/jni/java-nio/java_nio_channels_Channels.c
===================================================================
RCS file: native/jni/java-nio/java_nio_channels_Channels.c
diff -N native/jni/java-nio/java_nio_channels_Channels.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-nio/java_nio_channels_Channels.c	30 Apr 2004 08:28:13 -0000
@@ -0,0 +1,61 @@
+/* java_nio_channels_Channels.c - Native methods for Channel
+   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 "java_nio_channels_Channels.h"
+
+#define IO_EXCEPTION "java/io/IOException"
+
+JNIEXPORT jobject JNICALL
+Java_java_nio_channels_Channels_newInputStream (JNIEnv *env, jclass cls, jobject filechannel)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.channels.Channels.newInputStream(): not implemented");
+  return NULL;
+}
+
+JNIEXPORT jobject JNICALL
+Java_java_nio_channels_Channels_newOutputStream (JNIEnv *env, jclass cls, jobject filechannel)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "java.nio.channels.Channels.newOutputStream(): not implemented");
+  return NULL;
+}
+
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- native/jni/java-nio/Makefile.am	29 Apr 2004 14:37:06 -0000	1.7
+++ native/jni/java-nio/Makefile.am	30 Apr 2004 08:28:13 -0000
@@ -5,7 +5,8 @@
 			gnu_java_nio_SelectorImpl.c \
 			gnu_java_nio_channels_FileChannelImpl.c \
 			java_nio_DirectByteBufferImpl.c \
-			java_nio_MappedByteBufferImpl.c
+			java_nio_MappedByteBufferImpl.c \
+			java_nio_channels_Channels.c
 
 libjavanio_la_LDFLAGS = @CLASSPATH_MODULE@
 libjavanio_la_LIBADD = $(top_builddir)/native/jni/classpath/jcl.lo

--Boundary-00=_m6gkA/kPtCh7Z3L--



From MAILER-DAEMON Fri Apr 30 08:41:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJXKb-0007OS-Kk
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 08:41:29 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJXKW-0007NN-DM
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 08:41:24 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJXKU-0007N1-MN
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 08:41:23 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJXIJ-000797-5u
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 08:39:07 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJXIA-0007fT-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 14:38:58 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-oUJ35bvYphvVVzvGBWr9"
Message-Id: <1083328742.19524.6.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 14:39:03 +0200
Subject: FYI: Small documentation update/cleanup
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 12:41:25 -0000


--=-oUJ35bvYphvVVzvGBWr9
Content-Type: multipart/mixed; boundary="=-eW8cShkoZ9qc58ReUDoB"


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

Hi,

A small documentation update that mentions texinfo and updates version
numbers.

2004-04-30  Mark Wielaard  <mark@klomp.org>

       * README: Update end user dev environments and hackers runtime lists=
.
       * INSTALL: Update needed library versions, add texinfo version
       requirement, mention website/hacker guide.
       * doc/hacking.texinfo: Include item on texinfo.

Committed.

Cheers,

Mark

--=-eW8cShkoZ9qc58ReUDoB
Content-Disposition: inline; filename=doc_update.diff
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=doc_update.diff; charset=ISO-8859-1

SW5kZXg6IGRvYy9oYWNraW5nLnRleGluZm8NCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zzcm9v
dC9jbGFzc3BhdGgvY2xhc3NwYXRoL2RvYy9oYWNraW5nLnRleGluZm8sdg0KcmV0cmlldmluZyBy
ZXZpc2lvbiAxLjI1DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjYNCmRpZmYgLXUgLXUgLXIxLjI1
IC1yMS4yNg0KLS0tIGRvYy9oYWNraW5nLnRleGluZm8JMiBBcHIgMjAwNCAyMTozNDo0MyAtMDAw
MAkxLjI1DQorKysgZG9jL2hhY2tpbmcudGV4aW5mbwkzMCBBcHIgMjAwNCAxMjozMjoxNiAtMDAw
MAkxLjI2DQpAQCAtMzQzLDYgKzM0Myw4IEBADQogbGlidG9vbCAxLjQuMisNCiBAaXRlbQ0KIEdO
VSBtNCAxLjQNCitAaXRlbQ0KK3RleGluZm8gNC4yKw0KIEBlbmQgaXRlbWl6ZQ0KIA0KIEFsbCBv
ZiB0aGVzZSB0b29scyBhcmUgYXZhaWxhYmxlIGZyb20NCkBAIC0zOTQsNiArMzk2LDE2IEBADQog
DQogQGl0ZW0gcGVybA0KIExhcnJ5IFdhbGwncyBzY3JpcHRpbmcgbGFuZ3VhZ2UuICBJdCBpcyB1
c2VkIGludGVybmFsbHkgYnkgYXV0b21ha2UuDQorDQorQGl0ZW0gdGV4aW5mbw0KK01hbnVhbHMg
YW5kIGRvY3VtZW50YXRpb24gKGxpa2UgdGhpcyBndWlkZSkgYXJlIHdyaXR0ZW4gaW4gdGV4aW5m
by4NCitUZXhpbmZvIGlzIHRoZSBvZmZpY2lhbCBkb2N1bWVudGF0aW9uIGZvcm1hdCBvZiB0aGUg
R05VIHByb2plY3QuDQorVGV4aW5mbyB1c2VzIGEgc2luZ2xlIHNvdXJjZSBmaWxlIHRvIHByb2R1
Y2Ugb3V0cHV0IGluIGEgbnVtYmVyIG9mIGZvcm1hdHMsDQorYm90aCBvbmxpbmUgYW5kIHByaW50
ZWQgKGR2aSwgaW5mbywgaHRtbCwgeG1sLCBldGMuKS4gVGhpcyBtZWFucyB0aGF0DQoraW5zdGVh
ZCBvZiB3cml0aW5nIGRpZmZlcmVudCBkb2N1bWVudHMgZm9yIG9ubGluZSBpbmZvcm1hdGlvbiBh
bmQgYW5vdGhlcg0KK2ZvciBhIHByaW50ZWQgbWFudWFsLCB5b3UgbmVlZCB3cml0ZSBvbmx5IG9u
ZSBkb2N1bWVudC4gQW5kIHdoZW4gdGhlIHdvcmsNCitpcyByZXZpc2VkLCB5b3UgbmVlZCByZXZp
c2Ugb25seSB0aGF0IG9uZSBkb2N1bWVudC4NCisNCiBAZW5kIHRhYmxlDQogDQogDQpJbmRleDog
UkVBRE1FDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0
aC9SRUFETUUsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjEyDQpyZXRyaWV2aW5nIHJldmlzaW9u
IDEuMTMNCmRpZmYgLXUgLXUgLXIxLjEyIC1yMS4xMw0KLS0tIFJFQURNRQkyNCBEZWMgMjAwMiAw
NTozNToyMiAtMDAwMAkxLjEyDQorKysgUkVBRE1FCTMwIEFwciAyMDA0IDEyOjMyOjE1IC0wMDAw
CTEuMTMNCkBAIC0xLDQgKzEsNCBAQA0KLUdOVSBDbGFzc3BhdGggUkVBRE1FIC0gTGFzdCB1cGRh
dGVkOiBEZWNlbWJlciAyMywgMjAwMg0KK0dOVSBDbGFzc3BhdGggUkVBRE1FIC0gTGFzdCB1cGRh
dGVkOiBBcnBpbCAzMCwgMjAwNA0KIA0KIEdOVSBDbGFzc3BhdGgsIEVzc2VudGlhbCBMaWJyYXJp
ZXMgZm9yIEphdmEgaXMgYSBwcm9qZWN0IHRvIGNyZWF0ZQ0KIGEgY29tcGxldGUgImNsZWFuIHJv
b20iIGltcGxlbWVudGF0aW9uIG9mIHRoZSBKYXZhIGNsYXNzIGxpYnJhcmllcyANCkBAIC04LDE4
ICs4LDI5IEBADQogamF2YWRvYywgamF2YXAsIGphdmFoLCBhbmQgb3RoZXJzLg0KIA0KIEV2ZW50
dWFsbHksIHRoZXNlIGVzc2VudGlhbCBsaWJyYXJpZXMgZm9yIEphdmEgd2lsbCB3b3JrIHdpdGgg
YXMgbWFueSANCi1mcmVlIEpWTXMgYXMgcG9zc2libGUuICBWaXJ0dWFsIG1hY2hpbmVzIGtub3du
IHRvIHVzZSBHTlUgQ2xhc3NwYXRoDQotaW5jbHVkZToNCi0JKiBHQ0ogCQkoaHR0cDovL2djYy5n
bnUub3JnL2phdmEvKQ0KLQkqIE9SUAkJKGh0dHA6Ly9vcnAuc291cmNlZm9yZ2UubmV0LykNCitm
cmVlIEpWTXMgYXMgcG9zc2libGUuICBDb21wbGV0ZSBkZXZlbG9wbWVudCBlbnZpcm9ubWVudHMg
a25vd24gdG8gYmUNCitiYXNlZCBvbiBHTlUgQ2xhc3NwYXRoIGluY2x1ZGUgKHJlY29tbWVuZGVk
IGZvciBlbmQgdXNlcnMpOg0KKw0KKwkqIEdDQyB3aXRoIEdDSiAJKGh0dHA6Ly9nY2MuZ251Lm9y
Zy9qYXZhLykNCisJKiBLYWZmZQkJKGh0dHA6Ly93d3cua2FmZmUub3JnLykNCisNCitTbWFsbGVy
IChydW50aW1lIG9ubHkpIGVudmlyb25tZW50cyBiYXNlZCBvbiBHTlUgQ2xhc3NwYXRoIGluY2x1
ZGVpDQorKHJlY29tbWVuZGVkIGZvciBHTlUgQ2xhc3NwYXRoIGhhY2tlcnMpOg0KKw0KKwkqIEph
bVZNCQkoaHR0cDovL3d3dy5qYW12bXYub3JnLykNCisJKiBKaWtlcyBSVk0JKGh0dHA6Ly93d3cu
aWJtLmNvbS9kZXZlbG9wZXJ3b3Jrcy9vc3MvamlrZXNydm0vKQ0KIAkqIEtpc3NtZQkoaHR0cDov
L2tpc3NtZS5zb3VyY2Vmb3JnZS5uZXQvKQ0KLQkqIFNhYmxlVk0JKGh0dHA6Ly93d3cuc2FibGV2
bS5vcmcvKQ0KLQkqIEp1cGl0ZXIJKGh0dHA6Ly93d3cuZWVjZy50b3JvbnRvLmVkdS9+ZG95bGVw
L2p1cGl0ZXIvKQ0KLQkqIEpvYXMJCShodHRwOi8vd3d3Lm9iZXJvbi5ldGh6LmNoL2phb3MvKQ0K
LQkqIEFlZ2lzVk0JKGh0dHA6Ly9hZWdpc3ZtLnNvdXJjZWZvcmdlLm5ldC8pDQogDQotVGhpcyBp
cyBhIGRldmVsb3BtZW50IHJlbGVhc2Ugb25seSBhbmQgaXMgbm90IHJlYWR5IGZvciBnZW5lcmFs
DQotcHVycG9zZSB1c2UuDQorSW4gZ2VuZXJhbCB0aGUgbGF0ZXN0IHJlbGVhc2VzIG9mIHRoZSBh
Ym92ZSBWTXMgd2lsbCB3b3JrIG91dCBvZiB0aGUgYm94DQord2l0aCB0aGUgbGF0ZXN0IEdOVSBD
bGFzc3BhdGggcmVsZWFzZSAoYW5kIGluIG1vc3QgY2FzZXMgZGlyZWN0bHkgd2l0aCB0aGUNCitk
ZXZlbG9wbWVudCBzb3VyY2VzIGZyb20gQ1ZTKS4NCisNCitTZWUgZm9yIG90aGVyIEdOVSBDbGFz
c3BhdGggYmFzZWQgcnVudGltZXMsIGNvbXBpbGVycyBhbmQgdG9vbHMgdGhlDQorR05VIENsYXNz
cGF0aCB3ZWJzaXRlOiBodHRwOi8vd3d3LmdudS5vcmcvc29mdHdhcmUvY2xhc3NwYXRoL3N0b3Jp
ZXMuaHRtbA0KKw0KK1RoaXMgaXMgYSBkZXZlbG9wbWVudCBzbmFwc2hvdCByZWxlYXNlIG9ubHkg
YW5kIGlzIG5vdCByZWFkeSBmb3IgZ2VuZXJhbA0KK3B1cnBvc2UgdXNlLiAgWW91IG5lZWQgdG8g
Y29tYmluZSBpdCBhdCBsZWFzdCB3aXRoIG9uZSBvZiB0aGUgZGV2ZWxvcG1lbnQNCitlbnZpcm9u
bWVudHMgbWVudGlvbmVkIGFib3ZlLg0KIA0KIE1vc3QgSlZNcyBjb21lIHdpdGggdGhlaXIgb3du
IGN1c3RvbWl6ZWQgdmVyc2lvbiBvZiBHTlUgQ2xhc3NwYXRoLg0KIFBsZWFzZSBjaGVjayBpZiB0
aGVyZSBpcyBhIGN1c3RvbWlzZWQgdmVyc2lvbiBhdmFpbGFibGUgZm9yIHRoZSBKVk0geW91DQpA
QCAtMzIsNyArNDMsNyBAQA0KIFNlZSB0aGUgZmlsZSBUT0RPIGZvciB0aGUgbGF0ZXN0IHRvIGRv
IGxpc3QuDQogU2VlIHRoZSBmaWxlIEhBQ0tJTkcgZm9yIHdvcmtpbmcgb24gKG5vbi1yZWxlYXNl
ZCkgQ1ZTIGRldmVsb3BtZW50IHZlcnNpb25zLg0KIA0KLUhvbWVwYWdlOiBodHRwOi8vd3d3LmNs
YXNzcGF0aC5vcmcvIG9yIGh0dHA6Ly93d3cuZ251Lm9yZy9zb2Z0d2FyZS9jbGFzc3BhdGgvDQor
SG9tZXBhZ2U6IGh0dHA6Ly93d3cuZ251Lm9yZy9zb2Z0d2FyZS9jbGFzc3BhdGgvDQogDQogR2Vu
ZXJhbCBNYWlsaW5nIExpc3Q6IGNsYXNzcGF0aEBnbnUub3JnDQogICAtLT4gQnVncyBhbmQgcGF0
Y2hlcyBjYW4gYmUgcmVwb3J0ZWQgdmlhIFNhdmFubmFoIGlmIHlvdSBoYXZlIGEgYnJvd3Nlcg0K
QEAgLTQyLDE5ICs1MywxNSBAQA0KICAgICAgIG9ubHkgd2l0aCBhIGJvZHkgYW5kIHN1YmplY3Qg
b2YgInVuc3Vic2NyaWJlIi4gIFRoaXMgaXMgYQ0KICAgICAgIHNtYXJ0bGlzdCBtYW5hZ2VkIG1h
aWxpbmcgbGlzdC4NCiANCi1DVlMgQ29tbWl0IExpc3Q6IGNvbW1pdC1jbGFzc3BhdGhAZ251Lm9y
Zw0KK0NWUyBDb21taXQsIEJ1Z3MgYW5kIFBhdGNoZXMgTGlzdDogY29tbWl0LWNsYXNzcGF0aEBn
bnUub3JnDQogICAtLT4gVG8gc3Vic2NyaWJlIHNlbmQgZW1haWwgdG8gY29tbWl0LWNsYXNzcGF0
aC1yZXF1ZXN0QGdudS5vcmcgd2l0aCBhIA0KICAgICAgIHN1YmplY3QgYW5kIGJvZHkgb2YgInN1
YnNjcmliZSIuICBUbyB1bnN1YnNjcmliZSBkbyB0aGUgc2FtZSwNCiAgICAgICBvbmx5IHdpdGgg
YSBib2R5IGFuZCBzdWJqZWN0IG9mICJ1bnN1YnNjcmliZSIuICBUaGlzIGlzIGENCiAgICAgICBz
bWFydGxpc3QgbWFuYWdlZCBtYWlsaW5nIGxpc3QuDQogDQotQW5vbnltb3VzIENWU1JPT1Q6IDpw
c2VydmVyOmFub25jdnNAc3VidmVyc2lvbnMuZ251Lm9yZzovY3Zzcm9vdC9jbGFzc3BhdGggDQor
QW5vbnltb3VzIENWU1JPT1Q6IDpwc2VydmVyOmFub25jdnNAc2F2YW5uYWguZ251Lm9yZzovY3Zz
cm9vdC9jbGFzc3BhdGggDQogICAtLT4gRmlyc3QgZG8gImN2cyBsb2dpbiIuICBIaXQgPFJldHVy
bj4gd2hlbiBwcm9tcHRlZCBmb3IgYSBwYXNzd29yZA0KICAgLS0+IE1vcmUgZGV0YWlsZWQgaW5z
dHJ1Y3Rpb25zIGF2YWlsYWJsZSBvbiB0aGUgU2F2YW5uYWggcHJvamVjdCB3ZWJzaXRlLg0KLQ0K
LU90aGVyIEphdmEgZnJlZSBzb2Z0d2FyZSBwcm9qZWN0cyBvZiBub3RlOg0KLQ0KLUthZmZlIC0g
aHR0cDovL3d3dy5rYWZmZS5vcmcvDQorICAgICAgaHR0cDovL3NhdmFubmFoLmdudS5vcmcvcHJv
amVjdHMvY2xhc3NwYXRoLw0KIA0KIEhhcHB5IEhhY2tpbmchDQotDQpJbmRleDogSU5TVEFMTA0K
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvSU5TVEFM
TCx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTgNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xOQ0K
ZGlmZiAtdSAtdSAtcjEuMTggLXIxLjE5DQotLS0gSU5TVEFMTAk5IEFwciAyMDA0IDE2OjA0OjIx
IC0wMDAwCTEuMTgNCisrKyBJTlNUQUxMCTMwIEFwciAyMDA0IDEyOjMyOjE1IC0wMDAwCTEuMTkN
CkBAIC0xLDQgKzEsNCBAQA0KLUluc3RhbGxpbmcgR05VIENsYXNzcGF0aCAtIExhc3QgdXBkYXRl
ZDogRGVjZW1iZXIgMjMsIDIwMDINCitJbnN0YWxsaW5nIEdOVSBDbGFzc3BhdGggLSBMYXN0IHVw
ZGF0ZWQ6IEFwcmlsIDMwLCAyMDA0DQogDQogRmlyc3QsIHRoaXMgaXMgYSBkZXZlbG9wbWVudCBy
ZWxlYXNlIG9ubHkhIFVubGVzcyB5b3UgYXJlIGludGVyZXN0ZWQgaW4NCiBhY3RpdmUgZGV2ZWxv
cG1lbnQgYW5kIGRlYnVnZ2luZywgb3IganVzdCBsaWtlIHJ1bm5pbmcgcmFuZG9tIGFscGhhIGNv
ZGUsDQpAQCAtNiw3ICs2LDggQEANCiBsaXN0IG9mIFZNcyB0aGF0IHdvcmsgd2l0aCBHTlUgQ2xh
c3NwYXRoLg0KIA0KIE5vdGUgdGhhdCBpZiB5b3UgYXJlIGJ1aWxkaW5nIGZyb20gYSBub24tcmVs
ZWFzZWQgKENWUykgdmVyc2lvbiBvZiBHTlUNCi1jbGFzc3BhdGgsIGluc3RhbGxhdGlvbiBpbnN0
cnVjdGlvbnMgYXJlIGZvdW5kIGluIHRoZSBIQUNLSU5HIGZpbGUuDQorY2xhc3NwYXRoLCBpbnN0
YWxsYXRpb24gaW5zdHJ1Y3Rpb25zIGFyZSBmb3VuZCBpbiB0aGUgZG9jL2hhY2tpbmcudGV4aQ0K
K2ZpbGUuIE9yIGF0IGh0dHA6Ly93d3cuZ251Lm9yZy9zb2Z0d2FyZS9jbGFzc3BhdGgvZG9jcy9o
YWNraW5nLmh0bWwNCiANCiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCiBTdWdnZXN0ZWQgU29mdHdhcmUNCkBAIC0xOCwx
OSArMTksMTkgQEANCiAgICAgICAgIGlmIGNoYW5nZXMgYXJlIG1hZGUgdGhhdCByZXF1aXJlIHJl
YnVpbGRpbmcgY29uZmlndXJlLCBNYWtlZmlsZS5pbiwNCiAgICAgICAgIGFjbG9jYWwubTQsIG9y
IGNvbmZpZy5oLmluLg0KIA0KLSAgICAgICAgLSBHTlUgYXV0b2NvbmYgMi41OQ0KLSAgICAgICAg
LSBHTlUgYXV0b21ha2UgMS43DQotICAgICAgICAtIEdOVSBsaWJ0b29sIDEuNC4yDQorICAgICAg
ICAtIEdOVSBhdXRvY29uZiAyLjU5Kw0KKyAgICAgICAgLSBHTlUgYXV0b21ha2UgMS43Kw0KKyAg
ICAgICAgLSBHTlUgbGlidG9vbCAxLjQuMisNCisNCisJV2hlbiB3b3JraW5nIGZyb20gQ1ZTIHlv
dSBjYW4gcnVuIHRoZSBhYm92ZSB0b29scyBieSBleGVjdXRpbmcNCisJLi9hdXRvZ2VuLnNoIGlu
IHRoZSBzb3VyY2UgZGlyZWN0b3J5Lg0KIA0KIAlGb3IgYnVpbGRpbmcgdGhlIEphdmEgYnl0ZWNv
ZGUgKC5jbGFzcyBmaWxlcyksIG9uZSBvZiB0aGVzZQ0KIAljb21waWxlcnMgYXJlIHJlcXVpcmVk
LiAgWW91IGNhbiBzZWxlY3Qgd2hpY2ggY29tcGlsZXIgdXNpbmcNCiAJLS13aXRoLWppa2VzLCAt
LXdpdGgtZ2NqIG9yIC0td2l0aC1ramMgYXMgYXJndW1lbnQgdG8NCi0JY29uZmlndXJlOyB0aGUg
cHJlc2VudCBkZWZhdWx0IGlzIGdjai4gIFRoZSBqYXZhYyBjb21waWxlcg0KLQlpbmNsdWRlZCBp
biBhbnkgb2YgU3VuJ3MgSkRLcyB3aWxsIG5vdCB3b3JrLCBhcyBpdCB3aWxsIG5vdA0KLQljb21w
aWxlIGphdmEubGFuZy5PYmplY3QuDQorCWNvbmZpZ3VyZTsgdGhlIHByZXNlbnQgZGVmYXVsdCBp
cyBnY2ouDQogDQotICAgICAgICAtIEdDSiAzLjMrIChwYXJ0IG9mIHRoZSBHTlUgR0NDIHBhY2th
Z2UpLiAgTm90ZSB0aGF0IEdDQw0KLQkgIDMuNCAoZnJvbSBDVlMpIGlzIGN1cnJlbnRseSB1bnJl
bGVhc2VkLiAgDQorICAgICAgICAtIEdDSiAzLjMrIChwYXJ0IG9mIHRoZSBHTlUgR0NDIHBhY2th
Z2UpLg0KICAgICAgICAgLSBJQk0gamlrZXMgMS4xOCsuICANCiAgICAgICAgIC0gVGhlIGtqYyBj
b21waWxlciBpcyBzdXBwb3J0ZWQgd2l0aCBjb25maWd1cmUgYnV0IHdlIGhhdmUNCiAgICAgICAg
ICAgYmVlbiB1bmFibGUgdG8gc3VjY2Vzc2Z1bGx5IGNvbXBpbGUgd2l0aCBpdC4NCkBAIC0zOCw5
ICszOSwxMSBAQA0KIAlGb3IgYnVpbGRpbmcgdGhlIEpOSSBuYXRpdmUgbGlicmFyaWVzLCB0aGUg
Zm9sbG93aW5nIGFyZSByZXF1aXJlZA0KICAgICAgICAgdW5sZXNzIC0tZGlzYWJsZS1ndGstcGVl
ciBpcyB1c2VkIGFzIGFuIGFyZ3VtZW50IHRvIGNvbmZpZ3VyZS4NCiANCi0gICAgICAgIC0gR1RL
KyAyLngueA0KKyAgICAgICAgLSBHVEsrIDIuMi54IChvciBoaWdoZXIpDQogICAgICAgICAtIGxp
YmFydF9sZ3BsIDIuMS4wDQotICAgICAgICAtIGdkay1waXhidWYgKE9ubHkgbmVlZGVkIGlmIHlv
dSB3YW50IHRvIGNvbXBpbGUgdGhlIG5hdGl2ZSBsaWJyYXJ5KQ0KKyAgICAgICAgLSBnZGstcGl4
YnVmDQorDQorCUZvciBidWlsZGluZyB0aGUgZG9jdW1lbnRhdGlvbiB5b3Ugd2lsbCBuZWVkIHRl
eGluZm8gNC4yIG9yIGhpZ2hlci4NCiANCiBUaGlzIHBhY2thZ2Ugd2FzIGRlc2lnbmVkIHRvIHVz
ZSB0aGUgR05VIHN0YW5kYXJkIGZvciBjb25maWd1cmF0aW9uDQogYW5kIG1ha2VmaWxlcy4gIFRv
IGJ1aWxkIGFuZCBpbnN0YWxsIGRvIHRoZSBmb2xsb3dpbmc6DQpAQCAtODQsOCArODcsNyBAQA0K
IGV4cG9ydCBMRF9MSUJSQVJZX1BBVEggQ0xBU1NQQVRIDQogDQogTW9yZSBpbmZvcm1hdGlvbiBh
Ym91dCB0aGUgVk1zIHRoYXQgdXNlIEdOVSBDbGFzc3BhdGggY2FuIGJlIGZvdW5kIGluIHRoZQ0K
LVJFQURNRSBmaWxlLiBJbmZvcm1hdGlvbiBvbiB1c2luZyB0aGUgYWJvdmUgc2V0dXAgd2l0aCB0
aGUgT1JQIFZNIGNhbiBiZQ0KLWZvdW5kIGF0IDxodHRwOi8vd3d3LmdudS5vcmcvc29mdHdhcmUv
Y2xhc3NwYXRoL2RvYy9vcnAuaHRtbD4uDQorUkVBRE1FIGZpbGUuDQogDQogLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQog
TWlzYy4gTm90ZXMNCg==

--=-eW8cShkoZ9qc58ReUDoB--

--=-oUJ35bvYphvVVzvGBWr9
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)

iD8DBQBAkkjmxVhZCJWr9QwRAv/wAJ9Gno0XFgmX2JL9PPxYOaVsJibQewCeJ0ME
RajoZKWETpoeLjEsvVlrUz0=
=0dDU
-----END PGP SIGNATURE-----

--=-oUJ35bvYphvVVzvGBWr9--




From MAILER-DAEMON Fri Apr 30 08:43:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJXMl-0007lK-Ne
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 08:43:43 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJXMb-0007k2-DA
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 08:43:33 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJX3g-0005b3-4a
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 08:24:31 -0400
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 1BJW1V-00047I-6f
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 07:17:41 -0400
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.30) id 1BJVu7-00079Z-Fz
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 07:10:03 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-188.ewetel.net
	[80.228.94.188])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i3UB7Ypc028460
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 13:07:35 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJVsi-00017L-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 13:08:36 +0200
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 30 Apr 2004 13:07:14 +0200
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_iNjkAHzyqzEiXBp"
Message-Id: <200404301307.15124.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: native stuff all over
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 12:43:34 -0000


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

Hi list,


I just commited the attached patch to fix JNI headers and to remove some 
unused C methods in our native implementation. They were found by using
"-Werror -Wmissing-prototypes -Wmissing-declarations".


Michael


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

	* include/gnu_java_awt_peer_gtk_GdkFontMetrics.h,
	include/gnu_java_awt_peer_gtk_GdkGraphics.h,
	include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h,
	include/gnu_java_awt_peer_gtk_GtkLabelPeer.h,
	include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h,
	include/gnu_java_awt_peer_gtk_GtkMenuPeer.h,
	include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h,
	include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h,
	include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h,
	include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h,
	include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h,
	include/gnu_java_awt_peer_gtk_GtkWindowPeer.h:
	Fixed stange method signatures produced by buggy gcjh.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c:
	Include gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
	(dispose): Removed.
	(remove): Removed.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(dispose): Removed.
	(requestFocus): Removed.
	(gtkWidgetSetUSize): Removed.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
	(setTitle): Removed.
	* native/jni/gtk-peer/gthread-jni.c
	(gdk_threads_wake): Removed
	* native/jni/java-io/javaio.h
	(_javaio_open_read): Added prototype.
	(_javaio_open_readwrite): Likewise.
	* native/jni/java-lang/java_lang_VMDouble.c:
	Include java_lang_VMDouble.h.
	* native/jni/java-lang/java_lang_reflect_Array.c
	(getLength): Removed.
	* native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
	(nativeGetLength): Removed.


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

Index: include/gnu_java_awt_peer_gtk_GdkFontMetrics.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkFontMetrics.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GdkFontMetrics.h
--- include/gnu_java_awt_peer_gtk_GdkFontMetrics.h	2 Dec 2003 09:33:49 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GdkFontMetrics.h	30 Apr 2004 11:03:50 -0000
@@ -11,7 +11,7 @@
 #endif
 
 extern JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState (JNIEnv *env, jobject, jstring, jint);
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth__Ljava_lang_String_2ILjava_lang_String_2 (JNIEnv *env, jobject, jstring, jint, jstring);
+extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth (JNIEnv *env, jobject, jstring, jint, jstring);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GdkGraphics.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GdkGraphics.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GdkGraphics.h
--- include/gnu_java_awt_peer_gtk_GdkGraphics.h	19 Mar 2004 21:25:56 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GdkGraphics.h	30 Apr 2004 11:03:50 -0000
@@ -27,7 +27,7 @@
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawPolyline (JNIEnv *env, jobject, jintArray, jintArray, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawRect (JNIEnv *env, jobject, jint, jint, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_fillRect (JNIEnv *env, jobject, jint, jint, jint, jint);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString__Ljava_lang_String_2IILjava_lang_String_2II (JNIEnv *env, jobject, jstring, jint, jint, jstring, jint, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString (JNIEnv *env, jobject, jstring, jint, jint, jstring, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setClipRectangle (JNIEnv *env, jobject, jint, jint, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFGColor (JNIEnv *env, jobject, jint, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphics_setFunction (JNIEnv *env, jobject, jint);
Index: include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h,v
retrieving revision 1.1
diff -u -r1.1 gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h
--- include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h	12 Feb 2004 16:53:09 -0000	1.1
+++ include/gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer.h	30 Apr 2004 11:03:50 -0000
@@ -10,7 +10,7 @@
 {
 #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_create (JNIEnv *env, jobject, jlong);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkEmbeddedWindowPeer_construct (JNIEnv *env, jobject, jlong);
 
 #ifdef __cplusplus
Index: include/gnu_java_awt_peer_gtk_GtkLabelPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkLabelPeer.h,v
retrieving revision 1.4
diff -u -r1.4 gnu_java_awt_peer_gtk_GtkLabelPeer.h
--- include/gnu_java_awt_peer_gtk_GtkLabelPeer.h	19 Mar 2004 21:25:56 -0000	1.4
+++ include/gnu_java_awt_peer_gtk_GtkLabelPeer.h	30 Apr 2004 11:03:50 -0000
@@ -10,7 +10,7 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create__Ljava_lang_String_2F (JNIEnv *env, jobject, jstring, jfloat);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_create (JNIEnv *env, jobject, jstring, jfloat);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_nativeSetAlignment (JNIEnv *env, jobject, jfloat);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkLabelPeer_setText (JNIEnv *env, jobject, jstring);
Index: include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkMenuBarPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h	30 Jul 2003 16:47:19 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkMenuBarPeer.h	30 Apr 2004 11:03:50 -0000
@@ -11,7 +11,7 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu__Ljava_awt_peer_MenuPeer_2 (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_addMenu (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuBarPeer_delMenu (JNIEnv *env, jobject, jint);
 
 #ifdef __cplusplus
Index: include/gnu_java_awt_peer_gtk_GtkMenuPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkMenuPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkMenuPeer.h
--- include/gnu_java_awt_peer_gtk_GtkMenuPeer.h	30 Jul 2003 16:47:19 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkMenuPeer.h	30 Apr 2004 11:03:50 -0000
@@ -11,7 +11,7 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_create (JNIEnv *env, jobject, jstring);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem__Ljava_awt_peer_MenuItemPeer_2IZ (JNIEnv *env, jobject, jobject, jint, jboolean);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_addItem (JNIEnv *env, jobject, jobject, jint, jboolean);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_setupAccelGroup (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuPeer_delItem (JNIEnv *env, jobject, jint);
 
Index: include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h
--- include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h	30 Jul 2003 16:47:19 -0000	1.2
+++ include/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.h	30 Apr 2004 11:03:50 -0000
@@ -11,7 +11,7 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_setupAccelGroup (JNIEnv *env, jobject, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show__IIJ (JNIEnv *env, jobject, jint, jint, jlong);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkPopupMenuPeer_show (JNIEnv *env, jobject, jint, jint, jlong);
 
 #ifdef __cplusplus
 }
Index: include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkScrollPanePeer.h
--- include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h	7 Jan 2004 02:23:37 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GtkScrollPanePeer.h	30 Apr 2004 11:03:50 -0000
@@ -10,7 +10,7 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create__II (JNIEnv *env, jobject, jint, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_create (JNIEnv *env, jobject, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetScrollPosition (JNIEnv *env, jobject, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetHScrollIncrement (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollPanePeer_gtkScrolledWindowSetVScrollIncrement (JNIEnv *env, jobject, jint);
Index: include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkScrollbarPeer.h
--- include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h	7 Jan 2004 02:23:37 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GtkScrollbarPeer.h	30 Apr 2004 11:03:50 -0000
@@ -10,7 +10,7 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create__IIIIIII (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_create (JNIEnv *env, jobject, jint, jint, jint, jint, jint, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectJObject (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkScrollbarPeer_setLineIncrement (JNIEnv *env, jobject, jint);
Index: include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkTextAreaPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h	13 Jan 2004 22:37:28 -0000	1.6
+++ include/gnu_java_awt_peer_gtk_GtkTextAreaPeer.h	30 Apr 2004 11:03:50 -0000
@@ -10,7 +10,7 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create__III (JNIEnv *env, jobject, jint, jint, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create (JNIEnv *env, jobject, jint, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert (JNIEnv *env, jobject, jstring, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_replaceRange (JNIEnv *env, jobject, jstring, jint, jint);
Index: include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
--- include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h	20 Jan 2004 21:33:35 -0000	1.6
+++ include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h	30 Apr 2004 11:03:50 -0000
@@ -10,7 +10,7 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create__I (JNIEnv *env, jobject, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create (JNIEnv *env, jobject, jint);
 extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkSetFont (JNIEnv *env, jobject, jstring, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_setEchoChar (JNIEnv *env, jobject, jchar);
Index: include/gnu_java_awt_peer_gtk_GtkWindowPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h,v
retrieving revision 1.8
diff -u -r1.8 gnu_java_awt_peer_gtk_GtkWindowPeer.h
--- include/gnu_java_awt_peer_gtk_GtkWindowPeer.h	13 Jan 2004 22:29:35 -0000	1.8
+++ include/gnu_java_awt_peer_gtk_GtkWindowPeer.h	30 Apr 2004 11:03:50 -0000
@@ -10,7 +10,7 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create__IZIILgnu_java_awt_peer_gtk_GtkWindowPeer_2_3I (JNIEnv *env, jobject, jint, jboolean, jint, jint, jobject, jintArray);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create (JNIEnv *env, jobject, jint, jboolean, jint, jint, jobject, jintArray);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectJObject (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkWindowPeer_toBack (JNIEnv *env, jobject);
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,v
retrieving revision 1.6
diff -u -r1.6 gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c	29 Mar 2004 07:07:26 -0000	1.6
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c	30 Apr 2004 11:03:51 -0000
@@ -37,7 +37,7 @@
 
 
 #include "gtkpeer.h"
-#include "gnu_java_awt_peer_gtk_GtkMenuItemPeer.h"
+#include "gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.h"
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer_create
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,v
retrieving revision 1.11
diff -u -r1.11 gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c	7 Apr 2004 20:28:53 -0000	1.11
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c	30 Apr 2004 11:03:51 -0000
@@ -42,40 +42,6 @@
 
 static void item_toggled (GtkToggleButton *item, jobject peer);
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_dispose
-  (JNIEnv *env, jobject obj)
-{
-  /* The actual underlying widget is owned by a different class.  So
-     we just clean up the hash table here.  */
-  NSA_DEL_PTR (env, obj);
-}
-
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkCheckboxGroupPeer_remove
-  (JNIEnv *env, jobject obj, jobject checkbox)
-{
-  GtkRadioButton *button;
-  void *ptr;
-  GSList *list;
-
-  ptr = NSA_GET_PTR (env, checkbox);
-  gdk_threads_enter ();
-  button = GTK_RADIO_BUTTON (ptr);
-
-  /* Update the group to point to some other widget in the group.  We
-     have to do this because Gtk doesn't have a separate object to
-     represent a radio button's group.  */
-  for (list = gtk_radio_button_group (button); list != NULL;
-       list = list->next)
-    {
-      if (list->data != button)
-	break;
-    }
-
-  gdk_threads_leave ();
-
-  NSA_SET_PTR (env, obj, list ? list->data : NULL);
-}
-
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_nativeCreate
   (JNIEnv *env, jobject obj, jobject group, jboolean state)
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.25
diff -u -r1.25 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	17 Apr 2004 23:24:47 -0000	1.25
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	30 Apr 2004 11:03:51 -0000
@@ -43,24 +43,6 @@
 static GtkWidget *find_fg_color_widget (GtkWidget *widget);
 static GtkWidget *find_bg_color_widget (GtkWidget *widget);
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkGenericPeer_dispose
-  (JNIEnv *env, jobject obj)
-{
-  void *ptr;
-
-  /* Remove entries from state tables */
-  NSA_DEL_GLOBAL_REF (env, obj);
-  ptr = NSA_DEL_PTR (env, obj);
-
-  gdk_threads_enter ();
-  
-  /* For now the native state for any object must be a widget.
-     However, a subclass could override dispose() if required.  */
-  gtk_widget_destroy (GTK_WIDGET (ptr));
-
-  gdk_threads_leave ();
-}
-
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor 
   (JNIEnv *env, jobject obj, jint type) 
@@ -128,18 +110,6 @@
   gdk_threads_leave ();
 }
 
-JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus
-  (JNIEnv *env, jobject obj)
-{
-  void *ptr;
-
-  ptr = NSA_GET_PTR (env, obj);
-  
-  gdk_threads_enter ();
-  /* XXX gtk_widget_grab_focus (GTK_WIDGET (ptr)); */
-  gdk_threads_leave ();
-}
-
 /*
  * Find the origin of a widget's window.
  */
@@ -232,19 +202,6 @@
   gdk_threads_leave ();
 
   (*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
-}
-
-JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetUsize (JNIEnv *env, 
-    jobject obj, jint w, jint h)
-{
-  void *ptr;
-
-  ptr = NSA_GET_PTR (env, obj);
-  
-  gdk_threads_enter ();
-  gtk_widget_set_usize (GTK_WIDGET (ptr), w, h);
-  gdk_threads_leave ();
 }
 
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.26
diff -u -r1.26 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	29 Mar 2004 07:07:27 -0000	1.26
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	30 Apr 2004 11:03:51 -0000
@@ -284,28 +284,6 @@
 }
 
 /*
- * Set a frame's title
- */
-
-JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkWindowPeer_setTitle
-  (JNIEnv *env, jobject obj, jstring title)
-{
-  void *ptr;
-  const char *str;
-
-  ptr = NSA_GET_PTR (env, obj);
-  
-  str = (*env)->GetStringUTFChars (env, title, NULL);
-  
-  gdk_threads_enter ();
-  gtk_window_set_title (GTK_WINDOW (ptr), str);
-  gdk_threads_leave ();
-  
-  (*env)->ReleaseStringUTFChars (env, title, str);
-}
-
-/*
  * Lower the z-level of a window. 
  */
 
Index: native/jni/gtk-peer/gthread-jni.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gthread-jni.c,v
retrieving revision 1.10
diff -u -r1.10 gthread-jni.c
--- native/jni/gtk-peer/gthread-jni.c	9 Apr 2004 17:35:56 -0000	1.10
+++ native/jni/gtk-peer/gthread-jni.c	30 Apr 2004 11:03:51 -0000
@@ -505,7 +505,3 @@
   NULL
 };
 
-/* ??? */
-void gdk_threads_wake () {
-
-}
Index: native/jni/java-io/javaio.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-io/javaio.h,v
retrieving revision 1.4
diff -u -r1.4 javaio.h
--- native/jni/java-io/javaio.h	29 Mar 2004 07:07:27 -0000	1.4
+++ native/jni/java-io/javaio.h	30 Apr 2004 11:03:51 -0000
@@ -48,6 +48,8 @@
 extern jlong _javaio_get_file_length(JNIEnv *, jint);
 extern jlong _javaio_skip_bytes(JNIEnv *, jint, jlong);
 extern jint _javaio_open(JNIEnv *, jstring, int);
+extern jint _javaio_open_read(JNIEnv *, jstring);
+extern jint _javaio_open_readwrite(JNIEnv *, jstring);
 extern void _javaio_close(JNIEnv *, jint fd);
 extern jint _javaio_read(JNIEnv *, jobject obj, jint, jarray, jint, jint);
 extern jint _javaio_write(JNIEnv *, jobject obj, jint, jarray, jint, jint);
Index: native/jni/java-lang/java_lang_VMDouble.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_VMDouble.c,v
retrieving revision 1.3
diff -u -r1.3 java_lang_VMDouble.c
--- native/jni/java-lang/java_lang_VMDouble.c	29 Mar 2004 07:07:27 -0000	1.3
+++ native/jni/java-lang/java_lang_VMDouble.c	30 Apr 2004 11:03:51 -0000
@@ -39,6 +39,7 @@
 #include <config.h>
 
 #include "java_lang_Double.h"
+#include "java_lang_VMDouble.h"
 
 /*
  * Class:     java_lang_VMDouble
Index: native/jni/java-lang/java_lang_reflect_Array.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-lang/java_lang_reflect_Array.c,v
retrieving revision 1.4
diff -u -r1.4 java_lang_reflect_Array.c
--- native/jni/java-lang/java_lang_reflect_Array.c	29 Mar 2004 07:07:27 -0000	1.4
+++ native/jni/java-lang/java_lang_reflect_Array.c	30 Apr 2004 11:03:51 -0000
@@ -1,5 +1,5 @@
 /* java.lang.reflect.Array native functions
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,18 +41,10 @@
  * Version: 1.1.0
  * Date: 2 Jun 1998
  */
+
 #include <stddef.h>
-#include "java_lang_reflect_Array.h"
 
-/*
- * Class:     java_lang_reflect_Array
- * Method:    getLength
- * Signature: (Ljava/lang/Object;)I
- */
-JNIEXPORT jint JNICALL Java_java_lang_reflect_Array_getLength
-  (JNIEnv * env, jclass thisClass, jobject arr) {
-	return (*env)->GetArrayLength(env, arr);
-}
+#include "java_lang_reflect_Array.h"
 
 /*
  * Class:     java_lang_reflect_Array
Index: native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c,v
retrieving revision 1.8
diff -u -r1.8 gnu_java_nio_channels_FileChannelImpl.c
--- native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	29 Apr 2004 16:46:44 -0000	1.8
+++ native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c	30 Apr 2004 11:03:51 -0000
@@ -279,30 +279,6 @@
 
   return file_size;
 }
-/*************************************************************************/
-/*
- * Return the length of the file
- * Exception on error
- */
-JNIEXPORT jlong JNICALL
-Java_java_io_FileDescriptor_nativeGetLength(JNIEnv *env, jobject obj, jlong fd)
-{
-  int   native_fd;
-  jlong file_size;
-  int   result;
-
-  native_fd = get_native_fd(env, obj);
-
-  TARGET_NATIVE_FILE_SIZE(native_fd, file_size, result);
-  if (result != TARGET_NATIVE_OK)
-    {
-      JCL_ThrowException(env, IO_EXCEPTION,
-                         TARGET_NATIVE_LAST_ERROR_STRING());
-      return TARGET_NATIVE_MATH_INT_INT64_CONST_MINUS_1;
-    }
-
-  return file_size;
-}
 
 /*
  * Return the current position of the file pointer

--Boundary-00=_iNjkAHzyqzEiXBp--



From MAILER-DAEMON Fri Apr 30 10:21:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJYsQ-0007wq-UZ
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 10:20:30 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJYsH-0007vE-Ed
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 10:20:21 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJXnA-00032U-V6
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 09:11:32 -0400
Received: from [212.6.122.151] (helo=mail5.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJXev-0001xC-FK
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 09:02:29 -0400
Received: from majestix.konqueror.de (dynadsl-080-228-94-188.ewetel.net
	[80.228.94.188])
	by mail5.ewetel.de (8.12.1/8.12.9) with ESMTP id i3UD2QII023977;
	Fri, 30 Apr 2004 15:02:27 +0200 (MEST)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1BJXfs-0001MI-00; Fri, 30 Apr 2004 15:03:28 +0200
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>, commit-classpath@gnu.org
Date: Fri, 30 Apr 2004 15:02:05 +0200
User-Agent: KMail/1.5.4
References: <1083328742.19524.6.camel@elsschot.wildebeest.org>
In-Reply-To: <1083328742.19524.6.camel@elsschot.wildebeest.org>
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200404301502.06414.konqueror@gmx.de>
X-CheckCompat: OK
Cc: 
Subject: Re: FYI: Small documentation update/cleanup
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 14:20:22 -0000

Am Freitag, 30. April 2004 14:39 schrieb Mark Wielaard:
> Hi,
>
> A small documentation update that mentions texinfo and updates
> version numbers.
>
> 2004-04-30  Mark Wielaard  <mark@klomp.org>
>
>        * README: Update end user dev environments and hackers runtime
> lists. * INSTALL: Update needed library versions, add texinfo version
> requirement, mention website/hacker guide.
>        * doc/hacking.texinfo: Include item on texinfo.

+Smaller (runtime only) environments based on GNU Classpath includei

I think you meant "include", not "includei".


Michael



From MAILER-DAEMON Fri Apr 30 11:15:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJZjb-0000xe-FR
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 11:15:27 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJZjY-0000x9-4I
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:15:24 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJZj1-0000sX-PE
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:15:22 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJZj1-0000sJ-57
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:14:51 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJZj1-00052H-Bx
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:14:51 -0400
From: "Mark Wielaard" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8611
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6) Gecko/20040413 Epiphany/1.0.8
X-Apparently-From: 82.161.94.186
X-Copy-To: Array
Message-Id: <E1BJZj1-00052H-Bx@savannah.gnu.org>
Date: Fri, 30 Apr 2004 11:14:51 -0400
Subject: [bugs #8611] classpath0.08: java.lang.Runtime.loadLibrary : causes
	UnsatisfiedLinkException when VM is intializing
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 15:15:25 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.

/**************************************************************************/
[bugs #8611] Latest Modifications:

Changes by: 
		Mark Wielaard <mark@klomp.org>
'Date: 
		Fri 04/30/04 at 15:14 (Europe/Amsterdam)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
         Assigned to | None                      | mark
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Thanks. I made your suggestion a bit more abstract which cleaned up library loading a bit. Hopefully this prevents early bootstrap triggering of exception handling and it is hopefully be a little more efficient if your library path is large.

2004-04-30  Mark Wielaard  <mark@klomp.org>
                                                                                
        Reported by Nikolay Fiykov [bugs #8611]
        * java/lang/Runtime.java (loadLib): New private method.
        (load): Call loadLib.
        (loadLibrary): Call loadLib.

diff -u -r1.6 Runtime.java
--- java/lang/Runtime.java      17 Apr 2004 17:08:22 -0000      1.6
+++ java/lang/Runtime.java      30 Apr 2004 15:08:12 -0000
@@ -670,11 +664,20 @@
    */
   public void load(String filename)
   {
+    if (loadLib(filename) == 0)
+      throw new UnsatisfiedLinkError("Could not load library " + filename);
+  }
+
+  // Private version of load(String) that doesn't throw Exception on
+  // load error, but it does do security checks (which can throw
+  // SecurityExceptions). Convenience method for early bootstrap
+  // process.
+  private int loadLib(String filename)
+  {
     SecurityManager sm = securityManager; // Be thread-safe!
     if (sm != null)
       sm.checkLink(filename);
-    if (VMRuntime.nativeLoad(filename) == 0)
-      throw new UnsatisfiedLinkError("Could not load library " + filename);
+    return VMRuntime.nativeLoad(filename);
   }
  
   /**
@@ -706,21 +709,18 @@
         filename = cl.findLibrary(libname);
         if (filename != null)
           {
-            load(filename);
-            return;
+           // Use loadLib so no UnsatisfiedLinkError are thrown.
+            if (loadLib(filename) != 0)
+             return;
           }
       }
+
     filename = System.mapLibraryName(libname);
     for (int i = 0; i < libpath.length; i++)
-      try
-        {
-          load(libpath[i] + filename);
-          return;
-        }
-      catch (UnsatisfiedLinkError e)
-        {
-          // Try next path element.
-        }
+      // Use loadLib so no UnsatisfiedLinkError are thrown.
+      if (loadLib(libpath[i] + filename) != 0)
+       return;
+
     throw new UnsatisfiedLinkError("Could not find library " + libname + ".");
   }
  







/**************************************************************************/
[bugs #8611] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8611>
Project: classpath
Submitted by: Nikolay Fiykov
On: Sun 04/18/04 at 15:00

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  mark
Status:  Closed
Platform Version:  None


Summary:  classpath0.08: java.lang.Runtime.loadLibrary : causes UnsatisfiedLinkException when VM is intializing

Original Submission:  Hi,
While dealing with JAMVM I came across an exceptions related problem with java.lang.Runtime.loadLibrary.

Issue is that when scanning java.library.path dirs to find the required lib "loadLibrary" uses "load". In its turn "load" raise exeception if lib is not find.

In case of JAMVM when this exeception hapens during intialization it aborts VM. Because of that LD_LIBRARY_PATH is not scanned completely and lib is not located at all.

This also could be attributed to JAMVM specifics and probably it is true. Yet, I can understand also that VM exception handling may not be that "accurate" during VM build-up therefore I'd see it as Classpath issue as well.

Attached is a patch against Runtime.java which overcomes the problem by doing exactly what "load" does but without mentioned exception problem.

See sf.net/projects/jamvm:Forums-Help where this issues has been raised too.

-- niki

Follow-up Comments
------------------


-------------------------------------------------------
Date: Fri 04/30/04 at 15:14         By: mark
Thanks. I made your suggestion a bit more abstract which cleaned up library loading a bit. Hopefully this prevents early bootstrap triggering of exception handling and it is hopefully be a little more efficient if your library path is large.

2004-04-30  Mark Wielaard  <mark@klomp.org>
                                                                                
        Reported by Nikolay Fiykov [bugs #8611]
        * java/lang/Runtime.java (loadLib): New private method.
        (load): Call loadLib.
        (loadLibrary): Call loadLib.

diff -u -r1.6 Runtime.java
--- java/lang/Runtime.java      17 Apr 2004 17:08:22 -0000      1.6
+++ java/lang/Runtime.java      30 Apr 2004 15:08:12 -0000
@@ -670,11 +664,20 @@
    */
   public void load(String filename)
   {
+    if (loadLib(filename) == 0)
+      throw new UnsatisfiedLinkError("Could not load library " + filename);
+  }
+
+  // Private version of load(String) that doesn't throw Exception on
+  // load error, but it does do security checks (which can throw
+  // SecurityExceptions). Convenience method for early bootstrap
+  // process.
+  private int loadLib(String filename)
+  {
     SecurityManager sm = securityManager; // Be thread-safe!
     if (sm != null)
       sm.checkLink(filename);
-    if (VMRuntime.nativeLoad(filename) == 0)
-      throw new UnsatisfiedLinkError("Could not load library " + filename);
+    return VMRuntime.nativeLoad(filename);
   }
  
   /**
@@ -706,21 +709,18 @@
         filename = cl.findLibrary(libname);
         if (filename != null)
           {
-            load(filename);
-            return;
+           // Use loadLib so no UnsatisfiedLinkError are thrown.
+            if (loadLib(filename) != 0)
+             return;
           }
       }
+
     filename = System.mapLibraryName(libname);
     for (int i = 0; i < libpath.length; i++)
-      try
-        {
-          load(libpath[i] + filename);
-          return;
-        }
-      catch (UnsatisfiedLinkError e)
-        {
-          // Try next path element.
-        }
+      // Use loadLib so no UnsatisfiedLinkError are thrown.
+      if (loadLib(libpath[i] + filename) != 0)
+       return;
+
     throw new UnsatisfiedLinkError("Could not find library " + libname + ".");
   }
  


-------------------------------------------------------
Date: Sun 04/18/04 at 22:07         By: None
THis is JamVM specific.  THe patch should be rejected, and JamVM fixed.






File Attachments
-------------------

-------------------------------------------------------
Date: Sun 04/18/04 at 15:00  Name: classpath-0.08-loadlibrary.patch  Size: 1KB   By: fikin

http://savannah.gnu.org/bugs/download.php?item_id=8611&amp;item_file_id=1201






For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8611>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Fri Apr 30 11:22:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJZq4-0002WH-MR
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 11:22:08 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJZq1-0002Vb-Ah
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:22:05 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJZpy-0002Uw-ME
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:22:03 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJZpy-0002Up-2y
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:22:02 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJZpq-0008CY-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 17:21:54 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-kiZCtnc1TgVnG814NelQ"
Message-Id: <1083338517.19536.15.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 17:21:57 +0200
Subject: FYI: Two small Runtime cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 15:22:06 -0000


--=-kiZCtnc1TgVnG814NelQ
Content-Type: multipart/mixed; boundary="=-JbQX7vXViQuOF/ywzH8N"


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

Hi,

This cleans up two small things in Runtime.

2004-04-30  Mark Wielaard  <mark@klomp.org>

       Reported by Nikolay Fiykov [bugs #8611]
       * java/lang/Runtime.java (loadLib): New private method.
       (load): Call loadLib.
       (loadLibrary): Call loadLib.

       * java/lang/Runtime.java (runShutdownHooks): Use Thread.yield().

Hopefully this prevents early bootstrap triggering of exception handling
and it might  be a little more efficient if your library path is large.
Thread.yield() is more appropriate as hint to the Runtime to give
another Thread a little chance to run. Thread.sleep() [which should have
been called staticly anyway] might have some minimum sleep time
associated with it that is inappropriate here.

Committed.

Cheers,

Mark

--=-JbQX7vXViQuOF/ywzH8N
Content-Disposition: inline; filename=Runtime.diff
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=Runtime.diff; charset=ISO-8859-1

SW5kZXg6IGphdmEvbGFuZy9SdW50aW1lLmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3Zz
cm9vdC9jbGFzc3BhdGgvY2xhc3NwYXRoL2phdmEvbGFuZy9SdW50aW1lLmphdmEsdg0KcmV0cmll
dmluZyByZXZpc2lvbiAxLjYNCmRpZmYgLXUgLXIxLjYgUnVudGltZS5qYXZhDQotLS0gamF2YS9s
YW5nL1J1bnRpbWUuamF2YQkxNyBBcHIgMjAwNCAxNzowODoyMiAtMDAwMAkxLjYNCisrKyBqYXZh
L2xhbmcvUnVudGltZS5qYXZhCTMwIEFwciAyMDA0IDE1OjE3OjM5IC0wMDAwDQpAQCAtMSw1ICsx
LDUgQEANCiAvKiBSdW50aW1lLmphdmEgLS0gYWNjZXNzIHRvIHRoZSBWTSBwcm9jZXNzDQotICAg
Q29weXJpZ2h0IChDKSAxOTk4LCAyMDAyLCAyMDAzIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbg0K
KyAgIENvcHlyaWdodCAoQykgMTk5OCwgMjAwMiwgMjAwMywgMjAwNCBGcmVlIFNvZnR3YXJlIEZv
dW5kYXRpb24NCiANCiBUaGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAg
LTI4NywxNCArMjg3LDggQEANCiAgICAgICAgICAgICAgICAgICAgICAgew0KICAgICAgICAgICAg
ICAgICAgICAgICAgIHNodXRkb3duSG9va3MucmVtb3ZlKGhvb2tzW2ldKTsNCiAgICAgICAgICAg
ICAgICAgICAgICAgfQ0KLSAgICAgICAgICAgICAgICB0cnkNCi0gICAgICAgICAgICAgICAgICB7
DQotICAgICAgICAgICAgICAgICAgICBleGl0U2VxdWVuY2Uuc2xlZXAoMSk7IC8vIEdpdmUgb3Ro
ZXIgdGhyZWFkcyBhIGNoYW5jZS4NCi0gICAgICAgICAgICAgICAgICB9DQotICAgICAgICAgICAg
ICAgIGNhdGNoIChJbnRlcnJ1cHRlZEV4Y2VwdGlvbiBlKQ0KLSAgICAgICAgICAgICAgICAgIHsN
Ci0gICAgICAgICAgICAgICAgICAgIC8vIElnbm9yZSwgdGhlIG5leHQgbG9vcCBqdXN0IHN0YXJ0
cyBzb29uZXIuDQotICAgICAgICAgICAgICAgICAgfQ0KKw0KKyAgICAgICAgICAgICAgICAgICAg
VGhyZWFkLnlpZWxkKCk7IC8vIEdpdmUgb3RoZXIgdGhyZWFkcyBhIGNoYW5jZS4NCiAgICAgICAg
ICAgICAgIH0NCiAgICAgICAgICAgICBzeW5jaHJvbml6ZWQgKGxpYnBhdGgpDQogICAgICAgICAg
ICAgICB7DQpAQCAtNjcwLDExICs2NjQsMjAgQEANCiAgICAqLw0KICAgcHVibGljIHZvaWQgbG9h
ZChTdHJpbmcgZmlsZW5hbWUpDQogICB7DQorICAgIGlmIChsb2FkTGliKGZpbGVuYW1lKSA9PSAw
KQ0KKyAgICAgIHRocm93IG5ldyBVbnNhdGlzZmllZExpbmtFcnJvcigiQ291bGQgbm90IGxvYWQg
bGlicmFyeSAiICsgZmlsZW5hbWUpOw0KKyAgfQ0KKw0KKyAgLy8gUHJpdmF0ZSB2ZXJzaW9uIG9m
IGxvYWQoU3RyaW5nKSB0aGF0IGRvZXNuJ3QgdGhyb3cgRXhjZXB0aW9uIG9uDQorICAvLyBsb2Fk
IGVycm9yLCBidXQgaXQgZG9lcyBkbyBzZWN1cml0eSBjaGVja3MgKHdoaWNoIGNhbiB0aHJvdw0K
KyAgLy8gU2VjdXJpdHlFeGNlcHRpb25zKS4gQ29udmVuaWVuY2UgbWV0aG9kIGZvciBlYXJseSBi
b290c3RyYXANCisgIC8vIHByb2Nlc3MuDQorICBwcml2YXRlIGludCBsb2FkTGliKFN0cmluZyBm
aWxlbmFtZSkNCisgIHsNCiAgICAgU2VjdXJpdHlNYW5hZ2VyIHNtID0gc2VjdXJpdHlNYW5hZ2Vy
OyAvLyBCZSB0aHJlYWQtc2FmZSENCiAgICAgaWYgKHNtICE9IG51bGwpDQogICAgICAgc20uY2hl
Y2tMaW5rKGZpbGVuYW1lKTsNCi0gICAgaWYgKFZNUnVudGltZS5uYXRpdmVMb2FkKGZpbGVuYW1l
KSA9PSAwKQ0KLSAgICAgIHRocm93IG5ldyBVbnNhdGlzZmllZExpbmtFcnJvcigiQ291bGQgbm90
IGxvYWQgbGlicmFyeSAiICsgZmlsZW5hbWUpOw0KKyAgICByZXR1cm4gVk1SdW50aW1lLm5hdGl2
ZUxvYWQoZmlsZW5hbWUpOw0KICAgfQ0KIA0KICAgLyoqDQpAQCAtNzA2LDIxICs3MDksMTggQEAN
CiAgICAgICAgIGZpbGVuYW1lID0gY2wuZmluZExpYnJhcnkobGlibmFtZSk7DQogICAgICAgICBp
ZiAoZmlsZW5hbWUgIT0gbnVsbCkNCiAgICAgICAgICAgew0KLSAgICAgICAgICAgIGxvYWQoZmls
ZW5hbWUpOw0KLSAgICAgICAgICAgIHJldHVybjsNCisJICAgIC8vIFVzZSBsb2FkTGliIHNvIG5v
IFVuc2F0aXNmaWVkTGlua0Vycm9yIGFyZSB0aHJvd24uDQorICAgICAgICAgICAgaWYgKGxvYWRM
aWIoZmlsZW5hbWUpICE9IDApDQorCSAgICAgIHJldHVybjsNCiAgICAgICAgICAgfQ0KICAgICAg
IH0NCisNCiAgICAgZmlsZW5hbWUgPSBTeXN0ZW0ubWFwTGlicmFyeU5hbWUobGlibmFtZSk7DQog
ICAgIGZvciAoaW50IGkgPSAwOyBpIDwgbGlicGF0aC5sZW5ndGg7IGkrKykNCi0gICAgICB0cnkN
Ci0gICAgICAgIHsNCi0gICAgICAgICAgbG9hZChsaWJwYXRoW2ldICsgZmlsZW5hbWUpOw0KLSAg
ICAgICAgICByZXR1cm47DQotICAgICAgICB9DQotICAgICAgY2F0Y2ggKFVuc2F0aXNmaWVkTGlu
a0Vycm9yIGUpDQotICAgICAgICB7DQotICAgICAgICAgIC8vIFRyeSBuZXh0IHBhdGggZWxlbWVu
dC4NCi0gICAgICAgIH0NCisgICAgICAvLyBVc2UgbG9hZExpYiBzbyBubyBVbnNhdGlzZmllZExp
bmtFcnJvciBhcmUgdGhyb3duLg0KKyAgICAgIGlmIChsb2FkTGliKGxpYnBhdGhbaV0gKyBmaWxl
bmFtZSkgIT0gMCkNCisJcmV0dXJuOw0KKw0KICAgICB0aHJvdyBuZXcgVW5zYXRpc2ZpZWRMaW5r
RXJyb3IoIkNvdWxkIG5vdCBmaW5kIGxpYnJhcnkgIiArIGxpYm5hbWUgKyAiLiIpOw0KICAgfQ0K
IA0K

--=-JbQX7vXViQuOF/ywzH8N--

--=-kiZCtnc1TgVnG814NelQ
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)

iD8DBQBAkm8VxVhZCJWr9QwRAizUAJ0cxxg91GLOlqqm9v3jxBYaCu81hgCgjHj/
B+qFYw3cwmRCflktQ36npFQ=
=9eB7
-----END PGP SIGNATURE-----

--=-kiZCtnc1TgVnG814NelQ--




From MAILER-DAEMON Fri Apr 30 12:09:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJaaH-00042b-Fs
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 12:09:53 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJaa9-000413-0P
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 12:09:45 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJaZa-0003rt-E8
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 12:09:41 -0400
Received: from [199.232.41.5] (helo=savannah.gnu.org)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJaDS-0007ns-Ck
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:46:18 -0400
Received: from savannah ([127.0.0.1] helo=localhost)
	by savannah.gnu.org with smtp (Exim 4.24) id 1BJaDU-0006o7-FA
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 11:46:20 -0400
From: "Mark Wielaard" <noreply@savannah.gnu.org>
To: commit-classpath@gnu.org
X-Savannah-Server: savannah.gnu.org:443 [199.232.41.3]
X-Savannah-Project: classpath
X-Savannah-Artifact: bugs
X-Savannah-Artifact-ID: 8234
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US;
	rv:1.6) Gecko/20040413 Galeon/1.3.14 (Debian package 1.3.14a-1)
X-Apparently-From: 82.161.94.186
X-Copy-To: Array
Message-Id: <E1BJaDU-0006o7-FA@savannah.gnu.org>
Date: Fri, 30 Apr 2004 11:46:20 -0400
Subject: [bugs #8234] BufferedInputStream allocates too much memory
	(OutOfMemory w/ gcj)
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 16:09:46 -0000

This mail is an automated notification from the bugs tracker
 of the project: classpath.

/**************************************************************************/
[bugs #8234] Latest Modifications:

Changes by: 
		Mark Wielaard <mark@klomp.org>
'Date: 
		Fri 04/30/04 at 15:46 (Europe/Amsterdam)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
This has been fixed (in 0.08) byt the following patch:

2004-03-09  Guilhem Lavaux  <guilhem@kaffe.org>
                                                                                
        * java/io/BufferedInputStream.java (marktarget): New field for max
        mark limit.
        (CHUNKSIZE): New constant for incremental mark buffer allocation.
        (mark): Use new fields.
        (read): Likewise.
        (read(byte[],int,int)): Likewise.
        (skip): Likewise.
        (refill): Likewise.







/**************************************************************************/
[bugs #8234] Full Item Snapshot:

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=8234>
Project: classpath
Submitted by: 0
On: Sun 03/21/04 at 16:45

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  None
Status:  Closed
Platform Version:  None


Summary:  BufferedInputStream allocates too much memory (OutOfMemory w/ gcj)

Original Submission:  BufferedInputStream.reset() contains the following:

        // Need to grow the buffer now to have room for marklimit bytes.
        // Note that the new buffer is one greater than marklimit.
        // This is so that there will be one byte past marklimit to be read
        // before having to call refill again, thus allowing marklimit to be
        // invalidated.  That way refill doesn't have to check marklimit.
        byte[] newbuf = new byte[marklimit + 1];
        System.arraycopy(buf, 0, newbuf, 0, count);
        buf = newbuf;
 

But, marklimit may be an outrageously large number, as in mauve's BigMark test case, where we get an OutOfMemory exception on Linux with gcj.

We don't really need to allocate such a large array.



Follow-up Comments
------------------


-------------------------------------------------------
Date: Fri 04/30/04 at 15:46         By: mark
This has been fixed (in 0.08) byt the following patch:

2004-03-09  Guilhem Lavaux  <guilhem@kaffe.org>
                                                                                
        * java/io/BufferedInputStream.java (marktarget): New field for max
        mark limit.
        (CHUNKSIZE): New constant for incremental mark buffer allocation.
        (mark): Use new fields.
        (read): Likewise.
        (read(byte[],int,int)): Likewise.
        (skip): Likewise.
        (refill): Likewise.













For detailed info, follow this link:
<http://savannah.gnu.org/bugs/?func=detailitem&item_id=8234>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.gnu.org/






From MAILER-DAEMON Fri Apr 30 12:11:33 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJabs-0004Vj-Rf
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 12:11:32 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJabq-0004VJ-Pr
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 12:11:30 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJabp-0004Uu-9f
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 12:11:29 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJabo-0004Uf-An
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 12:11:28 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJabf-0008N8-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 18:11:19 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-2s04GGfGpaBPu6DCbQT8"
Message-Id: <1083341483.19533.18.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 18:11:23 +0200
Subject: FYI: Cleanup confusing system vs bootstrap classlaoder doc in
	Class.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 16:11:31 -0000


--=-2s04GGfGpaBPu6DCbQT8
Content-Type: multipart/mixed; boundary="=-7cjF4nCCILFTTJInuKyB"


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

Hi,

Just committed this small documentation clean up in Class.java:

2004-04-30  Mark Wielaard  <mark@klomp.org>

        Reported by David Holmes
        * java/lang/Class.java: Clean up confusing stateements about system
        classloader versus bootstrap classloader.

Cheers,

Mark

--=-7cjF4nCCILFTTJInuKyB
Content-Disposition: inline; filename=Class-doc.diff
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=Class-doc.diff; charset=ISO-8859-1

SW5kZXg6IGphdmEvbGFuZy9DbGFzcy5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jv
b3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZhL2xhbmcvQ2xhc3MuamF2YSx2DQpyZXRyaWV2aW5n
IHJldmlzaW9uIDEuMTkNCmRpZmYgLXUgLXIxLjE5IENsYXNzLmphdmENCi0tLSBqYXZhL2xhbmcv
Q2xhc3MuamF2YQkyMiBBcHIgMjAwNCAxNjoxODozNiAtMDAwMAkxLjE5DQorKysgamF2YS9sYW5n
L0NsYXNzLmphdmEJMzAgQXByIDIwMDQgMTY6MDg6NTAgLTAwMDANCkBAIC02Miw5ICs2MiwxMSBA
QA0KICAqIG9iamVjdHMgd2l0aCBpZGVudGljYWwgbmFtZXMgYW5kIENsYXNzTG9hZGVycy4gUHJp
bWl0aXZlIHR5cGVzLCBhcnJheQ0KICAqIHR5cGVzLCBhbmQgdm9pZCBhbHNvIGhhdmUgYSBDbGFz
cyBvYmplY3QuDQogICoNCi0gKiA8cD5BcnJheXMgd2l0aCBpZGVudGljYWwgdHlwZSBhbmQgbnVt
YmVyIG9mIGRpbWVuc2lvbnMgc2hhcmUgdGhlIHNhbWUNCi0gKiBjbGFzcyAoYW5kIG51bGwgInN5
c3RlbSIgQ2xhc3NMb2FkZXIsIGluY2lkZW50YWxseSkuICBUaGUgbmFtZSBvZiBhbg0KLSAqIGFy
cmF5IGNsYXNzIGlzIDxjb2RlPlsmbHQ7c2lnbmF0dXJlIGZvcm1hdCZndDs7PC9jb2RlPiAuLi4g
Zm9yIGV4YW1wbGUsDQorICogPHA+QXJyYXlzIHdpdGggaWRlbnRpY2FsIHR5cGUgYW5kIG51bWJl
ciBvZiBkaW1lbnNpb25zIHNoYXJlIHRoZSBzYW1lIGNsYXNzLg0KKyAqIFRoZSBhcnJheSBjbGFz
cyBDbGFzc0xvYWRlciBpcyB0aGUgc2FtZSBhcyB0aGUgQ2xhc3NMb2FkZXIgb2YgdGhlIGVsZW1l
bnQNCisgKiB0eXBlIG9mIHRoZSBhcnJheSAod2hpY2ggY2FuIGJlIG51bGwgdG8gaW5kaWNhdGUg
dGhlIGJvb3RzdHJhcCBjbGFzc2xvYWRlcikuDQorICogVGhlIG5hbWUgb2YgYW4gYXJyYXkgY2xh
c3MgaXMgPGNvZGU+WyZsdDtzaWduYXR1cmUgZm9ybWF0Jmd0Ozs8L2NvZGU+Lg0KKyAqIDxwPiBG
b3IgZXhhbXBsZSwNCiAgKiBTdHJpbmdbXSdzIGNsYXNzIGlzIDxjb2RlPltMamF2YS5sYW5nLlN0
cmluZzs8L2NvZGU+LiBib29sZWFuLCBieXRlLA0KICAqIHNob3J0LCBjaGFyLCBpbnQsIGxvbmcs
IGZsb2F0IGFuZCBkb3VibGUgaGF2ZSB0aGUgInR5cGUgbmFtZSIgb2YNCiAgKiBaLEIsUyxDLEks
SixGLEQgZm9yIHRoZSBwdXJwb3NlcyBvZiBhcnJheSBjbGFzc2VzLiAgSWYgaXQncyBhDQpAQCAt
MjM2LDEwICsyMzgsMTEgQEANCiAgIH0NCiAgIA0KICAgLyoqDQotICAgKiBHZXQgdGhlIENsYXNz
TG9hZGVyIHRoYXQgbG9hZGVkIHRoaXMgY2xhc3MuICBJZiBpdCB3YXMgbG9hZGVkIGJ5IHRoZQ0K
LSAgICogc3lzdGVtIGNsYXNzbG9hZGVyLCB0aGlzIG1ldGhvZCB3aWxsIHJldHVybiBudWxsLiBJ
ZiB0aGVyZSBpcyBhIHNlY3VyaXR5DQotICAgKiBtYW5hZ2VyLCBhbmQgdGhlIGNhbGxlcidzIGNs
YXNzIGxvYWRlciBkb2VzIG5vdCBtYXRjaCB0aGUgcmVxdWVzdGVkDQotICAgKiBvbmUsIGEgc2Vj
dXJpdHkgY2hlY2sgb2YgPGNvZGU+UnVudGltZVBlcm1pc3Npb24oImdldENsYXNzTG9hZGVyIik8
L2NvZGU+DQorICAgKiBHZXQgdGhlIENsYXNzTG9hZGVyIHRoYXQgbG9hZGVkIHRoaXMgY2xhc3Mu
ICBJZiB0aGUgY2xhc3Mgd2FzIGxvYWRlZA0KKyAgICogYnkgdGhlIGJvb3RzdHJhcCBjbGFzc2xv
YWRlciwgdGhpcyBtZXRob2Qgd2lsbCByZXR1cm4gbnVsbC4NCisgICAqIElmIHRoZXJlIGlzIGEg
c2VjdXJpdHkgbWFuYWdlciwgYW5kIHRoZSBjYWxsZXIncyBjbGFzcyBsb2FkZXIgZG9lcyBub3QN
CisgICAqIG1hdGNoIHRoZSByZXF1ZXN0ZWQgb25lLCBhIHNlY3VyaXR5IGNoZWNrIG9mDQorICAg
KiA8Y29kZT5SdW50aW1lUGVybWlzc2lvbigiZ2V0Q2xhc3NMb2FkZXIiKTwvY29kZT4NCiAgICAq
IG11c3QgZmlyc3Qgc3VjY2VlZC4gUHJpbWl0aXZlIHR5cGVzIGFuZCB2b2lkIHJldHVybiBudWxs
Lg0KICAgICoNCiAgICAqIEByZXR1cm4gdGhlIENsYXNzTG9hZGVyIHRoYXQgbG9hZGVkIHRoaXMg
Y2xhc3MNCg==

--=-7cjF4nCCILFTTJInuKyB--

--=-2s04GGfGpaBPu6DCbQT8
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)

iD8DBQBAknqrxVhZCJWr9QwRAvO5AJ41WZz3PlixHF2GKf96KadkPbxGqwCfZgLz
wjdrlwjYqS/oZ3xVbIyFCY8=
=DZ/d
-----END PGP SIGNATURE-----

--=-2s04GGfGpaBPu6DCbQT8--




From MAILER-DAEMON Fri Apr 30 12:38:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJb1g-0001by-3D
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 12:38:12 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJb1W-0001ZT-0q
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 12:38:02 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJb0x-0001RP-Qh
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 12:37:59 -0400
Received: from [207.174.178.92] (helo=email2.peakpeak.com)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.30) id 1BJb0x-0001QI-Cm
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 12:37:27 -0400
Received: (qmail 14221 invoked from network); 30 Apr 2004 16:40:46 -0000
Received: from 203-214-189-207.dyn.peakpeak.com (HELO fleche.redhat.com)
	([207.189.214.203]) (envelope-sender <tromey@redhat.com>)
	by email2.peakpeak.com (qmail-ldap-1.03) with SMTP
	for <konqueror@gmx.de>; 30 Apr 2004 16:40:46 -0000
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 77DF34F82AF; Fri, 30 Apr 2004 10:26:12 -0600 (MDT)
To: Michael Koch <konqueror@gmx.de>
References: <200404301307.15124.konqueror@gmx.de>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
Date: 30 Apr 2004 10:26:12 -0600
In-Reply-To: <200404301307.15124.konqueror@gmx.de>
Message-ID: <87r7u5mnyz.fsf@fleche.redhat.com>
Lines: 12
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: commit-classpath@gnu.org
Subject: Re: Patch: native stuff all over
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
Precedence: list
Reply-To: tromey@redhat.com
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, 30 Apr 2004 16:38:03 -0000

>>>>> "Michael" == Michael Koch <konqueror@gmx.de> writes:

Michael> I just commited the attached patch to fix JNI headers and to
Michael> remove some unused C methods in our native
Michael> implementation. They were found by using "-Werror
Michael> -Wmissing-prototypes -Wmissing-declarations".

Perhaps these options should be included by default.
For best results I think you'd have to merge this patch over to the
libgcj gui branch, so that no regressions show up via that route.

Tom



From MAILER-DAEMON Fri Apr 30 13:49:58 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJc97-00089t-76
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 13:49:57 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJc91-00087X-Vf
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 13:49:52 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJc8O-0007tT-Sl
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 13:49:44 -0400
Received: from [207.203.42.3] (helo=STVAVAPPL1.BHMSTV)
	by monty-python.gnu.org with smtp (Exim 4.30) id 1BJc2c-0006ge-PN
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 13:43:15 -0400
Received: from unknown(10.104.180.64) by STVAVAPPL1.BHMSTV via csmap 
	id 67d4fedc_9acd_11d8_8f15_00304811e8c8_23283;
	Fri, 30 Apr 2004 12:40:00 -0500 (CDT)
Received: from arch20m.dellroad.org (localhost [127.0.0.1])
	by arch20m.dellroad.org (8.12.9p2/8.12.9) with ESMTP id i3UHfSik001599; 
	Fri, 30 Apr 2004 12:41:28 -0500 (CDT)
	(envelope-from archie@arch20m.dellroad.org)
Received: (from archie@localhost)
	by arch20m.dellroad.org (8.12.9p2/8.12.9/Submit) id i3UHfSMn001598;
	Fri, 30 Apr 2004 12:41:28 -0500 (CDT) (envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200404301741.i3UHfSMn001598@arch20m.dellroad.org>
In-Reply-To: <1083108204.1471.48.camel@elsschot.wildebeest.org>
To: Mark Wielaard <mark@klomp.org>
Date: Fri, 30 Apr 2004 12:41:28 -0500 (CDT)
X-Mailer: ELM [version 2.4ME+ PL99b (25)]
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary=ELM1083346888-1510-0_
Content-Transfer-Encoding: 7bit
Cc: commit-classpath@gnu.org
Subject: Re: Committed VMProcess.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 17:49:53 -0000


--ELM1083346888-1510-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII

Mark Wielaard wrote:
> patch/diff and said what was different and why. Having the full patch in
> an email makes it so much easier to review then just the ChangeLog
> entry. (Not that it matters that much for this particular patch, but in
> general it is a good idea.)

The thing that generates the CVS commit email can also auto-generate
URLs to the cvsweb page(s) showing the diffs... this is a nice
additional feature to have in the commit emails.

Right now I do this for FreeBSD using a procmail recipie I got
off the net (attached)..

-Archie

__________________________________________________________________________
Archie Cobbs      *        CTO, Awarix        *      http://www.awarix.com

--ELM1083346888-1510-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain
Content-Disposition: attachment; filename=freebsd.rc
Content-Description: 

# freebsd.rc
# procmail rules for dealing with freebsd mail
# gsutter@zer0.org
#
# $Id: freebsd.rc,v 1.7 2003/08/05 07:41:44 gsutter Exp gsutter $

# To use:
#
# (optional steps; route around them as desired)
#   - mkdir ~/.procmail
#   - mv ~/.procmailrc ~/.procmail/procmailrc && \
#       ln -s ~/.procmail/procmailrc ~/.procmailrc
#   - Add PMDIR=$HOME/.procmail to the top of your procmailrc
#   - Edit lists ($BSDLISTS) and target folders to your specification.
#
# (necessary steps)
#   - Put freebsd.rc in your $PMDIR (set $PMDIR as necessary)
#   - INCLUDERC=freebsd.rc in your .procmailrc

# FreeBSD Project commit mail

REPOS=(CVSROOT|doc|ports|projects|src|www)

# tag FreeBSD commit messages appropriately
:0
* $ ^Sender:[ 	]*owner-(freebsd-)?[a-z]+-(all|committers|${REPOS})@FreeBSD.ORG
* ^Subject: cvs commit:
{
  # tag with the correct portion of the tree
  :0 f
  * $ ^Subject: cvs commit: \/${REPOS}
  | formail -i "X-FreeBSD-CVS-Tree: $MATCH"

  # add PR and CVSweb urls to the bottom of each commit
  # courtesy hoek@freebsd.org and dougb@freebsd.org
  PERLSCRIPT='
    while (<>) {
      if (/^\s+PR\:[^\d]+(\d+)/) {
        chomp;
        print "$_  http://www.FreeBSD.org/cgi/query-pr.cgi?pr=$1\n";
        next;
      }
      if (/^\s+[\d\.]+\s+\+\d+\s+\-\d+\s+(.*)\s+\((dead|new)\)/) {
        $l .= "http\:\/\/cvsweb\.FreeBSD\.org\/$1\n";
      } elsif (/^\s+([\d\.]+)\.(\d+)\s+\+\d+\s+\-\d+\s+(.*)/) {
        $l .= "http\:\/\/www\.FreeBSD\.org\/cgi\/cvsweb.cgi\/$3\.diff\?r1\=$1\." . ($2 - 1) . "\&r2\=$1\.$2\n";
      }
      print;
    }
    print "$l\n" if ($l);
  '
  :0 bf
  | perl -Te "${PERLSCRIPT}"
}


--ELM1083346888-1510-0_--



From MAILER-DAEMON Fri Apr 30 15:03:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJdIc-0002KN-65
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 15:03:50 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJdIZ-0002K5-PC
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 15:03:47 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJdIY-0002Jb-LT
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 15:03:46 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJdIY-0002JW-4V
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 15:03:46 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJdIQ-0000Vz-00
	for <commit-classpath@gnu.org>; Fri, 30 Apr 2004 21:03:38 +0200
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-OYMPDM2Yg+hwnFfhyaFg"
Message-Id: <1083351821.19526.54.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 21:03:42 +0200
Subject: FYI: Re-reverted some static class initializer cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 19:03:48 -0000


--=-OYMPDM2Yg+hwnFfhyaFg
Content-Type: multipart/mixed; boundary="=-+JkpTZ/772Ku31FqBdCl"


--=-+JkpTZ/772Ku31FqBdCl
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

This re-reverts some static class initializer cleanups done by Grzegorz
that got accidentally reverted by Etienne together with some othe CVS
reverts.

2004-04-30  Grzegorz B. Prokopski <gadek@debian.org>

	* java/lang/Object.java (static): Remove static initializer.
        * java/lang/Throwable.java (nl): Remove static field.
        (StaticData): New private static inner class.
        (stackTraceStringBuffer): Use StaticData.nl.

Note that the java/lang/reflect/Array.java patch that was in the
original commit was not re-reverted since that static block is currently
actually needed for VMs that use the GNU Classpath provided version for
createObjectArray() from our javalangreflect.so. We probably want to
move this to a VMArray class so a runtime is free to override it when
the want to.

Cheers,

Mark

--=-+JkpTZ/772Ku31FqBdCl
Content-Disposition: inline; filename=static-cleanup.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=static-cleanup.patch; charset=ISO-8859-1

SW5kZXg6IGphdmEvbGFuZy9PYmplY3QuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNy
b290L2NsYXNzcGF0aC9jbGFzc3BhdGgvamF2YS9sYW5nL09iamVjdC5qYXZhLHYNCnJldHJpZXZp
bmcgcmV2aXNpb24gMS4xNw0KZGlmZiAtdSAtcjEuMTcgT2JqZWN0LmphdmENCi0tLSBqYXZhL2xh
bmcvT2JqZWN0LmphdmEJMTcgQXByIDIwMDQgMTc6MDg6MjIgLTAwMDAJMS4xNw0KKysrIGphdmEv
bGFuZy9PYmplY3QuamF2YQkzMCBBcHIgMjAwNCAxOTowMzowNyAtMDAwMA0KQEAgLTEsNSArMSw1
IEBADQogLyogamF2YS5sYW5nLk9iamVjdCAtIFRoZSB1bml2ZXJzYWwgc3VwZXJjbGFzcyBpbiBK
YXZhDQotICAgQ29weXJpZ2h0IChDKSAxOTk4LCAxOTk5LCAyMDAxLCAyMDAyIEZyZWUgU29mdHdh
cmUgRm91bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykgMTk5OCwgMTk5OSwgMjAwMSwg
MjAwMiwgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBUaGlzIGZpbGUg
aXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTY0LDE3ICs2NCw4IEBADQogICAvLyBX
QVJOSU5HOiBPYmplY3QgaXMgYSBDT1JFIGNsYXNzIGluIHRoZSBib290c3RyYXAgY3ljbGUuIFNl
ZSB0aGUgY29tbWVudHMNCiAgIC8vIGluIHZtL3JlZmVyZW5jZS9qYXZhL2xhbmcvUnVudGltZSBm
b3IgaW1wbGljYXRpb25zIG9mIHRoaXMgZmFjdC4NCiANCi0gIC8qKg0KLSAgICogTG9hZCBpbiBh
bGwgbmF0aXZlIG1ldGhvZHMgaW4gdGhlIGphdmEubGFuZyBwYWNrYWdlLiBOb3RlIHRoYXQgdGhp
cw0KLSAgICogY2FsbCBpcyBhY3R1YWxseSBhIG5vLW9wLCBzaW5jZSBpdCB0cmlnZ2VycyB0aGUg
Y2xhc3MgaW5pdGlhbGl6YXRpb24NCi0gICAqIG9mIFN5c3RlbSwgd2hpY2ggbG9hZHMgdGhlIHNh
bWUgbGlicmFyeTsgYnV0IGl0IGlzIG5lY2Vzc2FyeSB0byBzdGFydA0KLSAgICogdGhlIFN5c3Rl
bSBjbGFzcyBpbml0aWFsaXphdGlvbiBmb3IgdGhlIGJvb3RzdHJhcCBzZXF1ZW5jZSB0byB3b3Jr
Lg0KLSAgICovDQotICBzdGF0aWMNCi0gIHsNCi0gICAgaWYgKENvbmZpZ3VyYXRpb24uSU5JVF9M
T0FEX0xJQlJBUlkpDQotICAgICAgU3lzdGVtLmxvYWRMaWJyYXJ5KCJqYXZhbGFuZyIpOw0KLSAg
fQ0KKyAgLy8gTWFueSBKVk1zIGRvIG5vdCBhbGxvdyBmb3Igc3RhdGljIGluaXRpYWxpemVycyBp
biB0aGlzIGNsYXNzLA0KKyAgLy8gaGVuY2Ugd2UgZG8gbm90IHVzZSB0aGVtIGluIHRoZSBkZWZh
dWx0IGltcGxlbWVudGF0aW9uLg0KIA0KICAgLy8gU29tZSBWTSdzIHJlbHkgb24gdGhlIG9yZGVy
IHRoYXQgdGhlc2UgbWV0aG9kcyBhcHBlYXIgd2hlbiBsYXlpbmcNCiAgIC8vIG91dCB0aGVpciBp
bnRlcm5hbCBzdHJ1Y3R1cmUuICBUaGVyZWZvcmUsIGRvIG5vdCBoYXBoYXphcmRseQ0KSW5kZXg6
IGphdmEvbGFuZy9UaHJvd2FibGUuamF2YQ0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290
L2NsYXNzcGF0aC9jbGFzc3BhdGgvamF2YS9sYW5nL1Rocm93YWJsZS5qYXZhLHYNCnJldHJpZXZp
bmcgcmV2aXNpb24gMS4yMg0KZGlmZiAtdSAtcjEuMjIgVGhyb3dhYmxlLmphdmENCi0tLSBqYXZh
L2xhbmcvVGhyb3dhYmxlLmphdmEJMjMgQXByIDIwMDQgMjE6MTM6MjAgLTAwMDAJMS4yMg0KKysr
IGphdmEvbGFuZy9UaHJvd2FibGUuamF2YQkzMCBBcHIgMjAwNCAxOTowMzowNyAtMDAwMA0KQEAg
LTEsNSArMSw1IEBADQogLyogamF2YS5sYW5nLlRocm93YWJsZSAtLSBSb290IGNsYXNzIGZvciBh
bGwgRXhjZXB0aW9ucyBhbmQgRXJyb3JzDQotICAgQ29weXJpZ2h0IChDKSAxOTk4LCAxOTk5LCAy
MDAyIEZyZWUgU29mdHdhcmUgRm91bmRhdGlvbiwgSW5jLg0KKyAgIENvcHlyaWdodCAoQykgMTk5
OCwgMTk5OSwgMjAwMiwgMjAwNCBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4NCiANCiBU
aGlzIGZpbGUgaXMgcGFydCBvZiBHTlUgQ2xhc3NwYXRoLg0KIA0KQEAgLTM5Niw3ICszOTYsMjAg
QEANCiAgICAgcHcucHJpbnQoc3RhY2tUcmFjZVN0cmluZygpKTsNCiAgIH0NCiANCi0gIHByaXZh
dGUgc3RhdGljIGZpbmFsIFN0cmluZyBubCA9IFN5c3RlbS5nZXRQcm9wZXJ0eSgibGluZS5zZXBh
cmF0b3IiKTsNCisgIC8qDQorICAgKiBXZSB1c2UgaW5uZXIgY2xhc3MgdG8gYXZvaWQgYSBzdGF0
aWMgaW5pdGlhbGl6ZXIgaW4gdGhpcyBiYXNpYyBjbGFzcy4NCisgICAqLw0KKyAgcHJpdmF0ZSBz
dGF0aWMgY2xhc3MgU3RhdGljRGF0YQ0KKyAgew0KKw0KKyAgICBwcml2YXRlIGZpbmFsIHN0YXRp
YyBTdHJpbmcgbmw7DQorDQorICAgIHN0YXRpYw0KKyAgICB7DQorICAgICAgbmwgPSBTeXN0ZW0u
Z2V0UHJvcGVydHkoImxpbmUuc2VwYXJhdG9yIik7DQorICAgIH0NCisgIH0NCisNCiAgIC8vIENy
ZWF0ZSB3aG9sZSBzdGFjayB0cmFjZSBpbiBhIHN0cmluZ2J1ZmZlciBzbyB3ZSBkb24ndCBoYXZl
IHRvIHByaW50DQogICAvLyBpdCBsaW5lIGJ5IGxpbmUuIFRoaXMgcHJldmVudHMgcHJpbnRpbmcg
bXVsdGlwbGUgc3RhY2sgdHJhY2VzIGZyb20NCiAgIC8vIGRpZmZlcmVudCB0aHJlYWRzIHRvIGdl
dCBtaXhlZCB1cCB3aGVuIHdyaXR0ZW4gdG8gdGhlIHNhbWUgUHJpbnRXcml0ZXIuDQpAQCAtNDQ5
LDYgKzQ2Miw3IEBADQogICBwcml2YXRlIHN0YXRpYyB2b2lkIHN0YWNrVHJhY2VTdHJpbmdCdWZm
ZXIoU3RyaW5nQnVmZmVyIHNiLCBTdHJpbmcgbmFtZSwNCiAJCQkJCVN0YWNrVHJhY2VFbGVtZW50
W10gc3RhY2ssIGludCBlcXVhbCkNCiAgIHsNCisgICAgU3RyaW5nIG5sID0gU3RhdGljRGF0YS5u
bDsNCiAgICAgLy8gKGZpbmlzaCkgZmlyc3QgbGluZQ0KICAgICBzYi5hcHBlbmQobmFtZSk7DQog
ICAgIHNiLmFwcGVuZChubCk7DQo=

--=-+JkpTZ/772Ku31FqBdCl--

--=-OYMPDM2Yg+hwnFfhyaFg
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)

iD8DBQBAkqMNxVhZCJWr9QwRAkTFAJ9TVYrs3dHZVP/JHrpDhOcX4c75NwCfUOoU
yE72FBxdM/GK5zaFgDgADE0=
=eRjc
-----END PGP SIGNATURE-----

--=-OYMPDM2Yg+hwnFfhyaFg--




From MAILER-DAEMON Fri Apr 30 15:23:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJdba-00034C-9E
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 15:23:26 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJdZc-0001mn-N5
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 15:21:24 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJdZU-0001kw-RF
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 15:21:18 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJdZU-0001kk-9B
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 15:21:16 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJdZL-0000We-00; Fri, 30 Apr 2004 21:21:07 +0200
From: Mark Wielaard <mark@klomp.org>
To: Ingo =?ISO-8859-1?Q?Pr=F6tel?= <proetel@aicas.com>
In-Reply-To: <40717F86.6030805@aicas.com>
References: <40717F86.6030805@aicas.com>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-M+Aq/Gq12pNScgjYfxKI"
Message-Id: <1083352871.19523.73.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 21:21:11 +0200
Cc: Classpath Discussion Mailing List <commit-classpath@gnu.org>
Subject: Re: Patch for java.util.zip.InflaterInputStream
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 19:23:17 -0000


--=-M+Aq/Gq12pNScgjYfxKI
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Hi,

On Mon, 2004-04-05 at 17:47, Ingo Pr=F6tel wrote:
> I suggest the following patch to skip more than 2k bytes:
> 2004-04-05  IngoProetel  <proetel@aicas.com>
>=20
> 	* java/util/zip/InflaterInputStream.java (skip): Copied implementation
> 	from java.io.InputStream.

That looks OK. I have committed it.
Although what we did was probably spec compliant it was unexpected and
inefficient.

Thanks,

Mark

--=-M+Aq/Gq12pNScgjYfxKI
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)

iD8DBQBAkqcnxVhZCJWr9QwRAghqAKCREjGUgXVQv178Qk2CgnvHQuz9yACfaK+u
cnjOxEM4dSqkXjHMQMnCVxE=
=vgUA
-----END PGP SIGNATURE-----

--=-M+Aq/Gq12pNScgjYfxKI--




From MAILER-DAEMON Fri Apr 30 16:20:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJeUI-0008ER-Iz
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 16:19:58 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJeUF-0008Cs-JN
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 16:19:55 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJeUD-0008B8-FF
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 16:19:54 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJeUC-0008Aa-HZ
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 16:19:52 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJeTx-0000hK-00; Fri, 30 Apr 2004 22:19:37 +0200
From: Mark Wielaard <mark@klomp.org>
To: tromey@redhat.com
In-Reply-To: <87fzalmfgp.fsf@fleche.redhat.com>
References: <87vfjhmo3c.fsf@fleche.redhat.com>
	<1083347685.19522.28.camel@elsschot.wildebeest.org>
	<87fzalmfgp.fsf@fleche.redhat.com>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-XWCliqDkN3PhGsq7KDmk"
Message-Id: <1083356380.19532.78.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 30 Apr 2004 22:19:40 +0200
Cc: commit-classpath@gnu.org
Subject: Re: toURI
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 30 Apr 2004 20:19:56 -0000


--=-XWCliqDkN3PhGsq7KDmk
Content-Type: multipart/mixed; boundary="=-JJydRqxth0Fw6kPvW2V3"


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

Hi all,

Tom and I had a little discussion off-list about his File.toURI() patch.

On Fri, 2004-04-30 at 21:29, Tom Tromey wrote:
> Mark> Then I saw toURL() does the same.
> Mark> So I made the attached patch. It doesn't change any mauve results.
> Mark> What do you think?
>=20
> Looks good to me.
>=20
> Mark> +        throw (InternalError) new InternalError("Uncovertable file=
: "
>=20
> Typo, "Unconvertible" -- missing 'n' and s/a/i/

Argh. English language...

I'll commit as follows:

2004-04-30  Tom Tromey  <tromey@redhat.com>
           Mark Wielaard  <mark@klomp.org>

       * java/io/File.java (toURI): New method.
       (toURL): Use isDirectory() directly.

Cheers,

Mark

--=-JJydRqxth0Fw6kPvW2V3
Content-Disposition: inline; filename=touri.patch
Content-Transfer-Encoding: base64
Content-Type: text/x-patch; name=touri.patch; charset=ISO-8859-1

SW5kZXg6IGphdmEvaW8vRmlsZS5qYXZhDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3Qv
Y2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZhL2lvL0ZpbGUuamF2YSx2DQpyZXRyaWV2aW5nIHJldmlz
aW9uIDEuNDMNCmRpZmYgLXUgLXIxLjQzIEZpbGUuamF2YQ0KLS0tIGphdmEvaW8vRmlsZS5qYXZh
CTI2IEFwciAyMDA0IDIwOjUxOjMxIC0wMDAwCTEuNDMNCisrKyBqYXZhL2lvL0ZpbGUuamF2YQkz
MCBBcHIgMjAwNCAyMDoxODo1NiAtMDAwMA0KQEAgLTQwLDYgKzQwLDggQEANCiBwYWNrYWdlIGph
dmEuaW87DQogDQogaW1wb3J0IGphdmEubmV0Lk1hbGZvcm1lZFVSTEV4Y2VwdGlvbjsNCitpbXBv
cnQgamF2YS5uZXQuVVJJOw0KK2ltcG9ydCBqYXZhLm5ldC5VUklTeW50YXhFeGNlcHRpb247DQog
aW1wb3J0IGphdmEubmV0LlVSTDsNCiANCiBpbXBvcnQgZ251LmphdmEuaW8uUGxhdGZvcm1IZWxw
ZXI7DQpAQCAtNzY2LDYgKzc2OCwyOCBAQA0KICAgfQ0KIA0KICAgLyoqDQorICAgKiBAcmV0dXJu
IEEgPGNvZGU+VVJJPC9jb2RlPiBmb3IgdGhpcyBvYmplY3QuDQorICAgKi8NCisgIHB1YmxpYyBV
UkkgdG9VUkkoKQ0KKyAgew0KKyAgICBTdHJpbmcgYWJzcGF0aCA9IGdldEFic29sdXRlUGF0aCgp
Ow0KKw0KKyAgICBpZiAoaXNEaXJlY3RvcnkoKSkNCisgICAgICBhYnNwYXRoID0gYWJzcGF0aCAr
IHNlcGFyYXRvcjsNCisgICAgICAgIA0KKyAgICB0cnkNCisgICAgICB7DQorCXJldHVybiBuZXcg
VVJJKCJmaWxlIiwgIiIsIGFic3BhdGgucmVwbGFjZShzZXBhcmF0b3JDaGFyLCAnLycpKTsNCisg
ICAgICB9DQorICAgIGNhdGNoIChVUklTeW50YXhFeGNlcHRpb24gdXNlKQ0KKyAgICAgIHsNCisg
ICAgICAgIC8vIENhbid0IGhhcHBlbi4NCisgICAgICAgIHRocm93IChJbnRlcm5hbEVycm9yKSBu
ZXcgSW50ZXJuYWxFcnJvcigiVW5jb252ZXJ0aWJsZSBmaWxlOiAiDQorCQkJCQkJKyB0aGlzKS5p
bml0Q2F1c2UodXNlKTsNCisgICAgICB9DQorICB9DQorDQorICAvKioNCiAgICAqIFRoaXMgbWV0
aG9kIHJldHVybnMgYSA8Y29kZT5VUkw8L2NvZGU+IHdpdGggdGhlIDxjb2RlPmZpbGU6PC9jb2Rl
Pg0KICAgICogcHJvdG9jb2wgdGhhdCByZXByZXNlbnRzIHRoaXMgZmlsZS4gIFRoZSBleGFjdCBm
b3JtIG9mIHRoaXMgVVJMIGlzDQogICAgKiBzeXN0ZW0gZGVwZW5kZW50Lg0KQEAgLTc3OCwxNCAr
ODAyLDEwIEBADQogICBwdWJsaWMgVVJMIHRvVVJMKCkgdGhyb3dzIE1hbGZvcm1lZFVSTEV4Y2Vw
dGlvbg0KICAgew0KICAgICBTdHJpbmcgYWJzcGF0aCA9IGdldEFic29sdXRlUGF0aCgpOw0KLSAg
ICANCi0gICAgdHJ5DQotICAgICAgew0KLSAgICAgICAgaWYgKG5ldyBGaWxlKGFic3BhdGgpLmlz
RGlyZWN0b3J5KCkpDQotICAJICBhYnNwYXRoID0gYWJzcGF0aCArIHNlcGFyYXRvcjsNCi0gICAg
ICB9DQotICAgIGNhdGNoKEV4Y2VwdGlvbiBfKSB7IH0NCi0gICAgICAgIA0KKw0KKyAgICBpZiAo
aXNEaXJlY3RvcnkoKSkNCisgICAgICBhYnNwYXRoID0gYWJzcGF0aCArIHNlcGFyYXRvcjsNCisN
CiAgICAgcmV0dXJuIG5ldyBVUkwoImZpbGUiLCAiIiwgYWJzcGF0aC5yZXBsYWNlKHNlcGFyYXRv
ckNoYXIsICcvJykpOw0KICAgfQ0KIA0K

--=-JJydRqxth0Fw6kPvW2V3--

--=-XWCliqDkN3PhGsq7KDmk
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)

iD8DBQBAkrTcxVhZCJWr9QwRAqb6AJ0S7embYlO5QR3geXqD10sSTYXz2gCcDlk7
mj89Qx2pJwkrRMO7EDEA25A=
=IKRx
-----END PGP SIGNATURE-----

--=-XWCliqDkN3PhGsq7KDmk--




From MAILER-DAEMON Fri Apr 30 20:19:52 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.30)
	id 1BJiER-0000l3-Dg
	for mharc-commit-classpath@gnu.org; Fri, 30 Apr 2004 20:19:51 -0400
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.30)
	id 1BJiEL-0000gJ-OL
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 20:19:45 -0400
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.30)
	id 1BJiEK-0000fk-BA
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 20:19:44 -0400
Received: from [82.161.94.186] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.30) id 1BJiEJ-0000dl-Hl
	for commit-classpath@gnu.org; Fri, 30 Apr 2004 20:19:43 -0400
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1BJiDz-0001Or-00; Sat, 01 May 2004 02:19:23 +0200
From: Mark Wielaard <mark@klomp.org>
To: Michael Koch <konqueror@gmx.de>
In-Reply-To: <200404300757.19643.konqueror@gmx.de>
References: <1083275335.24004.129.camel@elsschot.wildebeest.org>
	<200404300757.19643.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-ucJ5VQ8ocEKq19tmViJh"
Message-Id: <1083370767.19532.105.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Sat, 01 May 2004 02:19:27 +0200
Cc: commit-classpath@gnu.org
Subject: Re: [Fwd: FYI: Fix RandomAccessFile.setLenght (truncation file,
	updates file position).]
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.4
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, 01 May 2004 00:19:46 -0000


--=-ucJ5VQ8ocEKq19tmViJh
Content-Type: multipart/mixed; boundary="=-Ie9We6wRNCZ5benB8CVb"


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

Hi Michael,

On Fri, 2004-04-30 at 07:57, Michael Koch wrote:
> Areyou sure the bug isnt in FileChannelImpl.truncate(long) ? have you=20
> checked this ?

Good catch. Indeed the bug is in FileChannelImpl.truncate().
I have created a bunch of Mauve tests for it.
Unfortunately it has more then one bug.
It also has a bug were it allowed truncate() to actually expand the File
which isn't allowed. Attached are some patches for this including a new
implementation of RandomAccessFile.setLength() to only use truncate for
making the file smaller and using seek for expanding the file.

2004-04-30  Mark Wielaard  <mark@klomp.org>

	* gnu/java/nio/channels/FileChannelImpl.java (truncate): Only truncate
        when size is smaller.
        * native/jni/java-nio/gnu_java_nio_channels_FileChannelImpl.c
        (implTruncate): Always save current position. Only reposition file
        pointer to where we started if not beyond new lenght. Reposition fi=
le
        pointer to file length if it points beyond the end of file.
        * java/io/RandomAccessFile.java (setLength): Use truncate for
        shrinking the file and seek plus write for expanding the file.

This makes all Mauve tests pass (including the new ones). And no
regressions. I think this is the best we can do for this release. In the
future we might want an extra native/VM method for expanding and/or
truncating explicitly.

What do you think. OK for this release?
We can also go with what we have now, then FileChannel.truncate() will
be broken (two ways), but RandomAccessFile.setLength() will be correct.

Cheers,

Mark

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

SW5kZXg6IGdudS9qYXZhL25pby9jaGFubmVscy9GaWxlQ2hhbm5lbEltcGwuamF2YQ0KPT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0aC9jbGFzc3BhdGgvZ251L2phdmEvbmlv
L2NoYW5uZWxzL0ZpbGVDaGFubmVsSW1wbC5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS41
DQpkaWZmIC11IC1yMS41IEZpbGVDaGFubmVsSW1wbC5qYXZhDQotLS0gZ251L2phdmEvbmlvL2No
YW5uZWxzL0ZpbGVDaGFubmVsSW1wbC5qYXZhCTIzIEFwciAyMDA0IDA1OjUxOjE5IC0wMDAwCTEu
NQ0KKysrIGdudS9qYXZhL25pby9jaGFubmVscy9GaWxlQ2hhbm5lbEltcGwuamF2YQkxIE1heSAy
MDA0IDAwOjAzOjQxIC0wMDAwDQpAQCAtNDEzLDcgKzQxMyw5IEBADQogICAgIGlmICgobW9kZSAm
IFdSSVRFKSA9PSAwKQ0KICAgICAgICB0aHJvdyBuZXcgTm9uV3JpdGFibGVDaGFubmVsRXhjZXB0
aW9uICgpOw0KIA0KLSAgICBpbXBsVHJ1bmNhdGUgKHNpemUpOw0KKyAgICBpZiAoc2l6ZSA8IHNp
emUgKCkpDQorICAgICAgaW1wbFRydW5jYXRlIChzaXplKTsNCisNCiAgICAgcmV0dXJuIHRoaXM7
DQogICB9DQogfQ0KSW5kZXg6IGphdmEvaW8vUmFuZG9tQWNjZXNzRmlsZS5qYXZhDQo9PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09DQpSQ1MgZmlsZTogL2N2c3Jvb3QvY2xhc3NwYXRoL2NsYXNzcGF0aC9qYXZhL2lvL1JhbmRv
bUFjY2Vzc0ZpbGUuamF2YSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMzkNCmRpZmYgLXUgLXIx
LjM5IFJhbmRvbUFjY2Vzc0ZpbGUuamF2YQ0KLS0tIGphdmEvaW8vUmFuZG9tQWNjZXNzRmlsZS5q
YXZhCTI5IEFwciAyMDA0IDIxOjIxOjExIC0wMDAwCTEuMzkNCisrKyBqYXZhL2lvL1JhbmRvbUFj
Y2Vzc0ZpbGUuamF2YQkxIE1heSAyMDA0IDAwOjAzOjQxIC0wMDAwDQpAQCAtMjEwLDExICsyMTAs
MTcgQEANCiAgICAqLw0KICAgcHVibGljIHZvaWQgc2V0TGVuZ3RoIChsb25nIG5ld0xlbikgdGhy
b3dzIElPRXhjZXB0aW9uDQogICB7DQotICAgIGNoLnRydW5jYXRlIChuZXdMZW4pOw0KLQ0KLSAg
ICBsb25nIHBvc2l0aW9uID0gZ2V0RmlsZVBvaW50ZXIoKTsNCi0gICAgaWYgKHBvc2l0aW9uID4g
bmV3TGVuKQ0KLSAgICAgIHNlZWsobmV3TGVuKTsNCisgICAgLy8gRmlsZUNoYW5uZWwudHJ1bmNh
dGUoKSBjYW4gb25seSBzaHJpbmsgYSBmaWxlLg0KKyAgICAvLyBUbyBleHBhbmQgaXQgd2UgbmVl
ZCB0byBzZWVrIGZvcndhcmQgYW5kIHdyaXRlIGF0IGxlYXN0IG9uZSBieXRlLg0KKyAgICBpZiAo
bmV3TGVuIDwgbGVuZ3RoKCkpDQorICAgICAgY2gudHJ1bmNhdGUgKG5ld0xlbik7DQorICAgIGVs
c2UNCisgICAgICB7DQorCWxvbmcgcG9zID0gZ2V0RmlsZVBvaW50ZXIoKTsNCisJc2VlayhuZXdM
ZW4gLSAxKTsNCisJd3JpdGUoMCk7DQorCXNlZWsocG9zKTsNCisgICAgICB9DQogICB9DQogDQog
ICAvKioNCkluZGV4OiBuYXRpdmUvam5pL2phdmEtbmlvL2dudV9qYXZhX25pb19jaGFubmVsc19G
aWxlQ2hhbm5lbEltcGwuYw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnNyb290L2NsYXNzcGF0
aC9jbGFzc3BhdGgvbmF0aXZlL2puaS9qYXZhLW5pby9nbnVfamF2YV9uaW9fY2hhbm5lbHNfRmls
ZUNoYW5uZWxJbXBsLmMsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjkNCmRpZmYgLXUgLXIxLjkg
Z251X2phdmFfbmlvX2NoYW5uZWxzX0ZpbGVDaGFubmVsSW1wbC5jDQotLS0gbmF0aXZlL2puaS9q
YXZhLW5pby9nbnVfamF2YV9uaW9fY2hhbm5lbHNfRmlsZUNoYW5uZWxJbXBsLmMJMzAgQXByIDIw
MDQgMTE6MDU6MTcgLTAwMDAJMS45DQorKysgbmF0aXZlL2puaS9qYXZhLW5pby9nbnVfamF2YV9u
aW9fY2hhbm5lbHNfRmlsZUNoYW5uZWxJbXBsLmMJMSBNYXkgMjAwNCAwMDowMzo0MiAtMDAwMA0K
QEAgLTM5NCwyMCArMzk0LDIwIEBADQogICAgICAgcmV0dXJuOw0KICAgICB9DQogDQorICAvKiBT
YXZlIG9mZiBjdXJyZW50IHBvc2l0aW9uICovDQorICBUQVJHRVRfTkFUSVZFX0ZJTEVfVEVMTChu
YXRpdmVfZmQsIHNhdmVfb2Zmc2V0LCByZXN1bHQpOw0KKyAgaWYgKHJlc3VsdCAhPSBUQVJHRVRf
TkFUSVZFX09LKQ0KKyAgICB7DQorICAgICAgSkNMX1Rocm93RXhjZXB0aW9uKGVudiwgSU9fRVhD
RVBUSU9OLA0KKyAgICAgICAgICAgICAgICAgICAgICAgICBUQVJHRVRfTkFUSVZFX0xBU1RfRVJS
T1JfU1RSSU5HKCkpOw0KKyAgICAgIHJldHVybjsNCisgICAgfQ0KKw0KICAgaWYgKFRBUkdFVF9O
QVRJVkVfTUFUSF9JTlRfSU5UNjRfTFQoZmlsZV9zaXplLGxlbikpDQogICAgIHsNCiAgICAgICAv
KiBGaWxlIGlzIHRvbyBzaG9ydCAtLSBzZWVrIHRvIG9uZSBieXRlIHNob3J0IG9mIHdoZXJlIHdl
IHdhbnQsDQogICAgICAgICogdGhlbiB3cml0ZSBhIGJ5dGUgKi8NCiANCi0gICAgICAvKiBTYXZl
IG9mZiBjdXJyZW50IHBvc2l0aW9uICovDQotICAgICAgVEFSR0VUX05BVElWRV9GSUxFX1RFTEwo
bmF0aXZlX2ZkLCBzYXZlX29mZnNldCwgcmVzdWx0KTsNCi0gICAgICBpZiAocmVzdWx0ICE9IFRB
UkdFVF9OQVRJVkVfT0spDQotICAgICAgICB7DQotICAgICAgICAgIEpDTF9UaHJvd0V4Y2VwdGlv
bihlbnYsIElPX0VYQ0VQVElPTiwNCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRBUkdF
VF9OQVRJVkVfTEFTVF9FUlJPUl9TVFJJTkcoKSk7DQotICAgICAgICAgIHJldHVybjsNCi0gICAg
ICAgIH0NCi0NCiAgICAgICAvKiBtb3ZlIHRvIHBvc2l0aW9uIG4tMSAqLw0KICAgICAgIFRBUkdF
VF9OQVRJVkVfRklMRV9TRUVLX0JFR0lOKG5hdGl2ZV9mZCwgVEFSR0VUX05BVElWRV9NQVRIX0lO
VF9JTlQ2NF9TVUIobGVuLDEpLCBuZXdfb2Zmc2V0LCByZXN1bHQpOw0KICAgICAgIGlmIChyZXN1
bHQgIT0gVEFSR0VUX05BVElWRV9PSykNCkBAIC00MjksMTQgKzQyOSwxOCBAQA0KICAgICAgICAg
ICByZXR1cm47DQogICAgICAgICB9DQogDQotICAgICAgLyogUmVwb3NpdGlvbiBmaWxlIHBvaW50
ZXIgdG8gd2hlcmUgd2Ugc3RhcnRlZCAqLw0KLSAgICAgIFRBUkdFVF9OQVRJVkVfRklMRV9TRUVL
X0JFR0lOKG5hdGl2ZV9mZCwgc2F2ZV9vZmZzZXQsIG5ld19vZmZzZXQsIHJlc3VsdCk7DQotICAg
ICAgaWYgKHJlc3VsdCAhPSBUQVJHRVRfTkFUSVZFX09LKQ0KLSAgICAgICAgew0KLSAgICAgICAg
ICBKQ0xfVGhyb3dFeGNlcHRpb24oZW52LCBJT19FWENFUFRJT04sDQotICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICBUQVJHRVRfTkFUSVZFX0xBU1RfRVJST1JfU1RSSU5HKCkpOw0KLSAgICAg
ICAgICByZXR1cm47DQotICAgICAgICB9DQorICAgICAgLyogUmVwb3NpdGlvbiBmaWxlIHBvaW50
ZXIgdG8gd2hlcmUgd2Ugc3RhcnRlZCBpZiBub3QgYmV5b25kIG5ldyBsZW4uICovDQorICAgICAg
aWYgKFRBUkdFVF9OQVRJVkVfTUFUSF9JTlRfSU5UNjRfTFQoc2F2ZV9vZmZzZXQsIGxlbikpDQor
CXsNCisJICBUQVJHRVRfTkFUSVZFX0ZJTEVfU0VFS19CRUdJTihuYXRpdmVfZmQsIHNhdmVfb2Zm
c2V0LA0KKwkJCQkJbmV3X29mZnNldCwgcmVzdWx0KTsNCisJICBpZiAocmVzdWx0ICE9IFRBUkdF
VF9OQVRJVkVfT0spDQorCSAgICB7DQorCSAgICAgIEpDTF9UaHJvd0V4Y2VwdGlvbihlbnYsIElP
X0VYQ0VQVElPTiwNCisJCQkJIFRBUkdFVF9OQVRJVkVfTEFTVF9FUlJPUl9TVFJJTkcoKSk7DQor
CSAgICAgIHJldHVybjsNCisJICAgIH0NCisJfQ0KICAgICB9DQogICAgIGVsc2UgaWYgKFRBUkdF
VF9OQVRJVkVfTUFUSF9JTlRfSU5UNjRfR1QoZmlsZV9zaXplLGxlbikpDQogICAgIHsNCkBAIC00
NTgsNiArNDYyLDE4IEBADQogICAgICAgSkNMX1Rocm93RXhjZXB0aW9uKGVudiwgSU9fRVhDRVBU
SU9OLA0KICAgICAgICAgICAgICAgICAgICAgICAgICAiVW5hYmxlIHRvIHNob3J0ZW4gZmlsZSBs
ZW5ndGgiKTsNCiAjZW5kaWYgLyogSEFWRV9GVFJVTkNBVEUgKi8NCisNCisgICAgICAvKiBSZXBv
c2l0aW9uIGZpbGUgcG9pbnRlciB3aGVuIGl0IG5vdyBpcyBiZXlvbmQgdGhlIGVuZCBvZiBmaWxl
LiAqLw0KKyAgICAgIGlmIChUQVJHRVRfTkFUSVZFX01BVEhfSU5UX0lOVDY0X0dUKHNhdmVfb2Zm
c2V0LCBsZW4pKQ0KKwl7DQorCSAgVEFSR0VUX05BVElWRV9GSUxFX1NFRUtfQkVHSU4obmF0aXZl
X2ZkLCBsZW4sIG5ld19vZmZzZXQsIHJlc3VsdCk7DQorCSAgaWYgKHJlc3VsdCAhPSBUQVJHRVRf
TkFUSVZFX09LKQ0KKwkgICAgew0KKwkgICAgICBKQ0xfVGhyb3dFeGNlcHRpb24oZW52LCBJT19F
WENFUFRJT04sDQorCQkJCSBUQVJHRVRfTkFUSVZFX0xBU1RfRVJST1JfU1RSSU5HKCkpOw0KKwkg
ICAgICByZXR1cm47DQorCSAgICB9DQorCX0NCiAgICAgfQ0KIH0NCiANCm==

--=-Ie9We6wRNCZ5benB8CVb--

--=-ucJ5VQ8ocEKq19tmViJh
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)

iD8DBQBAku0OxVhZCJWr9QwRAsQnAJ9svscuEVqvvj004+Tc2pSeM9ZcxQCeLLQu
mI94NvABrimvpAdRLwxu40w=
=cxF7
-----END PGP SIGNATURE-----

--=-ucJ5VQ8ocEKq19tmViJh--




