From MAILER-DAEMON Sun Jan 04 20:22:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdJRZ-0006gt-0S
	for mharc-commit-classpath@gnu.org; Sun, 04 Jan 2004 20:22:09 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdJRV-0006b2-4d
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 20:22:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdJQA-0005Hw-Pg
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 20:21:14 -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.24) id 1AdJQ9-0005C1-Dn
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 20:20:41 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AdICk-0000Gb-Re
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 19:02:46 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-81-100.ewetel.net
	[80.228.81.100])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i04KefHA011582
	for <commit-classpath@gnu.org>; Sun, 4 Jan 2004 21:40:42 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AdF7B-0000mM-00
	for <commit-classpath@gnu.org>; Sun, 04 Jan 2004 21:44:49 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 4 Jan 2004 21:43:56 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_MsH+/NyPd5ZeJac"
Message-Id: <200401042143.57211.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.util.HashMap and java.util.Hashtable
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 01:22:06 -0000


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

Hi list,


I commited the attached patch to merge java.util.HashMap and 
java.util.Hashtable again with libgcj.


Michael

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

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1744
diff -u -b -B -r1.1744 ChangeLog
--- ChangeLog	31 Dec 2003 11:17:16 -0000	1.1744
+++ ChangeLog	4 Jan 2004 20:37:54 -0000
@@ -1,3 +1,13 @@
+2004-01-04  Michael Koch  <konqueror@gmx.de>
+
+	* java/util/HashMap.java (HashMap(Map)): As above.
+	(putAllInternal): As above.
+	* java/util/Hashtable.java (Hashtable(Map)): Use putAll, not
+	putAllInternal.
+	(putAllInternal): Correct comment.
+	(internalContainsValue): Removed.
+	(containsValue): Don't delegate to internalContainsValue.
+
 2003-12-31  Fernando Nasser  <fnasser@redhat.com>
 
 	* java/awt/Choice.java
Index: java/util/HashMap.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/HashMap.java,v
retrieving revision 1.25
diff -u -b -B -r1.25 HashMap.java
--- java/util/HashMap.java	7 Nov 2003 09:51:44 -0000	1.25
+++ java/util/HashMap.java	4 Jan 2004 20:37:54 -0000
@@ -223,7 +223,7 @@
   public HashMap(Map m)
   {
     this(Math.max(m.size() * 2, DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR);
-    putAllInternal(m);
+    putAll(m);
   }
 
   /**
@@ -699,9 +699,9 @@
   }
 
   /**
-   * A simplified, more efficient internal implementation of putAll(). The 
-   * Map constructor and clone() should not call putAll or put, in order to 
-   * be compatible with the JDK implementation with respect to subclasses.
+   * A simplified, more efficient internal implementation of putAll(). clone() 
+   * should not call putAll or put, in order to be compatible with the JDK 
+   * implementation with respect to subclasses.
    *
    * @param m the map to initialize this from
    */
Index: java/util/Hashtable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Hashtable.java,v
retrieving revision 1.30
diff -u -b -B -r1.30 Hashtable.java
--- java/util/Hashtable.java	28 Nov 2003 17:29:03 -0000	1.30
+++ java/util/Hashtable.java	4 Jan 2004 20:37:54 -0000
@@ -234,7 +234,7 @@
   public Hashtable(Map m)
   {
     this(Math.max(m.size() * 2, DEFAULT_CAPACITY), DEFAULT_LOAD_FACTOR);
-    putAllInternal(m);
+    putAll(m);
   }
 
   /**
@@ -333,11 +333,22 @@
    */
   public synchronized boolean contains(Object value)
   {
-    /* delegate to non-overridable worker method 
-     * to avoid blowing up the stack, when called 
-     * from overridden contains[Value]() method.
-     */
-    return internalContainsValue(value);
+    for (int i = buckets.length - 1; i >= 0; i--)
+      {
+        HashEntry e = buckets[i];
+        while (e != null)
+          {
+            if (value.equals(e.value))
+              return true;
+            e = e.next;
+          }
+      }
+
+    // Must throw on null argument even if the table is empty
+    if (value == null)
+      throw new NullPointerException();
+ 
+    return false;  
   }
 
   /**
@@ -354,44 +365,12 @@
    */
   public boolean containsValue(Object value)
   {
-    /* delegate to older method to make sure code overwriting it 
-     * continues to work.
-     */
+    // Delegate to older method to make sure code overriding it continues 
+    // to work.
     return contains(value);
   }
 
   /**
-   * Returns true if this Hashtable contains a value <code>o</code>, such that
-   * <code>o.equals(value)</code>. This is an internal worker method
-   * called by <code>contains()</code> and <code>containsValue()</code>.
-   *
-   * @param value the value to search for in this Hashtable
-   * @return true if at least one key maps to the value
-   * @see #contains(Object)
-   * @see #containsKey(Object)
-   * @throws NullPointerException if <code>value</code> is null
-   */
-  private boolean internalContainsValue(Object value)
-  {
-    for (int i = buckets.length - 1; i >= 0; i--)
-      {
-        HashEntry e = buckets[i];
-        while (e != null)
-          {
-            if (value.equals(e.value))
-              return true;
-            e = e.next;
-          }
-      }
-
-    // Must throw on null argument even if the table is empty
-    if (value == null)
-      throw new NullPointerException();
- 
-    return false;
-  }
-
-  /**
    * Returns true if the supplied object <code>equals()</code> a key
    * in this Hashtable.
    *
@@ -873,9 +852,9 @@
   }
 
   /**
-   * A simplified, more efficient internal implementation of putAll(). The 
-   * Map constructor and clone() should not call putAll or put, in order to 
-   * be compatible with the JDK implementation with respect to subclasses.
+   * A simplified, more efficient internal implementation of putAll(). clone() 
+   * should not call putAll or put, in order to be compatible with the JDK 
+   * implementation with respect to subclasses.
    *
    * @param m the map to initialize this from
    */

--Boundary-00=_MsH+/NyPd5ZeJac--




From MAILER-DAEMON Sun Jan 04 20:47:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdJpo-0007Ur-NA
	for mharc-commit-classpath@gnu.org; Sun, 04 Jan 2004 20:47:12 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdJpl-0007SB-Lj
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 20:47:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdJpF-00075a-TE
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 20:47:08 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdJpF-00074V-IC
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 20:46:37 -0500
Received: from [192.168.1.33] (unknown [217.8.218.106])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id 865784A20D
	for <commit-classpath@gnu.org>; Mon,  5 Jan 2004 01:45:04 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Mon, 5 Jan 2004 01:45:06 +0100
Message-Id: <20040105004506.3390@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: Solving cubic and quadratic equations
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 01:47:10 -0000

(commit messages still not sent; the following is done manually)

  2004-01-05  Sascha Brawer  <brawer@dandelis.ch>
  	 
  	         Fix for Classpath bug #6095
  	         Thanks to Brian Gough <bjg@network-theory.com>
  	         * java/awt/geom/CubicCurve2D.java (solveCubic): Implemented.
  	         * java/awt/geom/QuadCurve2D.java (solveQuadratic): Re-written.
  	         * NEWS: Mention the new capability for solving equations.
  	         * THANKYOU: Add Brian Gough.

Modified files:
	.              : ChangeLog NEWS THANKYOU
	java/awt/geom  : CubicCurve2D.java QuadCurve2D.java

Log message: Solving cubic and quadratic equations

CVSWeb URLs:

http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/
ChangeLog.diff?r1=1.1746&r2=1.1747

http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/
NEWS.diff?r1=1.30&r2=1.31

http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/
THANKYOU.diff?r1=1.35&r2=1.36

http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/java/awt/
geom/CubicCurve2D.java.diff?r1=1.5&r2=1.6

http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/java/awt/
geom/QuadCurve2D.java.diff?r1=1.9&r2=1.10





From MAILER-DAEMON Sun Jan 04 22:10:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdL8X-0005Sf-G1
	for mharc-commit-classpath@gnu.org; Sun, 04 Jan 2004 22:10:37 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdL8V-0005Rv-3B
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 22:10:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdL7x-00058B-Th
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 22:10:34 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdL7x-00057b-BI
	for commit-classpath@gnu.org; Sun, 04 Jan 2004 22:10:01 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-81-100.ewetel.net
	[80.228.81.100])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i04LCG1h020886
	for <commit-classpath@gnu.org>; Sun, 4 Jan 2004 22:12:16 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AdFbj-0000uI-00
	for <commit-classpath@gnu.org>; Sun, 04 Jan 2004 22:16:23 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 4 Jan 2004 22:15:31 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_zJI+/2VeEiAn9O7"
Message-Id: <200401042215.31584.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.net.JarURLConnection
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Jan 2004 03:10:35 -0000


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

Hi list,


I commited the attached patch to merge more java.net jar stuff with libgcj.


Michael

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

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1745
diff -u -b -B -r1.1745 ChangeLog
--- ChangeLog	4 Jan 2004 20:39:18 -0000	1.1745
+++ ChangeLog	4 Jan 2004 21:07:26 -0000
@@ -1,5 +1,15 @@
 2004-01-04  Michael Koch  <konqueror@gmx.de>
 
+	* java/net/JarURLConnection.java
+	(jarFileURLConnection): New field.
+	* gnu/java/net/protocol/jar/Connection.java
+	(Connection): Made class final.
+	(Connection): Made constructor protected.
+	(getJarFile): Check doInput.
+	(getInputStream): Likewise.
+
+2004-01-04  Michael Koch  <konqueror@gmx.de>
+
 	* java/util/HashMap.java (HashMap(Map)): As above.
 	(putAllInternal): As above.
 	* java/util/Hashtable.java (Hashtable(Map)): Use putAll, not
Index: java/net/JarURLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/JarURLConnection.java,v
retrieving revision 1.16
diff -u -b -B -r1.16 JarURLConnection.java
--- java/net/JarURLConnection.java	12 Oct 2003 17:24:37 -0000	1.16
+++ java/net/JarURLConnection.java	4 Jan 2004 21:07:26 -0000
@@ -79,6 +79,13 @@
   private final URL jarFileURL;
 
   /**
+   * The connection to the jar file itself. A JarURLConnection
+   * can represent an entry in a jar file or an entire jar file.  In
+   * either case this describes just the jar file itself.
+   */
+  protected URLConnection jarFileURLConnection;
+
+  /**
    * This is the jar file "entry name" or portion after the "!/" in the
    * URL which represents the pathname inside the actual jar file.
    */
Index: gnu/java/net/protocol/jar/Connection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/jar/Connection.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Connection.java
--- gnu/java/net/protocol/jar/Connection.java	2 Dec 2003 09:05:23 -0000	1.3
+++ gnu/java/net/protocol/jar/Connection.java	4 Jan 2004 21:07:26 -0000
@@ -44,6 +44,7 @@
 import java.io.IOException;
 import java.net.JarURLConnection;
 import java.net.MalformedURLException;
+import java.net.ProtocolException;
 import java.net.URL;
 import java.net.URLConnection;
 import java.util.Hashtable;
@@ -57,7 +58,7 @@
  *
  * @author Kresten Krab Thorup <krab@gnu.org>
  */
-public class Connection extends JarURLConnection
+public final class Connection extends JarURLConnection
 {
   private JarFile jar_file;
   private JarEntry jar_entry;
@@ -120,14 +121,15 @@
     }
   }
 
-  public Connection(URL url)
+  protected Connection(URL url)
     throws MalformedURLException
   {
     super(url);
   }
   
-  public void connect() throws IOException
+  public synchronized void connect() throws IOException
   {
+    // Call is ignored if already connected.
     if (connected)
       return;
     
@@ -147,23 +149,29 @@
     connected = true;
   }
   
-  public JarFile getJarFile() throws IOException
+  public InputStream getInputStream() throws IOException
   {
     if (!connected)
       connect();
     
-    return jar_file;
+    if (! doInput)
+      throw new ProtocolException("Can't open InputStream if doInput is false");
+    
+    if (jar_entry == null)
+      throw new IOException (jar_url + " couldn't be found.");
+    
+    return jar_file.getInputStream (jar_entry);
   }
   
-  public InputStream getInputStream() throws IOException
+  public synchronized JarFile getJarFile() throws IOException
   {
     if (!connected)
       connect();
     
-    if (jar_entry == null)
-      throw new IOException (jar_url + " couldn't be found.");
+    if (! doInput)
+      throw new ProtocolException("Can't open JarFile if doInput is false");
     
-    return jar_file.getInputStream (jar_entry);
+    return jar_file;
   }
   
   public int getContentLength()

--Boundary-00=_zJI+/2VeEiAn9O7--




From MAILER-DAEMON Mon Jan 05 21:55:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdhKV-0005eO-RT
	for mharc-commit-classpath@gnu.org; Mon, 05 Jan 2004 21:52:27 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdhGE-0001Mr-0i
	for commit-classpath@gnu.org; Mon, 05 Jan 2004 21:48:02 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdhFh-0001Bc-H0
	for commit-classpath@gnu.org; Mon, 05 Jan 2004 21:48:00 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdhFh-0001Au-7S
	for commit-classpath@gnu.org; Mon, 05 Jan 2004 21:47:29 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id D966C49FCA
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 02:45:57 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 02:45:56 +0100
Message-Id: <20040106014556.1612@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: javax.swing.event.EventListenerList
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 02:48:07 -0000

FYI, I've reformatted javax/swing/event/EventListenerList.java in
anticipation of more significant changes to that class.

-- Sascha

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





From MAILER-DAEMON Mon Jan 05 22:44:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Adi9D-0004uc-4p
	for mharc-commit-classpath@gnu.org; Mon, 05 Jan 2004 22:44:51 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Adi55-0001AM-3b
	for commit-classpath@gnu.org; Mon, 05 Jan 2004 22:40:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Adi4Y-0000ZI-FE
	for commit-classpath@gnu.org; Mon, 05 Jan 2004 22:40:33 -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.24) id 1Adi4S-00085O-Ly
	for commit-classpath@gnu.org; Mon, 05 Jan 2004 22:39:56 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Adh4G-000770-HP
	for commit-classpath@gnu.org; Mon, 05 Jan 2004 21:35:40 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id C26E84A08A
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 03:35:37 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 03:35:38 +0100
Message-Id: <20040106023538.21097@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: Fwd: [bugs #7099] EventListenerList.getListenerCount should accept
 null argument
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 03:40:36 -0000

---------------- Begin Forwarded Message ----------------
Subject: [bugs #7099] EventListenerList.getListenerCount should accept
null argument
Date Sent: Monday, January 5, 2004 9:32 PM
From: Sascha Brawer <noreply@savannah.gnu.org>
To: brawer@dandelis.ch

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

/**************************************************************************/
[bugs #7099] Latest Modifications:

Changes by: 
		Sascha Brawer <brawer@dandelis.ch>
'Date: 
		Tue 01/06/04 at 02:32 (Europe/Zurich)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Fixed in revision 1.4 of javax/swing/event/EventListenerList.java.






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

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7099>
Project: classpath
Submitted by: Sascha Brawer
On: Tue 01/06/04 at 02:18

Severity:  3 - Ordinary
Resolution:  Fixed
Assigned to:  brawer
Status:  Closed
Platform Version:  None


Summary:  EventListenerList.getListenerCount should accept null argument

Original Submission:  javax.swing.eve
nt.EventListenerList.getListenerCount(java.lang.Class) throws a
NullPointerException when passed a null argument. On Sun J2SE 1.4.1_01,
it returns 0 when passed null. Test case checked into Mauve.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Tue 01/06/04 at 02:32         By: brawer
Fixed in revision 1.4 of javax/swing/event/EventListenerList.java.












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

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





From MAILER-DAEMON Tue Jan 06 04:41:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Adnic-0008TR-Bi
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 04:41:46 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdniZ-0008R8-E9
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 04:41:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdnJW-0001Xz-CY
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 04:16:21 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdnJV-0001XM-5X
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 04:15:49 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp2.mail.ch.easynet.net (Postfix) with ESMTP id 0E88264660
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 09:14:18 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 09:14:18 +0100
Message-Id: <20040106081418.32565@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: [bugs #7104] EventListenerList.add does not work
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 09:41:44 -0000

---------------- Begin Forwarded Message ----------------
Subject: [bugs #7104] EventListenerList.add does not work
Date Sent: Tuesday, January 6, 2004 3:10 AM
From: Sascha Brawer <noreply@savannah.gnu.org>
To: brawer@dandelis.ch

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

/**************************************************************************/
[bugs #7104] Latest Modifications:

Changes by: 
		Sascha Brawer <brawer@dandelis.ch>
'Date: 
		Tue 01/06/04 at 08:10 (Europe/Zurich)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Fixed by revision 1.6 of javax/swing/event/EventListenerList.java.






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

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7104>
Project: classpath
Submitted by: Sascha Brawer
On: Tue 01/06/04 at 07:33

Severity:  7 - Major
Resolution:  Fixed
Assigned to:  brawer
Status:  Closed
Platform Version:  None


Summary:  EventListenerList.add does not work

Original Submission:  The method javax.swing.event.EventListenerList.add
does not work correctly: The wrong exceptions are thrown, and the second
listener does not get added correctly. Test cases checked into Mauve.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Tue 01/06/04 at 08:10         By: brawer
Fixed by revision 1.6 of javax/swing/event/EventListenerList.java.




CC List
-------

CC Address                          | Comment
------------------------------------+-----------------------------
commit-classpath --AT-- gnu --DOT-- org | 









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

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





From MAILER-DAEMON Tue Jan 06 05:29:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdoSS-0000wu-S1
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 05:29:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdoSO-0000uI-4a
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 05:29:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdoRp-0000gZ-Rb
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 05:29:00 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdoRp-0000gE-Bi
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 05:28:29 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp2.mail.ch.easynet.net (Postfix) with ESMTP id D5B95646D6
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 10:26:58 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 10:26:58 +0100
Message-Id: <20040106092658.8614@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: [bugs #7105] EventListenerList.remove does not work
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 10:29:06 -0000

---------------- Begin Forwarded Message ----------------
Subject: [bugs #7105] EventListenerList.remove does not work
Date Sent: Tuesday, January 6, 2004 4:25 AM
From: Sascha Brawer <noreply@savannah.gnu.org>
To: brawer@dandelis.ch

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

/**************************************************************************/
[bugs #7105] Latest Modifications:

Changes by: 
		Sascha Brawer <brawer@dandelis.ch>
'Date: 
		Tue 01/06/04 at 09:25 (Europe/Zurich)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Fixed by revision 1.7 of javax/swing/event/EventListenerList.java.






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

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7105>
Project: classpath
Submitted by: Sascha Brawer
On: Tue 01/06/04 at 08:51

Severity:  7 - Major
Resolution:  Fixed
Assigned to:  brawer
Status:  Closed
Platform Version:  None


Summary:  EventListenerList.remove does not work

Original Submission:  The method java
x.swing.event.EventListenerList.remove does not work. Test cases checked
into Mauve.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Tue 01/06/04 at 09:25         By: brawer
Fixed by revision 1.7 of javax/swing/event/EventListenerList.java.












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

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





From MAILER-DAEMON Tue Jan 06 05:44:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Adoh3-0007gr-8o
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 05:44:13 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Adoh0-0007gO-Vk
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 05:44:10 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdogR-0007KJ-6R
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 05:44:09 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdogO-0007H0-Op
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 05:43:32 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-138.ewetel.net
	[80.228.80.138])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i069fvHA029294
	for <commit-classpath@gnu.org>; Tue, 6 Jan 2004 10:41:58 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Adnip-0002O2-00
	for <commit-classpath@gnu.org>; Tue, 06 Jan 2004 10:41:59 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 6 Jan 2004 10:45:15 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_rOo+/00nh8/q7Jz"
Message-Id: <200401061045.15666.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.util.Date
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 10:44:11 -0000


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

Hi list,


I commited the attached patch with fixes done by Per Bothner to merge 
java.util.Date again with libgcj.


Michael


2004-01-06  Per Bothner  <per@bothner.com>

	* java/util/Date.java (parse):  Fix a number of problems.
	(skipParens):  Remove no-longer-needed method.


--Boundary-00=_rOo+/00nh8/q7Jz
Content-Type: text/x-diff;
  charset="us-ascii";
  name="date.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="date.diff"

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1751
diff -u -b -B -r1.1751 ChangeLog
--- ChangeLog	6 Jan 2004 08:09:21 -0000	1.1751
+++ ChangeLog	6 Jan 2004 09:33:36 -0000
@@ -1,3 +1,8 @@
+2004-01-06  Per Bothner  <per@bothner.com>
+
+	* java/util/Date.java (parse):  Fix a number of problems.
+	(skipParens):  Remove no-longer-needed method.
+
 2004-01-06  Sascha Brawer  <brawer@dandelis.ch>
 
 	Fix for Classpath bug #7104.
Index: java/util/Date.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Date.java,v
retrieving revision 1.15
diff -u -b -B -r1.15 Date.java
--- java/util/Date.java	29 Mar 2003 01:04:17 -0000	1.15
+++ java/util/Date.java	6 Jan 2004 09:33:36 -0000
@@ -304,34 +304,6 @@
     return format.format(this);
   }
 
-  private static int skipParens(String string, int offset)
-  {
-    int len = string.length();
-    int p = 0;
-    int i;
-
-    for (i = offset; i < len; ++i)
-      {
-	if (string.charAt(i) == '(')
-	  ++p;
-	else if (string.charAt(i) == ')')
-	  {
-	    --p;
-	    if (p == 0)
-	      return i + 1;
-	    // If we've encounted unbalanced parens, just return the
-	    // leftover one as an ordinary character.  It will be
-	    // caught later in parsing and cause an
-	    // IllegalArgumentException.
-      	    if (p < 0)
-	      return i;
-	  }
-      }
-
-    // Not sure what to do if `p != 0' here.
-    return i;
-  }
-
   private static int parseTz(String tok, char sign)
     throws IllegalArgumentException
   {
@@ -408,20 +380,25 @@
 
     // Trim out any nested stuff in parentheses now to make parsing easier.
     StringBuffer buf = new StringBuffer();
-    int off = 0;
-    int openParenOffset, tmpMonth;
-    while ((openParenOffset = string.indexOf('(', off)) >= 0)
-      {
-	// Copy part of string leading up to open paren.
-	buf.append(string.substring(off, openParenOffset));
-	off = skipParens(string, openParenOffset);
+    int parenNesting = 0;
+    int len = string.length();
+    for (int i = 0;  i < len;  i++)
+      {
+	char ch = string.charAt(i);
+	if (ch >= 'a' && ch <= 'z')
+	  ch -= 'a' - 'A';
+	if (ch == '(')
+	  parenNesting++;
+	else if (parenNesting == 0)
+	  buf.append(ch);
+	else if (ch == ')')
+	  parenNesting--;
       }
-    buf.append(string.substring(off));
+    int tmpMonth;
 
     // Make all chars upper case to simplify comparisons later.
     // Also ignore commas; treat them as delimiters.
-    StringTokenizer strtok =
-      new StringTokenizer(buf.toString().toUpperCase(), " \t\n\r,");
+    StringTokenizer strtok = new StringTokenizer(buf.toString(), " \t\n\r,");
 
     while (strtok.hasMoreTokens())
       {
@@ -436,56 +413,59 @@
 	  {
 	    while (tok != null && tok.length() > 0)
 	      {
-	        // A colon or slash may be valid in the number.
-	        // Find the first of these before calling parseInt.
-	        int colon = tok.indexOf(':');
-	        int slash = tok.indexOf('/');
-	        int hyphen = tok.indexOf('-');
-		// We choose tok.length initially because it makes
-		// processing simpler.
 	        int punctOffset = tok.length();
-		if (colon >= 0)
-		  punctOffset = Math.min(punctOffset, colon);
-	        if (slash >= 0)
-	          punctOffset = Math.min(punctOffset, slash);
-	        if (hyphen >= 0)
-	          punctOffset = Math.min(punctOffset, hyphen);
-		// Following code relies on -1 being the exceptional
-		// case.
-		if (punctOffset == tok.length())
-		  punctOffset = -1;
-
-	        int num;
-	        try
+		int num = 0;
+		int punct;
+		for (int i = 0;  ;  i++)
+		  {
+		    if (i >= punctOffset)
 	          {
-		    num = Integer.parseInt(punctOffset < 0 ? tok :
-					   tok.substring(0, punctOffset));
+			punct = -1;
+			break;
 	          }
-	        catch (NumberFormatException ex)
+		    else
+		      {
+			punct = tok.charAt(i);
+			if (punct >= '0' && punct <= '9')
 	          {
+			    if (num > 999999999) // in case of overflow
 		    throw new IllegalArgumentException(tok);
+			    num = 10 * num + (punct - '0');
+			  }
+			else
+			  {
+			    punctOffset = i;
+			    break;
+			  }
+		      }
+		      
 	          }
 
-		// TBD: Spec says year can be followed by a slash.  That might
-		// make sense if using YY/MM/DD formats, but it would fail in
-		// that format for years <= 70.  Also, what about 1900?  That
-		// is interpreted as the year 3800; seems that the comparison
-		// should be num >= 1900 rather than just > 1900.
-		// What about a year of 62 - 70?  (61 or less could be a (leap)
-		// second).  70/MM/DD cause an exception but 71/MM/DD is ok
-		// even though there's no ambiguity in either case.
-		// For the parse method, the spec as written seems too loose.
-		// Until shown otherwise, we'll follow the spec as written.
-	        if (num > 70 && (punctOffset < 0 || punctOffset == slash))
-		  year = num > 1900 ? num - 1900 : num;
-		else if (punctOffset > 0 && punctOffset == colon)
+		if (punct == ':')
 		  {
 		    if (hour < 0)
 		      hour = num;
 		    else
 		      minute = num;
 		  }
-		else if (punctOffset > 0 && punctOffset == slash)
+	        else if ((num >= 70
+			  && (punct == ' ' || punct == ','
+			      || punct == '/' || punct < 0))
+			 || (num < 70 && day >= 0 && month >= 0 && year < 0))
+		  {
+		    if (num >= 100)
+		      year = num;
+		    else
+		      {
+			int curYear = 1900 + new Date().getYear();
+			int firstYear = curYear - 80;
+			year = firstYear / 100 * 100 + num;
+			int yx = year;
+			if (year < firstYear)
+			  year += 100;
+		      }
+		  }
+		else if (punct == '/')
 		  {
 		    if (month < 0)
 		      month = num - 1;
@@ -502,7 +482,7 @@
 		  throw new IllegalArgumentException(tok);
 
 		// Advance string if there's more to process in this token.
-		if (punctOffset < 0 || punctOffset + 1 >= tok.length())
+		if (punct < 0 || punctOffset + 1 >= tok.length())
 		  tok = null;
 		else
 		  tok = tok.substring(punctOffset + 1);
@@ -573,22 +553,29 @@
 	  throw new IllegalArgumentException(tok);
       }
 
-    // Unspecified minutes and seconds should default to 0.
+    // Unspecified hours, minutes, or seconds should default to 0.
+    if (hour < 0)
+      hour = 0;
     if (minute < 0)
       minute = 0;
     if (second < 0)
       second = 0;
 
     // Throw exception if any other fields have not been recognized and set.
-    if (year < 0 || month < 0 || day < 0 || hour < 0)
+    if (year < 0 || month < 0 || day < 0)
       throw new IllegalArgumentException("Missing field");
 
     // Return the time in either local time or relative to GMT as parsed.
     // If no time-zone was specified, get the local one (in minutes) and
     // convert to milliseconds before adding to the UTC.
-    return UTC(year, month, day, hour, minute, second) + (localTimezone ?
-		new Date(year, month, day).getTimezoneOffset() * 60 * 1000:
-		-timezone * 60 * 1000);
+    GregorianCalendar cal
+      = new GregorianCalendar(year, month, day, hour, minute, second);
+    if (!localTimezone)
+      {
+	cal.set(Calendar.ZONE_OFFSET, timezone * 60 * 1000);
+	cal.set(Calendar.DST_OFFSET, 0);
+      }
+    return cal.getTimeInMillis();
   }
 
   /**

--Boundary-00=_rOo+/00nh8/q7Jz--




From MAILER-DAEMON Tue Jan 06 06:00:57 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdoxD-00006m-Az
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 06:00:55 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Adox5-0008VN-9Y
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 06:00:47 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdowQ-0008FS-Pw
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 06:00:38 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdowP-0008F4-7p
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 06:00:05 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-138.ewetel.net
	[80.228.80.138])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i069wYHA004449
	for <commit-classpath@gnu.org>; Tue, 6 Jan 2004 10:58:35 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Adnyt-0002Ot-00
	for <commit-classpath@gnu.org>; Tue, 06 Jan 2004 10:58:35 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 6 Jan 2004 11:01:52 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_Qeo+/i9wnfcwnh2"
Message-Id: <200401061101.52461.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.SecurityManager
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 11:00:49 -0000


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

Hi list,


I commited the attached patch to merge java.lang.SecurityManager with libgcj.


Michael


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

	* java/lang/SecurityManager.java
	(currentClassLoader): Use VMSecurityManager to get current class
	loader.
	(checkPackageList): Put array length into local variable.


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

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1753
diff -u -b -B -r1.1753 ChangeLog
--- ChangeLog	6 Jan 2004 09:40:31 -0000	1.1753
+++ ChangeLog	6 Jan 2004 09:53:11 -0000
@@ -1,3 +1,10 @@
+2004-01-06  Michael Koch  <konqueror@gmx.de>
+
+	* java/lang/SecurityManager.java
+	(currentClassLoader): Use VMSecurityManager to get current class
+	loader.
+	(checkPackageList): Put array length into local variable.
+
 2004-01-06  Per Bothner  <per@bothner.com>
 
 	* java/util/Date.java (parse):  Fix a number of problems.
Index: java/lang/SecurityManager.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/SecurityManager.java,v
retrieving revision 1.15
diff -u -b -B -r1.15 SecurityManager.java
--- java/lang/SecurityManager.java	31 Jul 2003 12:03:27 -0000	1.15
+++ java/lang/SecurityManager.java	6 Jan 2004 09:53:11 -0000
@@ -187,8 +187,7 @@
    */
   protected ClassLoader currentClassLoader()
   {
-    Class c = currentLoadedClass();
-    return c != null ? c.getClassLoader() : null;
+    return VMSecurityManager.currentClassLoader();
   }
 
   /**
@@ -1023,8 +1022,9 @@
              index != -1; index = list.indexOf(packageName, index + 1))
           {
             // Exploit package visibility for speed.
-            if (index + packageName.length() == list.length()
-                || list.charAt(index + packageName.length()) == ',')
+	    int packageNameCount = packageName.length();
+            if (index + packageNameCount == list.length()
+                || list.charAt(index + packageNameCount) == ',')
               {
                 checkPermission(p);
                 return;

--Boundary-00=_Qeo+/i9wnfcwnh2--




From MAILER-DAEMON Tue Jan 06 07:54:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdqjU-0006ua-L1
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 07:54:52 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdqjP-0006sk-BT
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 07:54:47 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Adqik-0006mZ-G3
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 07:54:37 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdqdZ-00060t-Sa
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 07:48:46 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-138.ewetel.net
	[80.228.80.138])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i06BlDl1002678
	for <commit-classpath@gnu.org>; Tue, 6 Jan 2004 12:47:14 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Adpg2-0002hz-00
	for <commit-classpath@gnu.org>; Tue, 06 Jan 2004 12:47:14 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 6 Jan 2004 12:50:30 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_GEq+/lrlPdljgzE"
Message-Id: <200401061250.31241.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.nio.NIOServerSocket
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 12:54:49 -0000


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

Hi list,


I commited the attached patch to add a native method needed for java.nio.


Michael


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

	* include/Makefile.am: Generate gnu_java_nio_NIOServerSocket.h.
	* include/gnu_java_nio_NIOServerSocket.h,
	native/jni/java-nio/gnu_java_nio_NIOServerSocket.c: New files.
	* native/jni/java-nio/Makefile.am: Compile
	gnu_java_nio_NIOServerSocket.c.

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

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1755
diff -u -b -B -r1.1755 ChangeLog
--- ChangeLog	6 Jan 2004 10:07:59 -0000	1.1755
+++ ChangeLog	6 Jan 2004 11:32:33 -0000
@@ -1,5 +1,12 @@
 2004-01-06  Michael Koch  <konqueror@gmx.de>
 
+	* include/Makefile.am: Generate gnu_java_nio_NIOServerSocket.h.
+	* include/gnu_java_nio_NIOServerSocket.h,
+	native/jni/java-nio/gnu_java_nio_NIOServerSocket.c: New files.
+	* native/jni/java-nio/Makefile.am: Compile
+	gnu_java_nio_NIOServerSocket.c.
+2004-01-06  Michael Koch  <konqueror@gmx.de>
+
 	* gnu/java/net/protocol/file/Connection.java
 	(Connection): Don't re-initialize doOutput with the default value.
 	* java/net/JarURLConnection.java
Index: include/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/include/Makefile.am,v
retrieving revision 1.7
diff -u -b -B -r1.7 Makefile.am
--- include/Makefile.am	27 Dec 2003 16:38:43 -0000	1.7
+++ include/Makefile.am	6 Jan 2004 11:32:33 -0000
@@ -35,6 +35,7 @@
 $(top_srcdir)/include/gnu_java_awt_peer_gtk_GtkWindowPeer.h \
 $(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/java_io_FileDescriptor.h \
 $(top_srcdir)/include/java_io_File.h \
 $(top_srcdir)/include/java_io_ObjectInputStream.h \
@@ -120,6 +121,8 @@
 	$(JAVAH) -o $@ gnu.java.net.PlainDatagramSocketImpl
 $(top_srcdir)/include/gnu_java_net_PlainSocketImpl.h: $(top_srcdir)/gnu/java/net/PlainSocketImpl.java
 	$(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/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: include/gnu_java_nio_NIOServerSocket.h
===================================================================
RCS file: include/gnu_java_nio_NIOServerSocket.h
diff -N include/gnu_java_nio_NIOServerSocket.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ include/gnu_java_nio_NIOServerSocket.h	6 Jan 2004 11:32:33 -0000
@@ -0,0 +1,19 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+
+#ifndef __gnu_java_nio_NIOServerSocket__
+#define __gnu_java_nio_NIOServerSocket__
+
+#include <jni.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+extern JNIEXPORT jobject JNICALL Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __gnu_java_nio_NIOServerSocket__ */
Index: native/jni/java-nio/gnu_java_nio_NIOServerSocket.c
===================================================================
RCS file: native/jni/java-nio/gnu_java_nio_NIOServerSocket.c
diff -N native/jni/java-nio/gnu_java_nio_NIOServerSocket.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/java-nio/gnu_java_nio_NIOServerSocket.c	6 Jan 2004 11:32:33 -0000
@@ -0,0 +1,52 @@
+/* gnu_java_nio_NIOServerSocket.c - Native methods for NIOServerSocket class
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+ 
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+#include <config.h>
+#include <errno.h>
+
+#include <jni.h>
+#include <jcl.h>
+
+#include "gnu_java_nio_NIOServerSocket.h"
+
+#define IO_EXCEPTION "java/io/IOException"
+
+JNIEXPORT jobject JNICALL
+Java_gnu_java_nio_NIOServerSocket_getPlainSocketImpl (JNIEnv *env, jclass class)
+{
+  JCL_ThrowException (env, IO_EXCEPTION, "gnu.java.nio.NIOServerSocket.getPlainSocketImpl(): not implemented");
+}
Index: native/jni/java-nio/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/java-nio/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- native/jni/java-nio/Makefile.am	2 Jul 2003 09:16:52 -0000	1.1
+++ native/jni/java-nio/Makefile.am	6 Jan 2004 11:32:33 -0000
@@ -1,6 +1,7 @@
 pkglib_LTLIBRARIES = libjavanio.la
 
-libjavanio_la_SOURCES = java_nio_DirectByteBufferImpl.c \
+libjavanio_la_SOURCES = gnu_java_nio_NIOServerSocket.c \
+			java_nio_DirectByteBufferImpl.c \
 			java_nio_FileChannelImpl.c \
 			java_nio_FileLockImpl.c
 

--Boundary-00=_GEq+/lrlPdljgzE--




From MAILER-DAEMON Tue Jan 06 10:55:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdtYO-0005e9-FZ
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 10:55:36 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdtYI-0005ck-3J
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 10:55:30 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdtXk-0005Pu-58
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 10:55:28 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdtXj-0005PS-G5
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 10:54:55 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp2.mail.ch.easynet.net (Postfix) with ESMTP id 4046C64707
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 15:53:24 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 15:53:22 +0100
Message-Id: <20040106145322.17637@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: [bugs #7107] DefaultBoundedRangeModel.setValue and friends should
 not throw
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 15:55:31 -0000

---------------- Begin Forwarded Message ----------------
Subject: [bugs #7107] DefaultBoundedRangeModel.setValue and friends
should not throw
Date Sent: Tuesday, January 6, 2004 9:51 AM
From: Sascha Brawer <noreply@savannah.gnu.org>
To: brawer@dandelis.ch

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

/**************************************************************************/
[bugs #7107] Latest Modifications:

Changes by: 
		Sascha Brawer <brawer@dandelis.ch>
'Date: 
		Tue 01/06/04 at 14:51 (Europe/Zurich)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Fixed with revision 1.4 of javax/swing/DefaultBoundedRangeModel.java.






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

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7107>
Project: classpath
Submitted by: Sascha Brawer
On: Tue 01/06/04 at 14:34

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  brawer
Status:  Closed
Platform Version:  None


Summary:  DefaultBoundedRangeModel.setValue and friends should not throw

Original Submission:  The various accessor methods in
javax.swing.DefaultBoundedRangeModel (setValue, setExtent, setMinimum,
setMaximum, etc.) should not throw exceptions when they receive out-of-
range arguments. Instead, the other properties should be adjusted
correspondingly. See Mauve for test cases.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Tue 01/06/04 at 14:51         By: brawer
Fixed with revision 1.4 of javax/swing/DefaultBoundedRangeModel.java.












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

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






From MAILER-DAEMON Tue Jan 06 11:01:50 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AdteQ-0001qS-1V
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 11:01:50 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdteN-0001oW-BK
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 11:01:47 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AdtdR-0001T6-KL
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 11:01:20 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AdtdQ-0001Rp-Us
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 11:00:49 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id C29604A058
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 15:59:17 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 15:59:16 +0100
Message-Id: <20040106145916.4661@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: javax.swing.DefaultBoundedRangeModel
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 16:01:48 -0000

Hi all,

I re-wrote large parts of javax.swing.DefaultBoundedRangeModel because
the previous implementation was totally broken. Tests for this class are
now in Mauve.

2004-01-06  Sascha Brawer  <brawer@dandelis.ch>

	       Fix for Classpath bug #7107.
	       * javax/swing/DefaultBoundedRangeModel.java: Documented API.
       	(changeEvent): Create event object on demand.
	       (DefaultBoundedRangeModel, toString, setValue, setExtent,
       	setMinimum, setMaximum, setValueIsAdjusting, setRangeProperties,
	       fireStateChanged): Re-written.
       	* NEWS: Mention fixed bug.

http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/javax/swing/
DefaultBoundedRangeModel.java.diff?r1=1.3&r2=1.4

-- Sascha

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





From MAILER-DAEMON Tue Jan 06 11:15:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Adtrh-00059T-CJ
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 11:15:33 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdtrV-000587-KQ
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 11:15:21 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Adtqy-0004uP-Hm
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 11:15:19 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Adtqx-0004u1-W1
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 11:14:48 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id 93F7D4A092
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 16:13:16 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 16:13:16 +0100
Message-Id: <20040106151316.14674@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: javax.swing.event.EventListenerList
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 16:15:24 -0000

Hi all,

I re-wrote large parts of javax.swing.event.EventListenerList because the
previous implementation was totally broken. Tests for this class are now
in Mauve.

In order to have individual changes in cvs, separated by "topic"/fixed
bug, I've made several commits (revision 1.3 to 1.8).

2004-01-06  Sascha Brawer  <brawer@dandelis.ch>

       	* javax/swing/event/EventListenerList.java (toString): Implemented.

       	* javax/swing/event/EventListenerList.java: Document typical usage.
       	(getListeners): Re-written.

       	Fix for Classpath bug #7105.
	       * javax/swing/event/EventListenerList.java (remove): Re-written.
       	* NEWS: Mention fixed bug.

       	Fix for Classpath bug #7104.
       	* javax/swing/event/EventListenerList.java (add): Re-written.
       	* NEWS: Mention fixed bug.

       	* javax/swing/event/EventListenerList.java (NO_LISTENERS): New
       	singleton field.
       	(listenerList): Declare as transient; document.
       	(serialVersionUID): Document.

       	Fix for Classpath bug #7099.
       	* javax/swing/event/EventListenerList.java (getListenerCount(Class)):
       	More efficient implementation, also accepts null argument.
       	Improve Javadoc.
       	* NEWS: Mention fixed bug.
	
       	* javax/swing/event/EventListenerList.java (getListenerCount()):
       	Remove unnecessary cast; docfix.

       	* javax/swing/event/EventListenerList.java: Reformatted.

http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/javax/swing/
event/EventListenerList.java.diff?r1=1.2&r2=1.8

-- Sascha

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





From MAILER-DAEMON Tue Jan 06 13:14:01 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Advfv-0008Kh-At
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 13:11:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Advdq-0007lu-Tx
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 13:09:22 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Advd2-0007Qf-GQ
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 13:09:04 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Advd1-0007Q0-Sx
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 13:08:32 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id 88D004A077
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 18:07:00 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 18:07:01 +0100
Message-Id: <20040106170701.31064@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: javax.swing.undo.UndoableEditSupport
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 18:11:29 -0000

Hi,

I did some fixes to javax.swing.undo.UndoableEditSupport in order to
allow for nested updates (Classpath bug #7109).

2004-01-06  Sascha Brawer  <brawer@dandelis.ch>

	Fix for Classpath bug #7109.
	* javax/swing/undo/UndoableEditSupport.java: Re-format, document.
	(beginUpdate, endUpdate): Support nested updates.
	(postEdit): Use compound edit if present.

http://savannah.gnu.org/cgi-bin/viewcvs/classpath/classpath/javax/swing/
undo/UndoableEditSupport.java.diff?r1=1.4&r2=1.5

-- Sascha

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





From MAILER-DAEMON Tue Jan 06 13:25:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Advt2-0003o1-Gp
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 13:25:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Advsz-0003lU-Ju
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 13:25:01 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Advi7-0000bV-Fm
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 13:14:19 -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.24) id 1Advi6-0000Zh-Pg
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 13:13:46 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AdukZ-0004xy-2H
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 12:12:15 -0500
Received: from [192.168.1.33] (199.202.dyn-adsl.customer.ch.easynet.net
	[217.8.199.202])
	by smtp2.mail.ch.easynet.net (Postfix) with ESMTP id 0E0AE646EF
	for <commit-classpath@gnu.org>; Tue,  6 Jan 2004 18:12:11 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Tue, 6 Jan 2004 18:12:11 +0100
Message-Id: <20040106171211.7879@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: [bugs #7109] UndoableEditSupport.beginUpdate not nestable
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 18:25:02 -0000

---------------- Begin Forwarded Message ----------------
Subject: [bugs #7109] UndoableEditSupport.beginUpdate not nestable
Date Sent: Tuesday, January 6, 2004 12:10 PM
From: Sascha Brawer <noreply@savannah.gnu.org>
To: brawer@dandelis.ch

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

/**************************************************************************/
[bugs #7109] Latest Modifications:

Changes by: 
		Sascha Brawer <brawer@dandelis.ch>
'Date: 
		Tue 01/06/04 at 17:10 (Europe/Zurich)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Fixed by r1.5 of javax/swing/undo/UndoableEditSupport.java.






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

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7109>
Project: classpath
Submitted by: Sascha Brawer
On: Tue 01/06/04 at 16:33

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  brawer
Status:  Closed
Platform Version:  None


Summary:  UndoableEditSupport.beginUpdate not nestable

Original Submission:  In constrast to Sun J2SE 1.4.1_01, the GNU
Classpath implementation of javax.swing.undo does not allow calls to
UndoableEditSupport.beginUpdate, unless endUpdate has been called.
However, we should support arbitrary undo levels.

For test code, see the Mauve testlet
gnu.testlet.javax.swing.undo.UndoableEditSupport.beginUpdate.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Tue 01/06/04 at 17:10         By: brawer
Fixed by r1.5 of javax/swing/undo/UndoableEditSupport.java.












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

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






From MAILER-DAEMON Tue Jan 06 16:42:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Adyxg-0001GZ-PV
	for mharc-commit-classpath@gnu.org; Tue, 06 Jan 2004 16:42:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AdyxT-00017U-Vj
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 16:41:51 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Adyww-0000i5-LJ
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 16:41:49 -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.24) id 1AdyvM-000859-Rp
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 16:39:40 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Adxx4-0000XA-9i
	for commit-classpath@gnu.org; Tue, 06 Jan 2004 15:37:22 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-016.ewetel.net
	[80.228.82.16])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i06KbIUa021404
	for <commit-classpath@gnu.org>; Tue, 6 Jan 2004 21:37:19 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Adxx2-0006yW-00
	for <commit-classpath@gnu.org>; Tue, 06 Jan 2004 21:37:20 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 6 Jan 2004 21:40:36 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_E1x+/OX1+p+N500"
Message-Id: <200401062140.36329.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.text
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Jan 2004 21:41:53 -0000


--Boundary-00=_E1x+/OX1+p+N500
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I commited the attached patch to merge small parts of java.text more with 
libgcj. This is only small stuff and reordering methods to match libgcj's 
order.


Michael


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

	* java/text/CollationElementIterator.java:
	Renamed "char_seq" to "key" all over.
	* java/text/RuleBasedCollator.java:
	Fixed class documentation, reordered methods to match libgcj's
	version.
	(CollationElement.key): Renamed from char_seq.


--Boundary-00=_E1x+/OX1+p+N500
Content-Type: text/x-diff;
  charset="us-ascii";
  name="text.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="text.diff"

Index: java/text/CollationElementIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationElementIterator.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 CollationElementIterator.java
--- java/text/CollationElementIterator.java	29 Dec 2003 21:50:36 -0000	1.11
+++ java/text/CollationElementIterator.java	6 Jan 2004 20:35:03 -0000
@@ -117,7 +117,7 @@
     RuleBasedCollator.CollationElement e =
       (RuleBasedCollator.CollationElement) text_decomposition[index++];
     
-    textIndex += e.char_seq.length();
+    textIndex += e.key.length();
 
     return e;
   }
@@ -131,7 +131,7 @@
     RuleBasedCollator.CollationElement e =
       (RuleBasedCollator.CollationElement) text_decomposition[index];
 
-    textIndex -= e.char_seq.length();
+    textIndex -= e.key.length();
     
     return e;
   }
@@ -278,7 +278,7 @@
 	if (prefix.expansion != null)
 	  {
 	    work_text = prefix.expansion
-	      + work_text.substring (idx+prefix.char_seq.length());
+	      + work_text.substring (idx+prefix.key.length());
 	    idx = 0;
 	    v.add (prefix);
 	  }
@@ -286,7 +286,7 @@
 	  {
 	    if (!prefix.ignore)
 	      v.add (prefix);
-	    idx += prefix.char_seq.length();
+	    idx += prefix.key.length();
 	  }
       }
     
@@ -351,7 +351,7 @@
       {
 	RuleBasedCollator.CollationElement e =
 	  (RuleBasedCollator.CollationElement) text_decomposition[i];
-	int idx = textIndex + e.char_seq.length();
+	int idx = textIndex + e.key.length();
 	
 	if (idx > offset)
 	  break;
Index: java/text/RuleBasedCollator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/RuleBasedCollator.java,v
retrieving revision 1.18
diff -u -b -B -r1.18 RuleBasedCollator.java
--- java/text/RuleBasedCollator.java	29 Dec 2003 21:50:36 -0000	1.18
+++ java/text/RuleBasedCollator.java	6 Jan 2004 20:35:03 -0000
@@ -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.text;
 
-import java.util.Vector;
+import java.util.Comparator;
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.Comparator;
+import java.util.Vector;
 
 /* Written using "Java Class Libraries", 2nd edition, plus online
  * API docs for JDK 1.2 from http://www.javasoft.com.
@@ -117,8 +116,8 @@
  * anywhere in the previous rule string segment so the rule following the
  * reset rule cannot be inserted.
  * <p>
- * "&lt; a &amp; A @ &lt e &amp; E &lt f&amp; F" - This sequence is equivalent to the following
- * "&lt; a &amp; A &lt E &amp; e &lt f &amp; F".
+ * "&lt; a &amp; A @ &lt; e &amp; E &lt; f&amp; F" - This sequence is equivalent to the following
+ * "&lt; a &amp; A &lt; E &amp; e &lt; f &amp; F".
  * <p>
  * For a description of the various comparison strength types, see the
  * documentation for the <code>Collator</code> class.
@@ -151,7 +150,7 @@
    */
   final class CollationElement
   {
-    String char_seq;
+    String key;
     int primary;
     short secondary;
     short tertiary;
@@ -159,10 +158,10 @@
     boolean ignore;
     String expansion;
 
-    CollationElement(String char_seq, int primary, short secondary, short tertiary,
+    CollationElement(String key, int primary, short secondary, short tertiary,
 		     short equality, String expansion)
     {
-      this.char_seq = char_seq;
+      this.key = key;
       this.primary = primary;
       this.secondary = secondary;
       this.tertiary = tertiary;
@@ -171,9 +170,9 @@
       this.expansion = expansion;
     }
     
-    CollationElement(String char_seq)
+    CollationElement(String key)
     {
-      this.char_seq = char_seq;
+      this.key = key;
       this.ignore = true;
     }
 
@@ -563,6 +562,38 @@
   private boolean inverseAccentComparison;
 
   /**
+   * This method initializes a new instance of <code>RuleBasedCollator</code>
+   * with the specified collation rules.  Note that an application normally
+   * obtains an instance of <code>RuleBasedCollator</code> by calling the
+   * <code>getInstance</code> method of <code>Collator</code>.  That method
+   * automatically loads the proper set of rules for the desired locale.
+   *
+   * @param rules The collation rule string.
+   *
+   * @exception ParseException If the rule string contains syntax errors.
+   */
+  public RuleBasedCollator(String rules) throws ParseException
+  {
+    this.rules = rules;
+
+    if (rules.equals(""))
+      throw new ParseException("Empty rule set", 0);
+
+    buildCollationVector(parseString(rules));
+    buildPrefixAccess();
+  }
+
+  /**
+   * This method creates a copy of this object.
+   *
+   * @return A copy of this object.
+   */
+  public Object clone()
+  {
+    return super.clone();
+  }
+
+  /**
    * This method uses the sorting instructions built by {@link #parseString}
    * to build collation elements which can be directly used to sort strings.
    *
@@ -669,101 +700,8 @@
       {
 	CollationElement e = (CollationElement) ce_table[i];
 
-	prefix_tree.put(e.char_seq, e);
-      }
-  }
-
-  /**
-   * This method initializes a new instance of <code>RuleBasedCollator</code>
-   * with the specified collation rules.  Note that an application normally
-   * obtains an instance of <code>RuleBasedCollator</code> by calling the
-   * <code>getInstance</code> method of <code>Collator</code>.  That method
-   * automatically loads the proper set of rules for the desired locale.
-   *
-   * @param rules The collation rule string.
-   *
-   * @exception ParseException If the rule string contains syntax errors.
-   */
-  public RuleBasedCollator(String rules) throws ParseException
-  {
-    this.rules = rules;
-
-    if (rules.equals(""))
-      throw new ParseException("Empty rule set", 0);
-
-    buildCollationVector(parseString(rules));
-    buildPrefixAccess();
-  }
-
-  /**
-   * This method returns a <code>String</code> containing the collation rules
-   * for this object.
-   *
-   * @return The collation rules for this object.
-   */
-  public String getRules()
-  {
-    return rules;
-  }
-
-  /**
-   * This method builds a default collation element without invoking
-   * the database created from the rules passed to the constructor.
-   *
-   * @param c Character which needs a collation element.
-   * @return A valid brand new CollationElement instance.
-   */
-  CollationElement getDefaultElement(char c)
-  {
-    int v;
-
-    // Preliminary support for generic accent sorting inversion (I don't know if all
-    // characters in the range should be sorted backward). This is the place
-    // to fix this if needed.
-    if (inverseAccentComparison && (c >= 0x02B9 && c <= 0x0361))
-      v = 0x0361 - ((int)c - 0x02B9);
-    else
-      v = (short)c;
-    return new CollationElement(""+c, last_primary_value + v,
-				(short)0, (short)0, (short) 0, null);
-  }
-
-  /**
-   * This method returns an instance for <code>CollationElementIterator</code>
-   * for the specified <code>String</code> under the collation rules for this
-   * object.
-   *
-   * @param str The <code>String</code> to return the <code>CollationElementIterator</code> instance for.
-   *
-   * @return A <code>CollationElementIterator</code> for the specified <code>String</code>.
-   */
-  public CollationElementIterator getCollationElementIterator(String str)
-  {
-    return new CollationElementIterator(this, str);
-  }  
-
-  /**
-   * This method returns an instance of <code>CollationElementIterator</code>
-   * for the <code>String</code> represented by the specified
-   * <code>CharacterIterator</code>.
-   *
-   * @param ci The <code>CharacterIterator</code> with the desired <code>String</code>.
-   *
-   * @return A <code>CollationElementIterator</code> for the specified <code>String</code>.
-   */
-  public CollationElementIterator getCollationElementIterator(CharacterIterator ci)
-  {
-    StringBuffer sb = new StringBuffer("");
-
-    // Right now we assume that we will read from the beginning of the string.
-    char c = ci.first();
-    while (c != CharacterIterator.DONE) 
-      {
-        sb.append(c);
-        c = ci.next();
+	prefix_tree.put(e.key, e);
       }
-
-    return getCollationElementIterator(sb.toString());
   }
 
   /**
@@ -772,16 +710,16 @@
    * the second.  The value depends not only on the collation rules in
    * effect, but also the strength and decomposition settings of this object.
    *
-   * @param s1 The first <code>String</code> to compare.
-   * @param s2 A second <code>String</code> to compare to the first.
+   * @param source The first <code>String</code> to compare.
+   * @param target A second <code>String</code> to compare to the first.
    *
-   * @return A negative integer if s1 &lt; s2, a positive integer
-   * if s1 &gt; s2, or 0 if s1 == s2.
+   * @return A negative integer if source &lt; target, a positive integer
+   * if source &gt; target, or 0 if source == target.
    */
-  public int compare(String s1, String s2)
+  public int compare(String source, String target)
   {
-    CollationElementIterator cei1 = getCollationElementIterator(s1);
-    CollationElementIterator cei2 = getCollationElementIterator(s2);
+    CollationElementIterator cei1 = getCollationElementIterator(source);
+    CollationElementIterator cei2 = getCollationElementIterator(target);
 
     for(;;)
       {
@@ -808,8 +746,8 @@
         if (ord1 == ord2)
 	  {
 	    if (getStrength() == IDENTICAL)
-	      if (!ord1block.char_seq.equals(ord2block.char_seq))
-		return ord1block.char_seq.compareTo(ord2block.char_seq);
+	      if (!ord1block.key.equals(ord2block.key))
+		return ord1block.key.compareTo(ord2block.key);
 	    continue;
 	  }
 
@@ -847,8 +785,88 @@
 	  continue;
 
 	// Apparently JDK does this (at least for my test case).
-	return ord1block.char_seq.compareTo(ord2block.char_seq);    
+	return ord1block.key.compareTo(ord2block.key);    
+      }
+  }
+
+  /**
+   * This method tests this object for equality against the specified 
+   * object.  This will be true if and only if the specified object is
+   * another reference to this object.
+   *
+   * @param obj The <code>Object</code> to compare against this object.
+   *
+   * @return <code>true</code> if the specified object is equal to this object,
+   * <code>false</code> otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if (obj == this)
+      return true;
+    else
+      return false;
+  }
+
+  /**
+   * This method builds a default collation element without invoking
+   * the database created from the rules passed to the constructor.
+   *
+   * @param c Character which needs a collation element.
+   * @return A valid brand new CollationElement instance.
+   */
+  CollationElement getDefaultElement(char c)
+  {
+    int v;
+
+    // Preliminary support for generic accent sorting inversion (I don't know if all
+    // characters in the range should be sorted backward). This is the place
+    // to fix this if needed.
+    if (inverseAccentComparison && (c >= 0x02B9 && c <= 0x0361))
+      v = 0x0361 - ((int) c - 0x02B9);
+    else
+      v = (short) c;
+    return new CollationElement("" + c, last_primary_value + v,
+				(short) 0, (short) 0, (short) 0, null);
+  }
+
+  /**
+   * This method returns an instance for <code>CollationElementIterator</code>
+   * for the specified <code>String</code> under the collation rules for this
+   * object.
+   *
+   * @param source The <code>String</code> to return the
+   * <code>CollationElementIterator</code> instance for.
+   *
+   * @return A <code>CollationElementIterator</code> for the specified
+   * <code>String</code>.
+   */
+  public CollationElementIterator getCollationElementIterator(String source)
+  {
+    return new CollationElementIterator(this, source);
+  }
+
+  /**
+   * This method returns an instance of <code>CollationElementIterator</code>
+   * for the <code>String</code> represented by the specified
+   * <code>CharacterIterator</code>.
+   *
+   * @param source The <code>CharacterIterator</code> with the desired <code>String</code>.
+   *
+   * @return A <code>CollationElementIterator</code> for the specified <code>String</code>.
+   */
+  public CollationElementIterator getCollationElementIterator(CharacterIterator source)
+  {
+    StringBuffer sb = new StringBuffer("");
+
+    // Right now we assume that we will read from the beginning of the string.
+    char c = source.first();
+    while (c != CharacterIterator.DONE) 
+      {
+        sb.append(c);
+        c = source.next();
       }
+
+    return getCollationElementIterator(sb.toString());
   }
 
   /**
@@ -858,13 +876,13 @@
    * provide speed benefits if multiple comparisons are performed, such
    * as during a sort.
    *
-   * @param str The <code>String</code> to create a <code>CollationKey</code> for.
+   * @param source The <code>String</code> to create a <code>CollationKey</code> for.
    *
    * @return A <code>CollationKey</code> for the specified <code>String</code>.
    */
-  public CollationKey getCollationKey(String str)
+  public CollationKey getCollationKey(String source)
   {
-    CollationElementIterator cei = getCollationElementIterator(str);
+    CollationElementIterator cei = getCollationElementIterator(source);
     Vector vect = new Vector(25);
 
     int ord = cei.next();
@@ -894,31 +912,25 @@
 
     for (int i = 0; i < objarr.length; i++)
       {
-        int j = ((Integer)objarr[i]).intValue();
-        key [i * 4] = (byte)((j & 0xFF000000) >> 24);
-        key [i * 4 + 1] = (byte)((j & 0x00FF0000) >> 16);
-        key [i * 4 + 2] = (byte)((j & 0x0000FF00) >> 8);
-        key [i * 4 + 3] = (byte)(j & 0x000000FF);
+        int j = ((Integer) objarr[i]).intValue();
+        key [i * 4] = (byte) ((j & 0xFF000000) >> 24);
+        key [i * 4 + 1] = (byte) ((j & 0x00FF0000) >> 16);
+        key [i * 4 + 2] = (byte) ((j & 0x0000FF00) >> 8);
+        key [i * 4 + 3] = (byte) (j & 0x000000FF);
       }
 
-    return new CollationKey(this, str, key);
+    return new CollationKey(this, source, key);
   }
 
   /**
-   * This method tests this object for equality against the specified 
-   * object.  This will be true if and only if the specified object is
-   * another reference to this object.
-   *
-   * @param obj The <code>Object</code> to compare against this object.
+   * This method returns a <code>String</code> containing the collation rules
+   * for this object.
    *
-   * @return <code>true</code> if the specified object is equal to this object, <code>false</code> otherwise.
+   * @return The collation rules for this object.
    */
-  public boolean equals(Object obj)
+  public String getRules()
   {
-    if (obj == this)
-      return true;
-    else
-      return false;
+    return rules;
   }
 
   /**
@@ -929,15 +941,5 @@
   public int hashCode()
   {
     return System.identityHashCode(this);
-  }
-
-  /**
-   * This method creates a copy of this object.
-   *
-   * @return A copy of this object.
-   */
-  public Object clone()
-  {
-    return super.clone();
   }
 }

--Boundary-00=_E1x+/OX1+p+N500--




From MAILER-DAEMON Wed Jan 07 05:10:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeAdl-0000Ed-97
	for mharc-commit-classpath@gnu.org; Wed, 07 Jan 2004 05:10:17 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeAdj-0000EG-0H
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:10:15 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeAd9-0008Tr-Tn
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:10:10 -0500
Received: from [217.8.215.180] (helo=aster.dandelis.ch)
	by monty-python.gnu.org with esmtp (TLSv1:DES-CBC3-SHA:168)
	(Exim 4.24) id 1AeAd8-0008TM-Vs
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:09:39 -0500
Received: from aster.dandelis.ch (aster.dandelis.ch [127.0.0.1])
	by aster.dandelis.ch (8.12.8/8.12.8) with ESMTP id i079CZSi003345
	for <commit-classpath@gnu.org>; Wed, 7 Jan 2004 10:12:35 +0100
Received: (from brawer@localhost)
	by aster.dandelis.ch (8.12.8/8.12.8/Submit) id i079CZWG003343
	for commit-classpath@gnu.org; Wed, 7 Jan 2004 10:12:35 +0100
Date: Wed, 7 Jan 2004 10:12:35 +0100
From: Sascha Brawer <brawer@dandelis.ch>
To: commit-classpath@gnu.org
Message-ID: <20040107091235.GB3330@aster.dandelis.ch>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="ADZbWkCsHQ7r3kzd"
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
Subject: FYI: javax.swing.undo.UndoableEditSupport
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 10:10:15 -0000


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

Hi all,

FYI, I've committed the attached patch to javax.swing.undo.UndoableEditSupport.
After the patch, all current Mauve test cases for javax.swing.undo succeed,
both with Classpath and with the Sun J2SE 1.4.1_01 implementation.

This also fixes Classpath bug #7119.

Best regards,

-- Sascha

--ADZbWkCsHQ7r3kzd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="ues.diff"

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1763
diff -u -r1.1763 ChangeLog
--- ChangeLog	7 Jan 2004 02:23:37 -0000	1.1763
+++ ChangeLog	7 Jan 2004 08:57:11 -0000
@@ -1,3 +1,13 @@
+2004-01-07  Sascha Brawer  <brawer@dandelis.ch>
+
+	* javax/swing/undo/UndoableEditSupport.java (UndoableEditSupport):
+	Set realSource field. Improve documentation.
+	(_postEdit): Iterate over cloned listener vector.
+	
+	Fix for Classpath bug #7119.
+	* javax/swing/undo/UndoableEditSupport.java (toString): Don't emit
+	realSource.
+
 2004-01-06  Graydon Hoare  <graydon@redhat.com>
 
 	* configure.in: Add --enable-gtk-cairo check.
Index: javax/swing/undo/UndoableEditSupport.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/undo/UndoableEditSupport.java,v
retrieving revision 1.5
diff -u -r1.5 UndoableEditSupport.java
--- javax/swing/undo/UndoableEditSupport.java	6 Jan 2004 17:03:57 -0000	1.5
+++ javax/swing/undo/UndoableEditSupport.java	7 Jan 2004 08:57:11 -0000
@@ -38,6 +38,7 @@
 
 package javax.swing.undo;
 
+import java.util.Iterator;
 import java.util.Vector;
 import javax.swing.event.UndoableEditEvent;
 import javax.swing.event.UndoableEditListener;
@@ -78,6 +79,19 @@
 
 
   /**
+   * Constructs a new helper for broadcasting UndoableEditEvents.  The
+   * events will indicate the newly constructed
+   * <code>UndoableEditSupport</code> instance as their source.
+   *
+   * @see #UndoableEditSupport(java.lang.Object)
+   */
+  public UndoableEditSupport()
+  {
+    realSource = this;
+  }
+
+
+  /**
    * Constructs a new helper for broadcasting UndoableEditEvents.
    *
    * @param realSource the source of the UndoableEditEvents that will
@@ -85,7 +99,7 @@
    * <code>null</code>, the events will indicate the newly constructed
    * <code>UndoableEditSupport</code> instance as their source.
    */
-  public UndoableEditSupport()
+  public UndoableEditSupport(Object realSource)
   {
     if (realSource == null)
       realSource = this;
@@ -94,23 +108,16 @@
 
 
   /**
-   * Constructor UndoableEditSupport
-   * @param object TODO
-   */
-  public UndoableEditSupport(Object object)
-  {
-    realSource = object;
-  }
-
-
-  /**
    * Returns a string representation of this object that may be useful
    * for debugging.
    */
   public String toString()
   {
-    return (super.toString() + " realSource: " + realSource
-	    + " updateLevel: " + updateLevel);
+    // Note that often, this.realSource == this. Therefore, dumping
+    // realSource without additional checks may lead to infinite
+    // recursion. See Classpath bug #7119.
+    return super.toString() + " updateLevel: " + updateLevel
+      + " listeners: " + listeners + " compoundEdit: " + compoundEdit;
   }
 
 
@@ -146,19 +153,36 @@
 
 
   /**
-   * _postEdit
-   * @param value0 TODO
+   * Notifies all registered listeners that an {@link
+   * UndoableEditEvent} has occured.
+   *
+   * <p><b>Lack of Thread Safety:</b> It is <em>not</em> safe to call
+   * this method from concurrent threads, unless the call is protected
+   * by a synchronization on this <code>UndoableEditSupport</code>
+   * instance.
+   *
+   * @param edit the edit action to be posted.
    */
   protected void _postEdit(UndoableEdit edit)
   {
-    UndoableEditEvent event = new UndoableEditEvent(realSource, edit);
-    int max = listeners.size();
-    for (int i = 0; i < max; ++i)
-      {
-	UndoableEditListener l
-	  = (UndoableEditListener) (listeners.elementAt(i));
-	l.undoableEditHappened(event);
-      }
+    UndoableEditEvent event;
+    Iterator iter;
+
+    // Do nothing if we have no listeners.
+    if (listeners.isEmpty())
+      return;
+
+    event = new UndoableEditEvent(realSource, edit);
+
+    // We clone the vector because this allows listeners to register
+    // or unregister listeners in their undoableEditHappened method.
+    // Otherwise, this would throw exceptions (in the case of
+    // Iterator, a java.util.ConcurrentModificationException; in the
+    // case of a direct loop over the Vector elements, some
+    // index-out-of-bounds exception).
+    iter = ((Vector) listeners.clone()).iterator();
+    while (iter.hasNext())
+      ((UndoableEditListener) iter.next()).undoableEditHappened(event);
   }
 
 

--ADZbWkCsHQ7r3kzd--



From MAILER-DAEMON Wed Jan 07 05:13:23 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeAgl-0001lN-LD
	for mharc-commit-classpath@gnu.org; Wed, 07 Jan 2004 05:13:23 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeAgj-0001iP-Bk
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:13:21 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeAgB-0001OM-5p
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:13:18 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeAgA-0001OC-Q4
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:12:46 -0500
Received: from [192.168.1.33] (215.180.static-adsl.customer.ch.easynet.net
	[217.8.215.180])
	by smtp2.mail.ch.easynet.net (Postfix) with ESMTP id 2ABEF646C9
	for <commit-classpath@gnu.org>; Wed,  7 Jan 2004 10:11:15 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Wed, 7 Jan 2004 10:11:14 +0100
Message-Id: <20040107091114.20192@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: [bugs #7119] Infinite recursion in UndoableEditSupport.toString
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 10:13:22 -0000

---------------- Begin Forwarded Message ----------------
Subject: [bugs #7119] Infinite recursion in UndoableEditSupport.toString
Date Sent: Wednesday, January 7, 2004 4:09 AM
From: Sascha Brawer <noreply@savannah.gnu.org>
To: brawer@dandelis.ch

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

/**************************************************************************/
[bugs #7119] Latest Modifications:

Changes by: 
		Sascha Brawer <brawer@dandelis.ch>
'Date: 
		Wed 01/07/04 at 09:09 (Europe/Zurich)

            What     | Removed                   | Added
---------------------------------------------------------------------------
          Resolution | None                      | Fixed
              Status | Open                      | Closed


------------------ Additional Follow-up Comments ----------------------------
Fixed by producing the same output as the Sun J2SE 1.4.1_01
implementation, which can be observed to omit realSource from the
returned string.






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

URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7119>
Project: classpath
Submitted by: Sascha Brawer
On: Wed 01/07/04 at 08:29

Severity:  5 - Average
Resolution:  Fixed
Assigned to:  brawer
Status:  Closed
Platform Version:  None


Summary:  Infinite recursion in UndoableEditSupport.toString

Original Submission:  The method java
x.swing.undo.UndoableEditSupport.toString can go into an infinite
recursion if this.realSource == this, as will be the case when the
UndoableEditSupport object was constructed by using the default constructor.

Follow-up Comments
------------------


-------------------------------------------------------
Date: Wed 01/07/04 at 09:09         By: brawer
Fixed by producing the same output as the Sun J2SE 1.4.1_01
implementation, which can be observed to omit realSource from the
returned string.

-------------------------------------------------------
Date: Wed 01/07/04 at 08:48         By: brawer
Test case in Mauve.












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

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





From MAILER-DAEMON Wed Jan 07 05:23:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeAqg-0000fd-D7
	for mharc-commit-classpath@gnu.org; Wed, 07 Jan 2004 05:23:38 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeAqc-0000aN-SG
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:23:34 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeAq4-0008E9-M0
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:23:31 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeAp5-0007IG-Hl
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:21:59 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-238.ewetel.net
	[80.228.75.238])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i079KMHA014938
	for <commit-classpath@gnu.org>; Wed, 7 Jan 2004 10:20:22 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ae9rV-0000R7-00
	for <commit-classpath@gnu.org>; Wed, 07 Jan 2004 10:20:25 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 7 Jan 2004 10:23:40 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_cA9+/v787hUhP0S"
Message-Id: <200401071023.40624.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.reflect.Array
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 10:23:36 -0000


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

Hi list,


I commited the attached little patch to merge java.lang.reflect.Array more 
with libgcj's version.


Michael


2004-01-07  Michael Koch  <konqueror@gmx.de>

	* java/lang/reflect/Array.java:
	Reformated to match libgcj's version more.


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

Index: java/lang/reflect/Array.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/reflect/Array.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 Array.java
--- java/lang/reflect/Array.java	9 Sep 2003 22:19:33 -0000	1.9
+++ java/lang/reflect/Array.java	7 Jan 2004 09:16:34 -0000
@@ -64,6 +64,7 @@
  *
  * @author John Keiser
  * @author Eric Blake <ebb9@email.byu.edu>
+ * @author Per Bothner <bothner@cygnus.com>
  * @see java.lang.Boolean#TYPE
  * @see java.lang.Byte#TYPE
  * @see java.lang.Short#TYPE
@@ -81,14 +82,14 @@
   {
     if (Configuration.INIT_LOAD_LIBRARY)
       {
-        System.loadLibrary ("javalangreflect");
+        System.loadLibrary("javalangreflect");
       }
   }
 
   /**
    * This class is uninstantiable.
    */
-  private Array ()
+  private Array()
   {
   }
 
@@ -437,12 +438,8 @@
 	  throw new IllegalArgumentException();
 	((Object[]) array)[index] = value;
       }
-    else if (value instanceof Boolean)
-      setBoolean(array, index, ((Boolean) value).booleanValue());
     else if (value instanceof Byte)
       setByte(array, index, ((Byte) value).byteValue());
-    else if (value instanceof Character)
-      setChar(array, index, ((Character) value).charValue());
     else if (value instanceof Short)
       setShort(array, index, ((Short) value).shortValue());
     else if (value instanceof Integer)
@@ -453,6 +450,10 @@
       setFloat(array, index, ((Float) value).floatValue());
     else if (value instanceof Double)
       setDouble(array, index, ((Double) value).doubleValue());
+    else if (value instanceof Character)
+      setChar(array, index, ((Character) value).charValue());
+    else if (value instanceof Boolean)
+      setBoolean(array, index, ((Boolean) value).booleanValue());
     else if (array == null)
       throw new NullPointerException();
     else

--Boundary-00=_cA9+/v787hUhP0S--




From MAILER-DAEMON Wed Jan 07 05:30:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeAwy-0006b0-Fb
	for mharc-commit-classpath@gnu.org; Wed, 07 Jan 2004 05:30:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeAwv-0006Zx-Tw
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:30:05 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeAwO-0006Oi-VT
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:30:04 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeAwO-0006Od-Fp
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 05:29:32 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-238.ewetel.net
	[80.228.75.238])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i079S11h001988
	for <commit-classpath@gnu.org>; Wed, 7 Jan 2004 10:28:01 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ae9yt-0000RW-00
	for <commit-classpath@gnu.org>; Wed, 07 Jan 2004 10:28:03 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 7 Jan 2004 10:31:18 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_mH9+/4TXOLr9ryk"
Message-Id: <200401071031.19241.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.text - more merging
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 10:30:06 -0000


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

Hi list,


I commited the attached patch to do some more merging for java.text.


Michael


2004-01-07  Michael Koch  <konqueror@gmx.de>

	* java/text/CollationElementIterator.java
	(collator): Made package-private.
	(text): Likewise.
	(index): Likewise.
	(textIndex): Likewise.
	(setText): Fixed documentation.
	(setText): Renamed some variables to match libgcj's version.
	(getOffset): Added @since tag to documentation.
	* java/text/CollationKey.java
	(hashCode): Reimplemented.
	* java/text/RuleBasedCollator.java:
	Some Reformating to match libgcj's version more.


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

Index: java/text/CollationElementIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationElementIterator.java,v
retrieving revision 1.12
diff -u -b -B -r1.12 CollationElementIterator.java
--- java/text/CollationElementIterator.java	6 Jan 2004 20:35:29 -0000	1.12
+++ java/text/CollationElementIterator.java	7 Jan 2004 09:25:25 -0000
@@ -71,22 +71,22 @@
   /**
    * This is the RuleBasedCollator this object was created from.
    */
-  private RuleBasedCollator collator;
+  RuleBasedCollator collator;
 
   /**
    * This is the String that is being iterated over.
    */
-  private String text;
+  String text;
 
   /**
    * This is the index into the collation decomposition where we are currently scanning.
    */
-  private int index;
+  int index;
 
   /**
    * This is the index into the String where we are currently scanning.
    */
-  private int textIndex;
+  int textIndex;
 
   /**
    * Array containing the collation decomposition of the
@@ -227,14 +227,16 @@
    * This method sets the <code>String</code> that it is iterating over
    * to the specified <code>String</code>.
    *
-   * @param The new <code>String</code> to iterate over.
+   * @param text The new <code>String</code> to iterate over.
+   *
+   * @since 1.2
    */
   public void setText(String text)
   {
     int idx = 0;
 
     this.text = text;
-    index = 0;
+    this.index = 0;
 
     String work_text = text.intern();
 
@@ -300,19 +302,17 @@
    *
    * @param ci The <code>CharacterIterator</code> containing the new <code>String</code> to iterate over.
    */
-  public void setText(CharacterIterator ci)
+  public void setText(CharacterIterator source)
   {
-    StringBuffer sb = new StringBuffer("");
+    StringBuffer expand = new StringBuffer();
 
     // For now assume we read from the beginning of the string.
-    char c = ci.first();
-    while (c != CharacterIterator.DONE)
-      {
-        sb.append(c);
-        c = ci.next();
-      }
+    for (char c = source.first();
+	 c != CharacterIterator.DONE;
+	 c = source.next())
+      expand.append(c);
 
-    setText(sb.toString());
+    setText(expand.toString());
   }
 
   /**
@@ -320,6 +320,8 @@
    * that is being iterated over.
    *
    * @return The iteration index position.
+   *
+   * @since 1.2
    */
   public int getOffset()
   {
Index: java/text/CollationKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationKey.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 CollationKey.java
--- java/text/CollationKey.java	21 Oct 2003 14:56:12 -0000	1.9
+++ java/text/CollationKey.java	7 Jan 2004 09:25:26 -0000
@@ -180,7 +180,11 @@
    */
   public int hashCode()
   {
-    return key.hashCode();
+    // We just follow BitSet instead of thinking up something new.
+    long h = originalText.hashCode();
+    for (int i = key.length - 1; i >= 0; --i)
+      h ^= key[i] * (i + 1);
+    return (int) ((h >> 32) ^ h);
   }
   
   /**
Index: java/text/RuleBasedCollator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/RuleBasedCollator.java,v
retrieving revision 1.19
diff -u -b -B -r1.19 RuleBasedCollator.java
--- java/text/RuleBasedCollator.java	6 Jan 2004 20:35:29 -0000	1.19
+++ java/text/RuleBasedCollator.java	7 Jan 2004 09:25:26 -0000
@@ -180,8 +180,7 @@
     {
       return (primary << 16) + (secondary << 8) + tertiary;
     }
-
-  } // inner class CollationElement
+  }
 
   /**
    * Basic collation instruction (internal format) to build the series of
@@ -210,6 +209,56 @@
   }
 
   /**
+   * This the the original rule string.
+   */
+  private String rules;
+
+  /**
+   * This is the table of collation element values
+   */
+  private Object[] ce_table;
+
+  /**
+   * Quick-prefix finder.
+   */
+  HashMap prefix_tree;
+
+  /**
+   * This is the value of the last sequence entered into
+   * <code>ce_table</code>. It is used to compute the
+   * ordering value of unspecified character.
+   */
+  private int last_primary_value;
+
+  /**
+   * This variable is true if accents need to be sorted
+   * in the other direction.
+   */
+  private boolean inverseAccentComparison;
+  
+  /**
+   * This method initializes a new instance of <code>RuleBasedCollator</code>
+   * with the specified collation rules.  Note that an application normally
+   * obtains an instance of <code>RuleBasedCollator</code> by calling the
+   * <code>getInstance</code> method of <code>Collator</code>.  That method
+   * automatically loads the proper set of rules for the desired locale.
+   *
+   * @param rules The collation rule string.
+   *
+   * @exception ParseException If the rule string contains syntax errors.
+   */
+  public RuleBasedCollator(String rules) throws ParseException
+  {
+    if (rules.equals(""))
+      throw new ParseException("empty rule set", 0);
+    
+    this.rules = rules;
+
+    buildCollationVector(parseString(rules));
+    buildPrefixAccess();
+  }
+
+  /**
    * This method returns the number of common characters at the beginning
    * of the string of the two parameters.
    *
@@ -220,14 +269,17 @@
    */
   static int findPrefixLength(String prefix, String s)
   {
-    int i;
+    int index;
+    int len = prefix.length();
 
-    for (i = 0; i < prefix.length() && i < s.length(); i++)
+    for (index = 0; index < len && index < s.length(); ++index)
       {
-	if (prefix.charAt(i) != s.charAt(i))
-	  return i;
+	if (prefix.charAt(index) != s.charAt(index))
+	  return index;
       }
-    return i;
+
+
+    return index;
   }
 
   /**
@@ -514,6 +566,16 @@
   }
 
   /**
+   * This method creates a copy of this object.
+   *
+   * @return A copy of this object.
+   */
+  public Object clone()
+  {
+    return super.clone();
+  }
+
+  /**
    * This method completely parses a string 'rules' containing sorting rules.
    *
    * @param rules String containing the rules to be parsed. 
@@ -534,66 +596,6 @@
   }
 
   /**
-   * This the the original rule string.
-   */
-  private String rules;
-
-  /**
-   * This is the table of collation element values
-   */
-  private Object[] ce_table;
-
-  /**
-   * Quick-prefix finder.
-   */
-  HashMap prefix_tree;
-
-  /**
-   * This is the value of the last sequence entered into
-   * <code>ce_table</code>. It is used to compute the
-   * ordering value of unspecified character.
-   */
-  private int last_primary_value;
-
-  /**
-   * This variable is true if accents need to be sorted
-   * in the other direction.
-   */
-  private boolean inverseAccentComparison;
-
-  /**
-   * This method initializes a new instance of <code>RuleBasedCollator</code>
-   * with the specified collation rules.  Note that an application normally
-   * obtains an instance of <code>RuleBasedCollator</code> by calling the
-   * <code>getInstance</code> method of <code>Collator</code>.  That method
-   * automatically loads the proper set of rules for the desired locale.
-   *
-   * @param rules The collation rule string.
-   *
-   * @exception ParseException If the rule string contains syntax errors.
-   */
-  public RuleBasedCollator(String rules) throws ParseException
-  {
-    this.rules = rules;
-
-    if (rules.equals(""))
-      throw new ParseException("Empty rule set", 0);
-
-    buildCollationVector(parseString(rules));
-    buildPrefixAccess();
-  }
-
-  /**
-   * This method creates a copy of this object.
-   *
-   * @return A copy of this object.
-   */
-  public Object clone()
-  {
-    return super.clone();
-  }
-
-  /**
    * This method uses the sorting instructions built by {@link #parseString}
    * to build collation elements which can be directly used to sort strings.
    *
@@ -718,13 +720,15 @@
    */
   public int compare(String source, String target)
   {
-    CollationElementIterator cei1 = getCollationElementIterator(source);
-    CollationElementIterator cei2 = getCollationElementIterator(target);
+    CollationElementIterator cs, ct;
+
+    cs = getCollationElementIterator(source);
+    ct = getCollationElementIterator(target);
 
     for(;;)
       {
-        CollationElement ord1block = cei1.nextBlock(); 
-        CollationElement ord2block = cei2.nextBlock(); 
+        CollationElement ord1block = cs.nextBlock(); 
+        CollationElement ord2block = ct.nextBlock(); 
 	int ord1;
 	int ord2;
 
@@ -752,8 +756,8 @@
 	  }
 
         // Check for primary strength differences
-        int prim1 = cei1.primaryOrder(ord1); 
-        int prim2 = cei2.primaryOrder(ord2); 
+        int prim1 = cs.primaryOrder(ord1); 
+        int prim2 = ct.primaryOrder(ord2); 
 
         if (prim1 < prim2)
           return -1;
@@ -763,8 +767,8 @@
           continue;
 
         // Check for secondary strength differences
-        int sec1 = cei1.secondaryOrder(ord1);
-        int sec2 = cei2.secondaryOrder(ord2);
+        int sec1 = cs.secondaryOrder(ord1);
+        int sec2 = ct.secondaryOrder(ord2);
 
         if (sec1 < sec2)
           return -1;
@@ -774,8 +778,8 @@
           continue;
 
         // Check for tertiary differences
-        int tert1 = cei1.tertiaryOrder(ord1);
-        int tert2 = cei2.tertiaryOrder(ord2);
+        int tert1 = cs.tertiaryOrder(ord1);
+        int tert2 = ct.tertiaryOrder(ord2);
 
         if (tert1 < tert2)
           return -1;
@@ -856,17 +860,15 @@
    */
   public CollationElementIterator getCollationElementIterator(CharacterIterator source)
   {
-    StringBuffer sb = new StringBuffer("");
+    StringBuffer expand = new StringBuffer("");
 
     // Right now we assume that we will read from the beginning of the string.
-    char c = source.first();
-    while (c != CharacterIterator.DONE) 
-      {
-        sb.append(c);
-        c = source.next();
-      }
+    for (char c = source.first();
+	 c != CharacterIterator.DONE;
+	 c = source.next())
+      decomposeCharacter(c, expand);
 
-    return getCollationElementIterator(sb.toString());
+    return getCollationElementIterator(expand.toString());
   }
 
   /**

--Boundary-00=_mH9+/4TXOLr9ryk--




From MAILER-DAEMON Wed Jan 07 06:24:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeBnA-0005UF-4T
	for mharc-commit-classpath@gnu.org; Wed, 07 Jan 2004 06:24:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeBn4-0005Pv-0f
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 06:23:58 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeBkl-0004Wt-6F
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 06:22:06 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeBkk-0004Vs-2W
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 06:21:34 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-238.ewetel.net
	[80.228.75.238])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i07AK01h024903
	for <commit-classpath@gnu.org>; Wed, 7 Jan 2004 11:20:01 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AeAnD-0000cm-00
	for <commit-classpath@gnu.org>; Wed, 07 Jan 2004 11:20:03 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 7 Jan 2004 11:23:17 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_V49+/FGOI7Vsfit"
Message-Id: <200401071123.18980.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.print.attribute.standard
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 11:23:59 -0000


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

Hi list,


I commited the attached patch to add some more javax.print.attribute.standard 
classes.


Michael


2004-01-07  Michael Koch  <konqueror@gmx.de>

	* javax/print/attribute/standard/DateTimeAtCompleted.java,
	javax/print/attribute/standard/DateTimeAtCreation.java,
	javax/print/attribute/standard/DateTimeAtProcessing.java,
	javax/print/attribute/standard/JobImpressionsCompleted.java,
	javax/print/attribute/standard/JobKOctets.java,
	javax/print/attribute/standard/JobKOctetsProcessed.java,
	javax/print/attribute/standard/JobMediaSheetsCompleted.java,
	javax/print/attribute/standard/JobPrioritySupported.java:
	New files.
	* javax/print/attribute/standard/Makefile.am (EXTRA_DIST):
	Added new files.


--Boundary-00=_V49+/FGOI7Vsfit
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/DateTimeAtCompleted.java
===================================================================
RCS file: javax/print/attribute/standard/DateTimeAtCompleted.java
diff -N javax/print/attribute/standard/DateTimeAtCompleted.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/DateTimeAtCompleted.java	7 Jan 2004 10:17:59 -0000
@@ -0,0 +1,95 @@
+/* DateTimeAtCompleted.java -- 
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.print.attribute.standard;
+
+import java.util.Date;
+import javax.print.attribute.DateTimeSyntax;
+import javax.print.attribute.PrintJobAttribute;
+
+public final class DateTimeAtCompleted extends DateTimeSyntax
+  implements PrintJobAttribute
+{
+  private static final long serialVersionUID = 6497399708058490000L;
+
+  /**
+   * Creates a <code>DateTimeAtCompleted</code> object.
+   *
+   * @param value the date at completion time
+   *
+   * @exception NullPointerException if value is null
+   */
+  public DateTimeAtCompleted(Date value)
+  {
+    super(value);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof DateTimeAtCompleted))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>DateTimeAtCompleted</code> itself
+   */
+  public final Class getCategory()
+  {
+    return DateTimeAtCompleted.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "date-time-at-completed"
+   */
+  public final String getName()
+  {
+    return "date-time-at-completed";
+  }
+}
Index: javax/print/attribute/standard/DateTimeAtCreation.java
===================================================================
RCS file: javax/print/attribute/standard/DateTimeAtCreation.java
diff -N javax/print/attribute/standard/DateTimeAtCreation.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/DateTimeAtCreation.java	7 Jan 2004 10:17:59 -0000
@@ -0,0 +1,95 @@
+/* DateTimeAtCreation.java -- 
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.print.attribute.standard;
+
+import java.util.Date;
+import javax.print.attribute.DateTimeSyntax;
+import javax.print.attribute.PrintJobAttribute;
+
+public final class DateTimeAtCreation extends DateTimeSyntax
+  implements PrintJobAttribute
+{
+  private static final long serialVersionUID = -2923732231056647903L;
+
+  /**
+   * Creates a <code>DateTimeAtCreation</code> object.
+   *
+   * @param value the date at creation time
+   *
+   * @exception NullPointerException if value is null
+   */
+  public DateTimeAtCreation(Date value)
+  {
+    super(value);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof DateTimeAtCreation))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>DateTimeAtCreation</code> itself
+   */
+  public final Class getCategory()
+  {
+    return DateTimeAtCreation.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "date-time-at-creation"
+   */
+  public final String getName()
+  {
+    return "date-time-at-creation";
+  }
+}
Index: javax/print/attribute/standard/DateTimeAtProcessing.java
===================================================================
RCS file: javax/print/attribute/standard/DateTimeAtProcessing.java
diff -N javax/print/attribute/standard/DateTimeAtProcessing.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/DateTimeAtProcessing.java	7 Jan 2004 10:17:59 -0000
@@ -0,0 +1,95 @@
+/* DateTimeAtProcessing.java -- 
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.print.attribute.standard;
+
+import java.util.Date;
+import javax.print.attribute.DateTimeSyntax;
+import javax.print.attribute.PrintJobAttribute;
+
+public final class DateTimeAtProcessing extends DateTimeSyntax
+  implements PrintJobAttribute
+{
+  private static final long serialVersionUID = -3710068197278263244L;
+
+  /**
+   * Creates a <code>DateTimeAtProcessing</code> object.
+   *
+   * @param value the date at processing time
+   *
+   * @exception NullPointerException if value is null
+   */
+  public DateTimeAtProcessing(Date value)
+  {
+    super(value);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof DateTimeAtProcessing))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>DateTimeAtProcessing</code> itself
+   */
+  public final Class getCategory()
+  {
+    return DateTimeAtProcessing.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "date-time-at-processing"
+   */
+  public final String getName()
+  {
+    return "date-time-at-processing";
+  }
+}
Index: javax/print/attribute/standard/JobImpressionsCompleted.java
===================================================================
RCS file: javax/print/attribute/standard/JobImpressionsCompleted.java
diff -N javax/print/attribute/standard/JobImpressionsCompleted.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobImpressionsCompleted.java	7 Jan 2004 10:17:59 -0000
@@ -0,0 +1,100 @@
+/* JobImpressionsCompleted.java -- 
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.print.attribute.standard;
+
+import javax.print.attribute.IntegerSyntax;
+import javax.print.attribute.PrintJobAttribute;
+
+/**
+ * @author Michael Koch
+ */
+public final class JobImpressionsCompleted extends IntegerSyntax
+  implements PrintJobAttribute
+{
+  private static final long serialVersionUID = 6722648442432393294L;
+  
+  /**
+   * Creates a <code>JobImpressionsCompleted</code> object.
+   *
+   * @param value the number of completed impressions
+   *
+   * @exception IllegalArgumentException if value < 0
+   */
+  public JobImpressionsCompleted(int value)
+  {
+    super(value);
+
+    if (value < 0)
+      throw new IllegalArgumentException("value may not be less than 0");
+  }
+  
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobImpressionsCompleted))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobImpressionsCompleted</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobImpressionsCompleted.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-impressions-completed"
+   */
+  public final String getName()
+  {
+    return "job-impressions";
+  }
+}
Index: javax/print/attribute/standard/JobKOctets.java
===================================================================
RCS file: javax/print/attribute/standard/JobKOctets.java
diff -N javax/print/attribute/standard/JobKOctets.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobKOctets.java	7 Jan 2004 10:17:59 -0000
@@ -0,0 +1,101 @@
+/* JobKOctets.java -- 
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.print.attribute.standard;
+
+import javax.print.attribute.IntegerSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+/**
+ * @author Michael Koch
+ */
+public final class JobKOctets extends IntegerSyntax
+  implements PrintJobAttribute, PrintRequestAttribute
+{
+  private static final long serialVersionUID = -8959710146498202869L;
+  
+  /**
+   * Creates a <code>JobKOctets</code> object.
+   *
+   * @param value the number of K octets
+   *
+   * @exception IllegalArgumentException if value < 0
+   */
+  public JobKOctets(int value)
+  {
+    super(value);
+
+    if (value < 0)
+      throw new IllegalArgumentException("value may not be less than 0");
+  }
+  
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobKOctets))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobKOctets</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobKOctets.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-k-octets"
+   */
+  public final String getName()
+  {
+    return "job-k-octets";
+  }
+}
Index: javax/print/attribute/standard/JobKOctetsProcessed.java
===================================================================
RCS file: javax/print/attribute/standard/JobKOctetsProcessed.java
diff -N javax/print/attribute/standard/JobKOctetsProcessed.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobKOctetsProcessed.java	7 Jan 2004 10:17:59 -0000
@@ -0,0 +1,101 @@
+/* JobKOctetsProcessed.java -- 
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.print.attribute.standard;
+
+import javax.print.attribute.IntegerSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+/**
+ * @author Michael Koch
+ */
+public final class JobKOctetsProcessed extends IntegerSyntax
+  implements PrintJobAttribute, PrintRequestAttribute
+{
+  private static final long serialVersionUID = -6265238509657881806L;
+  
+  /**
+   * Creates a <code>JobKOctetsProcessed</code> object.
+   *
+   * @param value the number of processed K octets
+   *
+   * @exception IllegalArgumentException if value < 0
+   */
+  public JobKOctetsProcessed(int value)
+  {
+    super(value);
+
+    if (value < 0)
+      throw new IllegalArgumentException("value may not be less than 0");
+  }
+  
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobKOctetsProcessed))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobKOctetsProcessed</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobKOctetsProcessed.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-k-octets-processed"
+   */
+  public final String getName()
+  {
+    return "job-k-octets-processed";
+  }
+}
Index: javax/print/attribute/standard/JobMediaSheetsCompleted.java
===================================================================
RCS file: javax/print/attribute/standard/JobMediaSheetsCompleted.java
diff -N javax/print/attribute/standard/JobMediaSheetsCompleted.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobMediaSheetsCompleted.java	7 Jan 2004 10:17:59 -0000
@@ -0,0 +1,100 @@
+/* JobMediaSheetsCompleted.java -- 
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.print.attribute.standard;
+
+import javax.print.attribute.IntegerSyntax;
+import javax.print.attribute.PrintJobAttribute;
+
+/**
+ * @author Michael Koch
+ */
+public class JobMediaSheetsCompleted extends IntegerSyntax
+  implements PrintJobAttribute
+{
+  private static final long serialVersionUID = 1739595973810840475L;
+  
+  /**
+   * Creates a <code>JobMediaSheetsCompleted</code> object.
+   *
+   * @param value the number of completed media sheets for a print job
+   *
+   * @exception IllegalArgumentException if value < 0
+   */
+  public JobMediaSheetsCompleted(int value)
+  {
+    super(value);
+
+    if (value < 0)
+      throw new IllegalArgumentException("value may not be less than 0");
+  }
+  
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobMediaSheetsCompleted))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobMediaSheetsCompleted</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobMediaSheetsCompleted.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-media-sheets-completed"
+   */
+  public final String getName()
+  {
+    return "job-media-sheets-completed";
+  }
+}
Index: javax/print/attribute/standard/JobPrioritySupported.java
===================================================================
RCS file: javax/print/attribute/standard/JobPrioritySupported.java
diff -N javax/print/attribute/standard/JobPrioritySupported.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobPrioritySupported.java	7 Jan 2004 10:17:59 -0000
@@ -0,0 +1,97 @@
+/* JobPrioritySupported.java -- 
+   Copyright (C) 2003 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.print.attribute.standard;
+
+import javax.print.attribute.IntegerSyntax;
+import javax.print.attribute.SupportedValuesAttribute;
+
+public final class JobPrioritySupported extends IntegerSyntax
+  implements SupportedValuesAttribute
+{
+  private static final long serialVersionUID = 2564840378013555894L;
+
+  /**
+   * Creates a <code>JobPrioritySupported</code> object.
+   *
+   * @param value the priority
+   *
+   * @exception IllegalArgumentException if value < 1 or value > 100
+   */
+  public JobPrioritySupported(int value)
+  {
+    super(value);
+
+    if (value < 1 || value > 100)
+      throw new IllegalArgumentException("value out of range");
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobPrioritySupported))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobPrioritySupported</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobPrioritySupported.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-priority-supported"
+   */
+  public final String getName()
+  {
+    return "job-priority-supported";
+  }
+}
Index: javax/print/attribute/standard/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/print/attribute/standard/Makefile.am,v
retrieving revision 1.1
diff -u -b -B -r1.1 Makefile.am
--- javax/print/attribute/standard/Makefile.am	26 Dec 2003 23:41:56 -0000	1.1
+++ javax/print/attribute/standard/Makefile.am	7 Jan 2004 10:17:59 -0000
@@ -2,9 +2,17 @@
 
 EXTRA_DIST = \
 Copies.java \
+DateTimeAtCompleted.java \
+DateTimeAtCreation.java \
+DateTimeAtProcessing.java \
 JobImpressions.java \
+JobImpressionsCompleted.java \
+JobKOctets.java \
+JobKOctetsProcessed.java \
 JobMediaSheets.java \
+JobMediaSheetsCompleted.java \
 JobPriority.java \
+JobPrioritySupported.java \
 NumberOfDocuments.java \
 NumberOfInterveningJobs.java \
 NumberUp.java \

--Boundary-00=_V49+/FGOI7Vsfit--




From MAILER-DAEMON Wed Jan 07 06:45:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeC7Z-0006Ac-Ry
	for mharc-commit-classpath@gnu.org; Wed, 07 Jan 2004 06:45:09 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeC7T-000626-NO
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 06:45:03 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeC6u-0005k7-R5
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 06:45:00 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeC5f-0005Fg-6D
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 06:43:11 -0500
Received: from [192.168.1.33] (215.180.static-adsl.customer.ch.easynet.net
	[217.8.215.180]) by smtp2.mail.ch.easynet.net (Postfix) with ESMTP
	id D8DD8646F5; Wed,  7 Jan 2004 11:41:39 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Wed, 7 Jan 2004 11:41:39 +0100
Message-Id: <20040107104139.15408@smtp.mail.ch.easynet.net>
In-Reply-To: <E1AeASp-0001iI-5B@savannah.gnu.org>
References: <E1AeASp-0001iI-5B@savannah.gnu.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: Michael Koch <konqueror@gmx.de>
Subject: Re: [bugs #6067] java.awt.geom.RoundRectangle2D.intersects
 partially wrong
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 11:45:08 -0000

Sascha Brawer <noreply@savannah.gnu.org> wrote on Wed, 7 Jan
2004 04:58:59 -0500:

>[bugs #6067]
>------------------ Additional Follow-up Comments ----------------------------
>Test case is in Mauve.
>
>The current Classpath implementation says in a comment: "Here we can use
>the same code we use for an ordinary rectangle." This is wrong, because
>RoundRectangle2D is, well, rounded :-)
>
>The implementation should cover the case where the intersection is only
>in the rounded corners, as in:
>
>          |
>-------  |
>         
>          -------
>          
>           |

Grr, for some reason savannah seems to strip backslash characters in the
automatically sent mails. Here we go again (use a fixed-with font):

>          |
>-------\  |
>        \ \ 
>         \ -------
>          \
>           |

-- Sascha

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





From MAILER-DAEMON Wed Jan 07 10:51:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeFxY-0003Sa-9g
	for mharc-commit-classpath@gnu.org; Wed, 07 Jan 2004 10:51:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeFxW-0003Rg-3d
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 10:51:02 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeFwz-0003K5-9O
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 10:51:01 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeFl4-0007tA-59
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 10:38:10 -0500
Received: from [192.168.1.33] (215.180.static-adsl.customer.ch.easynet.net
	[217.8.215.180])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id E40134A0D2
	for <commit-classpath@gnu.org>; Wed,  7 Jan 2004 15:36:38 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Wed, 7 Jan 2004 15:36:37 +0100
Message-Id: <20040107143637.7279@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: [bugs #7123] Bad results for QuadCurve2D.solveQuadratic
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 15:51:02 -0000

Summary:  Bad results for QuadCurve2D.solveQuadratic
URL: <http://savannah.gnu.org/bugs/?func=detailitem&item_id=7123>

Original Submission:  The method java.awt.geom.QuadCurve2D.solveQuadratic
sometimes does not return the right results for the following equation:

  (x^2)/10 + 20x + 1000 = 0

Expected result: -100

This equation is tested by Mauve; see gnu.testlet.java.awt.geom.QuadCurve2D.

The problem occurs with various versions of gcj, compiling for IA-32.
However, it does NOT occur when executing the same Mauve testlet on
jamvm, using the same implementation for java.awt.geom.QuadCurve2D.

It turned out that a small Java test program for computing the equation's
discriminant gives a very small negative number when run on gcj/IA-32,
but exactly zero when run on jamvm or the Sun J2SE 1.4.1_01.


Follow-up Comments
------------------


-------------------------------------------------------
Date: Wed 01/07/04 at 14:15         By: brawer
The problematic equation has been re-formulated as a test case for the
test suite of the GNU Scientific Library. It fails there, too.

See the attached e-mail to Brian Gough <bjg@network-theory.co.uk>, author
of the GNU Scientific Library.





From MAILER-DAEMON Wed Jan 07 12:49:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeHnp-0002lB-Tx
	for mharc-commit-classpath@gnu.org; Wed, 07 Jan 2004 12:49:09 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeHnm-0002js-N5
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 12:49:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeHgM-0008N2-MJ
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 12:41:57 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeHgL-0008LK-Bp
	for commit-classpath@gnu.org; Wed, 07 Jan 2004 12:41:25 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-238.ewetel.net
	[80.228.75.238])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i07GdjHA013058;
	Wed, 7 Jan 2004 17:39:45 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AeGii-0001Z1-00; Wed, 07 Jan 2004 17:39:48 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Wed, 7 Jan 2004 17:43:03 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_XcD//X0PLhWt1r8"
Message-Id: <200401071743.03232.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: java.net.ServerSocket
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Jan 2004 17:49:07 -0000


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

Hi lists,


I commited the attached patch to fix a typo in the method documentation of 
ServerSocket.isBound().


Michael


2004-01-07  Michael Koch  <konqueror@gmx.de>

	* java/net/ServerSocket.java (isBound): Fixed documentation.


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

Index: java/net/ServerSocket.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/ServerSocket.java,v
retrieving revision 1.33
diff -u -b -B -r1.33 ServerSocket.java
--- java/net/ServerSocket.java	25 Dec 2003 17:31:13 -0000	1.33
+++ java/net/ServerSocket.java	7 Jan 2004 16:37:23 -0000
@@ -385,7 +385,7 @@
   }
 
   /**
-   * Returns true then the socket is bound, otherwise false
+   * Returns true when the socket is bound, otherwise false
    * 
    * @since 1.4
    */

--Boundary-00=_XcD//X0PLhWt1r8--




From MAILER-DAEMON Thu Jan 08 04:33:52 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeWY4-0000ZN-BS
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 04:33:52 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeWY2-0000Z9-LB
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:33:50 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeWXW-0000Ug-MH
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:33:49 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeWXW-0000UH-8N
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:33:18 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-112.ewetel.net
	[80.228.80.112])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i088VlUa022522
	for <commit-classpath@gnu.org>; Thu, 8 Jan 2004 09:31:47 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AeVa3-0004EM-00
	for <commit-classpath@gnu.org>; Thu, 08 Jan 2004 09:31:51 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Jan 2004 09:35:08 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_8YR//g5Rdgir6f5"
Message-Id: <200401080935.08402.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.text
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 09:33:51 -0000


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

Hi list,


I commited the attached patch to fix a method documentation and the 
implementation of a equals() method.


Michael


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

	* java/text/CollationElementIterator.java
	(setText): Fixed argument name in documentation.
	* java/text/CollationKey.java
	(equals): Directly compare parent collators.


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

Index: java/text/CollationElementIterator.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationElementIterator.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 CollationElementIterator.java
--- java/text/CollationElementIterator.java	7 Jan 2004 09:26:33 -0000	1.13
+++ java/text/CollationElementIterator.java	8 Jan 2004 08:29:58 -0000
@@ -1,5 +1,5 @@
 /* CollationElementIterator.java -- Walks through collation elements
-   Copyright (C) 1998, 1999, 2001, 2002, 2003  Free Software Foundation
+   Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004  Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -300,7 +300,8 @@
    * to the <code>String</code> represented by the specified
    * <code>CharacterIterator</code>.
    *
-   * @param ci The <code>CharacterIterator</code> containing the new <code>String</code> to iterate over.
+   * @param source The <code>CharacterIterator</code> containing the new
+   * <code>String</code> to iterate over.
    */
   public void setText(CharacterIterator source)
   {
Index: java/text/CollationKey.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/CollationKey.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 CollationKey.java
--- java/text/CollationKey.java	7 Jan 2004 09:26:34 -0000	1.10
+++ java/text/CollationKey.java	8 Jan 2004 08:29:58 -0000
@@ -148,7 +148,7 @@
 
     CollationKey ck = (CollationKey) obj;
 
-    if (!ck.collator.equals (collator))
+    if (ck.collator != collator)
       return false;
 
     if (!ck.getSourceString ().equals (getSourceString ()))

--Boundary-00=_8YR//g5Rdgir6f5--




From MAILER-DAEMON Thu Jan 08 04:47:55 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeWiP-0002mz-Qn
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 04:44:33 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeWhw-0002Ew-E7
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:44:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeWgm-0000P0-At
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:43:23 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeWgW-0008U2-8O
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:42:36 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-112.ewetel.net
	[80.228.80.112])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i088f4l1023876
	for <commit-classpath@gnu.org>; Thu, 8 Jan 2004 09:41:05 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AeVj2-0004El-00
	for <commit-classpath@gnu.org>; Thu, 08 Jan 2004 09:41:08 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Jan 2004 09:44:25 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_phR//R+BL/j92aK"
Message-Id: <200401080944.25919.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.nio
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 09:44:32 -0000


--Boundary-00=_phR//R+BL/j92aK
Content-Type: text/plain;
  charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Hi list,


I commited the attached patch to merge java.nio with libgcj again.


Michael


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

	* gnu/java/nio/DatagramChannelImpl.java
	(blocking): Removed.
	(DatagramChannelImpl): Call configureBlocking().
	(implConfigureBlocking): Don't initialize blocking.
	* gnu/java/nio/PipeImpl.java
	(SourceChannelImpl): New inner class.
	(SinkChannelImpl): New inner class.
	(sink): New member variable.
	(source): New member variable.
	(PipeImpl): Add SelectorProvider argument, implemented.
	(nativeInit): New method.
	(sink): Return sink channel.
	(source): Return source channel.
	* gnu/java/nio/ServerSocketChannelImpl.java
	(serverSocket): Made private.
	(connected): Made private, don't re-initialize with default value.
	(blocking): Removed.
	(ServerSocketChannelImpl): Call configureBlocking().
	(implConfigureBlocking): Don't initialize blocking.
	* gnu/java/nio/SocketChannelImpl.java
	(blocking): Removed.
	(connectionPending): Don't re-initialize with default value.
	(SocketChannelImpl): Call configureBlocking().
	(implConfigureBlocking): Dont initialize blocking.
	(connect): Use isBlocking().
	* java/nio/channels/spi/AbstractSelectableChannel.java
	(configureBlocking): Use blockingLock() instead of LOCK.
	Set blocking after successfully called implConfigureBlocking().
	(register): Use blockingLock() instead of LOCK.


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

Index: gnu/java/nio/DatagramChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/DatagramChannelImpl.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 DatagramChannelImpl.java
--- gnu/java/nio/DatagramChannelImpl.java	26 Nov 2003 20:47:06 -0000	1.9
+++ gnu/java/nio/DatagramChannelImpl.java	8 Jan 2004 08:38:55 -0000
@@ -56,13 +56,13 @@
 public final class DatagramChannelImpl extends DatagramChannel
 {
   private NIODatagramSocket socket;
-  private boolean blocking = false;
   
   protected DatagramChannelImpl (SelectorProvider provider)
     throws IOException
   {
     super (provider);
     socket = new NIODatagramSocket (new PlainDatagramSocketImpl(), this);
+    configureBlocking(true);
   }
 
   public int getNativeFD()
@@ -85,7 +85,6 @@
     throws IOException
   {
     socket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
-    this.blocking = blocking;
   }
 
   public DatagramChannel connect (SocketAddress remote)
Index: gnu/java/nio/PipeImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/PipeImpl.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 PipeImpl.java
--- gnu/java/nio/PipeImpl.java	20 Oct 2003 15:41:47 -0000	1.5
+++ gnu/java/nio/PipeImpl.java	8 Jan 2004 08:38:55 -0000
@@ -38,24 +38,126 @@
 package gnu.java.nio;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
 import java.nio.channels.Pipe;
 import java.nio.channels.spi.SelectorProvider;
 
 class PipeImpl extends Pipe
 {
+  public final class SourceChannelImpl extends Pipe.SourceChannel
+  {
+    private int native_fd;
+    
+    public SourceChannelImpl (SelectorProvider selectorProvider,
+                              int native_fd)
+    {
+      super (selectorProvider);
+      this.native_fd = native_fd;
+    }
+
+    protected final void implCloseSelectableChannel()
+      throws IOException
+    {
+      throw new Error ("Not implemented");
+    }
+
+    protected void implConfigureBlocking (boolean blocking)
+      throws IOException
+    {
+      throw new Error ("Not implemented");
+    }
+
+    public final int read (ByteBuffer src)
+      throws IOException
+    {
+      throw new Error ("Not implemented");
+    }
+
+    public final long read (ByteBuffer[] srcs)
+      throws IOException
+    {
+      return read (srcs, 0, srcs.length);
+    }
+
+    public final long read (ByteBuffer[] srcs, int offset, int len)
+      throws IOException
+    {
+      throw new Error ("Not implemented");
+    }
+
+    public final int getNativeFD()
+    {
+      return native_fd;
+    }
+  }
+
+  public final class SinkChannelImpl extends Pipe.SinkChannel
+  {
+    private int native_fd;
+    
+    public SinkChannelImpl (SelectorProvider selectorProvider,
+                            int native_fd)
+    {
+      super (selectorProvider);
+      this.native_fd = native_fd;
+    }
+
+    protected final void implCloseSelectableChannel()
+      throws IOException
+    {
+      throw new Error ("Not implemented");
+    }
+
+    protected final void implConfigureBlocking (boolean blocking)
+      throws IOException
+    {
+      throw new Error ("Not implemented");
+    }
+
+    public final int write (ByteBuffer dst)
+      throws IOException
+    {
+      throw new Error ("Not implemented");
+    }
+
+    public final long write (ByteBuffer[] dsts)
+      throws IOException
+    {
+      return write (dsts, 0, dsts.length);
+    }
+
+    public final long write (ByteBuffer[] dsts, int offset, int len)
+      throws IOException
+    {
+      throw new Error ("Not implemented");
+    }
+
+    public final int getNativeFD()
+    {
+      return native_fd;
+    }
+  }
+
+  private SinkChannelImpl sink;
+  private SourceChannelImpl source;
+  
   public PipeImpl (SelectorProvider provider)
     throws IOException
   {
     super();
+    nativeInit (provider);
   }
     
+  private native void nativeInit (SelectorProvider provider)
+    throws IOException;
+    
   public Pipe.SinkChannel sink()
   {
-    return null;
+    return sink;
   }
 
   public Pipe.SourceChannel source()
   {
-    return null;
+    return source;
   }
 }
Index: gnu/java/nio/ServerSocketChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/ServerSocketChannelImpl.java,v
retrieving revision 1.9
diff -u -b -B -r1.9 ServerSocketChannelImpl.java
--- gnu/java/nio/ServerSocketChannelImpl.java	15 Oct 2003 12:51:31 -0000	1.9
+++ gnu/java/nio/ServerSocketChannelImpl.java	8 Jan 2004 08:38:55 -0000
@@ -54,15 +54,15 @@
 
 public final class ServerSocketChannelImpl extends ServerSocketChannel
 {
-  NIOServerSocket serverSocket;
-  boolean blocking = true;
-  boolean connected = false;
+  private NIOServerSocket serverSocket;
+  private boolean connected;
 
   protected ServerSocketChannelImpl (SelectorProvider provider)
     throws IOException
   {
     super (provider);
     serverSocket = new NIOServerSocket (this);
+    configureBlocking(true);
   }
 
   public int getNativeFD()
@@ -93,7 +93,6 @@
   protected void implConfigureBlocking (boolean blocking) throws IOException
   {
     serverSocket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
-    this.blocking = blocking;
   }
 
   public SocketChannel accept () throws IOException
Index: gnu/java/nio/SocketChannelImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/SocketChannelImpl.java,v
retrieving revision 1.20
diff -u -b -B -r1.20 SocketChannelImpl.java
--- gnu/java/nio/SocketChannelImpl.java	26 Nov 2003 20:47:06 -0000	1.20
+++ gnu/java/nio/SocketChannelImpl.java	8 Jan 2004 08:38:55 -0000
@@ -65,8 +65,7 @@
 {
   private PlainSocketImpl impl;
   private NIOSocket socket;
-  private boolean blocking = true;
-  private boolean connectionPending = false;
+  private boolean connectionPending;
 
   SocketChannelImpl (SelectorProvider provider)
     throws IOException
@@ -74,6 +73,7 @@
     super (provider);
     impl = new PlainSocketImpl();
     socket = new NIOSocket (impl, this);
+    configureBlocking(true);
   }
   
   SocketChannelImpl (SelectorProvider provider,
@@ -117,7 +117,6 @@
   protected void implConfigureBlocking (boolean blocking) throws IOException
   {
     socket.setSoTimeout (blocking ? 0 : NIOConstants.DEFAULT_TIMEOUT);
-    this.blocking = blocking;
   }   
 
   public boolean connect (SocketAddress remote) throws IOException
@@ -137,7 +136,7 @@
     if (((InetSocketAddress) remote).isUnresolved())
       throw new UnresolvedAddressException();
     
-    if (blocking)
+    if (isBlocking())
       {
         // Do blocking connect.
         socket.connect (remote);
@@ -301,8 +300,6 @@
         data = src.array();
       }
 
-    System.out.println ("INTERNAL: writing to socket outputstream");
-    
     OutputStream output = socket.getOutputStream();
     output.write (data, offset, len);
 
Index: java/nio/channels/spi/AbstractSelectableChannel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/nio/channels/spi/AbstractSelectableChannel.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 AbstractSelectableChannel.java
--- java/nio/channels/spi/AbstractSelectableChannel.java	12 Oct 2003 16:56:00 -0000	1.10
+++ java/nio/channels/spi/AbstractSelectableChannel.java	8 Jan 2004 08:38:55 -0000
@@ -75,13 +75,13 @@
   /**
    * Adjusts this channel's blocking mode.
    */
-  public final SelectableChannel configureBlocking (boolean block)
+  public final SelectableChannel configureBlocking (boolean blocking)
     throws IOException
   {
-    synchronized (LOCK)
+    synchronized (blockingLock())
       {
-        blocking = true;
-        implConfigureBlocking (block);
+        implConfigureBlocking(blocking);
+        this.blocking = blocking;
       }
     
     return this;
@@ -187,7 +187,7 @@
     SelectionKey key = null;
     AbstractSelector selector = (AbstractSelector) selin;
 
-    synchronized (LOCK)
+    synchronized (blockingLock())
       {
         key = locate (selector);
 

--Boundary-00=_phR//R+BL/j92aK--




From MAILER-DAEMON Thu Jan 08 04:48:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeWmJ-00056r-PL
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 04:48:35 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeWmG-00053b-Cy
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:48:32 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeWlN-0004Oi-Dz
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:48:08 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeWlM-0004NM-Gu
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:47:36 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-112.ewetel.net
	[80.228.80.112])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i088k4HA017822
	for <commit-classpath@gnu.org>; Thu, 8 Jan 2004 09:46:05 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AeVns-0004FX-00
	for <commit-classpath@gnu.org>; Thu, 08 Jan 2004 09:46:08 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Jan 2004 09:49:26 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_WmR//bUKkcx1uZ3"
Message-Id: <200401080949.26180.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.nio.SelectorImpl
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 09:48:33 -0000


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

Hi list,


I commited the attached patch to merge fixes made by Mohan Embar to libgcj's 
Java NIO.


Michael


2004-01-08  Mohan Embar  <gnustuff@thisiscool.com>

	* gnu/java/nio/SelectorImpl.java
	(selectThreadMutex): New field.
	(selectThread): New field.
	(unhandledWakeup): New field.
	(implCloseSelector): Added skeleton code which
	synchronizes as per Sun JRE JavaDoc.
	(keys): Throw ClosedSelectorException if selector
	is closed.
	(selectNow): Added comment that we're faking out
	an immediate select with a one-microsecond-timeout one.
	(select): Use 0 instead of -1 for infinite timeout.
	(implSelect): Changed comment in declaration.
	(select): Added synchronized to method declaration.
	Added synchronization and wakeup support as per Sun
	JRE JavaDoc.
	(selectedKeys): Throw ClosedSelectorException if selector
	is closed.
	(wakeup): Implemented.
	(deregisterCancelledKeys): Synchronize on cancelled key
	set before deregistering.
	(register): Synchronize on key set before registering.


--Boundary-00=_WmR//bUKkcx1uZ3
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/SelectorImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/SelectorImpl.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 SelectorImpl.java
--- gnu/java/nio/SelectorImpl.java	20 Oct 2003 15:32:56 -0000	1.13
+++ gnu/java/nio/SelectorImpl.java	8 Jan 2004 08:43:01 -0000
@@ -65,12 +65,34 @@
   private Set keys;
   private Set selected;
 
+  /**
+   * A dummy object whose monitor regulates access to both our
+   * selectThread and unhandledWakeup fields.
+   */
+  private Object selectThreadMutex = new Object ();
+  
+  /**
+   * Any thread that's currently blocked in a select operation.
+   */
+  private Thread selectThread;
+  
+  /**
+   * Indicates whether we have an unhandled wakeup call. This can
+   * be due to either wakeup() triggering a thread interruption while
+   * a thread was blocked in a select operation (in which case we need
+   * to reset this thread's interrupt status after interrupting the
+   * select), or else that no thread was on a select operation at the
+   * time that wakeup() was called, in which case the following select()
+   * operation should return immediately with nothing selected.
+   */
+  private boolean unhandledWakeup;
+
   public SelectorImpl (SelectorProvider provider)
   {
     super (provider);
     
-    keys = new HashSet();
-    selected = new HashSet();
+    keys = new HashSet ();
+    selected = new HashSet ();
   }
 
   protected void finalize() throws Throwable
@@ -81,61 +103,78 @@
   protected final void implCloseSelector()
     throws IOException
   {
-    // FIXME: We surely need to do more here.
+    // Cancel any pending select operation.
     wakeup();
+    
+    synchronized (keys)
+      {
+        synchronized (selected)
+          {
+            synchronized (cancelledKeys ())
+              {
+                // FIXME: Release resources here.
+              }
+          }
+      }
   }
 
   public final Set keys()
   {
+    if (!isOpen())
+      throw new ClosedSelectorException();
+
     return Collections.unmodifiableSet (keys);
   }
     
   public final int selectNow()
     throws IOException
   {
+    // FIXME: We're simulating an immediate select
+    // via a select with a timeout of one millisecond.
     return select (1);
   }
 
   public final int select()
     throws IOException
   {
-    return select (-1);
+    return select (0);
   }
 
-  // A timeout value of -1 means block forever.
+  // A timeout value of 0 means block forever.
   private static native int implSelect (int[] read, int[] write,
-                                        int[] except, long timeout);
+                                        int[] except, long timeout)
+    throws IOException;
 
   private final int[] getFDsAsArray (int ops)
   {
     int[] result;
     int counter = 0;
-    Iterator it = keys.iterator();
+    Iterator it = keys.iterator ();
 
     // Count the number of file descriptors needed
-    while (it.hasNext())
+    while (it.hasNext ())
       {
-        SelectionKeyImpl key = (SelectionKeyImpl) it.next();
+        SelectionKeyImpl key = (SelectionKeyImpl) it.next ();
 
-        if ((key.interestOps() & ops) != 0)
+        if ((key.interestOps () & ops) != 0)
           {
             counter++;
           }
       }
 
-    result = new int [counter];
+    result = new int[counter];
 
     counter = 0;
-    it = keys.iterator();
+    it = keys.iterator ();
 
     // Fill the array with the file descriptors
-    while (it.hasNext())
+    while (it.hasNext ())
       {
-        SelectionKeyImpl key = (SelectionKeyImpl) it.next();
+        SelectionKeyImpl key = (SelectionKeyImpl) it.next ();
 
-        if ((key.interestOps() & ops) != 0)
+        if ((key.interestOps () & ops) != 0)
           {
-            result [counter] = key.getNativeFD();
+            result[counter] = key.getNativeFD();
             counter++;
           }
       }
@@ -143,48 +182,109 @@
     return result;
   }
 
-  public int select (long timeout)
+  public synchronized int select (long timeout)
+    throws IOException
   {
     if (!isOpen())
       throw new ClosedSelectorException();
 
-    if (keys == null)
+    synchronized (keys)
+      {
+        synchronized (selected)
       {
-        return 0;
-      }
-
     deregisterCancelledKeys();
 
     // Set only keys with the needed interest ops into the arrays.
-    int[] read = getFDsAsArray (SelectionKey.OP_READ | SelectionKey.OP_ACCEPT);
-    int[] write = getFDsAsArray (SelectionKey.OP_WRITE | SelectionKey.OP_CONNECT);
-    int[] except = new int [0]; // FIXME: We dont need to check this yet
-    int anzahl = read.length + write.length + except.length;
+            int[] read = getFDsAsArray (SelectionKey.OP_READ
+                                        | SelectionKey.OP_ACCEPT);
+            int[] write = getFDsAsArray (SelectionKey.OP_WRITE
+                                         | SelectionKey.OP_CONNECT);
+
+            // FIXME: We dont need to check this yet
+            int[] except = new int [0];
+
+            // Test to see if we've got an unhandled wakeup call,
+            // in which case we return immediately. Otherwise,
+            // remember our current thread and jump into the select.
+            // The monitor for dummy object selectThreadMutex regulates
+            // access to these fields.
+
+            // FIXME: Not sure from the spec at what point we should
+            // return "immediately". Is it here or immediately upon
+            // entry to this function?
+            
+            // NOTE: There's a possibility of another thread calling
+            // wakeup() immediately after our thread releases
+            // selectThreadMutex's monitor here, in which case we'll
+            // do the select anyway. Since calls to wakeup() and select()
+            // among different threads happen in non-deterministic order,
+            // I don't think this is an issue.
+            synchronized (selectThreadMutex)
+              {
+                if (unhandledWakeup)
+                  {
+                    unhandledWakeup = false;
+                    return 0;
+                  }
+                else
+                  {
+                    selectThread = Thread.currentThread ();
+                  }
+              }
 
     // Call the native select() on all file descriptors.
+            int result = 0;
+            try
+              {
     begin();
-    int result = implSelect (read, write, except, timeout);
+                result = implSelect (read, write, except, timeout);
+              }
+            finally
+              {
     end();
+              }
+
+            // If our unhandled wakeup flag is set at this point,
+            // reset our thread's interrupt flag because we were
+            // awakened by wakeup() instead of an external thread
+            // interruption.
+            //
+            // NOTE: If we were blocked in a select() and one thread
+            // called Thread.interrupt() on the blocked thread followed
+            // by another thread calling Selector.wakeup(), then race
+            // conditions could make it so that the thread's interrupt
+            // flag is reset even though the Thread.interrupt() call
+            // "was there first". I don't think we need to care about
+            // this scenario.
+            synchronized (selectThreadMutex)
+              {
+                if (unhandledWakeup)
+                  {
+                    unhandledWakeup = false;
+                    selectThread.interrupted ();
+                  }
+                selectThread = null;
+              }
 
-    Iterator it = keys.iterator();
+            Iterator it = keys.iterator ();
 
-    while (it.hasNext())
+            while (it.hasNext ())
       {
         int ops = 0;
-        SelectionKeyImpl key = (SelectionKeyImpl) it.next();
+                SelectionKeyImpl key = (SelectionKeyImpl) it.next ();
 
         // If key is already selected retrieve old ready ops.
         if (selected.contains (key))
           {
-            ops = key.readyOps();
+                    ops = key.readyOps ();
           }
 
         // Set new ready read/accept ops
         for (int i = 0; i < read.length; i++)
           {
-            if (key.getNativeFD() == read [i])
+                    if (key.getNativeFD() == read[i])
               {
-                if (key.channel() instanceof ServerSocketChannelImpl)
+                        if (key.channel () instanceof ServerSocketChannelImpl)
                   {
                     ops = ops | SelectionKey.OP_ACCEPT;
                   }
@@ -198,18 +298,18 @@
         // Set new ready write ops
         for (int i = 0; i < write.length; i++)
           {
-            if (key.getNativeFD() == write [i])
+                    if (key.getNativeFD() == write[i])
               {
                 ops = ops | SelectionKey.OP_WRITE;
                 
-//                 if (key.channel().isConnected())
-//                   {
-//                     ops = ops | SelectionKey.OP_WRITE;
-//                   }
-//                 else
-//                   {
-//                     ops = ops | SelectionKey.OP_CONNECT;
-//                   }
+        //                 if (key.channel ().isConnected ())
+        //                   {
+        //                     ops = ops | SelectionKey.OP_WRITE;
+        //                   }
+        //                 else
+        //                   {
+        //                     ops = ops | SelectionKey.OP_CONNECT;
+        //                   }
              }
           }
 
@@ -222,31 +322,58 @@
           }
 
         // Set new ready ops
-        key.readyOps (key.interestOps() & ops);
+                key.readyOps (key.interestOps () & ops);
       }
-
     deregisterCancelledKeys();
+            
     return result;
   }
+        }
+  }
     
   public final Set selectedKeys()
   {
+    if (!isOpen())
+      throw new ClosedSelectorException();
+
     return selected;
   }
 
   public final Selector wakeup()
   {
-    return null;
+    // IMPLEMENTATION NOTE: Whereas the specification says that
+    // thread interruption should trigger a call to wakeup, we
+    // do the reverse under the covers: wakeup triggers a thread
+    // interrupt followed by a subsequent reset of the thread's
+    // interrupt status within select().
+    
+    // First, acquire the monitor of the object regulating
+    // access to our selectThread and unhandledWakeup fields.
+    synchronized (selectThreadMutex)
+      {
+        unhandledWakeup = true;
+        
+        // Interrupt any thread which is currently blocked in
+        // a select operation.
+        if (selectThread != null)
+          selectThread.interrupt ();
+      }
+      
+    return this;
   }
 
   private final void deregisterCancelledKeys()
   {
-    Iterator it = cancelledKeys().iterator();
+    Set ckeys = cancelledKeys ();
+    synchronized (ckeys)
+    {
+      Iterator it = ckeys.iterator();
 
-    while (it.hasNext())
+      while (it.hasNext ())
       {
-        keys.remove ((SelectionKeyImpl) it.next());
-        it.remove();
+          keys.remove ((SelectionKeyImpl) it.next ());
+          it.remove ();
+        }
       }
   }
 
@@ -280,7 +407,11 @@
         throw new InternalError ("No known channel type");
       }
 
+    synchronized (keys)
+      {
     keys.add (result);
+      }
+
     result.interestOps (ops);
     result.attach (att);
     return result;

--Boundary-00=_WmR//bUKkcx1uZ3--




From MAILER-DAEMON Thu Jan 08 04:56:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeWso-0003bY-6V
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 04:55:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeWrt-0002AQ-Mo
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:54:22 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeWqo-0000o6-FF
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:53:47 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeWq7-0008ET-4f
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 04:52:31 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-112.ewetel.net
	[80.228.80.112])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i088op9u029352
	for <commit-classpath@gnu.org>; Thu, 8 Jan 2004 09:50:51 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AeVsV-0004G5-00
	for <commit-classpath@gnu.org>; Thu, 08 Jan 2004 09:50:55 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Thu, 8 Jan 2004 09:54:12 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_0qR//aB+yQG4JIY"
Message-Id: <200401080954.12533.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing.JLayeredPane
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 09:55:12 -0000


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

Hi list,


I commited the attached patch to merge fixes in javax.swing.JLayeredPane from 
libgcj.


Michael


2004-01-08  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/JLayeredPane.java: Fix semantics, add javadocs.


--Boundary-00=_0qR//aB+yQG4JIY
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.7
diff -u -b -B -r1.7 JLayeredPane.java
--- javax/swing/JLayeredPane.java	2 Dec 2003 16:50:20 -0000	1.7
+++ javax/swing/JLayeredPane.java	8 Jan 2004 08:49:04 -0000
@@ -1,39 +1,40 @@
 /* JLayeredPane.java -- 
    Copyright (C) 2002 Free Software Foundation, Inc.
 
-This file is part of GNU Classpath.
+   This file is part of GNU Classpath.
 
-GNU Classpath is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Classpath is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Classpath; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-02111-1307 USA.
-
-Linking this library statically or dynamically with other modules is
-making a combined work based on this library.  Thus, the terms and
-conditions of the GNU General Public License cover the whole
-combination.
-
-As a special exception, the copyright holders of this library give you
-permission to link this library with independent modules to produce an
-executable, regardless of the license terms of these independent
-modules, and to copy and distribute the resulting executable under
-terms of your choice, provided that you also meet, for each linked
-independent module, the terms and conditions of the license of that
-module.  An independent module is a module which is not derived from
-or based on this library.  If you modify this library, you may extend
-this exception to your version of the library, but you are not
-obligated to do so.  If you do not wish to do so, delete this
-exception statement from your version. */
+   GNU Classpath is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GNU Classpath is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Classpath; see the file COPYING.  If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.
+
+   Linking this library statically or dynamically with other modules is
+   making a combined work based on this library.  Thus, the terms and
+   conditions of the GNU General Public License cover the whole
+   combination.
+
+   As a special exception, the copyright holders of this library give you
+   permission to link this library with independent modules to produce an
+   executable, regardless of the license terms of these independent
+   modules, and to copy and distribute the resulting executable under
+   terms of your choice, provided that you also meet, for each linked
+   independent module, the terms and conditions of the license of that
+   module.  An independent module is a module which is not derived from
+   or based on this library.  If you modify this library, you may extend
+   this exception to your version of the library, but you are not
+   obligated to do so.  If you do not wish to do so, delete this
+   exception statement from your version. 
+*/
 
 
 package javax.swing;
@@ -45,37 +46,51 @@
 
 
 /**
- * The "Layered Pane" is a container which divides its children into 6 (or
- * more) disjoint sets. the pre-defined sets are:
+ * <p>The "Layered Pane" is a container which divides its children into 6 (or
+ * more) disjoint sets. the pre-defined sets are:</p>
  *
- *  "Frame Content", "Default", "Palette", "Modal", "Popup", and "Drag".
+ *  <ul>
+ *    <li>"Frame Content"</li>
+ *    <li>"Default"</li>
+ *    <li>"Palette"</li>
+ *    <li>"Modal"</li>
+ *    <li>"Popup"</li>
+ *    <li>"Drag"</li>
+ *  </ul>
  *
- * A child is in exactly one of these layers at any time, though there may
- * be other layers if someone creates them.
+ * <p>A child is in exactly one of these layers at any time, though there may
+ * be other layers if someone creates them.</p>
  *
- * The purpose of this class is to translate this view of "layers" into a
+ * <p>The purpose of this class is to translate this view of "layers" into a
  * contiguous array of components: the one held in our ancestor,
- * java.awt.Container.
+ * {@link java.awt.Container}.</p>
  *
- * There is a precise set of words we will use to refer to numbers within
- * this class:
+ * <p>There is a precise set of words we will use to refer to numbers within
+ * this class:</p>
  * 
- * Internal Component Index: an offset into the "component" array held in
- * our ancestor, java.awt.Container, from [0 .. component.length). The
- * drawing rule with internal indices is that 0 is drawn first.
- *
- * External Component Index: an offset into the "logical drawing order" of
- * this container. If I is the internal index of a component, the external
- * index E = component.length - I. The rule with external indices is that 0
- * is drawn last.
- *
- * Layer Number: a general int specifying a layer within this component.
- * Negative numbers are drawn first, then layer 0, then positive numbered
- * layers, in ascending order.
- *
- * Position: 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").
+ * <dl>
+ * <dt>Internal Component Index:</dt> 
+ * <dd>An offset into the <code>component</code> array held in our ancestor,
+ * {@link java.awt.Container}, from <code>[0 .. component.length)</code>. The drawing
+ * rule with internal indices is that 0 is drawn first.</dd>
+ *
+ * <dt>External Component Index:</dt>
+ * <dd>An offset into the "logical drawing order" of this container. If <code>I</code>
+ * is the internal index of a component, the external index <tt>E =
+ * component.length - I</tt>. The rule with external indices is that 0 is
+ * drawn last.</dd>
+ *
+ * <dt>Layer Number:</dt>
+ * <dd>A general <code>int</code> specifying a layer within this component.  Negative
+ * numbers are drawn first, then layer 0, then positive numbered layers, in
+ * ascending order.</dd>
+ *
+ * <dt>Position:</dt> 
+ * <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>
+ *
+ * @author Graydon Hoare <graydon@redhat.com>
  */
 
 public class JLayeredPane extends JComponent implements Accessible
@@ -94,6 +109,21 @@
     TreeMap layers;               // Layer Number (Integer) -> Layer Size (Integer)
     Hashtable componentToLayer;   // Component -> Layer Number (Integer)
 
+  JLayeredPane()
+  {
+    layers = new TreeMap ();
+    componentToLayer = new Hashtable ();
+  }
+
+
+  /** 
+   * Looks up the layer a child component is currently assigned to.
+   *
+   * @param c the component to look up.
+   * @return the layer the component is currently assigned to, in this container.
+   * @throws IllegalArgumentException if the component is not a child of this container.
+   */
+
     protected Integer getLayer (Component c)
     {
 	if (! componentToLayer.containsKey (c))
@@ -101,10 +131,20 @@
 	return (Integer) componentToLayer.get (c);
     }
 
-    // this returns a half-open range [bottom, top), which is the range of
-    // internal component indices this layer number corresponds to.  note
-    // that top is *not* included in the range of component indices in this
-    // layer: a layer with 0 elements in it has ret[0] == ret[1].
+  /**
+   * Returns a pair of ints representing a half-open interval
+   * <code>[bottom, top)</code>, which is the range of internal component
+   * indices the provided layer number corresponds to.
+   *
+   * Note that "top" is <em>not</em> included in the interval of 
+   * component indices in this layer: a layer with 0 elements in it has 
+   * <code>ret[0] == ret[1]</code>.
+   *
+   * @param layer the layer to look up.
+   * @return the half-open range of internal indices this layer spans.
+   * @throws IllegalArgumentException if layer does not refer to an active layer
+   * in this container.
+   */
 
     protected int[] layerToRange (Integer layer)
     {
@@ -129,6 +169,13 @@
 	throw new IllegalArgumentException ();
     }
 
+  /**
+   * Increments the recorded size of a given layer.
+   *
+   * @param layer the layer number to increment.
+   * @see #incrLayer()
+   */
+
     protected void incrLayer(Integer layer)
     {
 	int sz = 1;
@@ -137,6 +184,13 @@
 	layers.put (layer, new Integer(sz));
     }
 
+  /**
+   * Decrements the recorded size of a given layer.
+   *
+   * @param layer the layer number to decrement.
+   * @see #decrLayer()
+   */
+
     protected void decrLayer(Integer layer)
     {
 	int sz = 0;
@@ -145,18 +199,13 @@
 	layers.put (layer, new Integer(sz));
     }
 
-    JLayeredPane()
-    {
-	layers = new TreeMap ();
-	layers.put (FRAME_CONTENT_LAYER, new Integer (0));
-	layers.put (DEFAULT_LAYER, new Integer (0));
-	layers.put (PALETTE_LAYER, new Integer (0));
-	layers.put (MODAL_LAYER, new Integer (0));
-	layers.put (POPUP_LAYER, new Integer (0));
-	layers.put (DRAG_LAYER, new Integer (0));	
-
-	componentToLayer = new Hashtable ();
-    }
+  /**
+   * Return the greatest layer number currently in use, in this container.
+   * This number may legally be positive <em>or</em> negative.
+   *
+   * @return the least layer number.
+   * @see #lowestLayer()
+   */
 
     public int highestLayer()
     {
@@ -165,6 +214,14 @@
 	return ((Integer)(layers.lastKey ())).intValue ();
     }
     
+  /**
+   * Return the least layer number currently in use, in this container.
+   * This number may legally be positive <em>or</em> negative.
+   *
+   * @return the least layer number.
+   * @see #highestLayer()
+   */
+    
     public int lowestLayer()
     {
 	if (layers.size() == 0)
@@ -172,16 +229,54 @@
 	return ((Integer)(layers.firstKey ())).intValue ();
     }
 
+  /**
+   * Moves a component to the "front" of its layer. The "front" is a
+   * synonym for position 0, which is also the last position drawn in each
+   * layer, so is usually the component which occludes the most other
+   * components in its layer.
+   *
+   * @param c the component to move to the front of its layer.
+   * @throws IllegalArgumentException if the component is not a child of
+   * this container.
+   * @see #moveToBack()
+   */
+
     public void moveToFront(Component c)
     {
 	setPosition (c, 0);
     }
 
+  /**
+   * <p>Moves a component to the "back" of its layer. The "back" is a
+   * synonym for position N-1 (also known as position -1), where N is the
+   * size of the layer.</p>
+   *
+   * <p>The "back" of a layer is the first position drawn, so the component at
+   * the "back" is usually the component which is occluded by the most
+   * other components in its layer.</p>
+   *
+   * @param c the component to move to the back of its layer.
+   * @throws IllegalArgumentException if the component is not a child of
+   * this container.
+   * @see #moveToFront()
+   */
+
     public void moveToBack(Component c)
     {
 	setPosition (c, -1);
     }
     
+  /**
+   * Return the position of a component within its layer. Positions are assigned
+   * from the "front" (position 0) to the "back" (position N-1), and drawn from 
+   * the back towards the front.
+   *
+   * @param c the component to get the position of.
+   * @throws IllegalArgumentException if the component is not a child of
+   * this container.
+   * @see #setPosition()
+   */
+    
     public int getPosition(Component c)
     {
 	Integer layer = getLayer (c);
@@ -197,6 +292,18 @@
 	throw new IllegalArgumentException ();
     }
 
+  /**
+   * Change the position of a component within its layer. Positions are assigned
+   * from the "front" (position 0) to the "back" (position N-1), and drawn from 
+   * the back towards the front.
+   *
+   * @param c the component to change the position of.
+   * @param position the position to assign the component to.
+   * @throws IllegalArgumentException if the component is not a child of
+   * this container.
+   * @see #getPosition()
+   */
+
     public void setPosition(Component c, int position)
     {
 	Integer layer = getLayer (c);
@@ -223,15 +330,19 @@
 	    // should have found it
 	    throw new IllegalArgumentException ();
 
-	// System.err.println("set component position to " + position + " in layer " + layer);
-
-	Component tmp = comps[curr];
-	super.remove (curr);
-	super.add (tmp, targ);
-	super.validate ();
+    super.swapComponents (curr, targ);
+    validate();
+    repaint();
     }
     
-
+  /**
+   * Return an array of all components within a layer of this
+   * container. Components are ordered back-to-front, with the "back"
+   * element (which draws first) at position 0 of the returned array.
+   *
+   * @param layer the layer to return components from.
+   * @return the components in the layer.
+   */
 
     public Component[] getComponentsInLayer(int layer)
     {
@@ -249,20 +360,46 @@
 	    }
     }
 
+  /**
+   * Return the number of components within a layer of this
+   * container. 
+   *
+   * @param layer the layer count components in.
+   * @return the number of components in the layer.
+   */
+
     public int getComponentCountInLayer(int layer)
     {
 	int[] range = layerToRange (getObjectForLayer (layer));
 	if (range[0] == range[1])
 	    return 0;
 	else
-	    return ((range[1] - 1) - range[0]);
+	    return (range[1] - range[0]);
     }
 
+  /**
+   * Return a hashtable mapping child components of this container to
+   * Integer objects representing the component's layer assignments.
+   */
+
     protected Hashtable getComponentToLayer()
     {
 	return componentToLayer;
     }
 
+
+  /**
+   * Return the index of a component within the underlying (contiguous)
+   * array of children. This is a "raw" number which does not represent the
+   * child's position in a layer, but rather its position in the
+   * concatenation of <em>all</em> layers within the container.
+   *
+   * @param c the component to look up.
+   * @return the internal index of the component.
+   * @throws IllegalArgumentException if the component is not a child of
+   * this container.
+   */
+
     protected int getInternalIndexOf(Component c) 
     {
 	Integer layer = getLayer (c);
@@ -278,6 +415,18 @@
     }
 
 
+  /**
+   * Return the external index of a component within the underlying
+   * (contiguous) array of children. This is a "raw" number which does not
+   * represent the child's position in a layer, but rather its position in
+   * the logical drawing order of all children of the container.
+   *
+   * @param c the component to look up.
+   * @return the external index of the component.
+   * @throws IllegalArgumentException if the component is not a child of
+   * this container.
+   */
+
     public int getIndexOf(Component c) 
     {
 	// returns the *external* index of the component.
@@ -285,6 +434,14 @@
 	return top - getIndexOf (c);
     }    
 
+  /**
+   * Return an Integer object which holds the same int value as the
+   * parameter. This is strictly an optimization to minimize the number of
+   * identical Integer objects which we allocate.
+   *
+   * @param layer the layer number as an int.
+   * @return the layer number as an Integer, possibly shared.
+   */
 
     protected Integer getObjectForLayer(int layer)
     {
@@ -315,9 +472,23 @@
 	return new Integer(layer);
     }
     
+  /**
+   * Computes an internal index at which to request the superclass {@link
+   * java.awt.Container} inserts a component, given an abstract layer and
+   * position number.
+   *
+   * @param layer the layer in which to insert a component.
+   * @param position the position in the layer at which to insert a component.
+   * @return the internal index at which to insert the component.
+   */
+    
     protected int insertIndexForLayer(int layer, int position)
     {
-	int[] range = layerToRange (getObjectForLayer (layer));
+
+    Integer lobj = getObjectForLayer (layer);
+    if (! layers.containsKey(lobj))
+      layers.put (lobj, new Integer (0));
+    int[] range = layerToRange (lobj);
 	if (range[0] == range[1])
 	    return range[0];
 	
@@ -330,6 +501,13 @@
 	    return top - position;
     }
     
+  /**
+   * Removes a child from this container. The child is specified by
+   * internal index. After removal, the child no longer occupies a layer.
+   *
+   * @param index the internal index of the child component to remove.
+   */
+    
     public void remove (int index)
     {
 	Component c = getComponent (index);
@@ -339,35 +517,64 @@
 	super.remove (index);
     }
 	
+  /**
+   * Removes a child from this container. The child is specified directly.
+   * After removal, the child no longer occupies a layer.
+   *
+   * @param comp the child to remove.
+   */
+	
     public void remove (Component comp)
     {
-	Integer layer = getLayer (comp);
-	decrLayer (layer);
-	componentToLayer.remove (comp);
-	super.remove (comp);
+    remove (getInternalIndexOf (comp));
     }
 
-    public void removeAll ()
-    {
-	componentToLayer.clear ();
-	layers.clear ();
-	super.removeAll ();
-    }
+  /**
+   * <p>Set the layer property for a component, within this container. The
+   * component will be implicitly mapped to the bottom-most position in the
+   * layer, but only if added <em>after</em> calling this method.</p>
+   *
+   * <p>Read that carefully: this method should be called <em>before</em> the
+   * component is added to the container.</p>
+   *
+   * @param c the component to set the layer property for.
+   * @param layer the layer number to assign to the component.
+   */
 
     public void setLayer(Component c, int layer)
     {
 	componentToLayer.put (c, getObjectForLayer (layer));
     }
 
+  /**
+   * Set the layer and position of a component, within this container. 
+   *
+   * @param c the child component to set the layer property for.
+   * @param layer the layer number to assign to the component.
+   * @param position the position number to assign to the component.
+   */
+
     public void setLayer(Component c,
 			 int layer,
 			 int position)
     {
 	componentToLayer.put (c, getObjectForLayer (layer));
 	setPosition(c, position);
+    validate();
         repaint();
     }
 
+  /**
+   * Overrides the default implementation from {@link java.awt.Container}
+   * such that <code>layerConstraint</code> is interpreted as an {@link
+   * Integer}, specifying the layer to which the component will be added
+   * (at the bottom position).
+   *
+   * @param comp the component to add.
+   * @param layerConstraint an integer specifying the layer to add the component to.
+   * @param index an ignored parameter, for compatibility.
+   */
+
     protected void addImpl(Component comp, Object layerConstraint, int index) 
     {        	
 	Integer layer;
@@ -382,8 +589,6 @@
 	componentToLayer.put (comp, layer);
 	incrLayer (layer);
 
-	// System.err.println("adding component to layer " + layer);
-	
         super.addImpl(comp, null, newIdx);	
         validate();
         repaint();

--Boundary-00=_0qR//aB+yQG4JIY--




From MAILER-DAEMON Thu Jan 08 05:22:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeXIl-0002yU-HI
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 05:22:07 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeXIi-0002w8-I4
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:22:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeXIA-0002fT-Fz
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:22:01 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeXI9-0002f2-R4
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:21:29 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AeWKM-0006kQ-00
	for <commit-classpath@gnu.org>; Thu, 08 Jan 2004 10:19:42 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
In-Reply-To: <200401080954.12533.konqueror@gmx.de>
References: <200401080954.12533.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-XBuQj7umoqdyRYaFf6Hb"
Message-Id: <1073553598.14310.16.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Thu, 08 Jan 2004 10:19:58 +0100
Subject: Re: FYI: Patch: javax.swing.JLayeredPane
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 10:22:06 -0000


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

Hi,

On Thu, 2004-01-08 at 09:54, Michael Koch wrote:
> diff -u -b -B -r1.7 JLayeredPane.java
> --- javax/swing/JLayeredPane.java       2 Dec 2003 16:50:20 -0000       1=
.7
> +++ javax/swing/JLayeredPane.java       8 Jan 2004 08:49:04 -0000
> @@ -1,39 +1,40 @@
>  /* JLayeredPane.java --=20
>     Copyright (C) 2002 Free Software Foundation, Inc.
> =20
> -This file is part of GNU Classpath.
> +   This file is part of GNU Classpath.
> =20
> -GNU Classpath is free software; you can redistribute it and/or modify
> -it under the terms of the GNU General Public License as published by
> -the Free Software Foundation; either version 2, or (at your option)
> -any later version.
> -
> -GNU Classpath is distributed in the hope that it will be useful, but
> -WITHOUT ANY WARRANTY; without even the implied warranty of
> -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> -General Public License for more details.
> -
> -You should have received a copy of the GNU General Public License
> -along with GNU Classpath; see the file COPYING.  If not, write to the
> -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> -02111-1307 USA.
> -
> -Linking this library statically or dynamically with other modules is
> -making a combined work based on this library.  Thus, the terms and
> -conditions of the GNU General Public License cover the whole
> -combination.
> -
> -As a special exception, the copyright holders of this library give you
> -permission to link this library with independent modules to produce an
> -executable, regardless of the license terms of these independent
> -modules, and to copy and distribute the resulting executable under
> -terms of your choice, provided that you also meet, for each linked
> -independent module, the terms and conditions of the license of that
> -module.  An independent module is a module which is not derived from
> -or based on this library.  If you modify this library, you may extend
> -this exception to your version of the library, but you are not
> -obligated to do so.  If you do not wish to do so, delete this
> -exception statement from your version. */
> +   GNU Classpath is free software; you can redistribute it and/or modify
> +   it under the terms of the GNU General Public License as published by
> +   the Free Software Foundation; either version 2, or (at your option)
> +   any later version.
> +
> +   GNU Classpath is distributed in the hope that it will be useful, but
> +   WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +   General Public License for more details.
> +
> +   You should have received a copy of the GNU General Public License
> +   along with GNU Classpath; see the file COPYING.  If not, write to the
> +   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, M=
A
> +   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 yo=
u
> +   permission to link this library with independent modules to produce a=
n
> +   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.=20
> +*/

Please use the standard boilerplate (non-indented).

Thanks,

Mark

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

iD8DBQA//SC+xVhZCJWr9QwRAu91AKCCXmngMxPl8JmwIrv1RPu4qE2J6gCfUWrD
Oa5nqK35n0Un1ZQbLITMCMQ=
=symI
-----END PGP SIGNATURE-----

--=-XBuQj7umoqdyRYaFf6Hb--




From MAILER-DAEMON Thu Jan 08 05:37:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeXXz-0000a5-Ji
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 05:37:51 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeXXw-0000Yq-Np
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:37:48 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeXUU-0007PR-89
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:34:47 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeXUM-000762-2a
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:34:06 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-112.ewetel.net
	[80.228.80.112])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i089WVl1019805;
	Thu, 8 Jan 2004 10:32:32 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AeWWo-0008Pz-00; Thu, 08 Jan 2004 10:32:34 +0100
Date: Thu, 8 Jan 2004 10:32:34 +0100
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Message-ID: <20040108093234.GA16237@mail.konqueror.de>
References: <200401080954.12533.konqueror@gmx.de>
	<1073553598.14310.16.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1073553598.14310.16.camel@elsschot.wildebeest.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: javax.swing.JLayeredPane
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 10:37:49 -0000

On Thu, Jan 08, 2004 at 10:19:58AM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Thu, 2004-01-08 at 09:54, Michael Koch wrote:
> > diff -u -b -B -r1.7 JLayeredPane.java
> > --- javax/swing/JLayeredPane.java       2 Dec 2003 16:50:20 -0000       1.7
> > +++ javax/swing/JLayeredPane.java       8 Jan 2004 08:49:04 -0000
> > @@ -1,39 +1,40 @@
> >  /* JLayeredPane.java -- 
> >     Copyright (C) 2002 Free Software Foundation, Inc.
> >  
> > -This file is part of GNU Classpath.
> > +   This file is part of GNU Classpath.
> >  
> > -GNU Classpath is free software; you can redistribute it and/or modify
> > -it under the terms of the GNU General Public License as published by
> > -the Free Software Foundation; either version 2, or (at your option)
> > -any later version.
> > -
> > -GNU Classpath is distributed in the hope that it will be useful, but
> > -WITHOUT ANY WARRANTY; without even the implied warranty of
> > -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > -General Public License for more details.
> > -
> > -You should have received a copy of the GNU General Public License
> > -along with GNU Classpath; see the file COPYING.  If not, write to the
> > -Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> > -02111-1307 USA.
> > -
> > -Linking this library statically or dynamically with other modules is
> > -making a combined work based on this library.  Thus, the terms and
> > -conditions of the GNU General Public License cover the whole
> > -combination.
> > -
> > -As a special exception, the copyright holders of this library give you
> > -permission to link this library with independent modules to produce an
> > -executable, regardless of the license terms of these independent
> > -modules, and to copy and distribute the resulting executable under
> > -terms of your choice, provided that you also meet, for each linked
> > -independent module, the terms and conditions of the license of that
> > -module.  An independent module is a module which is not derived from
> > -or based on this library.  If you modify this library, you may extend
> > -this exception to your version of the library, but you are not
> > -obligated to do so.  If you do not wish to do so, delete this
> > -exception statement from your version. */
> > +   GNU Classpath is free software; you can redistribute it and/or modify
> > +   it under the terms of the GNU General Public License as published by
> > +   the Free Software Foundation; either version 2, or (at your option)
> > +   any later version.
> > +
> > +   GNU Classpath is distributed in the hope that it will be useful, but
> > +   WITHOUT ANY WARRANTY; without even the implied warranty of
> > +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> > +   General Public License for more details.
> > +
> > +   You should have received a copy of the GNU General Public License
> > +   along with GNU Classpath; see the file COPYING.  If not, write to the
> > +   Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
> > +   02111-1307 USA.
> > +
> > +   Linking this library statically or dynamically with other modules is
> > +   making a combined work based on this library.  Thus, the terms and
> > +   conditions of the GNU General Public License cover the whole
> > +   combination.
> > +
> > +   As a special exception, the copyright holders of this library give you
> > +   permission to link this library with independent modules to produce an
> > +   executable, regardless of the license terms of these independent
> > +   modules, and to copy and distribute the resulting executable under
> > +   terms of your choice, provided that you also meet, for each linked
> > +   independent module, the terms and conditions of the license of that
> > +   module.  An independent module is a module which is not derived from
> > +   or based on this library.  If you modify this library, you may extend
> > +   this exception to your version of the library, but you are not
> > +   obligated to do so.  If you do not wish to do so, delete this
> > +   exception statement from your version. 
> > +*/
> 
> Please use the standard boilerplate (non-indented).

Damn, Graydon "fixed" this the wrong way. I will revert this part soon.


Michael



From MAILER-DAEMON Thu Jan 08 05:50:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeXkA-0008Ut-MS
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 05:50:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeXk6-0008RA-RC
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:50:22 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeXjV-00087L-Ka
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:50:16 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeXjU-00086k-RF
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 05:49:44 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-112.ewetel.net
	[80.228.80.112])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i089mC9u028073;
	Thu, 8 Jan 2004 10:48:13 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AeWm0-0008RK-00; Thu, 08 Jan 2004 10:48:16 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Thu, 8 Jan 2004 10:51:33 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_lgS//SawjYvtppA"
Message-Id: <200401081051.33990.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: javax.swing.JLayeredPane
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 10:50:24 -0000


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

Hi lists,


I commited the attached patch to revert a little change by Graydon Hoare that 
indented the standard boilerplate.


Michael


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

	* javax/swing/JLayeredPane.java: Revert changes to standard
	boilerplate, reworked imports.


--Boundary-00=_lgS//SawjYvtppA
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.8
diff -u -b -B -r1.8 JLayeredPane.java
--- javax/swing/JLayeredPane.java	8 Jan 2004 08:49:45 -0000	1.8
+++ javax/swing/JLayeredPane.java	8 Jan 2004 09:45:30 -0000
@@ -1,49 +1,48 @@
 /* JLayeredPane.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 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. 
-*/
+This file is part of GNU Classpath.
 
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
 
 package javax.swing;
 
 import java.awt.Component;
-import java.util.*;
-import java.awt.Component;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
 import javax.accessibility.Accessible;
-
 
 /**
  * <p>The "Layered Pane" is a container which divides its children into 6 (or

--Boundary-00=_lgS//SawjYvtppA--




From MAILER-DAEMON Thu Jan 08 06:09:18 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeY2P-0008CG-BW
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 06:09:17 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeY2H-00083w-Tq
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 06:09:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeY1b-0007eg-Ug
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 06:08:59 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeY1b-0007eA-3k
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 06:08:27 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AeX3o-0006rh-00
	for <commit-classpath@gnu.org>; Thu, 08 Jan 2004 11:06:40 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
In-Reply-To: <200401071031.19241.konqueror@gmx.de>
References: <200401071031.19241.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-46Qd1vvaTOgc95qmPIpK"
Message-Id: <1073556416.14306.59.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Thu, 08 Jan 2004 11:06:56 +0100
Subject: Re: FYI: Patch: java.text - more merging
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 11:09:14 -0000


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

Hi,

On Wed, 2004-01-07 at 10:31, Michael Koch wrote:
> 2004-01-07  Michael Koch  <konqueror@gmx.de>
>=20
> 	* java/text/CollationElementIterator.java
> 	(collator): Made package-private.
> 	(text): Likewise.
> 	(index): Likewise.
> 	(textIndex): Likewise.

Why? They are not used outside this class.

>         * java/text/CollationKey.java
>         (hashCode): Reimplemented.

Are you sure this new implementation is correct?
My Class Libraries book says that the hash code is not based on the
string from which the key was created. Seems you want to base it on the
toByteArray() (key) form.
You should at least document the hashCode() algorithm in the api doc.
Best would be to write a little mauve test for it to see if the equals()
then same hashCode() contract is still obeyed, looks like the equals()
method might also be wrong since the Class Libraries book says "It is
not necessary for the strings from which the keys were created to be
equal."

Cheers,

Mark

--=-46Qd1vvaTOgc95qmPIpK
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)

iD8DBQA//SvAxVhZCJWr9QwRAlC+AKCvGJ17buVfcKUDbGJKq5lnt/NRgACfUg8I
/xDhKye5ffBEdJl9Py/6A+A=
=aBgu
-----END PGP SIGNATURE-----

--=-46Qd1vvaTOgc95qmPIpK--




From MAILER-DAEMON Thu Jan 08 13:43:38 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aef1G-00075N-7j
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 13:36:34 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aeetq-0006O1-5E
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 13:28:54 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aeesv-0006DS-En
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 13:28:28 -0500
Received: from [195.8.69.18] (helo=oceanus2.uk.clara.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aeess-0006Ch-GM
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 13:27:54 -0500
Received: from du-253-232.nat.adsl.claranet.fr ([212.43.253.232]
	helo=[10.0.1.2]) by oceanus2.uk.clara.net with esmtp (Exim 3.36 #2)
	id 1AedvE-0000FF-00
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 17:26:16 +0000
Mime-Version: 1.0 (Apple Message framework v609)
In-Reply-To: <877k03s8o0.fsf@fleche.redhat.com>
References: <D4BDDC41-413A-11D8-BCCF-003065B22A76@bluezoo.org>
	<877k03s8o0.fsf@fleche.redhat.com>
Content-Type: multipart/mixed; boundary=Apple-Mail-2-786289453
Message-Id: <BFE281B3-41FF-11D8-ADF0-003065B22A76@bluezoo.org>
From: Chris Burdess <dog@bluezoo.org>
Date: Thu, 8 Jan 2004 18:26:09 +0100
To: commit-classpath@gnu.org
X-Mailer: Apple Mail (2.609)
Subject: inetlib build fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Jan 2004 18:36:30 -0000


--Apple-Mail-2-786289453
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream; x-unix-mode=0644; name="inetlib.diff.1"
Content-Disposition: attachment;
	filename=inetlib.diff.1

Index: Makefile.am
===================================================================
RCS file: /cvsroot/classpath/inetlib/Makefile.am,v
retrieving revision 1.1
diff -r1.1 Makefile.am
7a8
> JAVADOC = @JAVADOC@
10a12
> doc = docs
141a144,153
> # Package names for gjdoc
> package_names = \
> gnu.inet.util \
> gnu.inet.smtp \
> gnu.inet.imap \
> gnu.inet.pop3 \
> gnu.inet.nntp \
> gnu.inet.ftp \
> gnu.inet.gopher
> 
143,144c155
< BUILT_SOURCES = inetlib_jar
< #BUILT_SOURCES = smtp imap pop3 nntp ftp gopher
---
> BUILT_SOURCES = $(inetlib_jar)
162,163d172
< inetlib_jar: $(inetlib_jar)
< 
221a231,234
> javadoc:
> 	mkdir -p $(doc)
> 	$(JAVADOC) -d $(doc) -windowtitle "GNU inetlib API documentation" -sourcepath $(src) $(package_names)
> 
224a238
> 	rm -r $(doc)
228c242
< 	rm -f Makefile config.log config.status
---
> 	rm -f config.log config.status
Index: Makefile.in
===================================================================
RCS file: /cvsroot/classpath/inetlib/Makefile.in,v
retrieving revision 1.1
diff -r1.1 Makefile.in
1c1,2
< # Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
---
> # Makefile.in generated by automake 1.6.3 from Makefile.am.
> # @configure_input@
3c4,5
< # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
---
> # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
> # Free Software Foundation, Inc.
13,14c15
< # Makefile.am for GNU classpath inetlib.
< 
---
> @SET_MAKE@
15a17
> # Makefile.am for GNU classpath inetlib.
36,38d37
< 
< DESTDIR =
< 
42d40
< 
49a48
> am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
51c50
< INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
---
> INSTALL_PROGRAM = @INSTALL_PROGRAM@
52a52,54
> install_sh_DATA = $(install_sh) -c -m 644
> install_sh_PROGRAM = $(install_sh) -c
> install_sh_SCRIPT = $(install_sh) -c
53a56
> INSTALL_HEADER = $(INSTALL_DATA)
55d57
< 
68,69c70
< CC = @CC@
< CPP = @CPP@
---
> 
71c72,78
< HAVE_LIB = @HAVE_LIB@
---
> OBJEXT = @OBJEXT@
> PATH_SEPARATOR = @PATH_SEPARATOR@
> AMTAR = @AMTAR@
> AWK = @AWK@
> CPP = @CPP@
> DEPDIR = @DEPDIR@
> INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
73a81,84
> 
> JAVAC = @JAVAC@
> #JAVACFLAGS = @JAVACFLAGS@
> JAVACFLAGS = -g
80,82d90
< LIB = @LIB@
< LTLIB = @LTLIB@
< MAKEINFO = @MAKEINFO@
83a92
> STRIP = @STRIP@
85a95,97
> am__include = @am__include@
> am__quote = @am__quote@
> install_sh = @install_sh@
88,91d99
< JAVAC = @JAVAC@
< #JAVACFLAGS = @JAVACFLAGS@
< JAVACFLAGS = -g
< 
93a102,118
> doc = docs
> 
> inetlib_jar = inetlib.jar
> 
> @ENABLE_SMTP_TRUE@smtp_jar = smtp.jar
> 
> @ENABLE_IMAP_TRUE@imap_jar = imap.jar
> @ENABLE_IMAP_FALSE@imap_jar = 
> 
> @ENABLE_POP3_TRUE@pop3_jar = pop3.jar
> @ENABLE_POP3_FALSE@pop3_jar = 
> 
> @ENABLE_NNTP_TRUE@nntp_jar = nntp.jar
> @ENABLE_NNTP_FALSE@nntp_jar = 
> 
> @ENABLE_FTP_TRUE@ftp_jar = ftp.jar
> @ENABLE_FTP_FALSE@ftp_jar = 
95c120,121
< inetlib_jar = 1
---
> @ENABLE_GOPHER_TRUE@gopher_jar = gopher.jar
> @ENABLE_GOPHER_FALSE@gopher_jar = 
98c124,135
< util_sources =  $(src)/gnu/inet/util/BASE64.java $(src)/gnu/inet/util/CRLFInputStream.java $(src)/gnu/inet/util/CRLFOutputStream.java $(src)/gnu/inet/util/LineInputStream.java $(src)/gnu/inet/util/Logger.java $(src)/gnu/inet/util/MessageInputStream.java $(src)/gnu/inet/util/MessageOutputStream.java $(src)/gnu/inet/util/SaslCallbackHandler.java $(src)/gnu/inet/util/SaslInputStream.java $(src)/gnu/inet/util/SaslOutputStream.java $(src)/gnu/inet/util/StderrLogger.java
---
> util_sources = \
> $(src)/gnu/inet/util/BASE64.java \
> $(src)/gnu/inet/util/CRLFInputStream.java \
> $(src)/gnu/inet/util/CRLFOutputStream.java \
> $(src)/gnu/inet/util/LineInputStream.java \
> $(src)/gnu/inet/util/Logger.java \
> $(src)/gnu/inet/util/MessageInputStream.java \
> $(src)/gnu/inet/util/MessageOutputStream.java \
> $(src)/gnu/inet/util/SaslCallbackHandler.java \
> $(src)/gnu/inet/util/SaslInputStream.java \
> $(src)/gnu/inet/util/SaslOutputStream.java \
> $(src)/gnu/inet/util/StderrLogger.java
102c139,142
< smtp_sources =  $(src)/gnu/inet/smtp/Parameter.java $(src)/gnu/inet/smtp/ParameterList.java $(src)/gnu/inet/smtp/SMTPConnection.java
---
> smtp_sources = \
> $(src)/gnu/inet/smtp/Parameter.java \
> $(src)/gnu/inet/smtp/ParameterList.java \
> $(src)/gnu/inet/smtp/SMTPConnection.java
106c146,156
< imap_sources =  $(src)/gnu/inet/imap/IMAPConnection.java $(src)/gnu/inet/imap/IMAPConstants.java $(src)/gnu/inet/imap/IMAPException.java $(src)/gnu/inet/imap/IMAPResponse.java $(src)/gnu/inet/imap/IMAPResponseTokenizer.java $(src)/gnu/inet/imap/ListEntry.java $(src)/gnu/inet/imap/MailboxStatus.java $(src)/gnu/inet/imap/MessageStatus.java $(src)/gnu/inet/imap/Pair.java $(src)/gnu/inet/imap/UTF7imap.java
---
> imap_sources = \
> $(src)/gnu/inet/imap/IMAPConnection.java \
> $(src)/gnu/inet/imap/IMAPConstants.java \
> $(src)/gnu/inet/imap/IMAPException.java \
> $(src)/gnu/inet/imap/IMAPResponse.java \
> $(src)/gnu/inet/imap/IMAPResponseTokenizer.java \
> $(src)/gnu/inet/imap/ListEntry.java \
> $(src)/gnu/inet/imap/MailboxStatus.java \
> $(src)/gnu/inet/imap/MessageStatus.java \
> $(src)/gnu/inet/imap/Pair.java \
> $(src)/gnu/inet/imap/UTF7imap.java
110c160,161
< pop3_sources =  $(src)/gnu/inet/pop3/POP3Connection.java
---
> pop3_sources = \
> $(src)/gnu/inet/pop3/POP3Connection.java
114c165,189
< nntp_sources =  $(src)/gnu/inet/nntp/ActiveTime.java $(src)/gnu/inet/nntp/ActiveTimesIterator.java $(src)/gnu/inet/nntp/ArticleNumberIterator.java $(src)/gnu/inet/nntp/ArticleResponse.java $(src)/gnu/inet/nntp/ArticleStream.java $(src)/gnu/inet/nntp/FileNewsrc.java $(src)/gnu/inet/nntp/GroupIterator.java $(src)/gnu/inet/nntp/Group.java $(src)/gnu/inet/nntp/GroupResponse.java $(src)/gnu/inet/nntp/HeaderEntry.java $(src)/gnu/inet/nntp/HeaderIterator.java $(src)/gnu/inet/nntp/LineIterator.java $(src)/gnu/inet/nntp/Newsrc.java $(src)/gnu/inet/nntp/NNTPConnection.java $(src)/gnu/inet/nntp/NNTPConstants.java $(src)/gnu/inet/nntp/NNTPException.java $(src)/gnu/inet/nntp/OverviewIterator.java $(src)/gnu/inet/nntp/Overview.java $(src)/gnu/inet/nntp/PairIterator.java $(src)/gnu/inet/nntp/Pair.java $(src)/gnu/inet/nntp/PendingData.java $(src)/gnu/inet/nntp/PostStream.java $(src)/gnu/inet/nntp/Range.java $(src)/gnu/inet/nntp/StatusResponse.java
---
> nntp_sources = \
> $(src)/gnu/inet/nntp/ActiveTime.java \
> $(src)/gnu/inet/nntp/ActiveTimesIterator.java \
> $(src)/gnu/inet/nntp/ArticleNumberIterator.java \
> $(src)/gnu/inet/nntp/ArticleResponse.java \
> $(src)/gnu/inet/nntp/ArticleStream.java \
> $(src)/gnu/inet/nntp/FileNewsrc.java \
> $(src)/gnu/inet/nntp/GroupIterator.java \
> $(src)/gnu/inet/nntp/Group.java \
> $(src)/gnu/inet/nntp/GroupResponse.java \
> $(src)/gnu/inet/nntp/HeaderEntry.java \
> $(src)/gnu/inet/nntp/HeaderIterator.java \
> $(src)/gnu/inet/nntp/LineIterator.java \
> $(src)/gnu/inet/nntp/Newsrc.java \
> $(src)/gnu/inet/nntp/NNTPConnection.java \
> $(src)/gnu/inet/nntp/NNTPConstants.java \
> $(src)/gnu/inet/nntp/NNTPException.java \
> $(src)/gnu/inet/nntp/OverviewIterator.java \
> $(src)/gnu/inet/nntp/Overview.java \
> $(src)/gnu/inet/nntp/PairIterator.java \
> $(src)/gnu/inet/nntp/Pair.java \
> $(src)/gnu/inet/nntp/PendingData.java \
> $(src)/gnu/inet/nntp/PostStream.java \
> $(src)/gnu/inet/nntp/Range.java \
> $(src)/gnu/inet/nntp/StatusResponse.java
118c193,209
< ftp_sources =  $(src)/gnu/inet/ftp/ActiveModeDTP.java $(src)/gnu/inet/ftp/BlockInputStream.java $(src)/gnu/inet/ftp/BlockOutputStream.java $(src)/gnu/inet/ftp/CompressedInputStream.java $(src)/gnu/inet/ftp/CompressedOutputStream.java $(src)/gnu/inet/ftp/DTPInputStream.java $(src)/gnu/inet/ftp/DTP.java $(src)/gnu/inet/ftp/DTPOutputStream.java $(src)/gnu/inet/ftp/FTPConnection.java $(src)/gnu/inet/ftp/FTPException.java $(src)/gnu/inet/ftp/FTPResponse.java $(src)/gnu/inet/ftp/FTPURLConnection.java $(src)/gnu/inet/ftp/FTPURLStreamHandler.java $(src)/gnu/inet/ftp/PassiveModeDTP.java $(src)/gnu/inet/ftp/StreamInputStream.java $(src)/gnu/inet/ftp/StreamOutputStream.java
---
> ftp_sources = \
> $(src)/gnu/inet/ftp/ActiveModeDTP.java \
> $(src)/gnu/inet/ftp/BlockInputStream.java \
> $(src)/gnu/inet/ftp/BlockOutputStream.java \
> $(src)/gnu/inet/ftp/CompressedInputStream.java \
> $(src)/gnu/inet/ftp/CompressedOutputStream.java \
> $(src)/gnu/inet/ftp/DTPInputStream.java \
> $(src)/gnu/inet/ftp/DTP.java \
> $(src)/gnu/inet/ftp/DTPOutputStream.java \
> $(src)/gnu/inet/ftp/FTPConnection.java \
> $(src)/gnu/inet/ftp/FTPException.java \
> $(src)/gnu/inet/ftp/FTPResponse.java \
> $(src)/gnu/inet/ftp/FTPURLConnection.java \
> $(src)/gnu/inet/ftp/FTPURLStreamHandler.java \
> $(src)/gnu/inet/ftp/PassiveModeDTP.java \
> $(src)/gnu/inet/ftp/StreamInputStream.java \
> $(src)/gnu/inet/ftp/StreamOutputStream.java
122c213,230
< gopher_sources =  $(src)/gnu/inet/gopher/DirectoryEntry.java $(src)/gnu/inet/gopher/DirectoryListing.java $(src)/gnu/inet/gopher/GopherConnection.java $(src)/gnu/inet/gopher/GopherContentHandler.java $(src)/gnu/inet/gopher/GopherURLConnection.java $(src)/gnu/inet/gopher/GopherURLStreamHandler.java
---
> gopher_sources = \
> $(src)/gnu/inet/gopher/DirectoryEntry.java \
> $(src)/gnu/inet/gopher/DirectoryListing.java \
> $(src)/gnu/inet/gopher/GopherConnection.java \
> $(src)/gnu/inet/gopher/GopherContentHandler.java \
> $(src)/gnu/inet/gopher/GopherURLConnection.java \
> $(src)/gnu/inet/gopher/GopherURLStreamHandler.java
> 
> 
> # Package names for gjdoc
> package_names = \
> gnu.inet.util \
> gnu.inet.smtp \
> gnu.inet.imap \
> gnu.inet.pop3 \
> gnu.inet.nntp \
> gnu.inet.ftp \
> gnu.inet.gopher
126,127c234
< BUILT_SOURCES = inetlib_jar
< #BUILT_SOURCES = smtp imap pop3 nntp ftp gopher
---
> BUILT_SOURCES = $(inetlib_jar)
139a247
> subdir = .
142,145c250,257
< CONFIG_CLEAN_FILES = 
< DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
< Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess config.sub \
< configure configure.ac install-sh missing mkinstalldirs
---
> CONFIG_CLEAN_FILES =
> DIST_SOURCES =
> DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
> 	Makefile.in NEWS acinclude.m4 aclocal.m4 config.guess \
> 	config.sub configure configure.ac install-sh missing \
> 	mkinstalldirs
> all: $(BUILT_SOURCES)
> 	$(MAKE) $(AM_MAKEFLAGS) all-am
147,152d258
< 
< DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
< 
< TAR = tar
< GZIP_ENV = --best
< all: all-redirect
154,155d259
< $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) 
< 	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
157,159c261,267
< Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
< 	cd $(top_builddir) \
< 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
---
> am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
>  configure.lineno
> $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
> 	cd $(top_srcdir) && \
> 	  $(AUTOMAKE) --gnu  Makefile
> Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
> 	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
161,164c269
< $(ACLOCAL_M4):  configure.ac  acinclude.m4
< 	cd $(srcdir) && $(ACLOCAL)
< 
< config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
---
> $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
166c271
< $(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
---
> $(srcdir)/configure:  $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
167a273,276
> 
> $(ACLOCAL_M4):  configure.ac acinclude.m4
> 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
> uninstall-info-am:
170a280
> DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
171a282
> top_distdir = .
173c284,327
< top_distdir = $(distdir)
---
> 
> am__remove_distdir = \
>   { test ! -d $(distdir) \
>     || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
>          && rm -fr $(distdir); }; }
> 
> GZIP_ENV = --best
> distcleancheck_listfiles = find . -type f -print
> 
> distdir: $(DISTFILES)
> 	$(am__remove_distdir)
> 	mkdir $(distdir)
> 	@list='$(DISTFILES)'; for file in $$list; do \
> 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
> 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
> 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
> 	    dir="/$$dir"; \
> 	    $(mkinstalldirs) "$(distdir)$$dir"; \
> 	  else \
> 	    dir=''; \
> 	  fi; \
> 	  if test -d $$d/$$file; then \
> 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
> 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
> 	    fi; \
> 	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
> 	  else \
> 	    test -f $(distdir)/$$file \
> 	    || cp -p $$d/$$file $(distdir)/$$file \
> 	    || exit 1; \
> 	  fi; \
> 	done
> 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
> 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
> 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
> 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
> 	|| chmod -R a+r $(distdir)
> dist-gzip: distdir
> 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> 	$(am__remove_distdir)
> 
> dist dist-all: distdir
> 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
> 	$(am__remove_distdir)
179,180c333,335
< 	-rm -rf $(distdir)
< 	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
---
> 	$(am__remove_distdir)
> 	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
> 	chmod -R a-w $(distdir); chmod a+w $(distdir)
183,184c338,340
< 	dc_install_base=`cd $(distdir)/=inst && pwd`; \
< 	cd $(distdir)/=build \
---
> 	chmod a-w $(distdir)
> 	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
> 	  && cd $(distdir)/=build \
185a342
> 	    $(DISTCHECK_CONFIGURE_FLAGS) \
191,228c348,367
< 	  && $(MAKE) $(AM_MAKEFLAGS) dist
< 	-rm -rf $(distdir)
< 	@banner="$(distdir).tar.gz is ready for distribution"; \
< 	dashes=`echo "$$banner" | sed s/./=/g`; \
< 	echo "$$dashes"; \
< 	echo "$$banner"; \
< 	echo "$$dashes"
< dist: distdir
< 	-chmod -R a+r $(distdir)
< 	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
< 	-rm -rf $(distdir)
< dist-all: distdir
< 	-chmod -R a+r $(distdir)
< 	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
< 	-rm -rf $(distdir)
< distdir: $(DISTFILES)
< 	-rm -rf $(distdir)
< 	mkdir $(distdir)
< 	-chmod 777 $(distdir)
< 	here=`cd $(top_builddir) && pwd`; \
< 	top_distdir=`cd $(distdir) && pwd`; \
< 	distdir=`cd $(distdir) && pwd`; \
< 	cd $(top_srcdir) \
< 	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
< 	@for file in $(DISTFILES); do \
< 	  d=$(srcdir); \
< 	  if test -d $$d/$$file; then \
< 	    cp -pr $$d/$$file $(distdir)/$$file; \
< 	  else \
< 	    test -f $(distdir)/$$file \
< 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
< 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
< 	  fi; \
< 	done
< info-am:
< info: info-am
< dvi-am:
< dvi: dvi-am
---
> 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
> 	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
> 	      || { echo "ERROR: files left after uninstall:" ; \
> 	           find $$dc_install_base -type f -print ; \
> 	           exit 1; } >&2 ) \
> 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
> 	  && rm -f $(distdir).tar.gz \
> 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
> 	$(am__remove_distdir)
> 	@echo "$(distdir).tar.gz is ready for distribution" | \
> 	  sed 'h;s/./=/g;p;x;p;x'
> distcleancheck: distclean
> 	if test '$(srcdir)' = . ; then \
> 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
> 	  exit 1 ; \
> 	fi
> 	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
> 	  || { echo "ERROR: files left after distclean:" ; \
> 	       $(distcleancheck_listfiles) ; \
> 	       exit 1; } >&2
231,234c370
< installcheck-am:
< installcheck: installcheck-am
< install-exec-am:
< install-exec: install-exec-am
---
> all-am: Makefile
236,237c372
< install-data-am:
< install-data: install-data-am
---
> installdirs:
239,240d373
< install-am: all-am
< 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
242c375,376
< uninstall-am:
---
> install-exec: install-exec-am
> install-data: install-data-am
244,248d377
< all-am: Makefile
< all-redirect: all-am
< install-strip:
< 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
< installdirs:
249a379,380
> install-am: all-am
> 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
250a382,387
> installcheck: installcheck-am
> install-strip:
> 	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
> 	  INSTALL_STRIP_FLAG=-s \
> 	  `test -z '$(STRIP)' || \
> 	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
257d393
< 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
259a396,397
> 	@echo "This command is intended for maintainers to use"
> 	@echo "it deletes files that may require special tools to rebuild."
261c399
< mostlyclean-am:  mostlyclean-generic
---
> clean: clean-am
263c401
< mostlyclean: mostlyclean-am
---
> clean-am: clean-generic clean-local mostlyclean-am
265c403,405
< clean-am:  clean-generic mostlyclean-am clean-local
---
> distclean: distclean-am
> 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
> distclean-am: clean-am distclean-generic distclean-local
267c407
< clean: clean-am
---
> dvi: dvi-am
269c409
< distclean-am:  distclean-generic clean-am distclean-local
---
> dvi-am:
271,272c411
< distclean: distclean-am
< 	-rm -f config.status
---
> info: info-am
274,276c413
< maintainer-clean-am:  maintainer-clean-generic distclean-am
< 	@echo "This command is intended for maintainers to use;"
< 	@echo "it deletes files that may require special tools to rebuild."
---
> info-am:
278,279c415
< maintainer-clean: maintainer-clean-am
< 	-rm -f config.status
---
> install-data-am:
281,286c417
< .PHONY: tags distdir info-am info dvi-am dvi check check-am \
< installcheck-am installcheck install-exec-am install-exec \
< install-data-am install-data install-am install uninstall-am uninstall \
< all-redirect all-am all installdirs mostlyclean-generic \
< distclean-generic clean-generic maintainer-clean-generic clean \
< mostlyclean distclean maintainer-clean
---
> install-exec-am:
287a419
> install-info: install-info-am
289,290c421,428
< @ENABLE_SMTP_TRUE@  smtp_jar = smtp.jar
< @ENABLE_SMTP_FALSE@	smtp_jar =
---
> install-man:
> 
> installcheck-am:
> 
> maintainer-clean: maintainer-clean-am
> 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
> 	-rm -rf autom4te.cache
> maintainer-clean-am: distclean-am maintainer-clean-generic
292,293c430
< @ENABLE_IMAP_TRUE@  imap_jar = imap.jar
< @ENABLE_IMAP_FALSE@  imap_jar =
---
> mostlyclean: mostlyclean-am
295,296c432
< @ENABLE_POP3_TRUE@  pop3_jar = pop3.jar
< @ENABLE_POP3_FALSE@  pop3_jar =
---
> mostlyclean-am: mostlyclean-generic
298,299c434
< @ENABLE_NNTP_TRUE@  nntp_jar = nntp.jar
< @ENABLE_NNTP_FALSE@  nntp_jar =
---
> uninstall-am: uninstall-info-am
301,302c436,443
< @ENABLE_FTP_TRUE@  ftp_jar = ftp.jar
< @ENABLE_FTP_FALSE@  ftp_jar =
---
> .PHONY: all all-am check check-am clean clean-generic clean-local dist \
> 	dist-all dist-gzip distcheck distclean distclean-generic \
> 	distclean-local distcleancheck distdir dvi dvi-am info info-am \
> 	install install-am install-data install-data-am install-exec \
> 	install-exec-am install-info install-info-am install-man \
> 	install-strip installcheck installcheck-am installdirs \
> 	maintainer-clean maintainer-clean-generic mostlyclean \
> 	mostlyclean-generic uninstall uninstall-am uninstall-info-am
304,305c445
< @ENABLE_GOPHER_TRUE@  gopher_jar = gopher.jar
< @ENABLE_GOPHER_FALSE@  gopher_jar =
---
> @ENABLE_SMTP_FALSE@	smtp_jar =
311,312d450
< inetlib_jar: $(inetlib_jar)
< 
358a497,500
> javadoc:
> 	mkdir -p $(doc)
> 	$(JAVADOC) -d $(doc) -windowtitle "GNU inetlib API documentation" -sourcepath $(src) $(package_names)
> 
361a504
> 	rm -r $(doc)
365c508
< 	rm -f Makefile config.log config.status
---
> 	rm -f config.log config.status
368d510
< 
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/classpath/inetlib/aclocal.m4,v
retrieving revision 1.1
diff -r1.1 aclocal.m4
1c1
< dnl aclocal.m4 generated automatically by aclocal 1.4-p6
---
> # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
3,11c3,12
< dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
< dnl This file is free software; the Free Software Foundation
< dnl gives unlimited permission to copy and/or distribute it,
< dnl with or without modifications, as long as this notice is preserved.
< 
< dnl This program is distributed in the hope that it will be useful,
< dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
< dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
< dnl PARTICULAR PURPOSE.
---
> # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
> # Free Software Foundation, Inc.
> # This file is free software; the Free Software Foundation
> # gives unlimited permission to copy and/or distribute it,
> # with or without modifications, as long as this notice is preserved.
> 
> # This program is distributed in the hope that it will be useful,
> # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
> # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
> # PARTICULAR PURPOSE.
31c32
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
135c136
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
179c180
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
217c218
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
241c242
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
286c287
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
362c363
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
388c389
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
502c503
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
528c529
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
574c575
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
594c595
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
629c630
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
668c669
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
708c709
< dnl @version $Id: aclocal.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
---
> dnl @version $Id: acinclude.m4,v 1.1 2003/10/25 08:52:10 dog Exp $
733,850c734
< # lib-prefix.m4 serial 3 (gettext-0.12.2)
< dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
< dnl This file is free software, distributed under the terms of the GNU
< dnl General Public License.  As a special exception to the GNU General
< dnl Public License, this file may be distributed as part of a program
< dnl that contains a configuration script generated by Autoconf, under
< dnl the same distribution terms as the rest of that program.
< 
< dnl From Bruno Haible.
< 
< dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
< dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
< dnl require excessive bracketing.
< ifdef([AC_HELP_STRING],
< [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
< [AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
< 
< dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
< dnl to access previously installed libraries. The basic assumption is that
< dnl a user will want packages to use other packages he previously installed
< dnl with the same --prefix option.
< dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
< dnl libraries, but is otherwise very convenient.
< AC_DEFUN([AC_LIB_PREFIX],
< [
<   AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
<   AC_REQUIRE([AC_PROG_CC])
<   AC_REQUIRE([AC_CANONICAL_HOST])
<   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
<   dnl By default, look in $includedir and $libdir.
<   use_additional=yes
<   AC_LIB_WITH_FINAL_PREFIX([
<     eval additional_includedir=\"$includedir\"
<     eval additional_libdir=\"$libdir\"
<   ])
<   AC_LIB_ARG_WITH([lib-prefix],
< [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
<   --without-lib-prefix    don't search for libraries in includedir and libdir],
< [
<     if test "X$withval" = "Xno"; then
<       use_additional=no
<     else
<       if test "X$withval" = "X"; then
<         AC_LIB_WITH_FINAL_PREFIX([
<           eval additional_includedir=\"$includedir\"
<           eval additional_libdir=\"$libdir\"
<         ])
<       else
<         additional_includedir="$withval/include"
<         additional_libdir="$withval/lib"
<       fi
<     fi
< ])
<   if test $use_additional = yes; then
<     dnl Potentially add $additional_includedir to $CPPFLAGS.
<     dnl But don't add it
<     dnl   1. if it's the standard /usr/include,
<     dnl   2. if it's already present in $CPPFLAGS,
<     dnl   3. if it's /usr/local/include and we are using GCC on Linux,
<     dnl   4. if it doesn't exist as a directory.
<     if test "X$additional_includedir" != "X/usr/include"; then
<       haveit=
<       for x in $CPPFLAGS; do
<         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
<         if test "X$x" = "X-I$additional_includedir"; then
<           haveit=yes
<           break
<         fi
<       done
<       if test -z "$haveit"; then
<         if test "X$additional_includedir" = "X/usr/local/include"; then
<           if test -n "$GCC"; then
<             case $host_os in
<               linux*) haveit=yes;;
<             esac
<           fi
<         fi
<         if test -z "$haveit"; then
<           if test -d "$additional_includedir"; then
<             dnl Really add $additional_includedir to $CPPFLAGS.
<             CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
<           fi
<         fi
<       fi
<     fi
<     dnl Potentially add $additional_libdir to $LDFLAGS.
<     dnl But don't add it
<     dnl   1. if it's the standard /usr/lib,
<     dnl   2. if it's already present in $LDFLAGS,
<     dnl   3. if it's /usr/local/lib and we are using GCC on Linux,
<     dnl   4. if it doesn't exist as a directory.
<     if test "X$additional_libdir" != "X/usr/lib"; then
<       haveit=
<       for x in $LDFLAGS; do
<         AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
<         if test "X$x" = "X-L$additional_libdir"; then
<           haveit=yes
<           break
<         fi
<       done
<       if test -z "$haveit"; then
<         if test "X$additional_libdir" = "X/usr/local/lib"; then
<           if test -n "$GCC"; then
<             case $host_os in
<               linux*) haveit=yes;;
<             esac
<           fi
<         fi
<         if test -z "$haveit"; then
<           if test -d "$additional_libdir"; then
<             dnl Really add $additional_libdir to $LDFLAGS.
<             LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
<           fi
<         fi
<       fi
<     fi
<   fi
< ])
---
> # Do all the work for Automake.                            -*- Autoconf -*-
852,1418c736,737
< dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
< dnl acl_final_exec_prefix, containing the values to which $prefix and
< dnl $exec_prefix will expand at the end of the configure script.
< AC_DEFUN([AC_LIB_PREPARE_PREFIX],
< [
<   dnl Unfortunately, prefix and exec_prefix get only finally determined
<   dnl at the end of configure.
<   if test "X$prefix" = "XNONE"; then
<     acl_final_prefix="$ac_default_prefix"
<   else
<     acl_final_prefix="$prefix"
<   fi
<   if test "X$exec_prefix" = "XNONE"; then
<     acl_final_exec_prefix='${prefix}'
<   else
<     acl_final_exec_prefix="$exec_prefix"
<   fi
<   acl_save_prefix="$prefix"
<   prefix="$acl_final_prefix"
<   eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
<   prefix="$acl_save_prefix"
< ])
< 
< dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
< dnl variables prefix and exec_prefix bound to the values they will have
< dnl at the end of the configure script.
< AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
< [
<   acl_save_prefix="$prefix"
<   prefix="$acl_final_prefix"
<   acl_save_exec_prefix="$exec_prefix"
<   exec_prefix="$acl_final_exec_prefix"
<   $1
<   exec_prefix="$acl_save_exec_prefix"
<   prefix="$acl_save_prefix"
< ])
< 
< # lib-link.m4 serial 4 (gettext-0.12)
< dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
< dnl This file is free software, distributed under the terms of the GNU
< dnl General Public License.  As a special exception to the GNU General
< dnl Public License, this file may be distributed as part of a program
< dnl that contains a configuration script generated by Autoconf, under
< dnl the same distribution terms as the rest of that program.
< 
< dnl From Bruno Haible.
< 
< dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
< dnl the libraries corresponding to explicit and implicit dependencies.
< dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
< dnl augments the CPPFLAGS variable.
< AC_DEFUN([AC_LIB_LINKFLAGS],
< [
<   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
<   AC_REQUIRE([AC_LIB_RPATH])
<   define([Name],[translit([$1],[./-], [___])])
<   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
<                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
<   AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
<     AC_LIB_LINKFLAGS_BODY([$1], [$2])
<     ac_cv_lib[]Name[]_libs="$LIB[]NAME"
<     ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
<     ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
<   ])
<   LIB[]NAME="$ac_cv_lib[]Name[]_libs"
<   LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
<   INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
<   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
<   AC_SUBST([LIB]NAME)
<   AC_SUBST([LTLIB]NAME)
<   dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
<   dnl results of this search when this library appears as a dependency.
<   HAVE_LIB[]NAME=yes
<   undefine([Name])
<   undefine([NAME])
< ])
< 
< dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode)
< dnl searches for libname and the libraries corresponding to explicit and
< dnl implicit dependencies, together with the specified include files and
< dnl the ability to compile and link the specified testcode. If found, it
< dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and
< dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
< dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
< dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
< AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
< [
<   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
<   AC_REQUIRE([AC_LIB_RPATH])
<   define([Name],[translit([$1],[./-], [___])])
<   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
<                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
< 
<   dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
<   dnl accordingly.
<   AC_LIB_LINKFLAGS_BODY([$1], [$2])
< 
<   dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
<   dnl because if the user has installed lib[]Name and not disabled its use
<   dnl via --without-lib[]Name-prefix, he wants to use it.
<   ac_save_CPPFLAGS="$CPPFLAGS"
<   AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
< 
<   AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
<     ac_save_LIBS="$LIBS"
<     LIBS="$LIBS $LIB[]NAME"
<     AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no])
<     LIBS="$ac_save_LIBS"
<   ])
<   if test "$ac_cv_lib[]Name" = yes; then
<     HAVE_LIB[]NAME=yes
<     AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.])
<     AC_MSG_CHECKING([how to link with lib[]$1])
<     AC_MSG_RESULT([$LIB[]NAME])
<   else
<     HAVE_LIB[]NAME=no
<     dnl If $LIB[]NAME didn't lead to a usable library, we don't need
<     dnl $INC[]NAME either.
<     CPPFLAGS="$ac_save_CPPFLAGS"
<     LIB[]NAME=
<     LTLIB[]NAME=
<   fi
<   AC_SUBST([HAVE_LIB]NAME)
<   AC_SUBST([LIB]NAME)
<   AC_SUBST([LTLIB]NAME)
<   undefine([Name])
<   undefine([NAME])
< ])
< 
< dnl Determine the platform dependent parameters needed to use rpath:
< dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
< dnl hardcode_direct, hardcode_minus_L.
< AC_DEFUN([AC_LIB_RPATH],
< [
<   AC_REQUIRE([AC_PROG_CC])                dnl we use $CC, $GCC, $LDFLAGS
<   AC_REQUIRE([AC_LIB_PROG_LD])            dnl we use $LD, $with_gnu_ld
<   AC_REQUIRE([AC_CANONICAL_HOST])         dnl we use $host
<   AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
<   AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [
<     CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
<     ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
<     . ./conftest.sh
<     rm -f ./conftest.sh
<     acl_cv_rpath=done
<   ])
<   wl="$acl_cv_wl"
<   libext="$acl_cv_libext"
<   shlibext="$acl_cv_shlibext"
<   hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
<   hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
<   hardcode_direct="$acl_cv_hardcode_direct"
<   hardcode_minus_L="$acl_cv_hardcode_minus_L"
<   dnl Determine whether the user wants rpath handling at all.
<   AC_ARG_ENABLE(rpath,
<     [  --disable-rpath         do not hardcode runtime library paths],
<     :, enable_rpath=yes)
< ])
< 
< dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
< dnl the libraries corresponding to explicit and implicit dependencies.
< dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
< AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
< [
<   define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
<                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
<   dnl By default, look in $includedir and $libdir.
<   use_additional=yes
<   AC_LIB_WITH_FINAL_PREFIX([
<     eval additional_includedir=\"$includedir\"
<     eval additional_libdir=\"$libdir\"
<   ])
<   AC_LIB_ARG_WITH([lib$1-prefix],
< [  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
<   --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
< [
<     if test "X$withval" = "Xno"; then
<       use_additional=no
<     else
<       if test "X$withval" = "X"; then
<         AC_LIB_WITH_FINAL_PREFIX([
<           eval additional_includedir=\"$includedir\"
<           eval additional_libdir=\"$libdir\"
<         ])
<       else
<         additional_includedir="$withval/include"
<         additional_libdir="$withval/lib"
<       fi
<     fi
< ])
<   dnl Search the library and its dependencies in $additional_libdir and
<   dnl $LDFLAGS. Using breadth-first-seach.
<   LIB[]NAME=
<   LTLIB[]NAME=
<   INC[]NAME=
<   rpathdirs=
<   ltrpathdirs=
<   names_already_handled=
<   names_next_round='$1 $2'
<   while test -n "$names_next_round"; do
<     names_this_round="$names_next_round"
<     names_next_round=
<     for name in $names_this_round; do
<       already_handled=
<       for n in $names_already_handled; do
<         if test "$n" = "$name"; then
<           already_handled=yes
<           break
<         fi
<       done
<       if test -z "$already_handled"; then
<         names_already_handled="$names_already_handled $name"
<         dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
<         dnl or AC_LIB_HAVE_LINKFLAGS call.
<         uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
<         eval value=\"\$HAVE_LIB$uppername\"
<         if test -n "$value"; then
<           if test "$value" = yes; then
<             eval value=\"\$LIB$uppername\"
<             test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
<             eval value=\"\$LTLIB$uppername\"
<             test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
<           else
<             dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
<             dnl that this library doesn't exist. So just drop it.
<             :
<           fi
<         else
<           dnl Search the library lib$name in $additional_libdir and $LDFLAGS
<           dnl and the already constructed $LIBNAME/$LTLIBNAME.
<           found_dir=
<           found_la=
<           found_so=
<           found_a=
<           if test $use_additional = yes; then
<             if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
<               found_dir="$additional_libdir"
<               found_so="$additional_libdir/lib$name.$shlibext"
<               if test -f "$additional_libdir/lib$name.la"; then
<                 found_la="$additional_libdir/lib$name.la"
<               fi
<             else
<               if test -f "$additional_libdir/lib$name.$libext"; then
<                 found_dir="$additional_libdir"
<                 found_a="$additional_libdir/lib$name.$libext"
<                 if test -f "$additional_libdir/lib$name.la"; then
<                   found_la="$additional_libdir/lib$name.la"
<                 fi
<               fi
<             fi
<           fi
<           if test "X$found_dir" = "X"; then
<             for x in $LDFLAGS $LTLIB[]NAME; do
<               AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
<               case "$x" in
<                 -L*)
<                   dir=`echo "X$x" | sed -e 's/^X-L//'`
<                   if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
<                     found_dir="$dir"
<                     found_so="$dir/lib$name.$shlibext"
<                     if test -f "$dir/lib$name.la"; then
<                       found_la="$dir/lib$name.la"
<                     fi
<                   else
<                     if test -f "$dir/lib$name.$libext"; then
<                       found_dir="$dir"
<                       found_a="$dir/lib$name.$libext"
<                       if test -f "$dir/lib$name.la"; then
<                         found_la="$dir/lib$name.la"
<                       fi
<                     fi
<                   fi
<                   ;;
<               esac
<               if test "X$found_dir" != "X"; then
<                 break
<               fi
<             done
<           fi
<           if test "X$found_dir" != "X"; then
<             dnl Found the library.
<             LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
<             if test "X$found_so" != "X"; then
<               dnl Linking with a shared library. We attempt to hardcode its
<               dnl directory into the executable's runpath, unless it's the
<               dnl standard /usr/lib.
<               if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
<                 dnl No hardcoding is needed.
<                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
<               else
<                 dnl Use an explicit option to hardcode DIR into the resulting
<                 dnl binary.
<                 dnl Potentially add DIR to ltrpathdirs.
<                 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
<                 haveit=
<                 for x in $ltrpathdirs; do
<                   if test "X$x" = "X$found_dir"; then
<                     haveit=yes
<                     break
<                   fi
<                 done
<                 if test -z "$haveit"; then
<                   ltrpathdirs="$ltrpathdirs $found_dir"
<                 fi
<                 dnl The hardcoding into $LIBNAME is system dependent.
<                 if test "$hardcode_direct" = yes; then
<                   dnl Using DIR/libNAME.so during linking hardcodes DIR into the
<                   dnl resulting binary.
<                   LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
<                 else
<                   if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
<                     dnl Use an explicit option to hardcode DIR into the resulting
<                     dnl binary.
<                     LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
<                     dnl Potentially add DIR to rpathdirs.
<                     dnl The rpathdirs will be appended to $LIBNAME at the end.
<                     haveit=
<                     for x in $rpathdirs; do
<                       if test "X$x" = "X$found_dir"; then
<                         haveit=yes
<                         break
<                       fi
<                     done
<                     if test -z "$haveit"; then
<                       rpathdirs="$rpathdirs $found_dir"
<                     fi
<                   else
<                     dnl Rely on "-L$found_dir".
<                     dnl But don't add it if it's already contained in the LDFLAGS
<                     dnl or the already constructed $LIBNAME
<                     haveit=
<                     for x in $LDFLAGS $LIB[]NAME; do
<                       AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
<                       if test "X$x" = "X-L$found_dir"; then
<                         haveit=yes
<                         break
<                       fi
<                     done
<                     if test -z "$haveit"; then
<                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
<                     fi
<                     if test "$hardcode_minus_L" != no; then
<                       dnl FIXME: Not sure whether we should use
<                       dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
<                       dnl here.
<                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
<                     else
<                       dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
<                       dnl here, because this doesn't fit in flags passed to the
<                       dnl compiler. So give up. No hardcoding. This affects only
<                       dnl very old systems.
<                       dnl FIXME: Not sure whether we should use
<                       dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
<                       dnl here.
<                       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
<                     fi
<                   fi
<                 fi
<               fi
<             else
<               if test "X$found_a" != "X"; then
<                 dnl Linking with a static library.
<                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
<               else
<                 dnl We shouldn't come here, but anyway it's good to have a
<                 dnl fallback.
<                 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
<               fi
<             fi
<             dnl Assume the include files are nearby.
<             additional_includedir=
<             case "$found_dir" in
<               */lib | */lib/)
<                 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
<                 additional_includedir="$basedir/include"
<                 ;;
<             esac
<             if test "X$additional_includedir" != "X"; then
<               dnl Potentially add $additional_includedir to $INCNAME.
<               dnl But don't add it
<               dnl   1. if it's the standard /usr/include,
<               dnl   2. if it's /usr/local/include and we are using GCC on Linux,
<               dnl   3. if it's already present in $CPPFLAGS or the already
<               dnl      constructed $INCNAME,
<               dnl   4. if it doesn't exist as a directory.
<               if test "X$additional_includedir" != "X/usr/include"; then
<                 haveit=
<                 if test "X$additional_includedir" = "X/usr/local/include"; then
<                   if test -n "$GCC"; then
<                     case $host_os in
<                       linux*) haveit=yes;;
<                     esac
<                   fi
<                 fi
<                 if test -z "$haveit"; then
<                   for x in $CPPFLAGS $INC[]NAME; do
<                     AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
<                     if test "X$x" = "X-I$additional_includedir"; then
<                       haveit=yes
<                       break
<                     fi
<                   done
<                   if test -z "$haveit"; then
<                     if test -d "$additional_includedir"; then
<                       dnl Really add $additional_includedir to $INCNAME.
<                       INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
<                     fi
<                   fi
<                 fi
<               fi
<             fi
<             dnl Look for dependencies.
<             if test -n "$found_la"; then
<               dnl Read the .la file. It defines the variables
<               dnl dlname, library_names, old_library, dependency_libs, current,
<               dnl age, revision, installed, dlopen, dlpreopen, libdir.
<               save_libdir="$libdir"
<               case "$found_la" in
<                 */* | *\\*) . "$found_la" ;;
<                 *) . "./$found_la" ;;
<               esac
<               libdir="$save_libdir"
<               dnl We use only dependency_libs.
<               for dep in $dependency_libs; do
<                 case "$dep" in
<                   -L*)
<                     additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
<                     dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
<                     dnl But don't add it
<                     dnl   1. if it's the standard /usr/lib,
<                     dnl   2. if it's /usr/local/lib and we are using GCC on Linux,
<                     dnl   3. if it's already present in $LDFLAGS or the already
<                     dnl      constructed $LIBNAME,
<                     dnl   4. if it doesn't exist as a directory.
<                     if test "X$additional_libdir" != "X/usr/lib"; then
<                       haveit=
<                       if test "X$additional_libdir" = "X/usr/local/lib"; then
<                         if test -n "$GCC"; then
<                           case $host_os in
<                             linux*) haveit=yes;;
<                           esac
<                         fi
<                       fi
<                       if test -z "$haveit"; then
<                         haveit=
<                         for x in $LDFLAGS $LIB[]NAME; do
<                           AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
<                           if test "X$x" = "X-L$additional_libdir"; then
<                             haveit=yes
<                             break
<                           fi
<                         done
<                         if test -z "$haveit"; then
<                           if test -d "$additional_libdir"; then
<                             dnl Really add $additional_libdir to $LIBNAME.
<                             LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
<                           fi
<                         fi
<                         haveit=
<                         for x in $LDFLAGS $LTLIB[]NAME; do
<                           AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
<                           if test "X$x" = "X-L$additional_libdir"; then
<                             haveit=yes
<                             break
<                           fi
<                         done
<                         if test -z "$haveit"; then
<                           if test -d "$additional_libdir"; then
<                             dnl Really add $additional_libdir to $LTLIBNAME.
<                             LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
<                           fi
<                         fi
<                       fi
<                     fi
<                     ;;
<                   -R*)
<                     dir=`echo "X$dep" | sed -e 's/^X-R//'`
<                     if test "$enable_rpath" != no; then
<                       dnl Potentially add DIR to rpathdirs.
<                       dnl The rpathdirs will be appended to $LIBNAME at the end.
<                       haveit=
<                       for x in $rpathdirs; do
<                         if test "X$x" = "X$dir"; then
<                           haveit=yes
<                           break
<                         fi
<                       done
<                       if test -z "$haveit"; then
<                         rpathdirs="$rpathdirs $dir"
<                       fi
<                       dnl Potentially add DIR to ltrpathdirs.
<                       dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
<                       haveit=
<                       for x in $ltrpathdirs; do
<                         if test "X$x" = "X$dir"; then
<                           haveit=yes
<                           break
<                         fi
<                       done
<                       if test -z "$haveit"; then
<                         ltrpathdirs="$ltrpathdirs $dir"
<                       fi
<                     fi
<                     ;;
<                   -l*)
<                     dnl Handle this in the next round.
<                     names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
<                     ;;
<                   *.la)
<                     dnl Handle this in the next round. Throw away the .la's
<                     dnl directory; it is already contained in a preceding -L
<                     dnl option.
<                     names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
<                     ;;
<                   *)
<                     dnl Most likely an immediate library name.
<                     LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
<                     LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
<                     ;;
<                 esac
<               done
<             fi
<           else
<             dnl Didn't find the library; assume it is in the system directories
<             dnl known to the linker and runtime loader. (All the system
<             dnl directories known to the linker should also be known to the
<             dnl runtime loader, otherwise the system is severely misconfigured.)
<             LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
<             LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
<           fi
<         fi
<       fi
<     done
<   done
<   if test "X$rpathdirs" != "X"; then
<     if test -n "$hardcode_libdir_separator"; then
<       dnl Weird platform: only the last -rpath option counts, the user must
<       dnl pass all path elements in one option. We can arrange that for a
<       dnl single library, but not when more than one $LIBNAMEs are used.
<       alldirs=
<       for found_dir in $rpathdirs; do
<         alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
<       done
<       dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
<       acl_save_libdir="$libdir"
<       libdir="$alldirs"
<       eval flag=\"$hardcode_libdir_flag_spec\"
<       libdir="$acl_save_libdir"
<       LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
<     else
<       dnl The -rpath options are cumulative.
<       for found_dir in $rpathdirs; do
<         acl_save_libdir="$libdir"
<         libdir="$found_dir"
<         eval flag=\"$hardcode_libdir_flag_spec\"
<         libdir="$acl_save_libdir"
<         LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
<       done
<     fi
<   fi
<   if test "X$ltrpathdirs" != "X"; then
<     dnl When using libtool, the option that works for both libraries and
<     dnl executables is -R. The -R options are cumulative.
<     for found_dir in $ltrpathdirs; do
<       LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
<     done
<   fi
< ])
---
> # This macro actually does too much some checks are only needed if
> # your package does certain things.  But this isn't really a big deal.
1420,1439c739,740
< dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
< dnl unless already present in VAR.
< dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
< dnl contains two or three consecutive elements that belong together.
< AC_DEFUN([AC_LIB_APPENDTOVAR],
< [
<   for element in [$2]; do
<     haveit=
<     for x in $[$1]; do
<       AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
<       if test "X$x" = "X$element"; then
<         haveit=yes
<         break
<       fi
<     done
<     if test -z "$haveit"; then
<       [$1]="${[$1]}${[$1]:+ }$element"
<     fi
<   done
< ])
---
> # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
> # Free Software Foundation, Inc.
1441,1550c742,745
< # lib-ld.m4 serial 2 (gettext-0.12)
< dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
< dnl This file is free software, distributed under the terms of the GNU
< dnl General Public License.  As a special exception to the GNU General
< dnl Public License, this file may be distributed as part of a program
< dnl that contains a configuration script generated by Autoconf, under
< dnl the same distribution terms as the rest of that program.
< 
< dnl Subroutines of libtool.m4,
< dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
< dnl with libtool.m4.
< 
< dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
< AC_DEFUN([AC_LIB_PROG_LD_GNU],
< [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld,
< [# I'd rather use --version here, but apparently some GNU ld's only accept -v.
< if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
<   acl_cv_prog_gnu_ld=yes
< else
<   acl_cv_prog_gnu_ld=no
< fi])
< with_gnu_ld=$acl_cv_prog_gnu_ld
< ])
< 
< dnl From libtool-1.4. Sets the variable LD.
< AC_DEFUN([AC_LIB_PROG_LD],
< [AC_ARG_WITH(gnu-ld,
< [  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
< test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
< AC_REQUIRE([AC_PROG_CC])dnl
< AC_REQUIRE([AC_CANONICAL_HOST])dnl
< # Prepare PATH_SEPARATOR.
< # The user is always right.
< if test "${PATH_SEPARATOR+set}" != set; then
<   echo "#! /bin/sh" >conf$$.sh
<   echo  "exit 0"   >>conf$$.sh
<   chmod +x conf$$.sh
<   if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
<     PATH_SEPARATOR=';'
<   else
<     PATH_SEPARATOR=:
<   fi
<   rm -f conf$$.sh
< fi
< ac_prog=ld
< if test "$GCC" = yes; then
<   # Check if gcc -print-prog-name=ld gives a path.
<   AC_MSG_CHECKING([for ld used by GCC])
<   case $host in
<   *-*-mingw*)
<     # gcc leaves a trailing carriage return which upsets mingw
<     ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
<   *)
<     ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
<   esac
<   case $ac_prog in
<     # Accept absolute paths.
<     [[\\/]* | [A-Za-z]:[\\/]*)]
<       [re_direlt='/[^/][^/]*/\.\./']
<       # Canonicalize the path of ld
<       ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
<       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
< 	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
<       done
<       test -z "$LD" && LD="$ac_prog"
<       ;;
<   "")
<     # If it fails, then pretend we aren't using GCC.
<     ac_prog=ld
<     ;;
<   *)
<     # If it is relative, then search for the first ld in PATH.
<     with_gnu_ld=unknown
<     ;;
<   esac
< elif test "$with_gnu_ld" = yes; then
<   AC_MSG_CHECKING([for GNU ld])
< else
<   AC_MSG_CHECKING([for non-GNU ld])
< fi
< AC_CACHE_VAL(acl_cv_path_LD,
< [if test -z "$LD"; then
<   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
<   for ac_dir in $PATH; do
<     test -z "$ac_dir" && ac_dir=.
<     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
<       acl_cv_path_LD="$ac_dir/$ac_prog"
<       # Check to see if the program is GNU ld.  I'd rather use --version,
<       # but apparently some GNU ld's only accept -v.
<       # Break only if it was the GNU/non-GNU ld that we prefer.
<       if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
< 	test "$with_gnu_ld" != no && break
<       else
< 	test "$with_gnu_ld" != yes && break
<       fi
<     fi
<   done
<   IFS="$ac_save_ifs"
< else
<   acl_cv_path_LD="$LD" # Let the user override the test with a path.
< fi])
< LD="$acl_cv_path_LD"
< if test -n "$LD"; then
<   AC_MSG_RESULT($LD)
< else
<   AC_MSG_RESULT(no)
< fi
< test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
< AC_LIB_PROG_LD_GNU
< ])
---
> # 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, or (at your option)
> # any later version.
1552,1554c747,750
< # Do all the work for Automake.  This macro actually does too much --
< # some checks are only needed if your package does certain things.
< # But this isn't really a big deal.
---
> # 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.
1556c752,755
< # serial 1
---
> # 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.
1558,1559c757
< dnl Usage:
< dnl AM_INIT_AUTOMAKE(package,version, [no-define])
---
> # serial 8
1560a759,782
> # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
> # written in clear, in which case automake, when reading aclocal.m4,
> # will think it sees a *use*, and therefore will trigger all it's
> # C support machinery.  Also note that it means that autoscan, seeing
> # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
> 
> 
> AC_PREREQ([2.52])
> 
> # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
> # the ones we care about.
> m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
> 
> # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
> # AM_INIT_AUTOMAKE([OPTIONS])
> # -----------------------------------------------
> # The call with PACKAGE and VERSION arguments is the old style
> # call (pre autoconf-2.50), which is being phased out.  PACKAGE
> # and VERSION should now be passed to AC_INIT and removed from
> # the call to AM_INIT_AUTOMAKE.
> # We support both call styles for the transition.  After
> # the next Automake release, Autoconf can make the AC_INIT
> # arguments mandatory, and then we can depend on a new Autoconf
> # release and drop the old call support.
1563,1569c785,788
< AC_REQUIRE([AC_PROG_INSTALL])
< PACKAGE=[$1]
< AC_SUBST(PACKAGE)
< VERSION=[$2]
< AC_SUBST(VERSION)
< dnl test to see if srcdir already configured
< if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
---
>  AC_REQUIRE([AC_PROG_INSTALL])dnl
> # test to see if srcdir already configured
> if test "`cd $srcdir && pwd`" != "`pwd`" &&
>    test -f $srcdir/config.status; then
1572,1584c791,832
< ifelse([$3],,
< AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
< AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
< AC_REQUIRE([AM_SANITY_CHECK])
< AC_REQUIRE([AC_ARG_PROGRAM])
< dnl FIXME This is truly gross.
< missing_dir=`cd $ac_aux_dir && pwd`
< AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
< AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
< AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
< AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
< AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
< AC_REQUIRE([AC_PROG_MAKE_SET])])
---
> 
> # Define the identity of the package.
> dnl Distinguish between old-style and new-style calls.
> m4_ifval([$2],
> [m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
>  AC_SUBST([PACKAGE], [$1])dnl
>  AC_SUBST([VERSION], [$2])],
> [_AM_SET_OPTIONS([$1])dnl
>  AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
>  AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
> 
> _AM_IF_OPTION([no-define],,
> [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
>  AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
> 
> # Some tools Automake needs.
> AC_REQUIRE([AM_SANITY_CHECK])dnl
> AC_REQUIRE([AC_ARG_PROGRAM])dnl
> AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
> AM_MISSING_PROG(AUTOCONF, autoconf)
> AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
> AM_MISSING_PROG(AUTOHEADER, autoheader)
> AM_MISSING_PROG(MAKEINFO, makeinfo)
> AM_MISSING_PROG(AMTAR, tar)
> AM_PROG_INSTALL_SH
> AM_PROG_INSTALL_STRIP
> # We need awk for the "check" target.  The system "awk" is bad on
> # some platforms.
> AC_REQUIRE([AC_PROG_AWK])dnl
> AC_REQUIRE([AC_PROG_MAKE_SET])dnl
> 
> _AM_IF_OPTION([no-dependencies],,
> [AC_PROVIDE_IFELSE([AC_PROG_][CC],
>                   [_AM_DEPENDENCIES(CC)],
>                   [define([AC_PROG_][CC],
>                           defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
> AC_PROVIDE_IFELSE([AC_PROG_][CXX],
>                   [_AM_DEPENDENCIES(CXX)],
>                   [define([AC_PROG_][CXX],
>                           defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
> ])
> ])
1606c854
< AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
---
> AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
1613c861,905
< 	 [AM_AUTOMAKE_VERSION([1.4-p6])])
---
> 	 [AM_AUTOMAKE_VERSION([1.6.3])])
> 
> # Helper functions for option handling.                    -*- Autoconf -*-
> 
> # Copyright 2001, 2002  Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> # serial 2
> 
> # _AM_MANGLE_OPTION(NAME)
> # -----------------------
> AC_DEFUN([_AM_MANGLE_OPTION],
> [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
> 
> # _AM_SET_OPTION(NAME)
> # ------------------------------
> # Set option NAME.  Presently that only means defining a flag for this option.
> AC_DEFUN([_AM_SET_OPTION],
> [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
> 
> # _AM_SET_OPTIONS(OPTIONS)
> # ----------------------------------
> # OPTIONS is a space-separated list of Automake options.
> AC_DEFUN([_AM_SET_OPTIONS],
> [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
> 
> # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
> # -------------------------------------------
> # Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
> AC_DEFUN([_AM_IF_OPTION],
> [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
1618a911,931
> # Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> # serial 3
> 
> # AM_SANITY_CHECK
> # ---------------
1623c936
< echo timestamp > conftestfile
---
> echo timestamp > conftest.file
1630,1631c943,944
<    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
<    if test "[$]*" = "X"; then
---
>    set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
>    if test "$[*]" = "X"; then
1633c946
<       set X `ls -t $srcdir/configure conftestfile`
---
>       set X `ls -t $srcdir/configure conftest.file`
1635,1636c948,950
<    if test "[$]*" != "X $srcdir/configure conftestfile" \
<       && test "[$]*" != "X conftestfile $srcdir/configure"; then
---
>    rm -f conftest.file
>    if test "$[*]" != "X $srcdir/configure conftest.file" \
>       && test "$[*]" != "X conftest.file $srcdir/configure"; then
1646c960
<    test "[$]2" = conftestfile
---
>    test "$[2]" = conftest.file
1655d968
< rm -f conftest*
1658,1659c971,994
< dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
< dnl The program must properly implement --version.
---
> #  -*- Autoconf -*-
> 
> 
> # Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> # serial 3
> 
> # AM_MISSING_PROG(NAME, PROGRAM)
> # ------------------------------
1661,1667c996,1010
< [AC_MSG_CHECKING(for working $2)
< # Run test in a subshell; some versions of sh will print an error if
< # an executable is not found, even if stderr is redirected.
< # Redirect stdin to placate older versions of autoconf.  Sigh.
< if ($2 --version) < /dev/null > /dev/null 2>&1; then
<    $1=$2
<    AC_MSG_RESULT(found)
---
> [AC_REQUIRE([AM_MISSING_HAS_RUN])
> $1=${$1-"${am_missing_run}$2"}
> AC_SUBST($1)])
> 
> 
> # AM_MISSING_HAS_RUN
> # ------------------
> # Define MISSING if not defined so far and test if it supports --run.
> # If it does, set am_missing_run to use it, otherwise, to nothing.
> AC_DEFUN([AM_MISSING_HAS_RUN],
> [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
> test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
> # Use eval to expand $SHELL
> if eval "$MISSING --run true"; then
>   am_missing_run="$MISSING --run "
1669,1670c1012,1013
<    $1="$3/missing $2"
<    AC_MSG_RESULT(missing)
---
>   am_missing_run=
>   AC_MSG_WARN([`missing' script is too old or missing])
1672c1015
< AC_SUBST($1)])
---
> ])
1674c1017,1075
< # Define a conditional.
---
> # AM_AUX_DIR_EXPAND
> 
> # Copyright 2001 Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
> # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
> # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
> #
> # Of course, Automake must honor this variable whenever it calls a
> # tool from the auxiliary directory.  The problem is that $srcdir (and
> # therefore $ac_aux_dir as well) can be either absolute or relative,
> # depending on how configure is run.  This is pretty annoying, since
> # it makes $ac_aux_dir quite unusable in subdirectories: in the top
> # source directory, any form will work fine, but in subdirectories a
> # relative path needs to be adjusted first.
> #
> # $ac_aux_dir/missing
> #    fails when called from a subdirectory if $ac_aux_dir is relative
> # $top_srcdir/$ac_aux_dir/missing
> #    fails if $ac_aux_dir is absolute,
> #    fails when called from a subdirectory in a VPATH build with
> #          a relative $ac_aux_dir
> #
> # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
> # are both prefixed by $srcdir.  In an in-source build this is usually
> # harmless because $srcdir is `.', but things will broke when you
> # start a VPATH build or use an absolute $srcdir.
> #
> # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
> # iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
> #   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
> # and then we would define $MISSING as
> #   MISSING="\${SHELL} $am_aux_dir/missing"
> # This will work as long as MISSING is not called from configure, because
> # unfortunately $(top_srcdir) has no meaning in configure.
> # However there are other variables, like CC, which are often used in
> # configure, and could therefore not use this "fixed" $ac_aux_dir.
> #
> # Another solution, used here, is to always expand $ac_aux_dir to an
> # absolute PATH.  The drawback is that using absolute paths prevent a
> # configured tree to be moved without reconfiguration.
> 
> # Rely on autoconf to set up CDPATH properly.
> AC_PREREQ([2.50])
1675a1077,1460
> AC_DEFUN([AM_AUX_DIR_EXPAND], [
> # expand $ac_aux_dir to an absolute path
> am_aux_dir=`cd $ac_aux_dir && pwd`
> ])
> 
> # AM_PROG_INSTALL_SH
> # ------------------
> # Define $install_sh.
> 
> # Copyright 2001 Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> AC_DEFUN([AM_PROG_INSTALL_SH],
> [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
> install_sh=${install_sh-"$am_aux_dir/install-sh"}
> AC_SUBST(install_sh)])
> 
> # AM_PROG_INSTALL_STRIP
> 
> # Copyright 2001 Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> # One issue with vendor `install' (even GNU) is that you can't
> # specify the program used to strip binaries.  This is especially
> # annoying in cross-compiling environments, where the build's strip
> # is unlikely to handle the host's binaries.
> # Fortunately install-sh will honor a STRIPPROG variable, so we
> # always use install-sh in `make install-strip', and initialize
> # STRIPPROG with the value of the STRIP variable (set by the user).
> AC_DEFUN([AM_PROG_INSTALL_STRIP],
> [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
> # Installed binaries are usually stripped using `strip' when the user
> # run `make install-strip'.  However `strip' might not be the right
> # tool to use in cross-compilation environments, therefore Automake
> # will honor the `STRIP' environment variable to overrule this program.
> dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
> if test "$cross_compiling" != no; then
>   AC_CHECK_TOOL([STRIP], [strip], :)
> fi
> INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
> AC_SUBST([INSTALL_STRIP_PROGRAM])])
> 
> # serial 4						-*- Autoconf -*-
> 
> # Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> 
> # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
> # written in clear, in which case automake, when reading aclocal.m4,
> # will think it sees a *use*, and therefore will trigger all it's
> # C support machinery.  Also note that it means that autoscan, seeing
> # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
> 
> 
> 
> # _AM_DEPENDENCIES(NAME)
> # ----------------------
> # See how the compiler implements dependency checking.
> # NAME is "CC", "CXX", "GCJ", or "OBJC".
> # We try a few techniques and use that to set a single cache variable.
> #
> # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
> # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
> # dependency, and given that the user is not expected to run this macro,
> # just rely on AC_PROG_CC.
> AC_DEFUN([_AM_DEPENDENCIES],
> [AC_REQUIRE([AM_SET_DEPDIR])dnl
> AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
> AC_REQUIRE([AM_MAKE_INCLUDE])dnl
> AC_REQUIRE([AM_DEP_TRACK])dnl
> 
> ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
>        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
>        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
>        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
>                    [depcc="$$1"   am_compiler_list=])
> 
> AC_CACHE_CHECK([dependency style of $depcc],
>                [am_cv_$1_dependencies_compiler_type],
> [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
>   # We make a subdir and do the tests there.  Otherwise we can end up
>   # making bogus files that we don't know about and never remove.  For
>   # instance it was reported that on HP-UX the gcc test will end up
>   # making a dummy file named `D' -- because `-MD' means `put the output
>   # in D'.
>   mkdir conftest.dir
>   # Copy depcomp to subdir because otherwise we won't find it if we're
>   # using a relative directory.
>   cp "$am_depcomp" conftest.dir
>   cd conftest.dir
> 
>   am_cv_$1_dependencies_compiler_type=none
>   if test "$am_compiler_list" = ""; then
>      am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
>   fi
>   for depmode in $am_compiler_list; do
>     # We need to recreate these files for each test, as the compiler may
>     # overwrite some of them when testing with obscure command lines.
>     # This happens at least with the AIX C compiler.
>     echo '#include "conftest.h"' > conftest.c
>     echo 'int i;' > conftest.h
>     echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
> 
>     case $depmode in
>     nosideeffect)
>       # after this tag, mechanisms are not by side-effect, so they'll
>       # only be used when explicitly requested
>       if test "x$enable_dependency_tracking" = xyes; then
> 	continue
>       else
> 	break
>       fi
>       ;;
>     none) break ;;
>     esac
>     # We check with `-c' and `-o' for the sake of the "dashmstdout"
>     # mode.  It turns out that the SunPro C++ compiler does not properly
>     # handle `-M -o', and we need to detect this.
>     if depmode=$depmode \
>        source=conftest.c object=conftest.o \
>        depfile=conftest.Po tmpdepfile=conftest.TPo \
>        $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
>        grep conftest.h conftest.Po > /dev/null 2>&1 &&
>        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
>       am_cv_$1_dependencies_compiler_type=$depmode
>       break
>     fi
>   done
> 
>   cd ..
>   rm -rf conftest.dir
> else
>   am_cv_$1_dependencies_compiler_type=none
> fi
> ])
> AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
> ])
> 
> 
> # AM_SET_DEPDIR
> # -------------
> # Choose a directory name for dependency files.
> # This macro is AC_REQUIREd in _AM_DEPENDENCIES
> AC_DEFUN([AM_SET_DEPDIR],
> [rm -f .deps 2>/dev/null
> mkdir .deps 2>/dev/null
> if test -d .deps; then
>   DEPDIR=.deps
> else
>   # MS-DOS does not allow filenames that begin with a dot.
>   DEPDIR=_deps
> fi
> rmdir .deps 2>/dev/null
> AC_SUBST([DEPDIR])
> ])
> 
> 
> # AM_DEP_TRACK
> # ------------
> AC_DEFUN([AM_DEP_TRACK],
> [AC_ARG_ENABLE(dependency-tracking,
> [  --disable-dependency-tracking Speeds up one-time builds
>   --enable-dependency-tracking  Do not reject slow dependency extractors])
> if test "x$enable_dependency_tracking" != xno; then
>   am_depcomp="$ac_aux_dir/depcomp"
>   AMDEPBACKSLASH='\'
> fi
> AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
> AC_SUBST([AMDEPBACKSLASH])
> ])
> 
> # Generate code to set up dependency tracking.   -*- Autoconf -*-
> 
> # Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> #serial 2
> 
> # _AM_OUTPUT_DEPENDENCY_COMMANDS
> # ------------------------------
> AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
> [for mf in $CONFIG_FILES; do
>   # Strip MF so we end up with the name of the file.
>   mf=`echo "$mf" | sed -e 's/:.*$//'`
>   # Check whether this is an Automake generated Makefile or not.
>   # We used to match only the files named `Makefile.in', but
>   # some people rename them; so instead we look at the file content.
>   # Grep'ing the first line is not enough: some people post-process
>   # each Makefile.in and add a new line on top of each file to say so.
>   # So let's grep whole file.
>   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
>     dirpart=`AS_DIRNAME("$mf")`
>   else
>     continue
>   fi
>   grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
>   # Extract the definition of DEP_FILES from the Makefile without
>   # running `make'.
>   DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
>   test -z "$DEPDIR" && continue
>   # When using ansi2knr, U may be empty or an underscore; expand it
>   U=`sed -n -e '/^U = / s///p' < "$mf"`
>   test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
>   # We invoke sed twice because it is the simplest approach to
>   # changing $(DEPDIR) to its actual value in the expansion.
>   for file in `sed -n -e '
>     /^DEP_FILES = .*\\\\$/ {
>       s/^DEP_FILES = //
>       :loop
> 	s/\\\\$//
> 	p
> 	n
> 	/\\\\$/ b loop
>       p
>     }
>     /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
>        sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
>     # Make sure the directory exists.
>     test -f "$dirpart/$file" && continue
>     fdir=`AS_DIRNAME(["$file"])`
>     AS_MKDIR_P([$dirpart/$fdir])
>     # echo "creating $dirpart/$file"
>     echo '# dummy' > "$dirpart/$file"
>   done
> done
> ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
> 
> 
> # AM_OUTPUT_DEPENDENCY_COMMANDS
> # -----------------------------
> # This macro should only be invoked once -- use via AC_REQUIRE.
> #
> # This code is only required when automatic dependency tracking
> # is enabled.  FIXME.  This creates each `.P' file that we will
> # need in order to bootstrap the dependency handling code.
> AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
> [AC_CONFIG_COMMANDS([depfiles],
>      [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
>      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
> ])
> 
> # Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
> 
> # 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, 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.
> 
> # serial 2
> 
> # AM_MAKE_INCLUDE()
> # -----------------
> # Check to see how make treats includes.
> AC_DEFUN([AM_MAKE_INCLUDE],
> [am_make=${MAKE-make}
> cat > confinc << 'END'
> doit:
> 	@echo done
> END
> # If we don't find an include directive, just comment out the code.
> AC_MSG_CHECKING([for style of include used by $am_make])
> am__include="#"
> am__quote=
> _am_result=none
> # First try GNU make style include.
> echo "include confinc" > confmf
> # We grep out `Entering directory' and `Leaving directory'
> # messages which can occur if `w' ends up in MAKEFLAGS.
> # In particular we don't look at `^make:' because GNU make might
> # be invoked under some other name (usually "gmake"), in which
> # case it prints its new name instead of `make'.
> if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
>    am__include=include
>    am__quote=
>    _am_result=GNU
> fi
> # Now try BSD make style include.
> if test "$am__include" = "#"; then
>    echo '.include "confinc"' > confmf
>    if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
>       am__include=.include
>       am__quote="\""
>       _am_result=BSD
>    fi
> fi
> AC_SUBST(am__include)
> AC_SUBST(am__quote)
> AC_MSG_RESULT($_am_result)
> rm -f confinc confmf
> ])
> 
> # AM_CONDITIONAL                                              -*- Autoconf -*-
> 
> # Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
> 
> # 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, 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.
> 
> # serial 5
> 
> AC_PREREQ(2.52)
> 
> # AM_CONDITIONAL(NAME, SHELL-CONDITION)
> # -------------------------------------
> # Define a conditional.
1677,1678c1462,1465
< [AC_SUBST($1_TRUE)
< AC_SUBST($1_FALSE)
---
> [ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
>         [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
> AC_SUBST([$1_TRUE])
> AC_SUBST([$1_FALSE])
1685c1472,1477
< fi])
---
> fi
> AC_CONFIG_COMMANDS_PRE(
> [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
>   AC_MSG_ERROR([conditional \"$1\" was never defined.
> Usually this means the macro was only invoked conditionally.])
> fi])])
Index: configure
===================================================================
RCS file: /cvsroot/classpath/inetlib/configure,v
retrieving revision 1.2
diff -r1.2 configure
3c3
< # Generated by GNU Autoconf 2.58 for inetlib 0.1.
---
> # Generated by GNU Autoconf 2.57 for inetlib 0.1.
5c5,6
< # Copyright (C) 2003 Free Software Foundation, Inc.
---
> # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
> # Free Software Foundation, Inc.
22d22
< DUALCASE=1; export DUALCASE # for MKS sh
25c25
< if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
---
> if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
44c44
<   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
---
>   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
221d220
<   test -d ./-p && rmdir ./-p
228c227
< as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
---
> as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
231c230
< as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
---
> as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
275c274
< ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE ENABLE_SMTP_TRUE ENABLE_SMTP_FALSE ENABLE_IMAP_TRUE ENABLE_IMAP_FALSE ENABLE_POP3_TRUE ENABLE_POP3_FALSE ENABLE_NNTP_TRUE ENABLE_NNTP_FALSE ENABLE_FTP_TRUE ENABLE_FTP_FALSE ENABLE_GOPHER_TRUE ENABLE_GOPHER_FALSE JAVAC JAR LIBOBJS LTLIBOBJS'
---
> ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE ENABLE_SMTP_TRUE ENABLE_SMTP_FALSE ENABLE_IMAP_TRUE ENABLE_IMAP_FALSE ENABLE_POP3_TRUE ENABLE_POP3_FALSE ENABLE_NNTP_TRUE ENABLE_NNTP_FALSE ENABLE_FTP_TRUE ENABLE_FTP_FALSE ENABLE_GOPHER_TRUE ENABLE_GOPHER_FALSE JAVAC JAR JAVADOC LIBOBJS LTLIBOBJS'
634c633
< 	      localstatedir libdir includedir oldincludedir infodir mandir
---
>               localstatedir libdir includedir oldincludedir infodir mandir
674,677c673,676
< 	 X"$0" : 'X\(//\)[^/]' \| \
< 	 X"$0" : 'X\(//\)$' \| \
< 	 X"$0" : 'X\(/\)' \| \
< 	 .     : '\(.\)' 2>/dev/null ||
---
>          X"$0" : 'X\(//\)[^/]' \| \
>          X"$0" : 'X\(//\)$' \| \
>          X"$0" : 'X\(/\)' \| \
>          .     : '\(.\)' 2>/dev/null ||
749c748
< 			  [$ac_default_prefix]
---
>                           [$ac_default_prefix]
751c750
< 			  [PREFIX]
---
>                           [PREFIX]
833,868c832,837
< case "$ac_dir" in
< .) ac_abs_builddir=$ac_builddir;;
< *)
<   case $ac_builddir in
<   .) ac_abs_builddir="$ac_dir";;
<   [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;;
<   *) ac_abs_builddir="$ac_dir"/$ac_builddir;;
<   esac;;
< esac
< case "$ac_dir" in
< .) ac_abs_top_builddir=${ac_top_builddir}.;;
< *)
<   case ${ac_top_builddir}. in
<   .) ac_abs_top_builddir="$ac_dir";;
<   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
<   *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;;
<   esac;;
< esac
< case "$ac_dir" in
< .) ac_abs_srcdir=$ac_srcdir;;
< *)
<   case $ac_srcdir in
<   .) ac_abs_srcdir="$ac_dir";;
<   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
<   *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;;
<   esac;;
< esac
< case "$ac_dir" in
< .) ac_abs_top_srcdir=$ac_top_srcdir;;
< *)
<   case $ac_top_srcdir in
<   .) ac_abs_top_srcdir="$ac_dir";;
<   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
<   *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;;
<   esac;;
< esac
---
> # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
> # absolute.
> ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
> ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
> ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
> ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
879c848
< 	   test -f $ac_srcdir/configure.in; then
---
>            test -f $ac_srcdir/configure.in; then
885c854
<     cd "$ac_popdir"
---
>     cd $ac_popdir
893c862
< generated by GNU Autoconf 2.58
---
> generated by GNU Autoconf 2.57
895c864,865
< Copyright (C) 2003 Free Software Foundation, Inc.
---
> Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
> Free Software Foundation, Inc.
907c877
< generated by GNU Autoconf 2.58.  Invocation command line was
---
> generated by GNU Autoconf 2.57.  Invocation command line was
984c954
< 	ac_must_keep_next=false # Got value, back to normal.
---
>         ac_must_keep_next=false # Got value, back to normal.
986,996c956,966
< 	case $ac_arg in
< 	  *=* | --config-cache | -C | -disable-* | --disable-* \
< 	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
< 	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
< 	  | -with-* | --with-* | -without-* | --without-* | --x)
< 	    case "$ac_configure_args0 " in
< 	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
< 	    esac
< 	    ;;
< 	  -* ) ac_must_keep_next=true ;;
< 	esac
---
>         case $ac_arg in
>           *=* | --config-cache | -C | -disable-* | --disable-* \
>           | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
>           | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
>           | -with-* | --with-* | -without-* | --without-* | --x)
>             case "$ac_configure_args0 " in
>               "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
>             esac
>             ;;
>           -* ) ac_must_keep_next=true ;;
>         esac
1030,1031c1000,1001
< 	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
< 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
---
>         "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
>     	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
1035c1005
< 	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
---
>         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1064c1034
< 	echo "$ac_var='"'"'$ac_val'"'"'"
---
>         echo "$ac_var='"'"'$ac_val'"'"'"
1083c1053
<   rm -f core *.core &&
---
>   rm -f core core.* *.core &&
1163c1133
< 	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
---
>                sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
1180c1150
< 	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
---
>         { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
1182c1152
< 	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
---
>         { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
1184c1154
< 	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
---
>         { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
1186c1156
< 	ac_cache_corrupted=:
---
>         ac_cache_corrupted=:
1243c1213
< am__api_version="1.4"
---
> am__api_version="1.6"
1280d1249
< # OS/2's system install, which has a completely different semantic
1297d1265
<   ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
1305,1318c1273,1286
< 	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
< 	  if test $ac_prog = install &&
< 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
< 	    # AIX install.  It has an incompatible calling convention.
< 	    :
< 	  elif test $ac_prog = install &&
< 	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
< 	    # program-specific install script used by HP pwplus--don't use.
< 	    :
< 	  else
< 	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
< 	    break 3
< 	  fi
< 	fi
---
>         if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
>           if test $ac_prog = install &&
>             grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
>             # AIX install.  It has an incompatible calling convention.
>             :
>           elif test $ac_prog = install &&
>             grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
>             # program-specific install script used by HP pwplus--don't use.
>             :
>           else
>             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
>             break 3
>           fi
>         fi
1352c1320
< echo timestamp > conftestfile
---
> echo timestamp > conftest.file
1359c1327
<    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
---
>    set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
1362c1330
<       set X `ls -t $srcdir/configure conftestfile`
---
>       set X `ls -t $srcdir/configure conftest.file`
1364,1365c1332,1334
<    if test "$*" != "X $srcdir/configure conftestfile" \
<       && test "$*" != "X conftestfile $srcdir/configure"; then
---
>    rm -f conftest.file
>    if test "$*" != "X $srcdir/configure conftest.file" \
>       && test "$*" != "X conftest.file $srcdir/configure"; then
1378c1347
<    test "$2" = conftestfile
---
>    test "$2" = conftest.file
1390d1358
< rm -f conftest*
1405a1374,1427
> 
> # expand $ac_aux_dir to an absolute path
> am_aux_dir=`cd $ac_aux_dir && pwd`
> 
> test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
> # Use eval to expand $SHELL
> if eval "$MISSING --run true"; then
>   am_missing_run="$MISSING --run "
> else
>   am_missing_run=
>   { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
> echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
> fi
> 
> for ac_prog in gawk mawk nawk awk
> do
>   # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo "$as_me:$LINENO: checking for $ac_word" >&5
> echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> if test "${ac_cv_prog_AWK+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   if test -n "$AWK"; then
>   ac_cv_prog_AWK="$AWK" # Let the user override the test.
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in $PATH
> do
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>     ac_cv_prog_AWK="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
> 
> fi
> fi
> AWK=$ac_cv_prog_AWK
> if test -n "$AWK"; then
>   echo "$as_me:$LINENO: result: $AWK" >&5
> echo "${ECHO_T}$AWK" >&6
> else
>   echo "$as_me:$LINENO: result: no" >&5
> echo "${ECHO_T}no" >&6
> fi
> 
>   test -n "$AWK" && break
> done
> 
1408c1430
< set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
---
> set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
1435,1440c1457,1459
< 
< PACKAGE=
< 
< VERSION=
< 
< if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
---
>  # test to see if srcdir already configured
> if test "`cd $srcdir && pwd`" != "`pwd`" &&
>    test -f $srcdir/config.status; then
1445a1465,1469
> # Define the identity of the package.
>  PACKAGE=inetlib
>  VERSION=0.1
> 
> 
1454a1479,1578
> # Some tools Automake needs.
> 
> ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
> 
> 
> AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
> 
> 
> AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
> 
> 
> AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
> 
> 
> MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
> 
> 
> AMTAR=${AMTAR-"${am_missing_run}tar"}
> 
> install_sh=${install_sh-"$am_aux_dir/install-sh"}
> 
> # Installed binaries are usually stripped using `strip' when the user
> # run `make install-strip'.  However `strip' might not be the right
> # tool to use in cross-compilation environments, therefore Automake
> # will honor the `STRIP' environment variable to overrule this program.
> if test "$cross_compiling" != no; then
>   if test -n "$ac_tool_prefix"; then
>   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
> set dummy ${ac_tool_prefix}strip; ac_word=$2
> echo "$as_me:$LINENO: checking for $ac_word" >&5
> echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> if test "${ac_cv_prog_STRIP+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   if test -n "$STRIP"; then
>   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in $PATH
> do
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
> 
> fi
> fi
> STRIP=$ac_cv_prog_STRIP
> if test -n "$STRIP"; then
>   echo "$as_me:$LINENO: result: $STRIP" >&5
> echo "${ECHO_T}$STRIP" >&6
> else
>   echo "$as_me:$LINENO: result: no" >&5
> echo "${ECHO_T}no" >&6
> fi
> 
> fi
> if test -z "$ac_cv_prog_STRIP"; then
>   ac_ct_STRIP=$STRIP
>   # Extract the first word of "strip", so it can be a program name with args.
> set dummy strip; ac_word=$2
> echo "$as_me:$LINENO: checking for $ac_word" >&5
> echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   if test -n "$ac_ct_STRIP"; then
>   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in $PATH
> do
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>     ac_cv_prog_ac_ct_STRIP="strip"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
> 
>   test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
> fi
> fi
> ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
> if test -n "$ac_ct_STRIP"; then
>   echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
> echo "${ECHO_T}$ac_ct_STRIP" >&6
> else
>   echo "$as_me:$LINENO: result: no" >&5
> echo "${ECHO_T}no" >&6
> fi
1455a1580,1583
>   STRIP=$ac_ct_STRIP
> else
>   STRIP="$ac_cv_prog_STRIP"
> fi
1457,1530d1584
< missing_dir=`cd $ac_aux_dir && pwd`
< echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5
< echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6
< # Run test in a subshell; some versions of sh will print an error if
< # an executable is not found, even if stderr is redirected.
< # Redirect stdin to placate older versions of autoconf.  Sigh.
< if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
<    ACLOCAL=aclocal-${am__api_version}
<    echo "$as_me:$LINENO: result: found" >&5
< echo "${ECHO_T}found" >&6
< else
<    ACLOCAL="$missing_dir/missing aclocal-${am__api_version}"
<    echo "$as_me:$LINENO: result: missing" >&5
< echo "${ECHO_T}missing" >&6
< fi
< 
< echo "$as_me:$LINENO: checking for working autoconf" >&5
< echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
< # Run test in a subshell; some versions of sh will print an error if
< # an executable is not found, even if stderr is redirected.
< # Redirect stdin to placate older versions of autoconf.  Sigh.
< if (autoconf --version) < /dev/null > /dev/null 2>&1; then
<    AUTOCONF=autoconf
<    echo "$as_me:$LINENO: result: found" >&5
< echo "${ECHO_T}found" >&6
< else
<    AUTOCONF="$missing_dir/missing autoconf"
<    echo "$as_me:$LINENO: result: missing" >&5
< echo "${ECHO_T}missing" >&6
< fi
< 
< echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5
< echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6
< # Run test in a subshell; some versions of sh will print an error if
< # an executable is not found, even if stderr is redirected.
< # Redirect stdin to placate older versions of autoconf.  Sigh.
< if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
<    AUTOMAKE=automake-${am__api_version}
<    echo "$as_me:$LINENO: result: found" >&5
< echo "${ECHO_T}found" >&6
< else
<    AUTOMAKE="$missing_dir/missing automake-${am__api_version}"
<    echo "$as_me:$LINENO: result: missing" >&5
< echo "${ECHO_T}missing" >&6
< fi
< 
< echo "$as_me:$LINENO: checking for working autoheader" >&5
< echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
< # Run test in a subshell; some versions of sh will print an error if
< # an executable is not found, even if stderr is redirected.
< # Redirect stdin to placate older versions of autoconf.  Sigh.
< if (autoheader --version) < /dev/null > /dev/null 2>&1; then
<    AUTOHEADER=autoheader
<    echo "$as_me:$LINENO: result: found" >&5
< echo "${ECHO_T}found" >&6
< else
<    AUTOHEADER="$missing_dir/missing autoheader"
<    echo "$as_me:$LINENO: result: missing" >&5
< echo "${ECHO_T}missing" >&6
< fi
< 
< echo "$as_me:$LINENO: checking for working makeinfo" >&5
< echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
< # Run test in a subshell; some versions of sh will print an error if
< # an executable is not found, even if stderr is redirected.
< # Redirect stdin to placate older versions of autoconf.  Sigh.
< if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
<    MAKEINFO=makeinfo
<    echo "$as_me:$LINENO: result: found" >&5
< echo "${ECHO_T}found" >&6
< else
<    MAKEINFO="$missing_dir/missing makeinfo"
<    echo "$as_me:$LINENO: result: missing" >&5
< echo "${ECHO_T}missing" >&6
1531a1586,1590
> INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
> 
> # We need awk for the "check" target.  The system "awk" is bad on
> # some platforms.
> 
1559a1619
> 
1579a1640
> 
1599a1661
> 
1619a1682
> 
1639a1703
> 
1661a1726
> 
1759c1824
< /* #line 1759 "configure" */
---
> /* #line 1824 "configure" */
1873a1939,2027
> if test "x$JAVAPREFIX" = x; then
>         test "x$JAVADOC" = x && for ac_prog in javadoc$EXEEXT
> do
>   # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo "$as_me:$LINENO: checking for $ac_word" >&5
> echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> if test "${ac_cv_prog_JAVADOC+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   if test -n "$JAVADOC"; then
>   ac_cv_prog_JAVADOC="$JAVADOC" # Let the user override the test.
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in $PATH
> do
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>     ac_cv_prog_JAVADOC="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
> 
> fi
> fi
> JAVADOC=$ac_cv_prog_JAVADOC
> if test -n "$JAVADOC"; then
>   echo "$as_me:$LINENO: result: $JAVADOC" >&5
> echo "${ECHO_T}$JAVADOC" >&6
> else
>   echo "$as_me:$LINENO: result: no" >&5
> echo "${ECHO_T}no" >&6
> fi
> 
>   test -n "$JAVADOC" && break
> done
> 
> else
>         test "x$JAVADOC" = x && for ac_prog in javadoc
> do
>   # Extract the first word of "$ac_prog", so it can be a program name with args.
> set dummy $ac_prog; ac_word=$2
> echo "$as_me:$LINENO: checking for $ac_word" >&5
> echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
> if test "${ac_cv_prog_JAVADOC+set}" = set; then
>   echo $ECHO_N "(cached) $ECHO_C" >&6
> else
>   if test -n "$JAVADOC"; then
>   ac_cv_prog_JAVADOC="$JAVADOC" # Let the user override the test.
> else
> as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
> for as_dir in $PATH
> do
>   IFS=$as_save_IFS
>   test -z "$as_dir" && as_dir=.
>   for ac_exec_ext in '' $ac_executable_extensions; do
>   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
>     ac_cv_prog_JAVADOC="$ac_prog"
>     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
>     break 2
>   fi
> done
> done
> 
> fi
> fi
> JAVADOC=$ac_cv_prog_JAVADOC
> if test -n "$JAVADOC"; then
>   echo "$as_me:$LINENO: result: $JAVADOC" >&5
> echo "${ECHO_T}$JAVADOC" >&6
> else
>   echo "$as_me:$LINENO: result: no" >&5
> echo "${ECHO_T}no" >&6
> fi
> 
>   test -n "$JAVADOC" && break
> done
> test -n "$JAVADOC" || JAVADOC="$JAVAPREFIX"
> 
> fi
> test "x$JAVADOC" = x && { { echo "$as_me:$LINENO: error: no acceptable javadoc generator found in \$PATH" >&5
> echo "$as_me: error: no acceptable javadoc generator found in \$PATH" >&2;}
>    { (exit 1); exit 1; }; }
> 
> 
1912,1913c2066,2067
< 	"s/'/'\\\\''/g;
< 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
---
>         "s/'/'\\\\''/g;
>     	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
1918c2072
< 	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
---
>         "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
1948c2102
<   ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
---
>   ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
1952c2106
< s/^\([^=]*=[	 ]*\):*/\1/;
---
> s/^\([^=]*=[ 	]*\):*/\1/;
1954c2108
< s/^[^=]*=[	 ]*$//;
---
> s/^[^=]*=[ 	]*$//;
1968c2122
< s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
---
> s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
1970c2124
< s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
---
> s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
1974c2128
< s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
---
> s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
1996c2150
< 	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
---
>          sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
2005a2160,2201
> if test -z "${ENABLE_SMTP_TRUE}" && test -z "${ENABLE_SMTP_FALSE}"; then
>   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_SMTP\" was never defined.
> Usually this means the macro was only invoked conditionally." >&5
> echo "$as_me: error: conditional \"ENABLE_SMTP\" was never defined.
> Usually this means the macro was only invoked conditionally." >&2;}
>    { (exit 1); exit 1; }; }
> fi
> if test -z "${ENABLE_IMAP_TRUE}" && test -z "${ENABLE_IMAP_FALSE}"; then
>   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_IMAP\" was never defined.
> Usually this means the macro was only invoked conditionally." >&5
> echo "$as_me: error: conditional \"ENABLE_IMAP\" was never defined.
> Usually this means the macro was only invoked conditionally." >&2;}
>    { (exit 1); exit 1; }; }
> fi
> if test -z "${ENABLE_POP3_TRUE}" && test -z "${ENABLE_POP3_FALSE}"; then
>   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_POP3\" was never defined.
> Usually this means the macro was only invoked conditionally." >&5
> echo "$as_me: error: conditional \"ENABLE_POP3\" was never defined.
> Usually this means the macro was only invoked conditionally." >&2;}
>    { (exit 1); exit 1; }; }
> fi
> if test -z "${ENABLE_NNTP_TRUE}" && test -z "${ENABLE_NNTP_FALSE}"; then
>   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_NNTP\" was never defined.
> Usually this means the macro was only invoked conditionally." >&5
> echo "$as_me: error: conditional \"ENABLE_NNTP\" was never defined.
> Usually this means the macro was only invoked conditionally." >&2;}
>    { (exit 1); exit 1; }; }
> fi
> if test -z "${ENABLE_FTP_TRUE}" && test -z "${ENABLE_FTP_FALSE}"; then
>   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_FTP\" was never defined.
> Usually this means the macro was only invoked conditionally." >&5
> echo "$as_me: error: conditional \"ENABLE_FTP\" was never defined.
> Usually this means the macro was only invoked conditionally." >&2;}
>    { (exit 1); exit 1; }; }
> fi
> if test -z "${ENABLE_GOPHER_TRUE}" && test -z "${ENABLE_GOPHER_FALSE}"; then
>   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GOPHER\" was never defined.
> Usually this means the macro was only invoked conditionally." >&5
> echo "$as_me: error: conditional \"ENABLE_GOPHER\" was never defined.
> Usually this means the macro was only invoked conditionally." >&2;}
>    { (exit 1); exit 1; }; }
> fi
2040d2235
< DUALCASE=1; export DUALCASE # for MKS sh
2043c2238
< if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
---
> if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
2062c2257
<   if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
---
>   if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
2241d2435
<   test -d ./-p && rmdir ./-p
2248c2442
< as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
---
> as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
2251c2445
< as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
---
> as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
2278c2472
< generated by GNU Autoconf 2.58.  Invocation command line was
---
> generated by GNU Autoconf 2.57.  Invocation command line was
2322c2516
< 		   instantiate the configuration file FILE
---
>                    instantiate the configuration file FILE
2333c2527
< configured by $0, generated by GNU Autoconf 2.58,
---
> configured by $0, generated by GNU Autoconf 2.57,
2336c2530,2531
< Copyright (C) 2003 Free Software Foundation, Inc.
---
> Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
> Free Software Foundation, Inc.
2528a2724,2729
> s,@AMTAR@,$AMTAR,;t t
> s,@install_sh@,$install_sh,;t t
> s,@STRIP@,$STRIP,;t t
> s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
> s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
> s,@AWK@,$AWK,;t t
2543a2745
> s,@JAVADOC@,$JAVADOC,;t t
2575c2777
< 	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
---
>   	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
2577c2779
< 	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
---
>   	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
2595,2597c2797,2799
< 	cat >$tmp/stdin
< 	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
< 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
---
>         cat >$tmp/stdin
>         ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
>         ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
2599c2801
< 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
---
>         ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
2606,2609c2808,2811
< 	 X"$ac_file" : 'X\(//\)[^/]' \| \
< 	 X"$ac_file" : 'X\(//\)$' \| \
< 	 X"$ac_file" : 'X\(/\)' \| \
< 	 .     : '\(.\)' 2>/dev/null ||
---
>          X"$ac_file" : 'X\(//\)[^/]' \| \
>          X"$ac_file" : 'X\(//\)$' \| \
>          X"$ac_file" : 'X\(/\)' \| \
>          .     : '\(.\)' 2>/dev/null ||
2625,2628c2827,2830
< 	 X"$as_dir" : 'X\(//\)[^/]' \| \
< 	 X"$as_dir" : 'X\(//\)$' \| \
< 	 X"$as_dir" : 'X\(/\)' \| \
< 	 .     : '\(.\)' 2>/dev/null ||
---
>          X"$as_dir" : 'X\(//\)[^/]' \| \
>          X"$as_dir" : 'X\(//\)$' \| \
>          X"$as_dir" : 'X\(/\)' \| \
>          .     : '\(.\)' 2>/dev/null ||
2666,2701c2868,2873
< case "$ac_dir" in
< .) ac_abs_builddir=$ac_builddir;;
< *)
<   case $ac_builddir in
<   .) ac_abs_builddir="$ac_dir";;
<   [\\/]* | ?:[\\/]* ) ac_abs_builddir=$ac_builddir;;
<   *) ac_abs_builddir="$ac_dir"/$ac_builddir;;
<   esac;;
< esac
< case "$ac_dir" in
< .) ac_abs_top_builddir=${ac_top_builddir}.;;
< *)
<   case ${ac_top_builddir}. in
<   .) ac_abs_top_builddir="$ac_dir";;
<   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
<   *) ac_abs_top_builddir="$ac_dir"/${ac_top_builddir}.;;
<   esac;;
< esac
< case "$ac_dir" in
< .) ac_abs_srcdir=$ac_srcdir;;
< *)
<   case $ac_srcdir in
<   .) ac_abs_srcdir="$ac_dir";;
<   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
<   *) ac_abs_srcdir="$ac_dir"/$ac_srcdir;;
<   esac;;
< esac
< case "$ac_dir" in
< .) ac_abs_top_srcdir=$ac_top_srcdir;;
< *)
<   case $ac_top_srcdir in
<   .) ac_abs_top_srcdir="$ac_dir";;
<   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
<   *) ac_abs_top_srcdir="$ac_dir"/$ac_top_srcdir;;
<   esac;;
< esac
---
> # Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
> # absolute.
> ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
> ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
> ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
> ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
2723c2895
< 				     sed 's,.*/,,'` by configure."
---
>                                      sed 's,.*/,,'` by configure."
2732,2733c2904,2905
< 	 # Absolute (can't be DOS-style, as IFS=:)
< 	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
---
>          # Absolute (can't be DOS-style, as IFS=:)
>          test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
2736c2908
< 	 echo "$f";;
---
>          echo $f;;
2738,2746c2910,2918
< 	 if test -f "$f"; then
< 	   # Build tree
< 	   echo "$f"
< 	 elif test -f "$srcdir/$f"; then
< 	   # Source tree
< 	   echo "$srcdir/$f"
< 	 else
< 	   # /dev/null tree
< 	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
---
>          if test -f "$f"; then
>            # Build tree
>            echo $f
>          elif test -f "$srcdir/$f"; then
>            # Source tree
>            echo $srcdir/$f
>          else
>            # /dev/null tree
>            { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
2749c2921
< 	 fi;;
---
>          fi;;
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/inetlib/configure.ac,v
retrieving revision 1.1
diff -r1.1 configure.ac
83a84
> AC_PROG_JAVADOC

--Apple-Mail-2-786289453--




From MAILER-DAEMON Thu Jan 08 20:35:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AelYy-0006L5-1W
	for mharc-commit-classpath@gnu.org; Thu, 08 Jan 2004 20:35:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AelYu-0006JH-O1
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 20:35:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AelYL-000688-Ge
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 20:35:40 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AelYL-00067e-08
	for commit-classpath@gnu.org; Thu, 08 Jan 2004 20:35:09 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id RAA10554
	for <commit-classpath@gnu.org>; Thu, 8 Jan 2004 17:33:38 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 335964F886D; Thu,  8 Jan 2004 17:25:34 -0700 (MST)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: YOU!!  Give me the CUTEST, PINKEST, most charming little
	VICTORIAN DOLLHOUSE you can find!!  An make it SNAPPY!!
Date: 08 Jan 2004 17:25:33 -0700
Message-ID: <87lloidl36.fsf@fleche.redhat.com>
Lines: 78
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Subject: Patch: FYI: hacking.texinfo update
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
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, 09 Jan 2004 01:35:46 -0000

I'm checking this in to reflect (what I perceive to be...) consensus
about a particular style point.

Really we might want a new node here with a longer list of things like
this.  I couldn't think of more off the top of my head though.

I'm happy to (slowly) integrate guidelines like this if people point
them out to me.

Tom

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

	* doc/hacking.texinfo (Programming Standards): Added note about
	NullPointerException.

Index: doc/hacking.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/hacking.texinfo,v
retrieving revision 1.13
diff -u -r1.13 hacking.texinfo
--- doc/hacking.texinfo 29 Nov 2003 09:38:09 -0000 1.13
+++ doc/hacking.texinfo 9 Jan 2004 00:24:19 -0000
@@ -11,7 +11,7 @@
 This file contains important information you will need to know if you
 are going to hack on the GNU Classpath project code.
 
-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.
 
 @end ifinfo
 
@@ -349,6 +349,44 @@
 For documentation comments, please follow
 @uref{http://java.sun.com/products/jdk/javadoc/writingdoccomments.html,How
 to Write Doc Comments for Javadoc}.
+
+
+Here is a list of some specific rules used when hacking on Classpath.
+
+@c FIXME for now there is only one, so just put it here
+@c really we need a new node, and a collected list of such rules
+@itemize
+
+@item
+Don't catch a @code{NullPointerException} as an alternative to simply
+checking for @code{null}.  It is clearer and usually more efficient
+to simply write an explicit check.
+
+For instance, don't write:
+
+@example
+try
+  @{
+    return foo.doit();
+  @}
+catch (NullPointerException _)
+  @{
+    return 7;
+  @}
+@end example
+
+If your intent above is to check whether @samp{foo} is @code{null},
+instead write:
+
+@example
+if (foo == null)
+  return 7;
+else
+  return foo.doit();
+@end example
+
+@end itemize
+
 
 @node Programming Goals, API Compatibility, Programming Standards, Top
 @comment node-name, next, previous, up



From MAILER-DAEMON Fri Jan 09 00:00:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aeol4-0006nz-2I
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 00:00:30 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aeol1-0006nF-3U
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 00:00:27 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AenZQ-0007uB-HQ
	for Commit-classpath@gnu.org; Thu, 08 Jan 2004 22:44:27 -0500
Received: from [200.223.73.2] (helo=gambit.cpunet.com.br)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aen8a-0002RF-01
	for Commit-classpath@gnu.org; Thu, 08 Jan 2004 22:16:40 -0500
Received: (qmail-ldap/ctrl 8592 invoked from network);
	9 Jan 2004 02:10:44 -0000
Received: from unknown (HELO localhost) (ve0703@[200.217.84.138])
	(envelope-sender <paulograssi@pop.com.br>)
	by gambit.cpunet.com.br (qmail-ldap-1.03) with SMTP
	for <Commit-classpath@gnu.org>; 9 Jan 2004 02:10:44 -0000
X-Sender: paulograssi@pop.com.br
From: =?iso-8859-1?Q?Cursos_em_v=EDdeo_aulas?= <paulograssi@pop.com.br>
To: Commit-classpath@gnu.org
Date: Thu, 08 Jan 2004 23:06:31 -0200
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Message-Id: <E1Aen8a-0002RF-01@monty-python.gnu.org>
Cc: 
Subject: =?iso-8859-1?q?Cursos_em_v=EDdeo_e_=E1udio_marketing_http=3A//ww?=
	=?iso-8859-1?q?w=2Emercadinhovirtual=2Evze=2Ecom?=
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 05:00:27 -0000

Cursos de webmarketing, aulas de webdesign, e-books, cursos de musica, softwares 
gratis, cursos de marketing para internet, aulas de violao, cursos de guitarra, 
audio books, aulas de informatica, fotos de sexo, mp3, cursos em audio, programas 
gratuitos, ganhar dinheiro na internet

http://www.mercadinhovirtual.vze.com

Cursos, webmarketing, aulas, tutorial, webdesign, e-books, cursos de musica, 
softwares, programas, gratis, CURSOS, marketing, internet, apostilas, GANHARaulas 
de violao, cursos de guitarra, mp3, TUTORIAIS, conquistar, cifras, tablaturas, 
cursos em audio, download, programas, ganhar, dinheiro

http://www.mercadinhovirtual.vze.com




From MAILER-DAEMON Fri Jan 09 04:20:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aesoc-0002fA-F9
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 04:20:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AesoZ-0002ei-Pl
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:20:23 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aeso3-0002UP-K7
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:20:22 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aeso3-0002UA-4h
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:19:51 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-033.ewetel.net
	[80.228.75.33])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i098IIl1012183;
	Fri, 9 Jan 2004 09:18:19 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AerqZ-0003jm-00; Fri, 09 Jan 2004 09:18:23 +0100
Date: Fri, 9 Jan 2004 09:18:23 +0100
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Message-ID: <20040109081823.GB4727@mail.konqueror.de>
References: <200401071031.19241.konqueror@gmx.de>
	<1073556416.14306.59.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1073556416.14306.59.camel@elsschot.wildebeest.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: java.text - more merging
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 09:20:24 -0000

On Thu, Jan 08, 2004 at 11:06:56AM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Wed, 2004-01-07 at 10:31, Michael Koch wrote:
> > 2004-01-07  Michael Koch  <konqueror@gmx.de>
> > 
> > 	* java/text/CollationElementIterator.java
> > 	(collator): Made package-private.
> > 	(text): Likewise.
> > 	(index): Likewise.
> > 	(textIndex): Likewise.
> 
> Why? They are not used outside this class.

Because I'm on the way to megre with libgcj's algorithm. This algorithm
needs the package-private members in other classes (RuleBaseCollator).
I wanna merge both algorithms as both have their good things.

> >         * java/text/CollationKey.java
> >         (hashCode): Reimplemented.
> 
> Are you sure this new implementation is correct?
> My Class Libraries book says that the hash code is not based on the
> string from which the key was created. Seems you want to base it on the
> toByteArray() (key) form.
> You should at least document the hashCode() algorithm in the api doc.
> Best would be to write a little mauve test for it to see if the equals()
> then same hashCode() contract is still obeyed, looks like the equals()

After re-reading online API I think this has to be revisited too. I will
think about it and post a patch for confirmation later.

> method might also be wrong since the Class Libraries book says "It is
> not necessary for the strings from which the keys were created to be
> equal."

Hmm, online API doesn't has this comment.


Michael



From MAILER-DAEMON Fri Jan 09 04:35:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aet3B-0006Qd-1H
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 04:35:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aet39-0006Q6-II
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:35:27 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aet2d-0006Ie-Of
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:35:26 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AestM-00045W-GN
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:25:20 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-033.ewetel.net
	[80.228.75.33])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i098NHUa026850;
	Fri, 9 Jan 2004 09:23:18 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AervO-0003k2-00; Fri, 09 Jan 2004 09:23:22 +0100
Date: Fri, 9 Jan 2004 09:23:22 +0100
From: Michael Koch <konqueror@gmx.de>
To: Chris Burdess <dog@bluezoo.org>
Message-ID: <20040109082322.GC4727@mail.konqueror.de>
References: <D4BDDC41-413A-11D8-BCCF-003065B22A76@bluezoo.org>
	<877k03s8o0.fsf@fleche.redhat.com>
	<BFE281B3-41FF-11D8-ADF0-003065B22A76@bluezoo.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <BFE281B3-41FF-11D8-ADF0-003065B22A76@bluezoo.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: inetlib build fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 09:35:28 -0000

On Thu, Jan 08, 2004 at 06:26:09PM +0100, Chris Burdess wrote:

Several comments on your patch:

- ChangeLog entry missing.

- unified diffs are much more readable (preferable with 3 lines of
  context)

- Generated files are normally excluded from posted patches. The only
  bloat the patch and give nothing new.

I haven't tried to understand the patch yet but I think as
it is your code you are the one to approve it.


Michael



From MAILER-DAEMON Fri Jan 09 04:57:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AetOj-0002es-1U
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 04:57:45 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AetOh-0002ee-6K
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:57:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AetOB-0002Xv-3M
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:57:42 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AetOA-0002XJ-9J
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 04:57:10 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-033.ewetel.net
	[80.228.75.33])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i098taUa014443;
	Fri, 9 Jan 2004 09:55:36 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AesQf-0003kz-00; Fri, 09 Jan 2004 09:55:41 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Fri, 9 Jan 2004 09:58:59 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_T1m//zJ80gKZrlo"
Message-Id: <200401090958.59042.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: fixing warnings all over
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 09:57:43 -0000


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

Hi list,


I will commit the attached patch to fix some warnings during compiling libgcj 
with GCJFLAGS="-Wall -Werror" set. Only libgcj compiles new through with 
this. The code in the org package does not compile nor does the other stuff 
in external libs like the GTP peer.

I have to say I was really impressed that so few places needed to be fixed.
 

Michael


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

	* java/awt/geom/PathIterator.java
	(WIND_EVEN_ODD): Removed redundant modifiers.
	(WIND_NON_ZERO): Likewise.
	(SEG_MOVETO): Likewise.
	(SEG_LINETO): Likewise.
	(SEG_QUADTO): Likewise.
	(SEG_CUBICTO): Likewise.
	(SEG_CLOSE): Likewise.
	* java/awt/image/SinglePixelPackedSampleModel.java:
	Removed redundant semicolon.
	* java/io/ObjectInputStream.java
	(inputGetObjectStreamClasses): Removed unused variable "ret_val".
	* java/util/logging/Filter.java
	(isLoggable): Removed redundant modifier.
	* java/util/logging/LogManager.java:
	Removed redundant semicolon.
	* java/util/logging/XMLFormatter.java
	(format): Removed unused variable "key".


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

Index: java/awt/geom/PathIterator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/geom/PathIterator.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 PathIterator.java
--- java/awt/geom/PathIterator.java	26 Sep 2003 15:14:21 -0000	1.7
+++ java/awt/geom/PathIterator.java	9 Jan 2004 08:50:44 -0000
@@ -59,24 +59,24 @@
    * from the point to infinity (in any direction) crosses an odd number of
    * segments.
    */
-  static final int WIND_EVEN_ODD = 0;
+  int WIND_EVEN_ODD = 0;
 
   /**
    * The non-zero winding mode: a point is internal to the shape if a ray
    * from the point to infinity (in any direction) crosses a different number
    * of segments headed clockwise than those headed counterclockwise.
    */
-  static final int WIND_NON_ZERO = 1;
+  int WIND_NON_ZERO = 1;
 
   /**
    * Starts a new subpath. There is no segment from the previous vertex.
    */
-  static final int SEG_MOVETO = 0;
+  int SEG_MOVETO = 0;
 
   /**
    * The current segment is a line.
    */
-  static final int SEG_LINETO = 1;
+  int SEG_LINETO = 1;
 
   /**
    * The current segment is a quadratic parametric curve. It is interpolated
@@ -91,7 +91,7 @@
    *         = n! / (m! * (n-m)!)
    * </pre>
    */
-  static final int SEG_QUADTO = 2;
+  int SEG_QUADTO = 2;
 
   /**
    * The current segment is a cubic parametric curve (more commonly known as
@@ -107,13 +107,13 @@
    *         = n! / (m! * (n-m)!)
    * </pre>
    */
-  static final int SEG_CUBICTO = 3;
+  int SEG_CUBICTO = 3;
 
   /**
    * The current segment closes a loop by an implicit line to the previous
    * SEG_MOVETO coordinate.
    */
-  static final int SEG_CLOSE = 4;
+  int SEG_CLOSE = 4;
 
   /**
    * Returns the winding rule to determine which points are inside this path.
Index: java/awt/image/SinglePixelPackedSampleModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/image/SinglePixelPackedSampleModel.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 SinglePixelPackedSampleModel.java
--- java/awt/image/SinglePixelPackedSampleModel.java	26 Sep 2003 19:59:55 -0000	1.5
+++ java/awt/image/SinglePixelPackedSampleModel.java	9 Jan 2004 08:50:44 -0000
@@ -47,7 +47,7 @@
   private int scanlineStride;
   private int[] bitMasks;
   private int[] bitOffsets;
-  private int[] sampleSize;;
+  private int[] sampleSize;
   
   public SinglePixelPackedSampleModel(int dataType, int w, int h,
 				      int[] bitMasks)
Index: java/io/ObjectInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/io/ObjectInputStream.java,v
retrieving revision 1.24
diff -u -b -B -r1.24 ObjectInputStream.java
--- java/io/ObjectInputStream.java	30 Dec 2003 15:51:15 -0000	1.24
+++ java/io/ObjectInputStream.java	9 Jan 2004 08:50:45 -0000
@@ -657,8 +657,6 @@
   {
     ObjectStreamClass osc = lookupClass(clazz);
 
-    ObjectStreamClass[] ret_val;
-
     if (osc == null)
       return new ObjectStreamClass[0];
     else
Index: java/util/logging/Filter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/logging/Filter.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Filter.java
--- java/util/logging/Filter.java	21 Jun 2003 10:31:55 -0000	1.1
+++ java/util/logging/Filter.java	9 Jan 2004 08:50:45 -0000
@@ -64,5 +64,5 @@
    * @return <code>true</code> if the record should be published,
    *         <code>false</code> if it should be discarded.
    */
-  public boolean isLoggable(LogRecord record);
+  boolean isLoggable(LogRecord record);
 }
Index: java/util/logging/LogManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/logging/LogManager.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 LogManager.java
--- java/util/logging/LogManager.java	31 Aug 2003 16:52:16 -0000	1.2
+++ java/util/logging/LogManager.java	9 Jan 2004 08:50:45 -0000
@@ -200,7 +200,7 @@
     {
       /* FIXME: Is it ok to ignore exceptions here? */
     }
-  };
+  }
   
 
   private static LogManager makeLogManager()
Index: java/util/logging/XMLFormatter.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/logging/XMLFormatter.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 XMLFormatter.java
--- java/util/logging/XMLFormatter.java	21 Jun 2003 10:31:55 -0000	1.1
+++ java/util/logging/XMLFormatter.java	9 Jan 2004 08:50:45 -0000
@@ -195,7 +195,7 @@
     long            millis = record.getMillis();
     Object[]        params = record.getParameters();
     ResourceBundle  bundle = record.getResourceBundle();
-    String          key, message;
+    String          message;
     
     buf.append("<record>");
     buf.append(lineSep);

--Boundary-00=_T1m//zJ80gKZrlo--




From MAILER-DAEMON Fri Jan 09 05:48:03 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeuBP-00068Y-0F
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 05:48:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AeuBL-00067O-SY
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 05:47:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeuAn-0005wu-Eg
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 05:47:56 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeuAm-0005wN-TP
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 05:47:25 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-033.ewetel.net
	[80.228.75.33])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i099jpHA023688;
	Fri, 9 Jan 2004 10:45:52 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AetDJ-0003w1-00; Fri, 09 Jan 2004 10:45:57 +0100
Date: Fri, 9 Jan 2004 10:45:57 +0100
From: Michael Koch <konqueror@gmx.de>
To: Ranjit Mathew <rmathew@hotmail.com>
Message-ID: <20040109094557.GA15040@mail.konqueror.de>
References: <200401090958.59042.konqueror@gmx.de> <3FFE7523.607@hotmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <3FFE7523.607@hotmail.com>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org, java-patches@gcc.gnu.org
Subject: Re: FYI: Patch: fixing warnings all over
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 10:48:01 -0000

On Fri, Jan 09, 2004 at 03:02:19PM +0530, Ranjit Mathew wrote:
> Michael Koch wrote:
> > -  static final int WIND_EVEN_ODD = 0;
> > +  int WIND_EVEN_ODD = 0;
> 
> What's the rationale here (and at similar changes)?
> 
> 
> > -  public boolean isLoggable(LogRecord record);
> > +  boolean isLoggable(LogRecord record);
> 
> ...and here?
> 
> Sorry for being thick.

The rationale is that in interfaces all variables are "public static
final" and all methods are "public" by design. Our Coding Style says
that we avoid redundant modifiers because they are already there
implicitely.


Michael



From MAILER-DAEMON Fri Jan 09 06:20:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aeugt-0004o7-VY
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 06:20:35 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aeugq-0004nM-54
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 06:20:32 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AeugJ-0004eT-1Q
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 06:20:31 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeugI-0004e5-5a
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 06:19:58 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-033.ewetel.net
	[80.228.75.33])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i09AIO9u021287;
	Fri, 9 Jan 2004 11:18:25 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Aetio-00044y-00; Fri, 09 Jan 2004 11:18:30 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Fri, 9 Jan 2004 11:21:47 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_7Co//i1XgbVoJVs"
Message-Id: <200401091121.47422.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: javax.swing - import fixes.
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 11:20:33 -0000


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

Hi lists,


I will commit the attached patch to fix the import statements in several files 
to import only used classes.


Michael


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

	* javax/swing/AbstractAction.java,
	javax/swing/AbstractSet.java,
	javax/swing/Action.java,
	javax/swing/ActionMap.java,
	javax/swing/BoundedRangeModel.java,
	javax/swing/ButtonModel.java,
	javax/swing/CellEditor.java,
	javax/swing/CellRendererPane.java,
	javax/swing/ComboBoxEditor.java,
	javax/swing/DebugGraphics.java,
	javax/swing/DefaultCellEditor.java,
	javax/swing/DefaultCellRenderer.java,
	javax/swing/DefaultComboBoxModel.java,
	javax/swing/DefaultDesktopManager.java,
	javax/swing/DefaultFocusManager.java,
	javax/swing/DefaultListCellRenderer.java,
	javax/swing/Icon.java,
	javax/swing/JButton.java,
	javax/swing/JCheckBoxMenuItem.java,
	javax/swing/JDesktopPane.java,
	javax/swing/JEditorPane.java,
	javax/swing/JMenu.java,
	javax/swing/JPanel.java,
	javax/swing/JPasswordField.java,
	javax/swing/JPopupMenu.java,
	javax/swing/JProgressBar.java: Reworked imports.


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

Index: javax/swing/AbstractAction.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractAction.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 AbstractAction.java
--- javax/swing/AbstractAction.java	11 Jun 2003 13:20:38 -0000	1.3
+++ javax/swing/AbstractAction.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* AbstractAction.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,11 +38,13 @@
 
 package javax.swing;
 
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import javax.swing.event.*;
-import java.util.*;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.HashMap;
+import javax.swing.event.SwingPropertyChangeSupport;
 
 /**
  * AbstractAction
Index: javax/swing/AbstractSet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/AbstractSet.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 AbstractSet.java
--- javax/swing/AbstractSet.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/AbstractSet.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* AbstractSet.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,9 @@
 
 package javax.swing;
 
-import java.util.*;
+import java.util.AbstractCollection;
+import java.util.Collection;
+import java.util.Set;
 
 /**
  * Empty
Index: javax/swing/Action.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Action.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Action.java
--- javax/swing/Action.java	12 Oct 2003 13:20:49 -0000	1.3
+++ javax/swing/Action.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* Action.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,7 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.event.ActionListener;
 import java.beans.PropertyChangeListener;
 
 /**
Index: javax/swing/ActionMap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ActionMap.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ActionMap.java
--- javax/swing/ActionMap.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/ActionMap.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* ActionMap.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,17 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+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;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * ActionMap
Index: javax/swing/BoundedRangeModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/BoundedRangeModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BoundedRangeModel.java
--- javax/swing/BoundedRangeModel.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/BoundedRangeModel.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* BoundedRangeModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,7 @@
 
 package javax.swing;
 
-// Imports
-import javax.swing.event.*;
+import javax.swing.event.ChangeListener;
 
 /**
  * BoundedRangeModel
Index: javax/swing/ButtonModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ButtonModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ButtonModel.java
--- javax/swing/ButtonModel.java	14 Jul 2003 05:33:30 -0000	1.2
+++ javax/swing/ButtonModel.java	9 Jan 2004 10:11:40 -0000
@@ -1,5 +1,5 @@
 /* ButtonModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,10 @@
 
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.event.*;
+import java.awt.ItemSelectable;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemListener;
+import javax.swing.event.ChangeListener;
 
 public interface ButtonModel extends ItemSelectable
 {  
Index: javax/swing/CellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/CellEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 CellEditor.java
--- javax/swing/CellEditor.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/CellEditor.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* CellEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.util.*;
-import javax.swing.event.*;
+import java.util.EventObject;
+import javax.swing.event.CellEditorListener;
 
 /**
  * CellEditor
Index: javax/swing/CellRendererPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/CellRendererPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 CellRendererPane.java
--- javax/swing/CellRendererPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/CellRendererPane.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* CellRendererPane.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,15 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.accessibility.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
 
 /**
  * CellRendererPane
Index: javax/swing/ComboBoxEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ComboBoxEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ComboBoxEditor.java
--- javax/swing/ComboBoxEditor.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/ComboBoxEditor.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* ComboBoxEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Component;
+import java.awt.event.ActionListener;
 
 /**
  * ComboBoxEditor
Index: javax/swing/DebugGraphics.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DebugGraphics.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DebugGraphics.java
--- javax/swing/DebugGraphics.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/DebugGraphics.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DebugGraphics.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,11 +37,16 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.image.*;
-import java.io.*;
-import java.text.*;
+import java.awt.Color;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.Rectangle;
+import java.awt.Shape;
+import java.awt.image.ImageObserver;
+import java.io.PrintStream;
+import java.text.AttributedCharacterIterator;
 
 /**
  * DebugGraphics
Index: javax/swing/DefaultCellEditor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultCellEditor.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultCellEditor.java
--- javax/swing/DefaultCellEditor.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultCellEditor.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultCellEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,13 +37,15 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.io.*;
-import java.util.*;
-import javax.swing.table.*;
-import javax.swing.tree.*;
+import java.awt.Component;
+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.EventObject;
+import javax.swing.table.TableCellEditor;
+import javax.swing.tree.TreeCellEditor;
 
 /**
  * DefaultCellEditor
Index: javax/swing/DefaultCellRenderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultCellRenderer.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DefaultCellRenderer.java
--- javax/swing/DefaultCellRenderer.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/DefaultCellRenderer.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultCellRenderer.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,11 +37,10 @@
 
 package javax.swing;
 
-import java.awt.*;
-
-
 // this is what SUN basically told us to do so:
 // no icon though as that's not implemented yet....
+
+import java.awt.Component;
 
 public class DefaultCellRenderer extends JLabel implements ListCellRenderer 
 {
Index: javax/swing/DefaultComboBoxModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultComboBoxModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultComboBoxModel.java
--- javax/swing/DefaultComboBoxModel.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultComboBoxModel.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultComboBoxModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import java.util.*;
+import java.io.Serializable;
+import java.util.Vector;
 
 /**
  * DefaultComboBoxModel
Index: javax/swing/DefaultDesktopManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultDesktopManager.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultDesktopManager.java
--- javax/swing/DefaultDesktopManager.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultDesktopManager.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultDesktopManager.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
+import java.awt.Rectangle;
+import java.io.Serializable;
 
 /**
  * DefaultDesktopManager
Index: javax/swing/DefaultFocusManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultFocusManager.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 DefaultFocusManager.java
--- javax/swing/DefaultFocusManager.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/DefaultFocusManager.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultFocusManager.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,10 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.util.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.event.KeyEvent;
+import java.util.Stack;
 
 /**
  * DefaultFocusManager
Index: javax/swing/DefaultListCellRenderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/DefaultListCellRenderer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultListCellRenderer.java
--- javax/swing/DefaultListCellRenderer.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/DefaultListCellRenderer.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* DefaultListCellRenderer.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,11 +37,10 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.swing.border.*;
-import javax.swing.plaf.*;
+import java.awt.Component;
+import java.awt.Rectangle;
+import java.io.Serializable;
+import javax.swing.border.Border;
 
 /**
  * DefaultListCellRenderer
Index: javax/swing/Icon.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Icon.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Icon.java
--- javax/swing/Icon.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/Icon.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* Icon.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,8 @@
 
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Graphics;
 
 public interface Icon
 {
Index: javax/swing/JButton.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JButton.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JButton.java
--- javax/swing/JButton.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JButton.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JButton.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,9 @@
 
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.plaf.*;
-import javax.accessibility.*;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.swing.plaf.ButtonUI;
 
 /**
  * An instance of JButton can be added to a panel, frame etc
Index: javax/swing/JCheckBoxMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JCheckBoxMenuItem.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JCheckBoxMenuItem.java
--- javax/swing/JCheckBoxMenuItem.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JCheckBoxMenuItem.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JCheckBoxMenuItem.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,11 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import javax.accessibility.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
 
 /**
  * JCheckBoxMenuItem
Index: javax/swing/JDesktopPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JDesktopPane.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JDesktopPane.java
--- javax/swing/JDesktopPane.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JDesktopPane.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JDesktopPane.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,12 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.plaf.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.plaf.DesktopPaneUI;
 
 /**
  * JDesktopPane
Index: javax/swing/JMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JMenu.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JMenu.java
--- javax/swing/JMenu.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/JMenu.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JMenu.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,14 +37,23 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import java.util.*;
-import javax.accessibility.*;
-import javax.swing.event.*;
+import java.awt.Component;
+import java.awt.Point;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Hashtable;
+import javax.accessibility.Accessible;
+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.ChangeListener;
 
 /**
  * JMenu
Index: javax/swing/JPanel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPanel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JPanel.java
--- javax/swing/JPanel.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JPanel.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JPanel.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 +39,10 @@
 
 import java.awt.FlowLayout;
 import java.awt.LayoutManager;
-import javax.swing.plaf.PanelUI;
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
+import javax.swing.plaf.PanelUI;
+
 
 /**
  * An instance of JPanel can be added to a panel, frame etc
Index: javax/swing/JPasswordField.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPasswordField.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JPasswordField.java
--- javax/swing/JPasswordField.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JPasswordField.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JPasswordField.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,12 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.text.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Document;
 
 /**
  * JPasswordField
Index: javax/swing/JPopupMenu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JPopupMenu.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JPopupMenu.java
--- javax/swing/JPopupMenu.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JPopupMenu.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JPopupMenu.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,14 +37,21 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.event.*;
-import javax.swing.plaf.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
+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.event.PopupMenuListener;
+import javax.swing.plaf.PopupMenuUI;
 
 /**
  * JPopupMenu
Index: javax/swing/JProgressBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JProgressBar.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JProgressBar.java
--- javax/swing/JProgressBar.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JProgressBar.java	9 Jan 2004 10:11:41 -0000
@@ -1,5 +1,5 @@
 /* JProgressBar.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,12 +37,17 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.event.*;
-import javax.swing.plaf.*;
+import java.awt.Graphics;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleStateSet;
+import javax.accessibility.AccessibleValue;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.plaf.ProgressBarUI;
 
 /**
  * JProgressBar

--Boundary-00=_7Co//i1XgbVoJVs--




From MAILER-DAEMON Fri Jan 09 07:32:22 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AevoL-00014Y-5r
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 07:32:21 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AevoG-000132-7R
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 07:32:16 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aevni-0000vl-5m
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 07:32:13 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aevjk-000075-39
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 07:27:36 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-033.ewetel.net
	[80.228.75.33])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i09BQ09u027766;
	Fri, 9 Jan 2004 12:26:01 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AeumE-00062n-00; Fri, 09 Jan 2004 12:26:06 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Fri, 9 Jan 2004 12:29:22 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_SCp//3HmLifmxUl"
Message-Id: <200401091229.22731.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: javax.print.attribute.standard - more missing classes.
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 12:32:17 -0000


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

Hi list,


I will commit the attached patch to add more classes to javax.print module.


Michael


P.S.: The patch is slightly different Makefile.am-wise but I will post no 
extra patch for this. Is this okay ?


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

	* javax/print/attribute/standard/DocumentName.java,
	javax/print/attribute/standard/JobHoldUntil.java,
	javax/print/attribute/standard/JobMessageFromOperator.java,
	javax/print/attribute/standard/JobName.java,
	javax/print/attribute/standard/JobOriginatingUserName.java,
	javax/print/attribute/standard/OutputDeviceAssigned.java,
	javax/print/attribute/standard/PrinterInfo.java,
	javax/print/attribute/standard/PrinterLocation.java,
	javax/print/attribute/standard/PrinterMakeAndModel.java,
	javax/print/attribute/standard/PrinterMessageFromOperator.java,
	javax/print/attribute/standard/PrinterName.java,
	javax/print/attribute/standard/RequestingUserName.java: New files.
	* Makefile.am (javax_source_files): Added new files.
	* Makefile.in: Regenerated.


--Boundary-00=_SCp//3HmLifmxUl
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/DocumentName.java
===================================================================
RCS file: javax/print/attribute/standard/DocumentName.java
diff -N javax/print/attribute/standard/DocumentName.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/DocumentName.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* DocumentName.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.Locale;
+import javax.print.attribute.DocAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class DocumentName extends TextSyntax
+  implements DocAttribute
+{
+  private static final long serialVersionUID = 7883105848533280430L;
+
+  /**
+   * Creates a <code>DocumentName</code> object.
+   *
+   * @param documentName the document name
+   *
+   * @exception NullPointerException if documentName is null
+   */
+  public DocumentName(String documentName, Locale locale)
+  {
+    super(documentName, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof DocumentName))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>DocumentName</code> itself
+   */
+  public final Class getCategory()
+  {
+    return DocumentName.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "document-name"
+   */
+  public final String getName()
+  {
+    return "document-name";
+  }
+}
Index: javax/print/attribute/standard/JobHoldUntil.java
===================================================================
RCS file: javax/print/attribute/standard/JobHoldUntil.java
diff -N javax/print/attribute/standard/JobHoldUntil.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobHoldUntil.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,96 @@
+/* JobHoldUntil.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.Date;
+import javax.print.attribute.DateTimeSyntax;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+
+public final class JobHoldUntil extends DateTimeSyntax
+  implements PrintJobAttribute, PrintRequestAttribute
+{
+  private static final long serialVersionUID = -1664471048860415024L;
+
+  /**
+   * Creates a <code>JobHoldUntil</code> object.
+   *
+   * @param value the date to hold the job until
+   *
+   * @exception NullPointerException if value is null
+   */
+  public JobHoldUntil(Date value)
+  {
+    super(value);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobHoldUntil))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobHoldUntil</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobHoldUntil.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-hold-until"
+   */
+  public final String getName()
+  {
+    return "job-hold-until";
+  }
+}
Index: javax/print/attribute/standard/JobMessageFromOperator.java
===================================================================
RCS file: javax/print/attribute/standard/JobMessageFromOperator.java
diff -N javax/print/attribute/standard/JobMessageFromOperator.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobMessageFromOperator.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* JobMessageFromOperator.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.Locale;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class JobMessageFromOperator extends TextSyntax
+  implements PrintJobAttribute
+{
+  private static final long serialVersionUID = -4620751846003142047L;
+
+  /**
+   * Creates a <code>JobMessageFromOperator</code> object.
+   *
+   * @param message the message
+   *
+   * @exception NullPointerException if message is null
+   */
+  public JobMessageFromOperator(String message, Locale locale)
+  {
+    super(message, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobMessageFromOperator))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobMessageFromOperator</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobMessageFromOperator.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-message-from-operator"
+   */
+  public final String getName()
+  {
+    return "job-message-from-operator";
+  }
+}
Index: javax/print/attribute/standard/JobName.java
===================================================================
RCS file: javax/print/attribute/standard/JobName.java
diff -N javax/print/attribute/standard/JobName.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobName.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,96 @@
+/* JobName.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.Locale;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.PrintRequestAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class JobName extends TextSyntax
+  implements PrintJobAttribute, PrintRequestAttribute
+{
+  private static final long serialVersionUID = 4660359192078689545L;
+
+  /**
+   * Creates a <code>JobName</code> object.
+   *
+   * @param jobName the job name
+   *
+   * @exception NullPointerException if jobName is null
+   */
+  public JobName(String jobName, Locale locale)
+  {
+    super(jobName, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobName))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobName</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobName.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-name"
+   */
+  public final String getName()
+  {
+    return "job-name";
+  }
+}
Index: javax/print/attribute/standard/JobOriginatingUserName.java
===================================================================
RCS file: javax/print/attribute/standard/JobOriginatingUserName.java
diff -N javax/print/attribute/standard/JobOriginatingUserName.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/JobOriginatingUserName.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* JobOriginatingUserName.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.Locale;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class JobOriginatingUserName extends TextSyntax
+  implements PrintJobAttribute
+{
+  private static final long serialVersionUID = -8052537926362933477L;
+
+  /**
+   * Creates a <code>JobOriginatingUserName</code> object.
+   *
+   * @param userName the user name
+   *
+   * @exception NullPointerException if userName is null
+   */
+  public JobOriginatingUserName(String userName, Locale locale)
+  {
+    super(userName, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof JobOriginatingUserName))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>JobOriginatingUserName</code> itself
+   */
+  public final Class getCategory()
+  {
+    return JobOriginatingUserName.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "job-originating-user-name"
+   */
+  public final String getName()
+  {
+    return "job-originating-user-name";
+  }
+}
Index: javax/print/attribute/standard/OutputDeviceAssigned.java
===================================================================
RCS file: javax/print/attribute/standard/OutputDeviceAssigned.java
diff -N javax/print/attribute/standard/OutputDeviceAssigned.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/OutputDeviceAssigned.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* OutputDeviceAssigned.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.Locale;
+import javax.print.attribute.PrintJobAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class OutputDeviceAssigned extends TextSyntax
+  implements PrintJobAttribute
+{
+  private static final long serialVersionUID = 5486733778854271081L;
+
+  /**
+   * Creates a <code>OutputDeviceAssigned</code> object.
+   *
+   * @param deviceName the user name
+   *
+   * @exception NullPointerException if deviceName is null
+   */
+  public OutputDeviceAssigned(String deviceName, Locale locale)
+  {
+    super(deviceName, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof OutputDeviceAssigned))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>OutputDeviceAssigned</code> itself
+   */
+  public final Class getCategory()
+  {
+    return OutputDeviceAssigned.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "output-device-assigened"
+   */
+  public final String getName()
+  {
+    return "output-device-assigened";
+  }
+}
Index: javax/print/attribute/standard/PrinterInfo.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterInfo.java
diff -N javax/print/attribute/standard/PrinterInfo.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterInfo.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* PrinterInfo.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.Locale;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class PrinterInfo extends TextSyntax
+  implements PrintServiceAttribute
+{
+  private static final long serialVersionUID = 7765280618777599727L;
+
+  /**
+   * Creates a <code>PrinterInfo</code> object.
+   *
+   * @param printerInfo the printer info
+   *
+   * @exception NullPointerException if printerInfo is null
+   */
+  public PrinterInfo(String printerInfo, Locale locale)
+  {
+    super(printerInfo, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof PrinterInfo))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterInfo</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PrinterInfo.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "printer-info"
+   */
+  public final String getName()
+  {
+    return "printer-info";
+  }
+}
Index: javax/print/attribute/standard/PrinterLocation.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterLocation.java
diff -N javax/print/attribute/standard/PrinterLocation.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterLocation.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* PrinterLocation.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.Locale;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class PrinterLocation extends TextSyntax
+  implements PrintServiceAttribute
+{
+  private static final long serialVersionUID = -1598610039865566337L;
+
+  /**
+   * Creates a <code>PrinterLocation</code> object.
+   *
+   * @param printerLocation the printer location
+   *
+   * @exception NullPointerException if printerLocation is null
+   */
+  public PrinterLocation(String printerLocation, Locale locale)
+  {
+    super(printerLocation, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof PrinterLocation))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterLocation</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PrinterLocation.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "printer-location"
+   */
+  public final String getName()
+  {
+    return "printer-location";
+  }
+}
Index: javax/print/attribute/standard/PrinterMakeAndModel.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterMakeAndModel.java
diff -N javax/print/attribute/standard/PrinterMakeAndModel.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterMakeAndModel.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* PrinterMakeAndModel.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.Locale;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class PrinterMakeAndModel extends TextSyntax
+  implements PrintServiceAttribute
+{
+  private static final long serialVersionUID = 4580461489499351411L;
+
+  /**
+   * Creates a <code>PrinterMakeAndModel</code> object.
+   *
+   * @param makeAndModel the make and model string
+   *
+   * @exception NullPointerException if makeAndModel is null
+   */
+  public PrinterMakeAndModel(String makeAndModel, Locale locale)
+  {
+    super(makeAndModel, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof PrinterMakeAndModel))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterMakeAndModel</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PrinterMakeAndModel.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "printer-make-and-model"
+   */
+  public final String getName()
+  {
+    return "printer-make-and-model";
+  }
+}
Index: javax/print/attribute/standard/PrinterMessageFromOperator.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterMessageFromOperator.java
diff -N javax/print/attribute/standard/PrinterMessageFromOperator.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterMessageFromOperator.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* PrinterMessageFromOperator.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.Locale;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class PrinterMessageFromOperator extends TextSyntax
+  implements PrintServiceAttribute
+{
+  private static final long serialVersionUID = -4486871203218629318L;
+
+  /**
+   * Creates a <code>PrinterMessageFromOperator</code> object.
+   *
+   * @param message the message
+   *
+   * @exception NullPointerException if message is null
+   */
+  public PrinterMessageFromOperator(String message, Locale locale)
+  {
+    super(message, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof PrinterMessageFromOperator))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterMessageFromOperator</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PrinterMessageFromOperator.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "printer-message-from-operator"
+   */
+  public final String getName()
+  {
+    return "printer-message-from-operator";
+  }
+}
Index: javax/print/attribute/standard/PrinterName.java
===================================================================
RCS file: javax/print/attribute/standard/PrinterName.java
diff -N javax/print/attribute/standard/PrinterName.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/PrinterName.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* PrinterName.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.Locale;
+import javax.print.attribute.PrintServiceAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class PrinterName extends TextSyntax
+  implements PrintServiceAttribute
+{
+  private static final long serialVersionUID = 299740639137803127L;
+
+  /**
+   * Creates a <code>PrinterName</code> object.
+   *
+   * @param printerName the printer name
+   *
+   * @exception NullPointerException if printerName is null
+   */
+  public PrinterName(String printerName, Locale locale)
+  {
+    super(printerName, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof PrinterName))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>PrinterName</code> itself
+   */
+  public final Class getCategory()
+  {
+    return PrinterName.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "printer-name"
+   */
+  public final String getName()
+  {
+    return "printer-name";
+  }
+}
Index: javax/print/attribute/standard/RequestingUserName.java
===================================================================
RCS file: javax/print/attribute/standard/RequestingUserName.java
diff -N javax/print/attribute/standard/RequestingUserName.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ javax/print/attribute/standard/RequestingUserName.java	9 Jan 2004 11:24:06 -0000
@@ -0,0 +1,95 @@
+/* RequestingUserName.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.Locale;
+import javax.print.attribute.PrintRequestAttribute;
+import javax.print.attribute.TextSyntax;
+
+public final class RequestingUserName extends TextSyntax
+  implements PrintRequestAttribute
+{
+  private static final long serialVersionUID = 4660359192078689545L;
+
+  /**
+   * Creates a <code>RequestingUserName</code> object.
+   *
+   * @param userName the job name
+   *
+   * @exception NullPointerException if userName is null
+   */
+  public RequestingUserName(String userName, Locale locale)
+  {
+    super(userName, locale);
+  }
+
+  /**
+   * Tests of obj is equal to this object.
+   *
+   * @param obj the object to test
+   *
+   * @returns true if both objects are equal, false otherwise.
+   */
+  public boolean equals(Object obj)
+  {
+    if(! (obj instanceof RequestingUserName))
+      return false;
+
+    return super.equals(obj);
+  }
+
+  /**
+   * Returns category of this class.
+   *
+   * @return the class <code>RequestingUserName</code> itself
+   */
+  public final Class getCategory()
+  {
+    return RequestingUserName.class;
+  }
+
+  /**
+   * Returns name of this class.
+   *
+   * @return the string "requesting-user-name"
+   */
+  public final String getName()
+  {
+    return "requesting-user-name";
+  }
+}
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.351
diff -u -b -B -r1.351 Makefile.am
--- Makefile.am	6 Jan 2004 13:48:51 -0000	1.351
+++ Makefile.am	9 Jan 2004 11:24:08 -0000
@@ -1790,20 +1790,32 @@
 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 \
+javax/print/attribute/standard/PrinterInfo.java \
+javax/print/attribute/standard/PrinterLocation.java \
+javax/print/attribute/standard/PrinterMakeAndModel.java \
+javax/print/attribute/standard/PrinterMessageFromOperator.java \
+javax/print/attribute/standard/PrinterName.java \
 javax/print/attribute/standard/QueuedJobCount.java \
+javax/print/attribute/standard/RequestingUserName.java \
 javax/security/auth/x500/X500Principal.java \
 javax/sql/ConnectionEvent.java \
 javax/sql/ConnectionEventListener.java \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.375
diff -u -b -B -r1.375 Makefile.in
--- Makefile.in	6 Jan 2004 13:48:51 -0000	1.375
+++ Makefile.in	9 Jan 2004 11:24:10 -0000
@@ -1508,20 +1508,32 @@
 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 \
+javax/print/attribute/standard/PrinterInfo.java \
+javax/print/attribute/standard/PrinterLocation.java \
+javax/print/attribute/standard/PrinterMakeAndModel.java \
+javax/print/attribute/standard/PrinterMessageFromOperator.java \
+javax/print/attribute/standard/PrinterName.java \
 javax/print/attribute/standard/QueuedJobCount.java \
+javax/print/attribute/standard/RequestingUserName.java \
 javax/security/auth/x500/X500Principal.java \
 javax/sql/ConnectionEvent.java \
 javax/sql/ConnectionEventListener.java \
@@ -4235,20 +4247,32 @@
 .deps/javax/print/attribute/standard/DateTimeAtCompleted.P \
 .deps/javax/print/attribute/standard/DateTimeAtCreation.P \
 .deps/javax/print/attribute/standard/DateTimeAtProcessing.P \
+.deps/javax/print/attribute/standard/DocumentName.P \
+.deps/javax/print/attribute/standard/JobHoldUntil.P \
 .deps/javax/print/attribute/standard/JobImpressions.P \
 .deps/javax/print/attribute/standard/JobImpressionsCompleted.P \
 .deps/javax/print/attribute/standard/JobKOctets.P \
 .deps/javax/print/attribute/standard/JobKOctetsProcessed.P \
 .deps/javax/print/attribute/standard/JobMediaSheets.P \
 .deps/javax/print/attribute/standard/JobMediaSheetsCompleted.P \
+.deps/javax/print/attribute/standard/JobMessageFromOperator.P \
+.deps/javax/print/attribute/standard/JobName.P \
+.deps/javax/print/attribute/standard/JobOriginatingUserName.P \
 .deps/javax/print/attribute/standard/JobPriority.P \
 .deps/javax/print/attribute/standard/JobPrioritySupported.P \
 .deps/javax/print/attribute/standard/NumberOfDocuments.P \
 .deps/javax/print/attribute/standard/NumberOfInterveningJobs.P \
 .deps/javax/print/attribute/standard/NumberUp.P \
+.deps/javax/print/attribute/standard/OutputDeviceAssigned.P \
 .deps/javax/print/attribute/standard/PagesPerMinute.P \
 .deps/javax/print/attribute/standard/PagesPerMinuteColor.P \
+.deps/javax/print/attribute/standard/PrinterInfo.P \
+.deps/javax/print/attribute/standard/PrinterLocation.P \
+.deps/javax/print/attribute/standard/PrinterMakeAndModel.P \
+.deps/javax/print/attribute/standard/PrinterMessageFromOperator.P \
+.deps/javax/print/attribute/standard/PrinterName.P \
 .deps/javax/print/attribute/standard/QueuedJobCount.P \
+.deps/javax/print/attribute/standard/RequestingUserName.P \
 .deps/javax/rmi/BAD_OPERATION.P .deps/javax/rmi/CORBA/ClassDesc.P \
 .deps/javax/rmi/CORBA/ObjectImpl.P \
 .deps/javax/rmi/CORBA/PortableRemoteObjectDelegate.P \

--Boundary-00=_SCp//3HmLifmxUl--




From MAILER-DAEMON Fri Jan 09 16:57:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Af4cs-0002Ag-CN
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 16:57:06 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Af4co-00029A-Cu
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 16:57:02 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Af4c6-0001yu-MP
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 16:56:49 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Af4c6-0001wy-6G
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 16:56:18 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id NAA26083
	for <commit-classpath@gnu.org>; Fri, 9 Jan 2004 13:54:39 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 062274F824A; Fri,  9 Jan 2004 13:46:24 -0700 (MST)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: My mind is making ashtrays in Dayton....
Date: 09 Jan 2004 13:46:24 -0700
Message-ID: <87r7y8c0kf.fsf@fleche.redhat.com>
Lines: 45
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 standards updates
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
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, 09 Jan 2004 21:57:04 -0000

I'm checking this in.

I believe these new guidelines also reflect current consensus.  If you
disagree, we can discuss on the main list.

Tom

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

	* doc/hacking.texinfo (Programming Standards): Added some more
	standards.

Index: doc/hacking.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/hacking.texinfo,v
retrieving revision 1.14
diff -u -r1.14 hacking.texinfo
--- doc/hacking.texinfo 9 Jan 2004 00:34:16 -0000 1.14
+++ doc/hacking.texinfo 9 Jan 2004 20:52:47 -0000
@@ -385,6 +385,24 @@
   return foo.doit();
 @end example
 
+@item
+Don't use redundant modifiers.  For instance, all members of an
+interface are implicitly @code{public}, so there is no need to
+explicitly declare them as @code{public}.
+
+@item
+Because the output of different compilers differs, we have
+standardized on explicitly specifying @code{serialVersionUID} in
+@code{Serializable} classes in Classpath.  This field should be
+declared as @code{private static final}.
+@c fixme index
+@c fixme link to the discussion
+
+@item
+Don't declare unchecked exceptions in the @code{throws} clause of a
+method.  However, if throwing an unchecked exception is part of the
+method's API, you should mention it in the Javadoc.
+
 @end itemize
 
 



From MAILER-DAEMON Sat Jan 10 00:10:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfBO4-0001lV-LC
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 00:10:16 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Af5u7-0006Mq-3O
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 18:18:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AepAz-0003qQ-Tv
	for Commit-classpath@gnu.org; Fri, 09 Jan 2004 00:27:49 -0500
Received: from [200.223.73.2] (helo=gambit.cpunet.com.br)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AenQl-000631-Pj
	for Commit-classpath@gnu.org; Thu, 08 Jan 2004 22:35:28 -0500
Received: (qmail-ldap/ctrl 24584 invoked from network);
	9 Jan 2004 02:22:52 -0000
Received: from unknown (HELO localhost) (ve0703@[200.217.84.138])
	(envelope-sender <promonet@click21.com.br>)
	by gambit.cpunet.com.br (qmail-ldap-1.03) with SMTP
	for <Commit-classpath@gnu.org>; 9 Jan 2004 02:22:52 -0000
X-Sender: promonet@click21.com.br
From: Mala direta por e-mail <promonet@click21.com.br>
To: Commit-classpath@gnu.org
Date: Thu, 08 Jan 2004 23:18:27 -0200
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Message-Id: <E1AenQl-000631-Pj@monty-python.gnu.org>
Cc: 
Subject: E-mails segmentados para mal direta http://www.divulgamail.vze.com
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 05:10:14 -0000

Divulga Mail Mala Direta por E-mail - Cadastro mala-direta via E-mail de pessoas 
fisicas e juridicas anuncios e divulgação por e-mail. Fornece listas de milhares 
de e-mails para mala direta e propaganda. Serviço de envio de mensagens, programas 
gratis para spam. 
http://www.divulgamail.vze.com

Publicidade por e-mail, listas, cadastros, email, E-mail marketing. Mala direta

http://www.divulgamail.vze.com




From MAILER-DAEMON Sat Jan 10 01:03:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfCCw-0005gE-Qa
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 01:02:50 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfCCq-0005cx-Sy
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 01:02:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfCCD-0005UG-ID
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 01:02:36 -0500
Received: from [217.8.192.20] (helo=smtp2.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aeuc1-0003lw-So
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 06:15:34 -0500
Received: from [192.168.1.33] (197.5.dyn-adsl.customer.ch.easynet.net
	[217.8.197.5])
	by smtp2.mail.ch.easynet.net (Postfix) with ESMTP id 0DC6F6467A
	for <commit-classpath@gnu.org>; Fri,  9 Jan 2004 11:14:03 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Fri, 9 Jan 2004 11:14:04 +0100
Message-Id: <20040109101404.27833@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: Patch: javax.swing.undo.CompoundEdit
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 06:02:48 -0000

Hi,

I've committed the enclosed patch for serialization compatibility.

-- Sascha

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



Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1776
diff -u -r1.1776 ChangeLog
--- ChangeLog   9 Jan 2004 08:59:29 -0000       1.1776
+++ ChangeLog   9 Jan 2004 10:07:22 -0000
@@ -1,3 +1,7 @@
+2004-01-09  Sascha Brawer  <brawer@dandelis.ch>
+
+       * javax/swing/undo/CompoundEdit.java (serialVersionUID): Added.
+
 2004-01-09  Michael Koch  <konqueror@gmx.de>
 
        * java/awt/geom/PathIterator.java
Index: javax/swing/undo/CompoundEdit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/undo/CompoundEdit.java,v
retrieving revision 1.3
diff -u -r1.3 CompoundEdit.java
--- javax/swing/undo/CompoundEdit.java  17 Nov 2003 16:11:32 -0000      1.3
+++ javax/swing/undo/CompoundEdit.java  9 Jan 2004 10:07:22 -0000
@@ -1,5 +1,5 @@
 /* CompoundEdit.java -- Combines multiple UndoableEdits.
-   Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -63,6 +63,13 @@
 public class CompoundEdit
   extends AbstractUndoableEdit
 {
+  /**
+   * The identifier of this class in object serialization. Determined
+   * using the serialver tool of Sun J2SE 1.4.1_01.
+   */
+  static final long serialVersionUID = -6512679249930119683L;
+
+
   /**
    * The <code>UndoableEdit</code>s being combined into a compound
    * editing action.





From MAILER-DAEMON Sat Jan 10 02:13:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AeyG8-0005Jy-LO
	for mharc-commit-classpath@gnu.org; Fri, 09 Jan 2004 10:09:12 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AexbA-0005mr-Tg
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 09:26:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AevHO-0003gP-BX
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 06:58:50 -0500
Received: from [217.8.192.20] (helo=smtp1.mail.ch.easynet.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AeuvK-0008BV-JE
	for commit-classpath@gnu.org; Fri, 09 Jan 2004 06:35:31 -0500
Received: from [192.168.1.33] (197.5.dyn-adsl.customer.ch.easynet.net
	[217.8.197.5])
	by smtp1.mail.ch.easynet.net (Postfix) with ESMTP id BAA0049F24
	for <commit-classpath@gnu.org>; Fri,  9 Jan 2004 11:33:48 +0100 (CET)
From: Sascha Brawer <brawer@dandelis.ch>
To: <commit-classpath@gnu.org>
Date: Fri, 9 Jan 2004 11:33:50 +0100
Message-Id: <20040109103350.17466@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: Patch: javax.swing.undo.CompoundEdit
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Jan 2004 15:09:10 -0000

Hi,

I've committed the enclosed patch to make serialVersionUID private, in
order to follow the Classpath style. Thanks to Michael Koch for pointing
this out.

-- Sascha

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



2004-01-09  Sascha Brawer  <brawer@dandelis.ch>

      * javax/swing/undo/CompoundEdit.java (serialVersionUID): Made private.

Index: javax/swing/undo/CompoundEdit.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/undo/CompoundEdit.java,v
retrieving revision 1.4
diff -r1.4 CompoundEdit.java
70c70
<   static final long serialVersionUID = -6512679249930119683L;
---
>   private static final long serialVersionUID = -6512679249930119683L;





From MAILER-DAEMON Sat Jan 10 08:35:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfJBj-0004TP-PN
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 08:30:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfJBG-0004O5-Cg
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 08:29:34 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfJ6V-0003Xa-O8
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 08:25:11 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfJ30-00032c-Pz
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 08:21:02 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-034.ewetel.net
	[80.228.82.34])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0ACIm1h021675;
	Sat, 10 Jan 2004 13:18:48 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AfI4t-0001Ja-00; Sat, 10 Jan 2004 13:18:55 +0100
Date: Sat, 10 Jan 2004 13:18:55 +0100
From: Michael Koch <konqueror@gmx.de>
To: Chris Burdess <dog@bluezoo.org>
Message-ID: <20040110121855.GA4463@mail.konqueror.de>
References: <D4BDDC41-413A-11D8-BCCF-003065B22A76@bluezoo.org>
	<877k03s8o0.fsf@fleche.redhat.com>
	<BFE281B3-41FF-11D8-ADF0-003065B22A76@bluezoo.org>
	<20040109082322.GC4727@mail.konqueror.de>
	<903B383A-4365-11D8-AB87-003065B22A76@bluezoo.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <903B383A-4365-11D8-AB87-003065B22A76@bluezoo.org>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org, Michael Koch <konqueror@gmx.de>
Subject: Re: inetlib build fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 13:30:01 -0000

On Sat, Jan 10, 2004 at 01:07:29PM +0100, Chris Burdess wrote:

> >I haven't tried to understand the patch yet but I think as
> >it is your code you are the one to approve it.
> 
> is there a procedure for that?

Not yet for classpath but Mark wants to create a mailing list
classpath-patches@gnu.org (this doesnt exist yet). Each patch has to be
sent to this list for approval. Obvious changes need no approval. Some
people (probably only mjw) can then approve non-obvious patches.

This is the same procedure is in GCC. This ensures that patches get
reviewed before they get commited. This should ensure a high quality of
code in the future.


Michael



From MAILER-DAEMON Sat Jan 10 08:58:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfJdK-0001m6-59
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 08:58:34 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfJdI-0001lF-9G
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 08:58:32 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfJ2S-0002zp-P3
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 08:21:00 -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.24) id 1AfIy4-0002g0-ND
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 08:15:56 -0500
Received: from [195.8.69.18] (helo=oceanus2.uk.clara.net)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AfHuj-0003Hi-Rz
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 07:08:26 -0500
Received: from du-253-232.nat.adsl.claranet.fr ([212.43.253.232]
	helo=[10.0.1.2]) by oceanus2.uk.clara.net with esmtp (Exim 3.36 #2)
	id 1AfHtv-0008a5-00; Sat, 10 Jan 2004 12:07:36 +0000
In-Reply-To: <20040109082322.GC4727@mail.konqueror.de>
References: <D4BDDC41-413A-11D8-BCCF-003065B22A76@bluezoo.org>
	<877k03s8o0.fsf@fleche.redhat.com>
	<BFE281B3-41FF-11D8-ADF0-003065B22A76@bluezoo.org>
	<20040109082322.GC4727@mail.konqueror.de>
Mime-Version: 1.0 (Apple Message framework v609)
Content-Type: text/plain; charset=US-ASCII; format=flowed
Message-Id: <903B383A-4365-11D8-AB87-003065B22A76@bluezoo.org>
Content-Transfer-Encoding: 7bit
From: Chris Burdess <dog@bluezoo.org>
Date: Sat, 10 Jan 2004 13:07:29 +0100
To: Michael Koch <konqueror@gmx.de>
X-Mailer: Apple Mail (2.609)
Cc: commit-classpath@gnu.org
Subject: Re: inetlib build fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 13:58:33 -0000

Michael Koch wrote:
> Several comments on your patch:
>
> - ChangeLog entry missing.

now added.

> - unified diffs are much more readable (preferable with 3 lines of
>   context)

ok, i'll do that in future.

> - Generated files are normally excluded from posted patches. The only
>   bloat the patch and give nothing new.

that makes sense.

> I haven't tried to understand the patch yet but I think as
> it is your code you are the one to approve it.

is there a procedure for that?

thanks for the comments,
-- 
Chris Burdess




From MAILER-DAEMON Sat Jan 10 14:47:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfP5K-0000H0-KU
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 14:47:50 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfP5G-0000Cp-KW
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 14:47:46 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfP4k-0008K6-0z
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 14:47:45 -0500
Received: from [204.127.198.35] (helo=rwcrmhc11.comcast.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfP4i-0008JU-Qj
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 14:47:12 -0500
Received: from byu.net (c-24-10-254-137.client.comcast.net[24.10.254.137])
	by comcast.net (rwcrmhc11) with SMTP id <20040110184537013005g7qhe>
	(Authid: ericblake); Sat, 10 Jan 2004 18:45:37 +0000
Message-ID: <400047DA.8010000@byu.net>
Date: Sat, 10 Jan 2004 11:43:38 -0700
From: Eric Blake <ebb9@byu.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.4) Gecko/20030624
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: tromey@redhat.com
References: <87r7y8c0kf.fsf@fleche.redhat.com>
In-Reply-To: <87r7y8c0kf.fsf@fleche.redhat.com>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: commit-classpath <commit-classpath@gnu.org>
Subject: Re: Patch: FYI: more standards updates
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 19:47:47 -0000

Tom Tromey wrote:

> from  Tom Tromey  <tromey@redhat.com>
> 
> 	* doc/hacking.texinfo (Programming Standards): Added some more
> 	standards.
>  
> +@item
> +Don't use redundant modifiers.  For instance, all members of an
> +interface are implicitly @code{public}, so there is no need to
> +explicitly declare them as @code{public}.

I think this paragraph should go further, and show all the redundant modifiers 
we avoid.  At least these commented modifiers are redundant:
/*abstract*/ interface I {
   /*public abstract*/ void m();
   /*public static final*/ int i = 1;
   /*public static*/ class Inner {}
}
final class C {
   /*final*/ void m() {}
}

Jikes will warn for this, with the +Predundant-modifiers command-line option.

Do we additionally want modifiers to be listed in the order recommended by the 
JLS?  For example, 'public static' is preferred over 'static public'.  Jikes 
has the +Pmodifier-order option for this.

> +
> +@item
> +Because the output of different compilers differs, we have
> +standardized on explicitly specifying @code{serialVersionUID} in
> +@code{Serializable} classes in Classpath.

Remember also that a class may be Serializable without explicitly listing it 
as a super-interface (for example, all subclasses of Throwable need 
serialVersionUID).

   This field should be
> +declared as @code{private static final}.
> +@c fixme index
> +@c fixme link to the discussion
> +
> +@item
> +Don't declare unchecked exceptions in the @code{throws} clause of a
> +method.  However, if throwing an unchecked exception is part of the
> +method's API, you should mention it in the Javadoc.
> +
>  @end itemize
>  
>  

Other ideas: Do we have a preferred order for declarations?  For example, some 
classes list fields, constructors, methods, then nested classes; and either 
sort alphabetically or follow the order they are documented in Sun's API 
documentation.

When overriding Object.equals, remember that 'if (!(o instanceof Foo))' 
filters out null, so an explicit null check is not needed.

-- 
Someday, I might put a cute statement here.

Eric Blake             ebb9@byu.net




From MAILER-DAEMON Sat Jan 10 17:09:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfRI3-0005zn-N2
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 17:09:07 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfRHu-0005rQ-8s
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 17:08:58 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfRHE-0005SD-Nd
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 17:08:48 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfRHD-0005HL-5q
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 17:08:15 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-034.ewetel.net
	[80.228.82.34])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0AL6Nl1005928;
	Sat, 10 Jan 2004 22:06:24 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AfQJT-0002kc-00; Sat, 10 Jan 2004 22:06:31 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Sat, 10 Jan 2004 22:09:44 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_YoGAAQ0I2UJb9zA"
Message-Id: <200401102209.44983.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: javax.swing
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 22:09:00 -0000


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

Hi list,


I will commit the attached patch to fix the import statements all over swing.
This patch goes into libgcj and classpath at once.


Michael


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

	* javax/swing/JRadioButtonMenuItem.java,
	javax/swing/JSeparator.java,
	javax/swing/JSplitPane.java,
	javax/swing/JTextPane.java,
	javax/swing/JToolBar.java,
	javax/swing/ListCellRenderer.java,
	javax/swing/ListModel.java,
	javax/swing/MenuElement.java,
	javax/swing/OverlayLayout.java,
	javax/swing/ProgressMonitor.java,
	javax/swing/ProgressMonitorInputStream.java,
	javax/swing/Renderer.java,
	javax/swing/RootPaneContainer.java,
	javax/swing/Scrollable.java,
	javax/swing/SingleSelectionModel.java,
	javax/swing/ToolTipManager.java,
	javax/swing/ViewportLayout.java,
	javax/swing/event/DocumentEvent.java,
	javax/swing/event/SwingPropertyChangeSupport.java,
	javax/swing/event/TreeSelectionEvent.java,
	javax/swing/event/UndoableEditEvent.java,
	javax/swing/text/AbstractDocument.java,
	javax/swing/text/AttributeSet.java,
	javax/swing/text/Caret.java,
	javax/swing/text/ComponentView.java,
	javax/swing/text/DefaultCaret.java,
	javax/swing/text/DefaultEditorKit.java,
	javax/swing/text/Document.java,
	javax/swing/text/EditorKit.java,
	javax/swing/text/GapContent.java,
	javax/swing/text/Keymap.java,
	javax/swing/text/MutableAttributeSet.java,
	javax/swing/text/PlainEditorKit.java,
	javax/swing/text/Segment.java,
	javax/swing/text/Style.java,
	javax/swing/text/StyledDocument.java,
	javax/swing/text/StyledEditorKit.java,
	javax/swing/text/TextAction.java,
	javax/swing/text/View.java: Fixed import statements.


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

Index: javax/swing/JRadioButtonMenuItem.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JRadioButtonMenuItem.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JRadioButtonMenuItem.java
--- javax/swing/JRadioButtonMenuItem.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JRadioButtonMenuItem.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JRadioButtonMenuItem.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,11 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import javax.accessibility.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
 
 /**
  * JRadioButtonMenuItem
Index: javax/swing/JSeparator.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSeparator.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JSeparator.java
--- javax/swing/JSeparator.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JSeparator.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JSeparator.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,12 @@
 
 package javax.swing;
 
-// Imports
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.plaf.*;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.swing.plaf.SeparatorUI;
 
 /**
  * JSeparator
Index: javax/swing/JSplitPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JSplitPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JSplitPane.java
--- javax/swing/JSplitPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JSplitPane.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JSplitPane.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,11 +37,16 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.plaf.*;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.accessibility.Accessible;
+import javax.accessibility.AccessibleContext;
+import javax.accessibility.AccessibleRole;
+import javax.accessibility.AccessibleStateSet;
+import javax.accessibility.AccessibleValue;
+import javax.swing.plaf.SplitPaneUI;
 
 /**
  * JSplitPane
Index: javax/swing/JTextPane.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JTextPane.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JTextPane.java
--- javax/swing/JTextPane.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/JTextPane.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JTextPane.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,16 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
-import javax.swing.text.*;
+import java.awt.Component;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.Document;
+import javax.swing.text.EditorKit;
+import javax.swing.text.MutableAttributeSet;
+import javax.swing.text.Style;
+import javax.swing.text.StyledDocument;
+import javax.swing.text.StyledEditorKit;
 
 /**
  * JTextPane
Index: javax/swing/JToolBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/JToolBar.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 JToolBar.java
--- javax/swing/JToolBar.java	11 Jun 2003 13:20:39 -0000	1.2
+++ javax/swing/JToolBar.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* JToolBar.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,12 +37,19 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.beans.*;
-import java.io.*;
-import javax.accessibility.*;
-import javax.swing.plaf.*;
+import java.awt.Dimension;
+import java.awt.Component;
+import java.awt.Container;
+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;
+import javax.accessibility.AccessibleStateSet;
+import javax.swing.plaf.ToolBarUI;
 
 /**
  * JToolBar
Index: javax/swing/ListCellRenderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ListCellRenderer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ListCellRenderer.java
--- javax/swing/ListCellRenderer.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/ListCellRenderer.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ListCellRenderer.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,7 @@
 
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Component;
 
 public interface ListCellRenderer
 {
Index: javax/swing/ListModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ListModel.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ListModel.java
--- javax/swing/ListModel.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ListModel.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ListModel.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,7 @@
 
 package javax.swing;
 
-import javax.swing.event.*;
+import javax.swing.event.ListDataListener;
 
 public interface ListModel
 {    
Index: javax/swing/MenuElement.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/MenuElement.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 MenuElement.java
--- javax/swing/MenuElement.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/MenuElement.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* MenuElement.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,9 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Component;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
 
 /**
  * MenuElement
Index: javax/swing/OverlayLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/OverlayLayout.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 OverlayLayout.java
--- javax/swing/OverlayLayout.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/OverlayLayout.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* OverlayLayout.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,11 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.LayoutManager2;
+import java.io.Serializable;
 
 /**
  * OverlayLayout
Index: javax/swing/ProgressMonitor.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ProgressMonitor.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ProgressMonitor.java
--- javax/swing/ProgressMonitor.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ProgressMonitor.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ProgressMonitor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,7 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
+import java.awt.Component;
 
 /**
  * ProgressMonitor
Index: javax/swing/ProgressMonitorInputStream.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ProgressMonitorInputStream.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ProgressMonitorInputStream.java
--- javax/swing/ProgressMonitorInputStream.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ProgressMonitorInputStream.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ProgressMonitorInputStream.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,10 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
+import java.awt.Component;
+import java.io.FilterInputStream;
+import java.io.InputStream;
+import java.io.IOException;
 
 /**
  * ProgressMonitorInputStream
Index: javax/swing/Renderer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Renderer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 Renderer.java
--- javax/swing/Renderer.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/Renderer.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* Renderer.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,7 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
+import java.awt.Component;
 
 /**
  * Renderer
Index: javax/swing/RootPaneContainer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/RootPaneContainer.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 RootPaneContainer.java
--- javax/swing/RootPaneContainer.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/RootPaneContainer.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* RootPaneContainer.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
+import java.awt.Container;
+import java.awt.Component;
 
 /**
  * RootPaneContainer
Index: javax/swing/Scrollable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/Scrollable.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Scrollable.java
--- javax/swing/Scrollable.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/Scrollable.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* Scrollable.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,8 @@
 
 package javax.swing;
 
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Rectangle;
 
 public interface Scrollable
 {
Index: javax/swing/SingleSelectionModel.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/SingleSelectionModel.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 SingleSelectionModel.java
--- javax/swing/SingleSelectionModel.java	12 Oct 2003 13:20:49 -0000	1.2
+++ javax/swing/SingleSelectionModel.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* SingleSelectionModel.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,7 @@
 
 package javax.swing;
 
-// Imports
-import javax.swing.event.*;
+import javax.swing.event.ChangeListener;
 
 /**
  * SingleSelectionModel
Index: javax/swing/ToolTipManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ToolTipManager.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 ToolTipManager.java
--- javax/swing/ToolTipManager.java	9 Aug 2002 04:26:10 -0000	1.1
+++ javax/swing/ToolTipManager.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ToolTipManager.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,12 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
+import java.awt.Rectangle;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
 
 /**
  * ToolTipManager
Index: javax/swing/ViewportLayout.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/ViewportLayout.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ViewportLayout.java
--- javax/swing/ViewportLayout.java	31 Mar 2003 06:30:00 -0000	1.2
+++ javax/swing/ViewportLayout.java	10 Jan 2004 21:04:07 -0000
@@ -1,5 +1,5 @@
 /* ViewportLayout.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,11 @@
 
 package javax.swing;
 
-// Imports
-import java.awt.*;
-import java.io.*;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import java.io.Serializable;
 
 /**
  * ViewportLayout
Index: javax/swing/event/DocumentEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/DocumentEvent.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DocumentEvent.java
--- javax/swing/event/DocumentEvent.java	12 Oct 2003 13:25:59 -0000	1.2
+++ javax/swing/event/DocumentEvent.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* DocumentEvent.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package javax.swing.event;
 
-// Imports
-import javax.swing.text.*;
+import javax.swing.text.Document;
+import javax.swing.text.Element;
 
 /**
  * DocumentEvent public interface
Index: javax/swing/event/SwingPropertyChangeSupport.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/SwingPropertyChangeSupport.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 SwingPropertyChangeSupport.java
--- javax/swing/event/SwingPropertyChangeSupport.java	11 Jun 2003 13:20:40 -0000	1.2
+++ javax/swing/event/SwingPropertyChangeSupport.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* SwingPropertyChangeSupport.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,14 @@
 
 package javax.swing.event;
 
-// Imports
-import java.beans.*;
-import java.io.*;
-import java.util.*;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.EventListener;
+import java.util.Hashtable;
 
 /**
  * SwingPropertyChangeSupport
Index: javax/swing/event/TreeSelectionEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/TreeSelectionEvent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TreeSelectionEvent.java
--- javax/swing/event/TreeSelectionEvent.java	9 Aug 2002 04:26:11 -0000	1.1
+++ javax/swing/event/TreeSelectionEvent.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* TreeSelectionEvent.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing.event;
 
-// Imports
-import java.util.*;
-import javax.swing.tree.*;
+import java.util.EventObject;
+import javax.swing.tree.TreePath;
 
 /**
  * TreeSelectionEvent
Index: javax/swing/event/UndoableEditEvent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/event/UndoableEditEvent.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 UndoableEditEvent.java
--- javax/swing/event/UndoableEditEvent.java	11 Jun 2003 13:20:40 -0000	1.2
+++ javax/swing/event/UndoableEditEvent.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* UndoableEditEvent.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,8 @@
 
 package javax.swing.event;
 
-// Imports
-import java.util.*;
-import javax.swing.undo.*;
+import java.util.EventObject;
+import javax.swing.undo.UndoableEdit;
 
 /**
  * UndoableEditEvent
Index: javax/swing/text/AbstractDocument.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/AbstractDocument.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 AbstractDocument.java
--- javax/swing/text/AbstractDocument.java	12 Oct 2003 13:33:32 -0000	1.2
+++ javax/swing/text/AbstractDocument.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* AbstractDocument.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,17 @@
 
 package javax.swing.text;
 
-import javax.swing.event.*;
-import javax.swing.undo.*;
-import java.util.*;
-import javax.swing.tree.*;
+import java.util.Dictionary;
+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;
+import javax.swing.undo.UndoableEdit;
 
 public abstract class AbstractDocument implements Document
 {
Index: javax/swing/text/AttributeSet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/AttributeSet.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 AttributeSet.java
--- javax/swing/text/AttributeSet.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/AttributeSet.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* AttributeSet.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,7 @@
 
 package javax.swing.text;
 
-import java.util.*;
-
+import java.util.Enumeration;
 
 public interface AttributeSet
 { 
Index: javax/swing/text/Caret.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Caret.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Caret.java
--- javax/swing/text/Caret.java	21 Mar 2003 09:18:31 -0000	1.3
+++ javax/swing/text/Caret.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Caret.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,9 @@
 
 package javax.swing.text;
 
-import java.awt.*;
-import javax.swing.event.*;
+import java.awt.Graphics;
+import java.awt.Point;
+import javax.swing.event.ChangeListener;
 
 public interface Caret
 {
Index: javax/swing/text/ComponentView.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/ComponentView.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 ComponentView.java
--- javax/swing/text/ComponentView.java	24 Mar 2003 14:05:02 -0000	1.2
+++ javax/swing/text/ComponentView.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* ComponentView.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,9 @@
 
 package javax.swing.text;
 
-import java.awt.*;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Shape;
 
 public class ComponentView extends View
 {
Index: javax/swing/text/DefaultCaret.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/DefaultCaret.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 DefaultCaret.java
--- javax/swing/text/DefaultCaret.java	2 Mar 2003 19:45:52 -0000	1.2
+++ javax/swing/text/DefaultCaret.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* DefaultCaret.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,10 +37,20 @@
 
 package javax.swing.text;
 
-import java.awt.*;
-import java.util.*;
-import java.awt.event.*;
-import javax.swing.event.*;
+import java.awt.Color;
+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/DefaultEditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/DefaultEditorKit.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 DefaultEditorKit.java
--- javax/swing/text/DefaultEditorKit.java	29 Apr 2003 12:34:49 -0000	1.3
+++ javax/swing/text/DefaultEditorKit.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* DefaultEditorKit.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,12 @@
 
 package javax.swing.text;
 
-import javax.swing.*;
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
 
 public class DefaultEditorKit extends EditorKit
 {
Index: javax/swing/text/Document.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Document.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 Document.java
--- javax/swing/text/Document.java	12 Oct 2003 13:33:32 -0000	1.3
+++ javax/swing/text/Document.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Document.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package javax.swing.text;
 
-
-import javax.swing.event.*;
+import javax.swing.event.DocumentListener;
+import javax.swing.event.UndoableEditListener;
 
 public interface Document
 { 
Index: javax/swing/text/EditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/EditorKit.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 EditorKit.java
--- javax/swing/text/EditorKit.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/EditorKit.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* EditorKit.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,12 @@
 
 package javax.swing.text;
 
-import javax.swing.*;
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
 
 public abstract class EditorKit implements Cloneable
 {
Index: javax/swing/text/GapContent.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/GapContent.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 GapContent.java
--- javax/swing/text/GapContent.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/GapContent.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* GapContent.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -40,8 +40,7 @@
 // too lazy to make a real gapcontent.
 // lets just use a stringbuffer instead.
 
-import javax.swing.undo.*;
-
+import javax.swing.undo.UndoableEdit;
 
 public class GapContent implements AbstractDocument.Content
 {
Index: javax/swing/text/Keymap.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Keymap.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Keymap.java
--- javax/swing/text/Keymap.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/Keymap.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Keymap.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,8 @@
 
 package javax.swing.text;
 
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.KeyStroke;
 
 public interface Keymap
 {
Index: javax/swing/text/MutableAttributeSet.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/MutableAttributeSet.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 MutableAttributeSet.java
--- javax/swing/text/MutableAttributeSet.java	12 Oct 2003 13:33:32 -0000	1.2
+++ javax/swing/text/MutableAttributeSet.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* MutableAttributeSet.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,7 @@
 
 package javax.swing.text;
 
-// Imports
-import java.util.*;
+import java.util.Enumeration;
 
 /**
  * MutableAttributeSet
Index: javax/swing/text/PlainEditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/PlainEditorKit.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 PlainEditorKit.java
--- javax/swing/text/PlainEditorKit.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/PlainEditorKit.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* PlainEditorKit.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,12 @@
 
 package javax.swing.text;
 
-import javax.swing.*;
-import java.io.*;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import javax.swing.Action;
+import javax.swing.JEditorPane;
 
 public class PlainEditorKit extends EditorKit
 {
Index: javax/swing/text/Segment.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Segment.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Segment.java
--- javax/swing/text/Segment.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/Segment.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Segment.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -36,9 +36,6 @@
 exception statement from your version. */
 
 package javax.swing.text;
-
-import java.util.*;
-
 
 public class Segment implements Cloneable, CharacterIterator
 {
Index: javax/swing/text/Style.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/Style.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 Style.java
--- javax/swing/text/Style.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/Style.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* Style.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,7 @@
 
 package javax.swing.text;
 
-import javax.swing.event.*;
+import javax.swing.event.ChangeListener;
 
 public interface Style
 {
Index: javax/swing/text/StyledDocument.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/StyledDocument.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 StyledDocument.java
--- javax/swing/text/StyledDocument.java	12 Oct 2003 13:33:32 -0000	1.2
+++ javax/swing/text/StyledDocument.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* StyledDcoument.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,8 @@
 
 package javax.swing.text;
 
-// Imports
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Font;
 
 /**
  * StyledDocument
Index: javax/swing/text/StyledEditorKit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/StyledEditorKit.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 StyledEditorKit.java
--- javax/swing/text/StyledEditorKit.java	31 Mar 2003 06:30:01 -0000	1.2
+++ javax/swing/text/StyledEditorKit.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* StyledEditorKit.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,13 +37,19 @@
 
 package javax.swing.text;
 
-// Imports
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import javax.swing.*;
-import javax.swing.event.*;
+import java.awt.Color;
+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;
+import javax.swing.event.CaretListener;
 
 /**
  * StyledEditorKit
Index: javax/swing/text/TextAction.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/TextAction.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 TextAction.java
--- javax/swing/text/TextAction.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/TextAction.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* TextAction.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,9 @@
 
 package javax.swing.text;
 
-// Imports
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.event.ActionEvent;
+import javax.swing.AbstractAction;
+import javax.swing.Action;
 
 /**
  * TextAction
Index: javax/swing/text/View.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/text/View.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 View.java
--- javax/swing/text/View.java	9 Aug 2002 04:26:12 -0000	1.1
+++ javax/swing/text/View.java	10 Jan 2004 21:04:08 -0000
@@ -1,5 +1,5 @@
 /* View.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,9 +37,10 @@
 
 package javax.swing.text;
 
-import java.awt.*;
-import javax.swing.*;
-import java.util.*;
+import java.awt.Graphics;
+import java.awt.Shape;
+import java.util.Vector;
+import javax.swing.SwingConstants;
 
 public abstract class View implements SwingConstants
 {

--Boundary-00=_YoGAAQ0I2UJb9zA--




From MAILER-DAEMON Sat Jan 10 18:01:31 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfS6l-0006fL-HF
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 18:01:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfS6j-0006dc-8M
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 18:01:29 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfS6B-0006Uo-2U
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 18:01:27 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfS69-0006TH-VL
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 18:00:54 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-034.ewetel.net
	[80.228.82.34])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0ALxAl1025112;
	Sat, 10 Jan 2004 22:59:10 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AfR8Y-0002oY-00; Sat, 10 Jan 2004 22:59:18 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Sat, 10 Jan 2004 23:02:32 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_4ZHAAYWzqYSN7ql"
Message-Id: <200401102302.32303.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: javax.swing.plaf
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 23:01:30 -0000


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

Hi lists,


I will commit the attached patch to libgcj and classpath to fix the import 
statements in javax.swing.plaf


Michael


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

	* javax/swing/plaf/basic/BasicButtonUI.java,
	javax/swing/plaf/basic/BasicCheckBoxUI.java,
	javax/swing/plaf/basic/BasicListUI.java,
	javax/swing/plaf/basic/BasicOptionPaneUI.java,
	javax/swing/plaf/basic/BasicPanelUI.java,
	javax/swing/plaf/basic/BasicRadioButtonUI.java,
	javax/swing/plaf/basic/BasicScrollPaneUI.java,
	javax/swing/plaf/basic/BasicToggleButtonUI.java,
	javax/swing/plaf/basic/BasicViewportUI.java:
	Fixed import statements.


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

Index: javax/swing/plaf/basic/BasicButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicButtonUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicButtonUI.java
--- javax/swing/plaf/basic/BasicButtonUI.java	19 Jun 2003 10:48:46 -0000	1.3
+++ javax/swing/plaf/basic/BasicButtonUI.java	10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
 /* BasicButtonUI.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,18 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Insets;
+import java.awt.Rectangle;
+import javax.swing.AbstractButton;
+import javax.swing.JComponent;
+import javax.swing.SwingUtilities;
+import javax.swing.plaf.ButtonUI;
+import javax.swing.plaf.ComponentUI;
 
 public class BasicButtonUI extends ButtonUI
 {
Index: javax/swing/plaf/basic/BasicCheckBoxUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicCheckBoxUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicCheckBoxUI.java
--- javax/swing/plaf/basic/BasicCheckBoxUI.java	19 Jun 2003 10:48:46 -0000	1.3
+++ javax/swing/plaf/basic/BasicCheckBoxUI.java	10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
 /* BasicCheckBoxUI.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,13 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+import java.awt.Component;
+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;
 
 public class BasicCheckBoxUI extends BasicRadioButtonUI
 {  
Index: javax/swing/plaf/basic/BasicListUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicListUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicListUI.java
--- javax/swing/plaf/basic/BasicListUI.java	25 Jun 2003 04:34:20 -0000	1.3
+++ javax/swing/plaf/basic/BasicListUI.java	10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
 /* BasicListUI.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,17 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.plaf.*;
-import javax.swing.*;
-import java.awt.*;
-
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Point;
+import java.awt.Rectangle;
+import javax.swing.JComponent;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ListUI;
 
 public class BasicListUI extends ListUI
 {
Index: javax/swing/plaf/basic/BasicOptionPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicOptionPaneUI.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 BasicOptionPaneUI.java
--- javax/swing/plaf/basic/BasicOptionPaneUI.java	25 Jun 2003 04:34:20 -0000	1.5
+++ javax/swing/plaf/basic/BasicOptionPaneUI.java	10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
 /* BasicOptionPaneUI.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,11 +38,17 @@
 
 package javax.swing.plaf.basic;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.plaf.*;
-import javax.accessibility.*;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.LayoutManager;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.OptionPaneUI;
 
 public class BasicOptionPaneUI extends OptionPaneUI
 {
Index: javax/swing/plaf/basic/BasicPanelUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicPanelUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicPanelUI.java
--- javax/swing/plaf/basic/BasicPanelUI.java	10 May 2003 08:14:36 -0000	1.2
+++ javax/swing/plaf/basic/BasicPanelUI.java	10 Jan 2004 21:55:22 -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,10 +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.PanelUI;
 
 public class BasicPanelUI extends PanelUI
 {
Index: javax/swing/plaf/basic/BasicRadioButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicRadioButtonUI.java
--- javax/swing/plaf/basic/BasicRadioButtonUI.java	19 Jun 2003 10:48:46 -0000	1.3
+++ javax/swing/plaf/basic/BasicRadioButtonUI.java	10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
 /* BasicRadioButtonUI.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,13 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+import java.awt.Color;
+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;
 
 public class BasicRadioButtonUI extends BasicToggleButtonUI
 {
Index: javax/swing/plaf/basic/BasicScrollPaneUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicScrollPaneUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicScrollPaneUI.java
--- javax/swing/plaf/basic/BasicScrollPaneUI.java	10 May 2003 08:14:36 -0000	1.2
+++ javax/swing/plaf/basic/BasicScrollPaneUI.java	10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
 /* BasicScrollPaneUI.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,12 +38,12 @@
 
 package javax.swing.plaf.basic;
 
-
-import javax.swing.plaf.*;
-import javax.swing.*;
-import java.awt.*;
-
-
+import java.awt.Dimension;
+import java.awt.Graphics;
+import javax.swing.JComponent;
+import javax.swing.JScrollPane;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ScrollPaneUI;
 
 public class BasicScrollPaneUI extends ScrollPaneUI
 {
Index: javax/swing/plaf/basic/BasicToggleButtonUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicToggleButtonUI.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 BasicToggleButtonUI.java
--- javax/swing/plaf/basic/BasicToggleButtonUI.java	19 Jun 2003 10:48:46 -0000	1.3
+++ javax/swing/plaf/basic/BasicToggleButtonUI.java	10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
 /* BasicToggleButtonUI.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,12 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.*;
-import javax.swing.plaf.*;
-import java.awt.*;
-
+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;
 
 public class BasicToggleButtonUI extends BasicButtonUI
 {
Index: javax/swing/plaf/basic/BasicViewportUI.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/plaf/basic/BasicViewportUI.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 BasicViewportUI.java
--- javax/swing/plaf/basic/BasicViewportUI.java	10 May 2003 08:14:36 -0000	1.2
+++ javax/swing/plaf/basic/BasicViewportUI.java	10 Jan 2004 21:55:22 -0000
@@ -1,5 +1,5 @@
 /* BasicViewportUI.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,11 @@
 
 package javax.swing.plaf.basic;
 
-import javax.swing.plaf.*;
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import javax.swing.JComponent;
+import javax.swing.plaf.ComponentUI;
+import javax.swing.plaf.ViewportUI;
 
 public class BasicViewportUI extends ViewportUI 
 {

--Boundary-00=_4ZHAAYWzqYSN7ql--




From MAILER-DAEMON Sat Jan 10 18:18:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfSNB-0000da-HD
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 18:18:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfSN8-0000d2-O4
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 18:18:26 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfSMc-0000aB-G0
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 18:18:25 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AfSLz-0000Vt-Uw
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 18:17:16 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-034.ewetel.net
	[80.228.82.34])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i0AMFh9u013728;
	Sat, 10 Jan 2004 23:15:44 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AfROZ-0002vX-00; Sat, 10 Jan 2004 23:15:51 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Sat, 10 Jan 2004 23:19:05 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ZpHAAiFLmRJ2Fhy"
Message-Id: <200401102319.05350.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: javax.print.attribute
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jan 2004 23:18:27 -0000


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

Hi lists,


I will commit the attached patch to libgcj and classpath to fix some bugs 
found in javax.print.attribute by japitools.


Michael


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

	* javax/print/attribute/EnumSyntax.java
	(getStringTable): Made protected.
	(getEnumValueTable): Likewise.
	* javax/print/attribute/standard/JobKOctetsProcessed.java
	(JobKOctetsProcessed): Don't implement PrintRequestAttribute.
	* javax/print/attribute/standard/JobMediaSheetsCompleted.java
	(JobMediaSheetsCompleted): Made class final.
	* javax/print/attribute/standard/OutputDeviceAssigned.java
	(getName): Fixed typo.
	* javax/print/attribute/standard/RequestingUserName.java
	(serialVersionUID): Fixed value.


--Boundary-00=_ZpHAAiFLmRJ2Fhy
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: /cvs/gcc/gcc/libjava/javax/print/attribute/EnumSyntax.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 EnumSyntax.java
--- javax/print/attribute/EnumSyntax.java	21 Dec 2003 15:56:38 -0000	1.1
+++ javax/print/attribute/EnumSyntax.java	10 Jan 2004 22:05:04 -0000
@@ -122,7 +122,7 @@
    *
    * @return the enumeration values as strings
    */
-  public String[] getStringTable()
+  protected String[] getStringTable()
   {
     return null;
   }
@@ -134,7 +134,7 @@
    *
    * @return the enumeration values
    */
-  public EnumSyntax[] getEnumValueTable()
+  protected EnumSyntax[] getEnumValueTable()
   {
     return null;
   }
Index: javax/print/attribute/standard/JobKOctetsProcessed.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobKOctetsProcessed.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JobKOctetsProcessed.java
--- javax/print/attribute/standard/JobKOctetsProcessed.java	6 Jan 2004 13:48:52 -0000	1.1
+++ javax/print/attribute/standard/JobKOctetsProcessed.java	10 Jan 2004 22:05:04 -0000
@@ -1,5 +1,5 @@
 /* JobKOctetsProcessed.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -39,13 +39,12 @@
 
 import javax.print.attribute.IntegerSyntax;
 import javax.print.attribute.PrintJobAttribute;
-import javax.print.attribute.PrintRequestAttribute;
 
 /**
  * @author Michael Koch
  */
 public final class JobKOctetsProcessed extends IntegerSyntax
-  implements PrintJobAttribute, PrintRequestAttribute
+  implements PrintJobAttribute
 {
   private static final long serialVersionUID = -6265238509657881806L;
   
Index: javax/print/attribute/standard/JobMediaSheetsCompleted.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/JobMediaSheetsCompleted.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JobMediaSheetsCompleted.java
--- javax/print/attribute/standard/JobMediaSheetsCompleted.java	6 Jan 2004 13:48:52 -0000	1.1
+++ javax/print/attribute/standard/JobMediaSheetsCompleted.java	10 Jan 2004 22:05:04 -0000
@@ -1,5 +1,5 @@
 /* JobMediaSheetsCompleted.java -- 
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -43,7 +43,7 @@
 /**
  * @author Michael Koch
  */
-public class JobMediaSheetsCompleted extends IntegerSyntax
+public final class JobMediaSheetsCompleted extends IntegerSyntax
   implements PrintJobAttribute
 {
   private static final long serialVersionUID = 1739595973810840475L;
Index: javax/print/attribute/standard/OutputDeviceAssigned.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/OutputDeviceAssigned.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 OutputDeviceAssigned.java
--- javax/print/attribute/standard/OutputDeviceAssigned.java	9 Jan 2004 11:26:42 -0000	1.1
+++ javax/print/attribute/standard/OutputDeviceAssigned.java	10 Jan 2004 22:05:04 -0000
@@ -86,10 +86,10 @@
   /**
    * Returns name of this class.
    *
-   * @return the string "output-device-assigened"
+   * @return the string "output-device-assigned"
    */
   public final String getName()
   {
-    return "output-device-assigened";
+    return "output-device-assigned";
   }
 }
Index: javax/print/attribute/standard/RequestingUserName.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/print/attribute/standard/RequestingUserName.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 RequestingUserName.java
--- javax/print/attribute/standard/RequestingUserName.java	9 Jan 2004 11:26:42 -0000	1.1
+++ javax/print/attribute/standard/RequestingUserName.java	10 Jan 2004 22:05:04 -0000
@@ -44,7 +44,7 @@
 public final class RequestingUserName extends TextSyntax
   implements PrintRequestAttribute
 {
-  private static final long serialVersionUID = 4660359192078689545L;
+  private static final long serialVersionUID = -2683049894310331454L;
 
   /**
    * Creates a <code>RequestingUserName</code> object.

--Boundary-00=_ZpHAAiFLmRJ2Fhy--




From MAILER-DAEMON Sat Jan 10 19:14:12 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfTF6-0005oK-Fq
	for mharc-commit-classpath@gnu.org; Sat, 10 Jan 2004 19:14:12 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfTF2-0005nE-Tk
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 19:14:08 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfTEV-0005cl-BM
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 19:14:06 -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.24) id 1AfTEU-0005cP-Ki
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 19:13:34 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AfSGk-0000HG-P6
	for commit-classpath@gnu.org; Sat, 10 Jan 2004 18:11:50 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-034.ewetel.net
	[80.228.82.34])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0ANBbUa012343;
	Sun, 11 Jan 2004 00:11:37 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AfSGe-000355-00; Sun, 11 Jan 2004 00:11:44 +0100
From: Michael Koch <konqueror@gmx.de>
To: java-patches@gcc.gnu.org
Date: Sun, 11 Jan 2004 00:14:58 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ydIAAjQQ4kInr/z"
Message-Id: <200401110014.58985.konqueror@gmx.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: FYI: Patch: javax.swing.undo.StateEditable
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2004 00:14:10 -0000


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

Hi lists,


I will commit the attached patch to make javax/swing/undo/StateEditable.java 
more compliant to our style.


Michael


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

	* javax/swing/undo/StateEditable.java
	(RCSID): Removed redundant modifiers.


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

Index: javax/swing/undo/StateEditable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/javax/swing/undo/StateEditable.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 StateEditable.java
--- javax/swing/undo/StateEditable.java	26 Nov 2003 22:23:40 -0000	1.5
+++ javax/swing/undo/StateEditable.java	10 Jan 2004 23:06:10 -0000
@@ -80,7 +80,7 @@
    * Sun&#x2019;s reference implementation, GNU Classpath also has to
    * provide this field. However, we do not try to match its value.
    */
-  static final String RCSID = "";
+  String RCSID = "";
 
 
   /**

--Boundary-00=_ydIAAjQQ4kInr/z--




From MAILER-DAEMON Sun Jan 11 09:05:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Afg9z-00038J-K3
	for mharc-commit-classpath@gnu.org; Sun, 11 Jan 2004 09:01:47 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Afg9X-00036N-4W
	for commit-classpath@gnu.org; Sun, 11 Jan 2004 09:01:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Afg85-0002fa-Tv
	for commit-classpath@gnu.org; Sun, 11 Jan 2004 09:00:21 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Afg85-0002eY-7s
	for commit-classpath@gnu.org; Sun, 11 Jan 2004 08:59:49 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-030.ewetel.net
	[80.228.80.30])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0BCwBHA001194
	for <commit-classpath@gnu.org>; Sun, 11 Jan 2004 13:58:11 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AffAZ-0004u9-00
	for <commit-classpath@gnu.org>; Sun, 11 Jan 2004 13:58:19 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 11 Jan 2004 14:01:33 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_tkUAAclzjEaCwsk"
Message-Id: <200401111401.33776.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing.undo.StateEditable
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2004 14:01:20 -0000


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

Hi list,


I commited the attached patch to removed redundant modifiers which violate our 
coding standard.


Michael


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

	* javax/swing/undo/StateEditable.java
	(RCSID): Removed redundant modifiers.


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

Index: javax/swing/undo/StateEditable.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/undo/StateEditable.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 StateEditable.java
--- javax/swing/undo/StateEditable.java	14 Nov 2003 15:44:51 -0000	1.5
+++ javax/swing/undo/StateEditable.java	11 Jan 2004 12:50:58 -0000
@@ -80,7 +80,7 @@
    * Sun&#x2019;s reference implementation, GNU Classpath also has to
    * provide this field. However, we do not try to match its value.
    */
-  static final String RCSID = "";
+  String RCSID = "";
 
 
   /**

--Boundary-00=_tkUAAclzjEaCwsk--




From MAILER-DAEMON Sun Jan 11 09:05:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AfgDj-000472-Fx
	for mharc-commit-classpath@gnu.org; Sun, 11 Jan 2004 09:05:39 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AfgDg-00045E-4V
	for commit-classpath@gnu.org; Sun, 11 Jan 2004 09:05:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AfgD6-0003kA-Ty
	for commit-classpath@gnu.org; Sun, 11 Jan 2004 09:05:31 -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.24) id 1AfgD6-0003jB-5m
	for commit-classpath@gnu.org; Sun, 11 Jan 2004 09:05:00 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AffEb-00010W-0w
	for commit-classpath@gnu.org; Sun, 11 Jan 2004 08:02:29 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-030.ewetel.net
	[80.228.80.30])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0BD2Q1h008628
	for <commit-classpath@gnu.org>; Sun, 11 Jan 2004 14:02:27 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AffEh-000507-00
	for <commit-classpath@gnu.org>; Sun, 11 Jan 2004 14:02:35 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 11 Jan 2004 14:05:49 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_toUAAq9Q9q64Xtc"
Message-Id: <200401111405.49135.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing.JLayeredPane
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 11 Jan 2004 14:05:36 -0000


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

Hi list,


I commited the attached patch which merges fixes from Graydon Hoare in libgcj 
to classpath.


Michael


2004-01-11  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/JLayeredPane.java: Rewrite to accomodate
	djee@redhat.com's recent inverse ordering of Container
	elements.


--Boundary-00=_toUAAq9Q9q64Xtc
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.9
diff -u -b -B -r1.9 JLayeredPane.java
--- javax/swing/JLayeredPane.java	8 Jan 2004 09:46:00 -0000	1.9
+++ javax/swing/JLayeredPane.java	11 Jan 2004 13:00:12 -0000
@@ -68,16 +68,10 @@
  * this class:</p>
  * 
  * <dl>
- * <dt>Internal Component Index:</dt> 
+ * <dt>Component Index:</dt> 
  * <dd>An offset into the <code>component</code> array held in our ancestor,
  * {@link java.awt.Container}, from <code>[0 .. component.length)</code>. The drawing
- * rule with internal indices is that 0 is drawn first.</dd>
- *
- * <dt>External Component Index:</dt>
- * <dd>An offset into the "logical drawing order" of this container. If <code>I</code>
- * is the internal index of a component, the external index <tt>E =
- * component.length - I</tt>. The rule with external indices is that 0 is
- * drawn last.</dd>
+ * rule with indices is that 0 is drawn last.</dd>
  *
  * <dt>Layer Number:</dt>
  * <dd>A general <code>int</code> specifying a layer within this component.  Negative
@@ -89,6 +83,9 @@
  * is drawn last. Layer position -1 is a synonym for the first layer
  * position (the logical "bottom").</dd>
  *
+ * <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>
  */
 
@@ -131,16 +128,16 @@
   }
 
   /**
-   * Returns a pair of ints representing a half-open interval
-   * <code>[bottom, top)</code>, which is the range of internal component
-   * indices the provided layer number corresponds to.
+   * <p>Returns a pair of ints representing a half-open interval 
+   * <code>[top, bottom)</code>, which is the range of component indices 
+   * the provided layer number corresponds to.</p>
    *
-   * Note that "top" is <em>not</em> included in the interval of 
+   * <p>Note that "bottom" is <em>not</em> included in the interval of
    * component indices in this layer: a layer with 0 elements in it has 
-   * <code>ret[0] == ret[1]</code>.
+   * <code>ret[0] == ret[1]</code>.</p>
    *
    * @param layer the layer to look up.
-   * @return the half-open range of internal indices this layer spans.
+   * @return the half-open range of indices this layer spans.
    * @throws IllegalArgumentException if layer does not refer to an active layer
    * in this container.
    */
@@ -148,6 +145,7 @@
   protected int[] layerToRange (Integer layer)
   {
     int[] ret = new int[2];	
+    ret[1] = getComponents ().length;
     Iterator i = layers.entrySet ().iterator ();
     while (i.hasNext())
 	    {
@@ -156,12 +154,12 @@
         Integer layerSz = (Integer) pair.getValue ();
         if (layerNum == layer)
           {
-            ret[1] = ret[0] + layerSz.intValue ();
+            ret[0] = ret[1] - layerSz.intValue ();
             return ret;
           }
         else
           {
-            ret[0] += layerSz.intValue ();
+            ret[1] -= layerSz.intValue ();
           }
 	    }
     // should have found the layer during iteration
@@ -280,12 +278,13 @@
   {
     Integer layer = getLayer (c);
     int[] range = layerToRange (layer);
-    int top = (range[1] - 1);
+    int top = range[0];
+    int bot = range[1];
     Component[] comps = getComponents ();
-    for (int i = range[0]; i < range[1]; ++i)
+    for (int i = top; i < bot; ++i)
 	    {
         if (comps[i] == c)
-          return top - i;
+          return i - top;
 	    }
     // should have found it
     throw new IllegalArgumentException ();
@@ -310,14 +309,15 @@
     if (range[0] == range[1])
 	    throw new IllegalArgumentException ();
 
-    int top = (range[1] - 1);
+    int top = range[0];
+    int bot = range[1];
     if (position == -1)
-	    position = top - range[0];
-    int targ = top - position;
+	    position = (bot - top) - 1;
+    int targ = top + position;
     int curr = -1;
 
     Component[] comps = getComponents();
-    for (int i = range[0]; i < range[1]; ++i)
+    for (int i = top; i < bot; ++i)
 	    {
         if (comps[i] == c)
           {
@@ -336,8 +336,8 @@
     
   /**
    * Return an array of all components within a layer of this
-   * container. Components are ordered back-to-front, with the "back"
-   * element (which draws first) at position 0 of the returned array.
+   * container. Components are ordered front-to-back, with the "front"
+   * element (which draws last) at position 0 of the returned array.
    *
    * @param layer the layer to return components from.
    * @return the components in the layer.
@@ -351,7 +351,7 @@
     else
 	    {
         Component[] comps = getComponents ();
-        int sz = (range[1] - 1) - range[0];
+        int sz = range[1] - range[0];
         Component[] nc = new Component[sz];
         for (int i = 0; i < sz; ++i)
           nc[i] = comps[range[0] + i];
@@ -390,16 +389,16 @@
   /**
    * Return the index of a component within the underlying (contiguous)
    * array of children. This is a "raw" number which does not represent the
-   * child's position in a layer, but rather its position in the
-   * concatenation of <em>all</em> layers within the container.
+   * child's position in a layer, but rather its position in the logical
+   * drawing order of all children of the container.
    *
    * @param c the component to look up.
-   * @return the internal index of the component.
+   * @return the external index of the component.
    * @throws IllegalArgumentException if the component is not a child of
    * this container.
    */
 
-  protected int getInternalIndexOf(Component c) 
+  public int getIndexOf(Component c) 
   {
     Integer layer = getLayer (c);
     int[] range = layerToRange (layer);
@@ -413,26 +412,6 @@
     throw new IllegalArgumentException ();
   }
 
-
-  /**
-   * Return the external index of a component within the underlying
-   * (contiguous) array of children. This is a "raw" number which does not
-   * represent the child's position in a layer, but rather its position in
-   * the logical drawing order of all children of the container.
-   *
-   * @param c the component to look up.
-   * @return the external index of the component.
-   * @throws IllegalArgumentException if the component is not a child of
-   * this container.
-   */
-
-  public int getIndexOf(Component c) 
-  {
-    // returns the *external* index of the component.
-    int top = getComponentCount() - 1;
-    return top - getIndexOf (c);
-  }    
-
   /**
    * Return an Integer object which holds the same int value as the
    * parameter. This is strictly an optimization to minimize the number of
@@ -472,13 +451,13 @@
   }
 
   /**
-   * Computes an internal index at which to request the superclass {@link
+   * Computes an index at which to request the superclass {@link
    * java.awt.Container} inserts a component, given an abstract layer and
    * position number.
    *
    * @param layer the layer in which to insert a component.
    * @param position the position in the layer at which to insert a component.
-   * @return the internal index at which to insert the component.
+   * @return the index at which to insert the component.
    */
     
   protected int insertIndexForLayer(int layer, int position)
@@ -491,20 +470,20 @@
     if (range[0] == range[1])
 	    return range[0];
 	
-    int bottom = range[0];
-    int top = range[1] - 1;
+    int top = range[0];
+    int bot = range[1];
 	
-    if (position == -1 || position > (top - bottom))
-	    return bottom;
+    if (position == -1 || position > (bot - top))
+        return bot;
     else
-	    return top - position;
+        return top + position;
   }
 
   /**
    * Removes a child from this container. The child is specified by
-   * internal index. After removal, the child no longer occupies a layer.
+   * index. After removal, the child no longer occupies a layer.
    *
-   * @param index the internal index of the child component to remove.
+   * @param index the index of the child component to remove.
    */
     
   public void remove (int index)
@@ -525,7 +504,7 @@
 	
   public void remove (Component comp)
   {
-    remove (getInternalIndexOf (comp));
+    remove (getIndexOf (comp));
   }
 
   /**

--Boundary-00=_toUAAq9Q9q64Xtc--




From MAILER-DAEMON Mon Jan 12 08:38:36 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag2H6-0006Bv-8N
	for mharc-commit-classpath@gnu.org; Mon, 12 Jan 2004 08:38:36 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag24K-00031L-KU
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 08:25:24 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag1qs-0007ot-BA
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 08:12:01 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag1cc-0004mT-3a
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 07:56:46 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-73-110.ewetel.net
	[80.228.73.110])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0CBsxHA008026
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 12:54:59 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ag0ey-00036a-00
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 12:55:08 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Jan 2004 12:58:24 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_gvoAA9FMoiXN5pk"
Message-Id: <200401121258.24186.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.net.protocol.http.Connection
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 13:38:34 -0000


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

Hi list,


I commited the attached patch to fix bug #2424.


Michael


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

	* gnu/java/net/protocol/http/Connection.java
	(connect): Dont initialize bufferedOutputStream.
	(sendRequest): Handle case when bufferedOutputStream is null.
	(getOutputStream): Throw exception if called after it got connected.
	Initialize bufferedOutputStream.


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

Index: gnu/java/net/protocol/http/Connection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/http/Connection.java,v
retrieving revision 1.12
diff -u -b -B -r1.12 Connection.java
--- gnu/java/net/protocol/http/Connection.java	30 Dec 2003 14:09:07 -0000	1.12
+++ gnu/java/net/protocol/http/Connection.java	12 Jan 2004 11:51:46 -0000
@@ -168,7 +168,6 @@
     inputStream =
       new DataInputStream(new BufferedInputStream(socket.getInputStream()));
     outputStream = new BufferedOutputStream (socket.getOutputStream());
-    bufferedOutputStream = new ByteArrayOutputStream (256); //default is too small
 
     sendRequest();
     receiveReply();
@@ -226,6 +225,7 @@
       setRequestProperty ("Content-type", "application/x-www-form-urlencoded");
 
     // Set correct content length.
+    if (bufferedOutoutStream != null)
     setRequestProperty ("Content-length", String.valueOf (bufferedOutputStream.size()));
 
     // Write all req_props name-value pairs to the output writer.
@@ -242,9 +242,12 @@
     outputWriter.flush();
 
     // Write content
+    if (bufferedOutputStream != null)
+      {
     bufferedOutputStream.writeTo (outputStream);
     outputStream.flush();
   }
+  }
 
   /**
    * Read HTTP reply from inputStream.
@@ -382,6 +385,10 @@
    */
   public OutputStream getOutputStream() throws IOException
   {
+    if (connected)
+      throw new ProtocolException
+	("You cannot get an outputstream for an existing http connection");
+
     if (!doOutput)
       throw new ProtocolException
         ("Want output stream while haven't setDoOutput(true)");
@@ -389,8 +396,8 @@
     if (!method.equals ("POST")) //But we might support "PUT" in future
       setRequestMethod ("POST");
   
-    if (!connected)
-      connect();
+    if (bufferedOutputStream == null)
+      bufferedOutputStream = new ByteArrayOutputStream (256); //default is too small
     
     return bufferedOutputStream;
   }

--Boundary-00=_gvoAA9FMoiXN5pk--




From MAILER-DAEMON Mon Jan 12 13:36:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag6vY-0001F0-3f
	for mharc-commit-classpath@gnu.org; Mon, 12 Jan 2004 13:36:40 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag6vV-0001Di-6v
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 13:36:37 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag6l0-0006YL-Ls
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 13:26:17 -0500
Received: from [195.8.69.18] (helo=oceanus2.uk.clara.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag6kz-0006XA-A1
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 13:25:45 -0500
Received: from du-253-232.nat.adsl.claranet.fr ([212.43.253.232]
	helo=[10.0.0.2]) by oceanus2.uk.clara.net with esmtp (Exim 3.36 #2)
	id 1Ag5nK-000EVZ-00
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 17:24:06 +0000
Mime-Version: 1.0 (Apple Message framework v609)
To: commit-classpath@gnu.org
Message-Id: <1C715084-4524-11D8-BF62-003065B22A76@bluezoo.org>
Content-Type: multipart/mixed; boundary=Apple-Mail-2--1015723538
From: Chris Burdess <dog@bluezoo.org>
Date: Mon, 12 Jan 2004 18:24:00 +0100
X-Mailer: Apple Mail (2.609)
Subject: Removal of abstract methods from DTP streams
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 18:36:38 -0000


--Apple-Mail-2--1015723538
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed

This solves the illegal calling of abstract methods issue as shown in 
gcc bugzilla issue #12893.
-- 
Chris Burdess
--Apple-Mail-2--1015723538
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream; x-unix-mode=0664; name="inetlib.diff.2"
Content-Disposition: attachment;
	filename=inetlib.diff.2

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/inetlib/ChangeLog,v
retrieving revision 1.3
diff -u -r1.3 ChangeLog
--- ChangeLog	12 Jan 2004 17:11:21 -0000	1.3
+++ ChangeLog	12 Jan 2004 17:19:10 -0000
@@ -1,3 +1,9 @@
+2004-01-12  Chris Burdess  <dog@bluezoo.org>
+
+	* DTPInputStream.java: Removed abstract methods so that subclasses can
+	    call super implementation.
+	* DTPOutputStream.java: See above.
+
 2004-01-08  Chris Burdess  <dog@bluezoo.org>
 
 	* Makefile.am: Correct problem with infinite recursion during build.
Index: source/gnu/inet/ftp/DTPInputStream.java
===================================================================
RCS file: /cvsroot/classpath/inetlib/source/gnu/inet/ftp/DTPInputStream.java,v
retrieving revision 1.3
diff -u -r1.3 DTPInputStream.java
--- source/gnu/inet/ftp/DTPInputStream.java	10 Nov 2003 12:29:56 -0000	1.3
+++ source/gnu/inet/ftp/DTPInputStream.java	12 Jan 2004 17:19:10 -0000
@@ -64,12 +64,6 @@
         transferComplete = flag;
     }
     
-    public abstract int read() throws IOException;
-    
-    public abstract int read(byte[]buf) throws IOException;
-    
-    public abstract int read(byte[]buf, int off, int len) throws IOException;
-    
     /**
      * Notifies the controlling DTP that this stream has completed transfer.
      */
Index: source/gnu/inet/ftp/DTPOutputStream.java
===================================================================
RCS file: /cvsroot/classpath/inetlib/source/gnu/inet/ftp/DTPOutputStream.java,v
retrieving revision 1.3
diff -u -r1.3 DTPOutputStream.java
--- source/gnu/inet/ftp/DTPOutputStream.java	10 Nov 2003 12:29:56 -0000	1.3
+++ source/gnu/inet/ftp/DTPOutputStream.java	12 Jan 2004 17:19:10 -0000
@@ -64,12 +64,6 @@
         transferComplete = flag;
     }
     
-    public abstract void write(int c) throws IOException;
-    
-    public abstract void write(byte[]b) throws IOException;
-    
-    public abstract void write(byte[]b, int off, int len) throws IOException;
-    
     /**
      * Notifies the controlling DTP that this stream has been terminated.
      */

--Apple-Mail-2--1015723538--




From MAILER-DAEMON Mon Jan 12 16:41:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ag9oJ-0006xN-Tt
	for mharc-commit-classpath@gnu.org; Mon, 12 Jan 2004 16:41:23 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag9oF-0006vQ-Ci
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 16:41:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag9nd-0006lB-WB
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 16:41:13 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag9nd-0006l1-HJ
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 16:40:41 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-111.ewetel.net
	[80.228.80.111])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0CKdAHA014528
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 21:39:11 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ag8qG-0006pG-00
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 21:39:20 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Jan 2004 21:42:34 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_6awAA9e/PXRzU+t"
Message-Id: <200401122142.35906.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing.table.DefaultTableCellRenderer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Jan 2004 21:41:21 -0000


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

Hi list,


I commited the attached patch to fix some compilation issues. :-/


Michael


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

	* javax/swing/table/DefaultTableCellRenderer.java:
	Compile fixes.


--Boundary-00=_6awAA9e/PXRzU+t
Content-Type: text/x-diff;
  charset="us-ascii";
  name="fix.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="fix.diff"

Index: javax/swing/table/DefaultTableCellRenderer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/DefaultTableCellRenderer.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 DefaultTableCellRenderer.java
--- javax/swing/table/DefaultTableCellRenderer.java	12 Jan 2004 20:17:49 -0000	1.5
+++ javax/swing/table/DefaultTableCellRenderer.java	12 Jan 2004 20:37:14 -0000
@@ -45,7 +45,6 @@
 import javax.swing.JTable;
 import javax.swing.border.Border;
 import javax.swing.border.EmptyBorder;
-import javax.swing.plaf.UIResource;
 
 /**
  * Class to display every cells.
@@ -58,7 +57,7 @@
   protected static Border noFocusBorder;
 
   public static class UIResource extends DefaultTableCellRenderer
-    implements UIResource
+    implements javax.swing.plaf.UIResource
   {
     public UIResource()
     {
@@ -100,7 +99,7 @@
    * <p>Replaces the current UI object with the  latest version from
    * the UIManager.</p>
    */
-  pulic void updateUI()
+  public void updateUI()
   {
     super.updateUI();
   }

--Boundary-00=_6awAA9e/PXRzU+t--




From MAILER-DAEMON Mon Jan 12 19:07:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgC5m-0006d0-0D
	for mharc-commit-classpath@gnu.org; Mon, 12 Jan 2004 19:07:34 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgC5h-0006bK-BA
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 19:07:29 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgBMf-0002PF-OZ
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 18:21:30 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AgBAo-00082c-CQ
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 18:08:42 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0CM6ug19604
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 17:06:56 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0CM6uE26237
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 17:06:56 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0CM6tlJ023144
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 17:06:55 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-wmjuUq+Qh9U1b1QgUt2Q"
Organization: 
Message-Id: <1073945215.4742.27.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 12 Jan 2004 17:06:55 -0500
Subject: FYI: Patch: java.awt.Container and
	gnu/java/net/protocol/http/Connection.java
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 00:07:31 -0000


--=-wmjuUq+Qh9U1b1QgUt2Q
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

I'm committing the following patch to merge the recent changes in
java.awt.Container from libgcj.  I'm also correcting a small typo in
gnu/java/net/protocol/http/Connection.java.

-David Jee


2004-01-12  David Jee  <djee@redhat.com>

        * gnu/java/net/protocol/http/Connection.java
        (sendRequest): Fix a small typo.
        * java/awt/Container.java
        (update): Clear only the clipped region, instead of clearing the
        entire Container.
        (visitChildren): Visit children in descending order.




--=-wmjuUq+Qh9U1b1QgUt2Q
Content-Disposition: attachment; filename=Container.patch
Content-Type: text/x-patch; name=Container.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: gnu/java/net/protocol/http/Connection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/http/Connection.java,v
retrieving revision 1.13
diff -u -r1.13 Connection.java
--- gnu/java/net/protocol/http/Connection.java	12 Jan 2004 11:52:28 -0000	1.13
+++ gnu/java/net/protocol/http/Connection.java	12 Jan 2004 21:59:56 -0000
@@ -225,7 +225,7 @@
       setRequestProperty ("Content-type", "application/x-www-form-urlencoded");
 
     // Set correct content length.
-    if (bufferedOutoutStream != null)
+    if (bufferedOutputStream != null)
       setRequestProperty ("Content-length", String.valueOf (bufferedOutputStream.size()));
 
     // Write all req_props name-value pairs to the output writer.
Index: java/awt/Container.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.24
diff -u -r1.24 Container.java
--- java/awt/Container.java	2 Dec 2003 20:22:09 -0000	1.24
+++ java/awt/Container.java	12 Jan 2004 21:59:59 -0000
@@ -678,7 +678,11 @@
    */
   public void update(Graphics g)
   {
-    g.clearRect(0, 0, width, height);
+    Rectangle clip = g.getClipBounds();
+    if (clip == null)
+      g.clearRect(0, 0, width, height);
+    else
+      g.clearRect(clip.x, clip.y, clip.width, clip.height);
     super.update(g);
   }
 
@@ -1197,7 +1201,7 @@
   {
     synchronized (getTreeLock ())
       {
-        for (int i = 0; i < ncomponents; ++i)
+        for (int i = ncomponents - 1; i >= 0; --i)
           {
             Component comp = component[i];
             boolean applicable = comp.isVisible()

--=-wmjuUq+Qh9U1b1QgUt2Q--




From MAILER-DAEMON Mon Jan 12 22:10:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgEwX-0000AP-LI
	for mharc-commit-classpath@gnu.org; Mon, 12 Jan 2004 22:10:13 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ag9Wp-0001a0-Fj
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 16:23:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ag9WF-0001IN-Vw
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 16:23:15 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ag9WF-0001Ho-0T
	for commit-classpath@gnu.org; Mon, 12 Jan 2004 16:22:43 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-111.ewetel.net
	[80.228.80.111])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0CKLBUa000742
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 21:21:12 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ag8Ys-0006nn-00
	for <commit-classpath@gnu.org>; Mon, 12 Jan 2004 21:21:22 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Mon, 12 Jan 2004 21:24:37 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_FKwAAJXY6MnCFVj"
Message-Id: <200401122124.37259.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing.table.DefaultTableCellRenderer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 03:10:11 -0000


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

Hi list,


I commited the attached patch to close classpath patch #2388.
The patch is slightly edited to match out style more.


Michael


2004-01-12  Arnaud Vandyck  <arnaud.vandyck@ulg.ac.be>
            Michael Koch  <konqueror@gmx.de>

	* javax/swing/table/DefaultTableCellRenderer.java
	(DefaultTableCellRenderer): Added javadoc for the class and for
	the constructor, Border instance, create an EmptyBorder.
	(UIResource): Removed the comment at the end of the class
	(setForeground): New method.
	(setBackground): New method.
	(updateUI): New method.
	(getTableCellRendererComponent): Rewritten with the help of
	dvholten and Stephane Meslin-Weber.
	(validate): New method.
	(repaint): New method.
	(firePropertyChange): New method.
	(setValue): New method.


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

Index: javax/swing/table/DefaultTableCellRenderer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/DefaultTableCellRenderer.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 DefaultTableCellRenderer.java
--- javax/swing/table/DefaultTableCellRenderer.java	8 Jun 2003 12:14:56 -0000	1.4
+++ javax/swing/table/DefaultTableCellRenderer.java	12 Jan 2004 20:16:49 -0000
@@ -1,5 +1,5 @@
 /* DefaultTableCellRenderer.java
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -35,40 +35,177 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-
 package javax.swing.table;
 
+import java.awt.Color;
 import java.awt.Component;
+import java.awt.Rectangle;
 import java.io.Serializable;
 import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+import javax.swing.plaf.UIResource;
 
 /**
- * STUBBED
+ * Class to display every cells.
  */
 public class DefaultTableCellRenderer extends JLabel
   implements TableCellRenderer, Serializable
 {
   static final long serialVersionUID = 7878911414715528324L;
 
+  protected static Border noFocusBorder;
+
   public static class UIResource extends DefaultTableCellRenderer
-    implements javax.swing.plaf.UIResource
+    implements UIResource
   {
     public UIResource()
     {
     }
-  } // class UIResource
+  }
 
+  /**
+   * Creates a default table cell renderer with an empty border.
+   */
   public DefaultTableCellRenderer()
   {
+    super();
+    this.noFocusBorder = new EmptyBorder(0, 0, 0, 0);
+  }
+
+  /**
+   * Assign the unselected-foreground.
+   *
+   * @param c the color to assign
+   */
+  public void setForeground(Color c)
+  {
+    super.setForeground(c);
+  }
+
+  /**
+   * Assign the unselected-background.
+   *
+   * @param c the color to assign
+   */
+  public void setBackground(Color c)
+  {
+    super.setBackground(c);
   }
 
+  /**
+   * Look and feel has changed.
+   *
+   * <p>Replaces the current UI object with the  latest version from
+   * the UIManager.</p>
+   */
+  pulic void updateUI()
+  {
+    super.updateUI();
+  }
+
+  /**
+   * Get the string value of the object and pass it to setText().
+   *
+   * @param table the JTable
+   * @param value the value of the object
+   * @param isSelected is the cell selected?
+   * @param hasFocus has the cell the focus?
+   * @param row the row to render
+   * @param column the cell to render
+   * 
+   * @return this component (the default table cell renderer)
+   */
   public Component getTableCellRendererComponent(JTable table, Object value,
                                                  boolean isSelected,
                                                  boolean hasFocus,
                                                  int row, int column)
   {
-    return null;
+    if (value!=null)
+      super.setText(value.toString());
+    
+    return this;
+  }
+
+  /**
+   * Overriden for performance.
+   *
+   * <p>This method needs to be overridden in a subclass to actually
+   * do something.</p>
+   *
+   * @return always true
+   */
+  public boolean isOpaque()
+  {
+    return true;
+  }
+
+  /**
+   * Overriden for performance.
+   *
+   * <p>This method needs to be overridden in a subclass to actually
+   * do something.</p>
+   */
+  public void validate()
+  {
+    // Does nothing.
+  }
+
+  /**
+   * Overriden for performance.
+   *
+   * <p>This method needs to be overridden in a subclass to actually
+   * do something.</p>
+   */
+  public void repaint(long tm, int x, int y, int width, int height)
+  {
+    // Does nothing.
+  }
+
+  /**
+   * Overriden for performance.
+   *
+   * <p>This method needs to be overridden in a subclass to actually
+   * do something.</p>
+   */
+  public void repaint(Rectangle r)
+  {
+    // Does nothing.
+  }
+
+  /**
+   * Overriden for performance.
+   *
+   * <p>This method needs to be overridden in a subclass to actually
+   * do something.</p>
+   */
+  public void firePropertyChange(String propertyName, Object oldValue,
+                                 Object newValue)
+  {
+    // Does nothing.
+  }
+
+  /**
+   * Overriden for performance.
+   *
+   * <p>This method needs to be overridden in a subclass to actually
+   * do something.</p>
+   */
+  public void firePropertyChange(String propertyName, boolean oldValue,
+		                 boolean newValue)
+  {
+    // Does nothing.
+  }
+
+  /**
+   * Sets the String for this cell.
+   * 
+   * @param value the string value for this cell; if value is null it
+   * sets the text value to an empty string
+   */
+  protected void setValue(Object value)
+  {
+    super.setText((value!=null) ? value.toString() : "");
   }
-} // class DefaultTableCellRenderer
+}

--Boundary-00=_FKwAAJXY6MnCFVj--




From MAILER-DAEMON Tue Jan 13 18:23:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgXsF-0004ns-UU
	for mharc-commit-classpath@gnu.org; Tue, 13 Jan 2004 18:23:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgXsB-0004lq-9P
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 18:22:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgXCI-0005fr-Vd
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 17:40:14 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AgXCI-0005fO-7F
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 17:39:42 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0DMdfg02063
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 17:39:41 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0DMdfE14779
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 17:39:41 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0DMdelJ030268
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 17:39:40 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-JoSW7AJXWip4nAGZlJwO"
Message-Id: <1074033580.922.219.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 13 Jan 2004 17:39:40 -0500
Subject: Patch: FYI: fix GtkTextAreaPeer's preferred and minimum size
	calculations
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 23:23:00 -0000


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

2004-01-13  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
	(native	create): Add width and height parameters.  Set text
	view's size request according to new parameters.
	(create): Calculate text view size based on current font's
	metrics and number of rows and columns.  Set TextArea's font if
	not already set.  Call native create.
	(getMinimumSize): Call minimumSize.
	(getPreferredSize): Call preferredSize.
	(getHScrollbarHeight): New method.
	(getVScrollbarWidth): New method.
	(minimumSize): Calculate minimum size based on scrollbar
	visibility, scrollbar sizes, font metrics and number of rows and
	columns.
	(preferredSize): Likewise for preferred size.
	(gtkTextGetSize): Remove method.


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

Index: gnu/java/awt/peer/gtk/GtkTextAreaPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,v
retrieving revision 1.17
diff -u -r1.17 GtkTextAreaPeer.java
--- gnu/java/awt/peer/gtk/GtkTextAreaPeer.java	8 Oct 2003 23:40:49 -0000	1.17
+++ gnu/java/awt/peer/gtk/GtkTextAreaPeer.java	13 Jan 2004 22:36:06 -0000
@@ -40,22 +40,45 @@
 
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.TextArea;
 import java.awt.peer.TextAreaPeer;
 
 public class GtkTextAreaPeer extends GtkTextComponentPeer
   implements TextAreaPeer
 {
-  native void create (int scrollbarVisibility);
+  native void create (int width, int height, int scrollbarVisibility);
 
-  native void gtkSetFont(String name, int style, int size);
+  native void gtkSetFont (String name, int style, int size);
 
   void create ()
   {
-    create (((TextArea)awtComponent).getScrollbarVisibility ());
-  }
+    Font f = awtComponent.getFont ();
+
+    // By default, Sun sets a TextArea's font when its peer is
+    // created.  If f != null then the peer's font is set by
+    // GtkComponent.create.
+    if (f == null)
+      {
+	f = new Font ("Fixed", Font.PLAIN, 12);
+	awtComponent.setFont (f);
+      }
+
+    FontMetrics fm;
+    if (GtkToolkit.useGraphics2D ())
+      fm = new GdkClasspathFontPeerMetrics (f);
+    else
+      fm = new GdkFontMetrics (f);
+
+    TextArea ta = ((TextArea) awtComponent);
+    int rows = ta.getRows ();
+    int cols = ta.getColumns ();
 
-  native void gtkTextGetSize (int dims[]);
+    int width = cols * fm.getMaxAdvance ();
+    int height = rows * (fm.getMaxDescent () + fm.getMaxAscent ());
+
+    create (width, height, ta.getScrollbarVisibility ());
+  }
 
   public GtkTextAreaPeer (TextArea ta)
   {
@@ -67,31 +90,80 @@
 
   public Dimension getMinimumSize (int rows, int cols)
   {
-    int dims[] = new int[2];
-
-    gtkTextGetSize (dims);
-
-    return (new Dimension (dims[0], dims[1]));
+    return minimumSize (rows, cols);
   }
 
   public Dimension getPreferredSize (int rows, int cols)
   {
-    int dims[] = new int[2];
-
-    gtkTextGetSize (dims);
-
-    return (new Dimension (dims[0], dims[1]));
+    return preferredSize (rows, cols);
   }
 
-  /* Deprecated */
+  native int getHScrollbarHeight ();
+  native int getVScrollbarWidth ();
+
+  // Deprecated
   public Dimension minimumSize (int rows, int cols)
   {
-    return getMinimumSize (rows, cols);
+    TextArea ta = ((TextArea) awtComponent);
+    int hScrollbarHeight = 0;
+    int vScrollbarWidth = 0;
+    int height = 0;
+    int width = 0;
+
+    if (ta.getScrollbarVisibility () == TextArea.SCROLLBARS_BOTH
+	|| ta.getScrollbarVisibility () == TextArea.SCROLLBARS_HORIZONTAL_ONLY)
+      height = getHScrollbarHeight ();
+
+    if (ta.getScrollbarVisibility () == TextArea.SCROLLBARS_BOTH
+	|| ta.getScrollbarVisibility () == TextArea.SCROLLBARS_VERTICAL_ONLY)
+      width = getVScrollbarWidth ();
+
+    Font f = awtComponent.getFont ();
+    if (f == null)
+      return new Dimension (width, height);
+
+    FontMetrics fm;
+    if (GtkToolkit.useGraphics2D ())
+      fm = new GdkClasspathFontPeerMetrics (f);
+    else
+      fm = new GdkFontMetrics (f);
+
+    width += cols * fm.getMaxAdvance ();
+    height += rows * (fm.getMaxDescent () + fm.getMaxAscent ());
+
+    return new Dimension (width, height);
   }
 
   public Dimension preferredSize (int rows, int cols)
   {
-    return getPreferredSize (rows, cols);
+    TextArea ta = ((TextArea) awtComponent);
+    int hScrollbarHeight = 0;
+    int vScrollbarWidth = 0;
+    int height = 0;
+    int width = 0;
+
+    if (ta.getScrollbarVisibility () == TextArea.SCROLLBARS_BOTH
+	|| ta.getScrollbarVisibility () == TextArea.SCROLLBARS_HORIZONTAL_ONLY)
+      height = getHScrollbarHeight ();
+
+    if (ta.getScrollbarVisibility () == TextArea.SCROLLBARS_BOTH
+	|| ta.getScrollbarVisibility () == TextArea.SCROLLBARS_VERTICAL_ONLY)
+      width = getVScrollbarWidth ();
+
+    Font f = awtComponent.getFont ();
+    if (f == null)
+      return new Dimension (width, height);
+
+    FontMetrics fm;
+    if (GtkToolkit.useGraphics2D ())
+      fm = new GdkClasspathFontPeerMetrics (f);
+    else
+      fm = new GdkFontMetrics (f);
+
+    width += cols * fm.getMaxAdvance ();
+    height += rows * (fm.getMaxDescent () + fm.getMaxAscent ());
+
+    return new Dimension (width, height);
   }
 
   public void replaceText (String str, int start, int end)
@@ -106,6 +178,6 @@
 
   public void setFont (Font f)
   {
-    gtkSetFont(f.getName(), f.getStyle(), f.getSize());
+    gtkSetFont (f.getName (), f.getStyle (), f.getSize ());
   }
 }
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,v
retrieving revision 1.12
diff -u -r1.12 gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c	7 Jan 2004 02:23:37 -0000	1.12
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c	13 Jan 2004 22:36:07 -0000
@@ -42,7 +42,8 @@
 #define TEXT_FROM_SW(obj) (GTK_TEXT_VIEW(GTK_SCROLLED_WINDOW (obj)->container.child))
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create
-  (JNIEnv *env, jobject obj, jint scroll)
+  (JNIEnv *env, jobject obj,
+   jint textview_width, jint textview_height,  jint scroll)
 {
   GtkWidget *text, *sw;
 
@@ -50,8 +51,9 @@
   NSA_SET_GLOBAL_REF (env, obj);
 
   gdk_threads_enter ();
-  
+
   text = gtk_text_view_new ();
+  gtk_widget_set_size_request (text, textview_width, textview_height);
   gtk_widget_show (text);
 
   sw = gtk_scrolled_window_new (NULL, NULL);
@@ -78,34 +80,6 @@
 }
 
 JNIEXPORT void JNICALL 
-Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_gtkTextGetSize
-  (JNIEnv *env, jobject obj, jintArray jdims)
-{
-  void *ptr;
-  jint *dims;
-  GtkWidget *text;
-  GtkRequisition requisition;
-
-  ptr = NSA_GET_PTR (env, obj);
-
-  dims = (*env)->GetIntArrayElements (env, jdims, 0);  
-  dims[0] = dims[1] = 0;
-
-  gdk_threads_enter ();
-
-  text = GTK_WIDGET (TEXT_FROM_SW (ptr));
-
-  gtk_widget_size_request(GTK_WIDGET (text), &requisition);
-  dims[0] = requisition.width;
-  dims[1] = requisition.height;
-
-  gdk_threads_leave ();
-  
-  (*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
-}
-
-
-JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_insert
   (JNIEnv *env, jobject obj, jstring contents, jint position)
 {
@@ -197,4 +171,52 @@
   gdk_threads_leave();
 
   (*env)->ReleaseStringUTFChars (env, name, font_name);
+}
+
+JNIEXPORT jint JNICALL
+Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getHScrollbarHeight
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr;
+  GtkScrolledWindow *sw;
+  GtkRequisition requisition;
+  jint height = 0;
+  jint spacing = 0;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+  sw = GTK_SCROLLED_WINDOW (ptr);
+
+  gtk_widget_size_request (sw->hscrollbar, &requisition);
+  gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
+  height = requisition.height + spacing;
+
+  gdk_threads_leave ();
+
+  return height;
+}
+
+JNIEXPORT jint JNICALL 
+Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_getVScrollbarWidth
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr;
+  GtkScrolledWindow *sw;
+  GtkRequisition requisition;
+  jint width = 0;
+  jint spacing = 0;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+  sw = GTK_SCROLLED_WINDOW (ptr);
+
+  gtk_widget_size_request (sw->vscrollbar, &requisition);
+  gtk_widget_style_get (GTK_WIDGET (sw), "scrollbar_spacing", &spacing, NULL);
+  width = requisition.width + spacing;
+
+  gdk_threads_leave ();
+
+  return width;
 }

--=-JoSW7AJXWip4nAGZlJwO--




From MAILER-DAEMON Tue Jan 13 18:33:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgY2D-0006Hf-8G
	for mharc-commit-classpath@gnu.org; Tue, 13 Jan 2004 18:33:21 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgY29-0006Ge-PO
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 18:33:17 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgXjW-0002du-V1
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 18:14:34 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AgX56-0003qk-U4
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 17:32:16 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0DMWBg31428
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 17:32:11 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0DMWAE11889
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 17:32:10 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0DMWAlJ030094
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 17:32:10 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-SJuxJ0IsIYscJ67vYVAi"
Message-Id: <1074033130.922.216.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 13 Jan 2004 17:32:10 -0500
Subject: Patch: FYI: fix frame insets calculation
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jan 2004 23:33:18 -0000


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

2004-01-13  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(initializeInsets): Remove method.
	(GtkComponentPeer): Initialize insets field.  Remove call to
	initializeInsets.
	* gnu/java/awt/peer/gtk/GtkDialogPeer.java (initializeInsets):
	Remove method.
	* gnu/java/awt/peer/gtk/GtkFramePeer.java (initializeInsets):
	Remove method.
	* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
	(latestInsets): Remove field.
	(native create): Add insets parameter.  Call
	window_get_frame_extents.  Set the window's default size and
	size request based on its frame extents.
	(create): Initialize insets.
	(postInsetsChangedEvent): New method.
	(postConfigureEvent): Remove parameters top, left, bottom,
	right.  Remove insets-related logic.
	(connectJObject): Handle property-notify-event.
	(window_get_frame_extents, request_frame_extents,
	property_notify_predicate, window_property_changed_cb): New
	static functions.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
	(pre_event_handler): Remove insets-related logic for configure
	events.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (gtkInit):
	Update postConfigureEvent signature.



--=-SJuxJ0IsIYscJ67vYVAi
Content-Disposition: attachment; filename=cp-frame-insets.patch
Content-Type: text/x-patch; name=cp-frame-insets.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1763
diff -u -r1.1763 ChangeLog
--- ChangeLog	7 Jan 2004 02:23:37 -0000	1.1763
+++ ChangeLog	13 Jan 2004 22:23:43 -0000
@@ -1,3 +1,33 @@
+2004-01-13  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
+	(initializeInsets): Remove method.
+	(GtkComponentPeer): Initialize insets field.  Remove call to
+	initializeInsets.
+	* gnu/java/awt/peer/gtk/GtkDialogPeer.java (initializeInsets):
+	Remove method.
+	* gnu/java/awt/peer/gtk/GtkFramePeer.java (initializeInsets):
+	Remove method.
+	* gnu/java/awt/peer/gtk/GtkWindowPeer.java,
+	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+	(latestInsets): Remove field.
+	(native create): Add insets parameter.  Call
+	window_get_frame_extents.  Set the window's default size and
+	size request based on its frame extents.
+	(create): Initialize insets.
+	(postInsetsChangedEvent): New method.
+	(postConfigureEvent): Remove parameters top, left, bottom,
+	right.  Remove insets-related logic.
+	(connectJObject): Handle property-notify-event.
+	(window_get_frame_extents, request_frame_extents,
+	property_notify_predicate, window_property_changed_cb): New
+	static functions.
+	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
+	(pre_event_handler): Remove insets-related logic for configure
+	events.
+	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (gtkInit):
+	Update postConfigureEvent signature.
+
 2004-01-06  Graydon Hoare  <graydon@redhat.com>
 
 	* configure.in: Add --enable-gtk-cairo check.
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.56
diff -u -r1.56 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java	7 Jan 2004 02:23:37 -0000	1.56
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java	13 Jan 2004 22:23:43 -0000
@@ -96,11 +96,6 @@
     throw new RuntimeException ();
   }
 
-  void initializeInsets ()
-  {
-    insets = new Insets (0, 0, 0, 0);
-  }
-
   native void connectJObject ();
   native void connectSignals ();
 
@@ -108,6 +103,7 @@
   {
     super (awtComponent);
     this.awtComponent = awtComponent;
+    insets = new Insets (0, 0, 0, 0);
 
     /* temporary try/catch block until all peers use this creation method */
     try {
@@ -126,8 +122,6 @@
 	setBackground (awtComponent.getBackground ());
       if (awtComponent.getFont() != null)
 	setFont(awtComponent.getFont());
-
-      initializeInsets ();
 
       setCursor (awtComponent.getCursor ());
       Rectangle bounds = awtComponent.getBounds ();
Index: gnu/java/awt/peer/gtk/GtkDialogPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkDialogPeer.java,v
retrieving revision 1.18
diff -u -r1.18 GtkDialogPeer.java
--- gnu/java/awt/peer/gtk/GtkDialogPeer.java	24 Oct 2003 19:54:22 -0000	1.18
+++ gnu/java/awt/peer/gtk/GtkDialogPeer.java	13 Jan 2004 22:23:43 -0000
@@ -41,7 +41,6 @@
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.Dialog;
-import java.awt.Insets;
 import java.awt.peer.DialogPeer;
 
 public class GtkDialogPeer extends GtkWindowPeer
@@ -50,17 +49,6 @@
   public GtkDialogPeer (Dialog dialog)
   {
     super (dialog);
-  }
-
-  void initializeInsets ()
-  {
-    synchronized (latestInsets)
-      {
-	insets = new Insets (latestInsets.top,
-			     latestInsets.left,
-			     latestInsets.bottom,
-			     latestInsets.right);
-      }
   }
 
   void create ()
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.17
diff -u -r1.17 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	7 Jan 2004 02:23:37 -0000	1.17
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	13 Jan 2004 22:23:43 -0000
@@ -43,7 +43,6 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.Image;
-import java.awt.Insets;
 import java.awt.MenuBar;
 import java.awt.Rectangle;
 import java.awt.event.PaintEvent;
@@ -69,21 +68,6 @@
   public GtkFramePeer (Frame frame)
   {
     super (frame);
-  }
-
-  void initializeInsets ()
-  {
-    // Unfortunately, X does not provide a clean way to calculate the
-    // dimensions of a frame's borders before it has been displayed.
-    // So we guess and then fix the dimensions upon receipt of the
-    // first configure event.
-    synchronized (latestInsets)
-      {
-	insets = new Insets (latestInsets.top,
-			     latestInsets.left,
-			     latestInsets.bottom,
-			     latestInsets.right);
-      }
   }
 
   void create ()
Index: gnu/java/awt/peer/gtk/GtkWindowPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java,v
retrieving revision 1.25
diff -u -r1.25 GtkWindowPeer.java
--- gnu/java/awt/peer/gtk/GtkWindowPeer.java	7 Jan 2004 02:23:37 -0000	1.25
+++ gnu/java/awt/peer/gtk/GtkWindowPeer.java	13 Jan 2004 22:23:43 -0000
@@ -40,7 +40,6 @@
 
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.Insets;
 import java.awt.Window;
 import java.awt.Frame;
 import java.awt.event.WindowEvent;
@@ -61,30 +60,30 @@
   private boolean hasBeenShown = false;
   private int oldState = Frame.NORMAL;
 
-  // Unfortunately, X does not provide a clean way to calculate the
-  // dimensions of a window's borders before it has been displayed.
-  // So when creating the application's first window we guess the
-  // border dimensions.  Then if need be for that window, we fix the
-  // dimensions upon receipt of the first configure event.  Windows
-  // created after the first one will use the latest inset values
-  // received in postConfigureEvent.
-  static Insets latestInsets = new Insets (20, 6, 6, 6);
-
   native void create (int type, boolean decorated,
 		      int width, int height,
-		      GtkWindowPeer parent);
+		      GtkWindowPeer parent,
+		      int[] insets);
 
   void create (int type, boolean decorated)
   {
     GtkWindowPeer parent_peer = null;
     Component parent = awtComponent.getParent();
+    int[] insets = new int [] { 0, 0, 0, 0 };
+
     if (parent != null)
       parent_peer = (GtkWindowPeer) awtComponent.getParent().getPeer();
 
     create (type, decorated,
 	    awtComponent.getWidth(),
 	    awtComponent.getHeight(),
-	    parent_peer);
+	    parent_peer,
+	    insets);
+
+    this.insets.top = insets [0];
+    this.insets.left = insets [1];
+    this.insets.bottom = insets [2];
+    this.insets.right = insets [3];
   }
 
   void create ()
@@ -132,7 +131,7 @@
     // false the window will shrink to the dimensions it had before it
     // was resizable.
     setSize (awtComponent.getWidth() - insets.left - insets.right,
-    	     awtComponent.getHeight() - insets.top - insets.bottom);
+	     awtComponent.getHeight() - insets.top - insets.bottom);
     set ("allow_shrink", resizable);
     set ("allow_grow", resizable);
   }
@@ -141,67 +140,29 @@
 				 int x, int y,
 				 int width, int height);
 
-  protected void postConfigureEvent (int x, int y, int width, int height,
-				     int top, int left, int bottom, int right)
+  protected void postInsetsChangedEvent (int top, int left,
+					 int bottom, int right)
   {
-    // Configure events tell us the location and dimensions of the
-    // window within the frame borders, and the dimensions of the
-    // frame borders (top, left, bottom, right).
-
-    // If our borders change we need to make sure that a new layout
-    // will happen, since Sun forgets to handle this case.
-    if (insets.top != top
-	|| insets.left != left
-	|| insets.bottom != bottom
-	|| insets.right != right)
-      {
-	// When our insets change, we receive a configure event with
-	// the new insets, the old window location and the old window
-	// dimensions.  We update our Window object's location and
-	// size using our old inset values.
-	setBoundsCallback ((Window) awtComponent,
-			   x - insets.left,
-			   y - insets.top,
-			   width + insets.left + insets.right,
-			   height + insets.top + insets.bottom);
-
-	// The peer's dimensions do not get updated automatically when
-	// insets change so we need to do it manually.
-	setSize (width + (insets.left - left) + (insets.right - right),
-		 height + (insets.top - top) + (insets.bottom - bottom));
-
-	insets.top = top;
-	insets.left = left;
-	insets.bottom = bottom;
-	insets.right = right;
-
-	synchronized (latestInsets)
-	  {
-	    latestInsets.top = top;
-	    latestInsets.left = left;
-	    latestInsets.bottom = bottom;
-	    latestInsets.right = right;
-	  }
-      }
-    else
-      {
-	int frame_x = x - insets.left;
-	int frame_y = y - insets.top;
-	int frame_width = width + insets.left + insets.right;
-	int frame_height = height + insets.top + insets.bottom;
-
-	if (frame_x != awtComponent.getX()
-	    || frame_y != awtComponent.getY()
-	    || frame_width != awtComponent.getWidth()
-	    || frame_height != awtComponent.getHeight())
-	  {
-	    setBoundsCallback ((Window) awtComponent,
-			       frame_x,
-			       frame_y,
-			       frame_width,
-			       frame_height);
-	  }
-      }
+    insets.top = top;
+    insets.left = left;
+    insets.bottom = bottom;
+    insets.right = right;
+  }
+
+  protected void postConfigureEvent (int x, int y, int width, int height)
+  {
+    int frame_x = x - insets.left;
+    int frame_y = y - insets.top;
+    int frame_width = width + insets.left + insets.right;
+    int frame_height = height + insets.top + insets.bottom;
+
+    if (frame_x != awtComponent.getX()
+	|| frame_y != awtComponent.getY()
+	|| frame_width != awtComponent.getWidth()
+	|| frame_height != awtComponent.getHeight())
+      setBoundsCallback ((Window) awtComponent,
+			 frame_x, frame_y, frame_width, frame_height);
+
     awtComponent.validate();
   }
 
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.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkWindowPeer.h
--- include/gnu_java_awt_peer_gtk_GtkWindowPeer.h	7 Jan 2004 02:23:37 -0000	1.7
+++ include/gnu_java_awt_peer_gtk_GtkWindowPeer.h	13 Jan 2004 22:23:43 -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 (JNIEnv *env, jobject, jint, jboolean, jint, jint, jobject);
+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_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_GtkEvents.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,v
retrieving revision 1.18
diff -u -r1.18 gnu_java_awt_peer_gtk_GtkEvents.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c	7 Jan 2004 02:23:37 -0000	1.18
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c	13 Jan 2004 22:23:50 -0000
@@ -989,40 +989,18 @@
 	    
 	if (widget && GTK_WIDGET_TOPLEVEL (widget))
 	  {
-	    gint top, left, right, bottom;
-
 	    /* Configure events are not posted to the AWT event
 	       queue, and as such, the gdk/gtk peer functions will
 	       be called back before postConfigureEvent
 	       returns. */
 	    gdk_threads_leave ();
 
-	    /* FIXME: hard-code these values for now. */
-	    if (GTK_IS_PLUG (widget))
-	      {
-		top = 0;
-		left = 0;
-		bottom = 0;
-		right = 0;
-	      }
-	    else
-	      {
-		top = 20;
-		left = 6;
-		bottom = 6;
-		right = 6;
-	      }
-
  	    (*gdk_env)->CallVoidMethod (gdk_env, peer,
 					postConfigureEventID,
 					(jint) event->configure.x,
 					(jint) event->configure.y,
 					(jint) event->configure.width,
-					(jint) event->configure.height,
-					(jint) top,
-					(jint) left,
-					(jint) bottom,
-					(jint) right);
+					(jint) event->configure.height);
 	    gdk_threads_enter ();
 	  }
       }
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,v
retrieving revision 1.14
diff -u -r1.14 gnu_java_awt_peer_gtk_GtkMainThread.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c	7 Jan 2004 02:23:37 -0000	1.14
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c	13 Jan 2004 22:23:50 -0000
@@ -168,7 +168,7 @@
   postMouseEventID = (*env)->GetMethodID (env, gtkcomponentpeer, 
 					  "postMouseEvent", "(IJIIIIZ)V");
   postConfigureEventID = (*env)->GetMethodID (env, gtkwindowpeer, 
-					  "postConfigureEvent", "(IIIIIIII)V");
+					      "postConfigureEvent", "(IIII)V");
   postWindowEventID = (*env)->GetMethodID (env, gtkwindowpeer,
 					   "postWindowEvent",
 					   "(ILjava/awt/Window;I)V");
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.15
diff -u -r1.15 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	7 Jan 2004 02:23:37 -0000	1.15
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	13 Jan 2004 22:23:50 -0000
@@ -44,6 +44,16 @@
 #include <gdk/gdkx.h>
 #include <X11/Xatom.h>
 
+static void window_get_frame_extents (GtkWidget *window,
+                                      int *top, int *left,
+                                      int *bottom, int *right);
+
+static void request_frame_extents (GtkWidget *window);
+
+static int property_notify_predicate (Display *xdisplay,
+                                      XEvent  *event,
+                                      XPointer window_id);
+
 static void window_delete_cb (GtkWidget *widget, GdkEvent *event,
 			      jobject peer);
 static void window_destroy_cb (GtkWidget *widget, GdkEvent *event,
@@ -59,6 +69,9 @@
 					GdkEvent *event,
 					jobject peer);
 static jint window_get_new_state (GtkWidget *widget);
+static gboolean window_property_changed_cb (GtkWidget *widget,
+					    GdkEventProperty *event,
+					    jobject peer);
 
 /*
  * Make a new window.
@@ -67,12 +80,21 @@
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkWindowPeer_create 
   (JNIEnv *env, jobject obj, jint type, jboolean decorated,
-   jint width, jint height, jobject parent)
+   jint width, jint height, jobject parent, jintArray jinsets)
 {
   GtkWidget *window_widget;
   GtkWindow *window;
   void *window_parent;
-  GtkWidget *vbox, *layout;
+  GtkWidget *vbox;
+  GtkWidget *layout;
+  int top = 0;
+  int left = 0;
+  int bottom = 0;
+  int right = 0;
+  jint *insets;
+
+  insets = (*env)->GetIntArrayElements (env, jinsets, 0);
+  insets[0] = insets[1] = insets[2] = insets[3] = 0;
 
   /* Create global reference and save it for future use */
   NSA_SET_GLOBAL_REF (env, obj);
@@ -82,19 +104,6 @@
   window_widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   window = GTK_WINDOW (window_widget);
 
-  // Avoid GTK runtime assertion failures.
-  width = (width < 1) ? 1 : width;
-  height = (height < 1) ? 1 : height;
-
-  gtk_window_set_default_size (window, width, height);
-
-  /* We must set this window's size requisition.  Otherwise when a
-     resize is queued (when gtk_widget_queue_resize is called) the
-     window will snap to its default requisition of 0x0.  If we omit
-     this call, Frames and Dialogs shrink to degenerate 1x1 windows
-     when their resizable property changes. */
-  gtk_widget_set_size_request (window_widget, width, height);
-
   /* Keep this window in front of its parent, if it has one. */
   if (parent)
     {
@@ -115,9 +124,33 @@
 
   gtk_widget_show (layout);
   gtk_widget_show (vbox);
+  gtk_widget_realize (window_widget);
+
+  if (decorated)
+    window_get_frame_extents (window_widget, &top, &left, &bottom, &right);
+
+  gtk_window_set_default_size (window,
+			       MAX (1, width - left - right),
+			       MAX (1, height - top - bottom));
+
+  /* We must set this window's size requisition.  Otherwise when a
+     resize is queued (when gtk_widget_queue_resize is called) the
+     window will snap to its default requisition of 0x0.  If we omit
+     this call, Frames and Dialogs shrink to degenerate 1x1 windows
+     when their resizable property changes. */
+  gtk_widget_set_size_request (window_widget,
+			       MAX (1, width - left - right),
+			       MAX (1, height - top - bottom));
+
+  insets[0] = top;
+  insets[1] = left;
+  insets[2] = bottom;
+  insets[3] = right;
 
   gdk_threads_leave ();
 
+  (*env)->ReleaseIntArrayElements (env, jinsets, insets, 0);
+
   NSA_SET_PTR (env, obj, window_widget);
 }
 
@@ -176,6 +209,9 @@
 
   connect_awt_hook (env, obj, 1, GTK_WIDGET (ptr)->window);
 
+  g_signal_connect (G_OBJECT (ptr), "property-notify-event",
+		    G_CALLBACK (window_property_changed_cb), obj);
+
   gdk_threads_leave ();
 }
 
@@ -291,7 +327,7 @@
 {
   void *ptr = NSA_GET_PTR (env, obj);
 
-  // Avoid GTK runtime assertion failures.
+  /* Avoid GTK runtime assertion failures. */
   width = (width < 1) ? 1 : width;
   height = (height < 1) ? 1 : height;
 
@@ -306,7 +342,7 @@
 {
   void *ptr = NSA_GET_PTR (env, obj);
 
-  // Avoid GTK runtime assertion failures.
+  /* Avoid GTK runtime assertion failures. */
   width = (width < 1) ? 1 : width;
   height = (height < 1) ? 1 : height;
 
@@ -365,6 +401,112 @@
 }
 
 static void
+window_get_frame_extents (GtkWidget *window,
+                          int *top, int *left, int *bottom, int *right)
+{
+  unsigned long *extents = NULL;
+
+  /* Guess frame extents in case _NET_FRAME_EXTENTS is not
+     supported. */
+  *top = 23;
+  *left = 6;
+  *bottom = 6;
+  *right = 6;
+
+  /* Request that the window manager set window's
+     _NET_FRAME_EXTENTS property. */
+  request_frame_extents (window);
+
+  /* Attempt to retrieve window's frame extents. */
+  if (gdk_property_get (window->window,
+                        gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE),
+                        gdk_atom_intern ("CARDINAL", FALSE),
+                        0,
+                        sizeof (unsigned long) * 4,
+                        FALSE,
+                        NULL,
+                        NULL,
+                        NULL,
+                        (guchar **)&extents))
+    {
+      *left = extents [0];
+      *right = extents [1];
+      *top = extents [2];
+      *bottom = extents [3];
+    }
+}
+
+static Atom extents_atom = 0;
+
+/* Requests that the window manager set window's
+   _NET_FRAME_EXTENTS property. */
+static void
+request_frame_extents (GtkWidget *window)
+{
+  const char *request_str = "_NET_REQUEST_FRAME_EXTENTS";
+  GdkAtom request_extents = gdk_atom_intern (request_str, FALSE);
+
+  /* Check if the current window manager supports
+     _NET_REQUEST_FRAME_EXTENTS. */
+  if (gdk_net_wm_supports (request_extents))
+    {
+      GdkDisplay *display = gtk_widget_get_display (window);
+      Display *xdisplay = GDK_DISPLAY_XDISPLAY (display);
+
+      GdkWindow *root_window = gdk_get_default_root_window ();
+      Window xroot_window = GDK_WINDOW_XID (root_window);
+
+      Atom extents_request_atom =
+	gdk_x11_get_xatom_by_name_for_display (display, request_str);
+
+      XEvent xevent;
+      XEvent notify_xevent;
+
+      unsigned long window_id = GDK_WINDOW_XID (GDK_DRAWABLE(window->window));
+
+      if (!extents_atom)
+	{
+	  const char *extents_str = "_NET_FRAME_EXTENTS";
+	  extents_atom =
+	    gdk_x11_get_xatom_by_name_for_display (display, extents_str);
+	}
+
+      xevent.xclient.type = ClientMessage;
+      xevent.xclient.message_type = extents_request_atom;
+      xevent.xclient.display = xdisplay;
+      xevent.xclient.window = window_id;
+      xevent.xclient.format = 32;
+      xevent.xclient.data.l[0] = 0;
+      xevent.xclient.data.l[1] = 0;
+      xevent.xclient.data.l[2] = 0;
+      xevent.xclient.data.l[3] = 0;
+      xevent.xclient.data.l[4] = 0;
+
+      XSendEvent (xdisplay, xroot_window, False,
+		  (SubstructureRedirectMask | SubstructureNotifyMask),
+                  &xevent);
+
+      XIfEvent(xdisplay, &notify_xevent,
+	       property_notify_predicate, (XPointer) &window_id);
+    }
+}
+
+static int
+property_notify_predicate (Display *xdisplay __attribute__((unused)),
+                           XEvent  *event,
+                           XPointer window_id)
+{
+  unsigned long *window = (unsigned long *) window_id;
+
+  if (event->xany.type == PropertyNotify
+      && event->xany.window == *window
+      && event->xproperty.atom == extents_atom)
+        return True;
+
+  return False;
+}
+
+static void
 window_delete_cb (GtkWidget *widget __attribute__((unused)),
 		  GdkEvent *event __attribute__((unused)),
 		  jobject peer)
@@ -513,4 +655,45 @@
       XFree (atom_list);
     }
   return new_state;
+}
+
+static gboolean
+window_property_changed_cb (GtkWidget *widget __attribute__((unused)),
+                            GdkEventProperty *event,
+                            jobject peer)
+{
+  unsigned long *extents;
+
+  static int id_set = 0;
+  static jmethodID postInsetsChangedEventID;
+
+  if (!id_set)
+    {
+      jclass gtkwindowpeer = (*gdk_env)->FindClass (gdk_env,
+				 "gnu/java/awt/peer/gtk/GtkWindowPeer");
+      postInsetsChangedEventID = (*gdk_env)->GetMethodID (gdk_env,
+						      gtkwindowpeer,
+						      "postInsetsChangedEvent",
+						      "(IIII)V");
+    }
+
+  if (gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE) == event->atom
+      && gdk_property_get (event->window,
+                           gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE),
+                           gdk_atom_intern ("CARDINAL", FALSE),
+                           0,
+                           sizeof (unsigned long) * 4,
+                           FALSE,
+                           NULL,
+                           NULL,
+                           NULL,
+                           (guchar **)&extents))
+    (*gdk_env)->CallVoidMethod (gdk_env, peer,
+				postInsetsChangedEventID,
+				(jint) extents[2],  /* top */
+				(jint) extents[0],  /* left */
+				(jint) extents[3],  /* bottom */
+				(jint) extents[1]); /* right */
+
+  return FALSE;
 }

--=-SJuxJ0IsIYscJ67vYVAi--




From MAILER-DAEMON Tue Jan 13 21:14:30 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AgaYA-0003H6-L7
	for mharc-commit-classpath@gnu.org; Tue, 13 Jan 2004 21:14:30 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgaY8-0003Gn-Fm
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 21:14:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AgW7O-0004Vi-Lo
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 16:31:06 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AgW7N-0004UM-1C
	for commit-classpath@gnu.org; Tue, 13 Jan 2004 16:30:33 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0DLUPg10145
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 16:30:25 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0DLUOE21223
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 16:30:24 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0DLUNlJ028232
	for <commit-classpath@gnu.org>; Tue, 13 Jan 2004 16:30:23 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-dMBCa7HHICYK5bBW+gXk"
Organization: 
Message-Id: <1074029423.18114.4.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 13 Jan 2004 16:30:23 -0500
Subject: FYI: Patch: gnu.java.awt.peer.gtk.GtkContainerPeer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Jan 2004 02:14:29 -0000


--=-dMBCa7HHICYK5bBW+gXk
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

I'm committing the following patch to merge the recent changes in
gnu.java.awt.peer.gtk.GtkContainerPeer from libgcj.

-David Jee


2004-01-13  David Jee  <djee@redhat.com>

        * gnu/java/awt/peer/gtk/GtkContainerPeer.java
        (setBackground): New method. Children with no explicitly-set
        background will be repainted with the parent container's new
        background color.



--=-dMBCa7HHICYK5bBW+gXk
Content-Disposition: attachment; filename=GtkContainerPeer.patch
Content-Type: text/x-patch; name=GtkContainerPeer.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: gnu/java/awt/peer/gtk/GtkContainerPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkContainerPeer.java,v
retrieving revision 1.20
diff -u -r1.20 GtkContainerPeer.java
--- gnu/java/awt/peer/gtk/GtkContainerPeer.java	7 Jan 2004 02:23:37 -0000	1.20
+++ gnu/java/awt/peer/gtk/GtkContainerPeer.java	13 Jan 2004 19:19:06 -0000
@@ -39,6 +39,8 @@
 package gnu.java.awt.peer.gtk;
 
 import java.awt.AWTEvent;
+import java.awt.Color;
+import java.awt.Component;
 import java.awt.Container;
 import java.awt.Graphics;
 import java.awt.Insets;
@@ -136,4 +138,23 @@
   public void beginLayout () { }
   public void endLayout () { }
   public boolean isPaintPending () { return false; }
+
+  public void setBackground (Color c)
+  {
+    super.setBackground(c);
+  
+    Object components[] = ((Container) awtComponent).getComponents();
+    for (int i = 0; i < components.length; i++)
+      {
+        Component comp = (Component) components[i];
+
+        // If the child's background has not been explicitly set yet,
+        // it should inherit this container's background. This makes the
+        // child component appear as if it has a transparent background.
+        // Note that we do not alter the background property of the child,
+        // but only repaint the child with the parent's background color.
+        if (!comp.isBackgroundSet() && comp.getPeer() != null)
+          comp.getPeer().setBackground(c);
+      }
+  }
 }

--=-dMBCa7HHICYK5bBW+gXk--




From MAILER-DAEMON Wed Jan 14 21:38:17 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Agw6Q-0002nI-9k
	for mharc-commit-classpath@gnu.org; Wed, 14 Jan 2004 20:15:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AgveU-0006PH-Fe
	for commit-classpath@gnu.org; Wed, 14 Jan 2004 19:46:26 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Agt4I-000203-5e
	for commit-classpath@gnu.org; Wed, 14 Jan 2004 17:01:25 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Agsjl-0006tB-Du
	for commit-classpath@gnu.org; Wed, 14 Jan 2004 16:39:41 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-83-115.ewetel.net
	[80.228.83.115])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0ELdXHA009263
	for <commit-classpath@gnu.org>; Wed, 14 Jan 2004 22:39:34 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Agsjq-0005xp-00
	for <commit-classpath@gnu.org>; Wed, 14 Jan 2004 22:39:46 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 14 Jan 2004 22:43:03 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_nfbBAQrgD+c1Ea0"
Message-Id: <200401142243.03659.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.text.MessageFormat
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jan 2004 01:15:16 -0000


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

Hi list,


I just commited the attached patch to add message texts to exceptions in 
java.text.MessageFormat.


Michael


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

	* java/text/MessageFormat.java:
	Added descriptions to exceptions.
	This fixes PR libgcj/2429.


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

Index: java/text/MessageFormat.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/text/MessageFormat.java,v
retrieving revision 1.8
diff -u -b -B -r1.8 MessageFormat.java
--- java/text/MessageFormat.java	26 Dec 2003 22:40:33 -0000	1.8
+++ java/text/MessageFormat.java	14 Jan 2004 21:36:01 -0000
@@ -170,7 +170,7 @@
 	else if (c == '{')
 	  break;
 	else if (c == '}')
-	  throw new IllegalArgumentException ();
+	  throw new IllegalArgumentException("Found '}' without '{'");
 	else
 	  buffer.append(c);
       }
@@ -245,7 +245,7 @@
       }
     catch (NumberFormatException nfx)
       {
-	throw new IllegalArgumentException ();
+	throw new IllegalArgumentException("Failed to parse integer string");
       }
 
     // Extract the element format.
@@ -264,7 +264,7 @@
 
     // Advance past the last terminator.
     if (index >= max || pat.charAt(index) != '}')
-      throw new IllegalArgumentException ();
+      throw new IllegalArgumentException("Missing '}' at end of message format");
     ++index;
 
     // Now fetch trailing string.
@@ -349,7 +349,8 @@
     for (int i = 0; i < elements.length; ++i)
       {
 	if (elements[i].argNumber >= arguments.length)
-	  throw new IllegalArgumentException ();
+	  throw new IllegalArgumentException("Not enough arguments given");
+
 	Object thisArg = arguments[elements[i].argNumber];
 
 	Format formatter = null;
@@ -359,7 +360,8 @@
 	  {
 	    if (elements[i].formatClass != null
 		&& ! elements[i].formatClass.isInstance(thisArg))
-	      throw new IllegalArgumentException ();
+	      throw new IllegalArgumentException("Wrong format class");
+	    
 	    formatter = elements[i].format;
 	  }
 	else if (thisArg instanceof Number)
@@ -596,7 +598,8 @@
   public void setFormats (Format[] newFormats)
   {
     if (newFormats.length < elements.length)
-      throw new IllegalArgumentException ();
+      throw new IllegalArgumentException("Not enough format objects");
+
     int len = Math.min(newFormats.length, elements.length);
     for (int i = 0; i < len; ++i)
       elements[i].setFormat = newFormats[i];

--Boundary-00=_nfbBAQrgD+c1Ea0--




From MAILER-DAEMON Thu Jan 15 18:00:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhGTB-0006K4-4X
	for mharc-commit-classpath@gnu.org; Thu, 15 Jan 2004 18:00:09 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhGT6-0006Io-Mf
	for commit-classpath@gnu.org; Thu, 15 Jan 2004 18:00:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhCGM-0005oa-D5
	for Commit-classpath@gnu.org; Thu, 15 Jan 2004 13:31:09 -0500
Received: from [200.223.73.2] (helo=gambit.cpunet.com.br)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhAuh-0005nD-Dp
	for Commit-classpath@gnu.org; Thu, 15 Jan 2004 12:04:11 -0500
Received: (qmail-ldap/ctrl 24850 invoked from network);
	15 Jan 2004 15:12:39 -0000
Received: from unknown (HELO localhost) (ve0703@[200.217.84.172])
	(envelope-sender <divulgamail2004@bol.com.br>)
	by gambit.cpunet.com.br (qmail-ldap-1.03) with SMTP
	for <Commit-classpath@gnu.org>; 15 Jan 2004 15:12:39 -0000
X-Sender: divulgamail2004@bol.com.br
From: Paula Grassi <divulgamail2004@bol.com.br>
To: Commit-classpath@gnu.org
Date: Thu, 15 Jan 2004 12:12:20 -0200
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Message-Id: <E1AhAuh-0005nD-Dp@monty-python.gnu.org>
Cc: 
Subject: Mala Direta - Email - lista  http://www.divulgamail.vze.com
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 15 Jan 2004 23:00:06 -0000

Mala Direta por E-mail - Segmentados ou genéricos. Cadastro mala-direta via E-mail 
de pessoas fisicas e juridicas anuncios e divulgação por e-mail. Fornece listas 
de milhares de e-mails para mala direta e propaganda. Serviço de envio de mensagens, 
programas gratis para divulgação. Criação de mensagens gráficas para e-mail marketing
http://www.divulgamail.vze.com

Publicidade por e-mail, listas, cadastros, email, E-mail marketing. Mala direta

http://www.divulgamail.vze.com





From MAILER-DAEMON Thu Jan 15 20:09:23 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhI3Q-0001VX-Ue
	for mharc-commit-classpath@gnu.org; Thu, 15 Jan 2004 19:41:40 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhExU-0004x2-Ho
	for commit-classpath@gnu.org; Thu, 15 Jan 2004 16:23:20 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhEQX-0007h8-QZ
	for commit-classpath@gnu.org; Thu, 15 Jan 2004 15:49:48 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhEQX-0007h0-BN
	for commit-classpath@gnu.org; Thu, 15 Jan 2004 15:49:17 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0FKnGg01348
	for <commit-classpath@gnu.org>; Thu, 15 Jan 2004 15:49:16 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0FKnFE06883
	for <commit-classpath@gnu.org>; Thu, 15 Jan 2004 15:49:15 -0500
Received: from toby.toronto.redhat.com (toby.toronto.redhat.com [172.16.14.35])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0FKnFXd007088
	for <commit-classpath@gnu.org>; Thu, 15 Jan 2004 15:49:15 -0500
From: Olga Rodimina <rodimina@redhat.com>
To: commit-classpath@gnu.org
In-Reply-To: <1074013613.18224.94.camel@toby.toronto.redhat.com>
References: <1074013613.18224.94.camel@toby.toronto.redhat.com>
Content-Type: multipart/mixed; boundary="=-dJWCJeu6Fe2nxgsHOK59"
Organization: 
Message-Id: <1074199755.19253.13.camel@toby.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 15 Jan 2004 15:49:15 -0500
Subject: [PATCH] Rendering Hints
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 00:41:38 -0000


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

On Tue, 2004-01-13 at 12:06, Olga Rodimina wrote:
> Hi,
> 
> This patch modifies GdkGraphics2D to accept rendering hint
> KEY_STROKE_CONTROL and normalizes certain paths when
> KEY_STROKE_CONTROL is set to "NORMALIZE" mode. This patch also
> implements some of the rendering hints related methods. 
> 
> 

I will be committing this patch. 

Olga.

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

? .snprj
? classpath.proj
? patch
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1795
diff -c -p -u -r1.1795 ChangeLog
--- ChangeLog	14 Jan 2004 21:37:33 -0000	1.1795
+++ ChangeLog	15 Jan 2004 20:39:46 -0000
@@ -1,3 +1,14 @@
+2004-01-15  Olga Rodimina <rodimina@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
+	Implemented rendering hints related methods.
+	(getDefaultHints): New helper method. Returns
+	default rendering hints.
+	(walkPath): changed to normalize path if
+	the KEY_STROKE_CONTROL key is in "normalize" mode.
+	(draw3DRect): changed coordinates of rectangle by +0.5
+	if in "normalize" mode.
+
 2004-01-14  Michael Koch  <konqueror@gmx.de>
 
 	* java/text/MessageFormat.java:
Index: gnu/java/awt/peer/gtk/GdkGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java,v
retrieving revision 1.4
diff -c -p -u -r1.4 GdkGraphics2D.java
--- gnu/java/awt/peer/gtk/GdkGraphics2D.java	20 Nov 2003 22:27:36 -0000	1.4
+++ gnu/java/awt/peer/gtk/GdkGraphics2D.java	15 Jan 2004 20:39:47 -0000
@@ -44,6 +44,8 @@ import java.awt.font.*;
 import java.awt.color.*;
 import java.awt.image.*;
 import java.awt.image.renderable.*;
+import java.util.HashMap;
+import java.util.Map;
 
 import java.text.AttributedCharacterIterator;
 import java.util.Map;
@@ -79,6 +81,7 @@ public class GdkGraphics2D extends Graph
   private AffineTransform transform;
   private GtkComponentPeer component;
   private Font font;  
+  private RenderingHints hints;
 
   private Stack stateStack;
   
@@ -106,6 +109,7 @@ public class GdkGraphics2D extends Graph
   {
     paint = g.paint;
     stroke = g.stroke;
+    hints = g.hints;
 
     if (g.fg.getAlpha() != -1)
       fg = new Color (g.fg.getRed (), g.fg.getGreen (), 
@@ -152,6 +156,7 @@ public class GdkGraphics2D extends Graph
     setFont (new Font("SansSerif", Font.PLAIN, 12));
     setTransform (AffineTransform.getTranslateInstance (0.5, 0.5));
     setStroke (new BasicStroke ());
+    setRenderingHints (new HashMap ());
 
     stateStack = new Stack();
   }
@@ -167,6 +172,7 @@ public class GdkGraphics2D extends Graph
     setFont (new Font("SansSerif", Font.PLAIN, 12));
     setTransform (AffineTransform.getTranslateInstance (0.5, 0.5));
     setStroke (new BasicStroke ());
+    setRenderingHints (new HashMap ());
 
     stateStack = new Stack ();
   }
@@ -333,6 +339,29 @@ public class GdkGraphics2D extends Graph
   }
 
 
+  private Map getDefaultHints()
+  {
+    HashMap defaultHints = new HashMap ();
+    
+    defaultHints.put (RenderingHints.KEY_TEXT_ANTIALIASING, 
+                      RenderingHints.VALUE_TEXT_ANTIALIAS_DEFAULT);
+		      
+    defaultHints.put (RenderingHints.KEY_STROKE_CONTROL, 
+                      RenderingHints.VALUE_STROKE_DEFAULT);    
+		      
+    defaultHints.put (RenderingHints.KEY_FRACTIONALMETRICS, 
+                      RenderingHints.VALUE_FRACTIONALMETRICS_OFF);    
+		      
+    defaultHints.put (RenderingHints.KEY_ANTIALIASING, 
+                      RenderingHints.VALUE_ANTIALIAS_OFF);    
+		      
+    defaultHints.put (RenderingHints.KEY_RENDERING,  
+                      RenderingHints.VALUE_RENDER_DEFAULT);
+    
+    return defaultHints;
+    
+  }
+
   //////////////////////////////////////////////////
   ////// Implementation of Graphics2D Methods //////
   //////////////////////////////////////////////////
@@ -349,6 +378,14 @@ public class GdkGraphics2D extends Graph
 
     stateSave ();
     cairoNewPath ();
+
+    boolean normalize;
+    normalize = hints.containsValue (RenderingHints.VALUE_STROKE_NORMALIZE)
+                || hints.containsValue (RenderingHints.VALUE_STROKE_DEFAULT);
+
+    if (normalize)
+      translate (0.5,0.5);      
+    
     if (s instanceof Rectangle2D)
       {
         Rectangle2D r = (Rectangle2D)s;
@@ -357,6 +394,10 @@ public class GdkGraphics2D extends Graph
     else      
       walkPath (s.getPathIterator (null));
     cairoStroke ();
+    
+    if (normalize)
+      translate (-0.5,-0.5);
+      
     stateRestore ();
   }
 
@@ -638,6 +679,19 @@ public class GdkGraphics2D extends Graph
     stateSave ();
     
     cairoNewPath ();
+    
+    boolean normalize;
+    normalize = hints.containsValue (RenderingHints.VALUE_STROKE_NORMALIZE)
+                || hints.containsValue (RenderingHints.VALUE_STROKE_DEFAULT);
+		
+    if (normalize) 
+      {
+    	x1 += 0.5;
+	y1 += 0.5; 
+	x2 += 0.5;
+	y2 += 0.5; 
+      }
+    
     setColor (light);
     cairoMoveTo (x1, y1);
     cairoLineTo (x2, y1);
@@ -1074,27 +1128,28 @@ public class GdkGraphics2D extends Graph
   public void setRenderingHint(RenderingHints.Key hintKey,
                                Object hintValue)
   {
-    throw new java.lang.UnsupportedOperationException ();
+    hints.put (hintKey, hintValue);    
   }
 
   public Object getRenderingHint(RenderingHints.Key hintKey)
   {
-    throw new java.lang.UnsupportedOperationException ();
+    return hints.get (hintKey);
   }
   
   public void setRenderingHints(Map hints)
   {
-    throw new java.lang.UnsupportedOperationException ();
+    this.hints = new RenderingHints (getDefaultHints ());
+    this.hints.add (new RenderingHints (hints));
   }
 
   public void addRenderingHints(Map hints)
   {
-    throw new java.lang.UnsupportedOperationException ();
+    this.hints.add (new RenderingHints (hints));
   }
 
   public RenderingHints getRenderingHints()
   {
-    throw new java.lang.UnsupportedOperationException ();
+    return hints;
   }
 
   public Composite getComposite()

--=-dJWCJeu6Fe2nxgsHOK59--




From MAILER-DAEMON Fri Jan 16 02:44:48 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhOeu-0004g8-1T
	for mharc-commit-classpath@gnu.org; Fri, 16 Jan 2004 02:44:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhOep-0004cm-1g
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 02:44:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhOeD-0004J3-9U
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 02:44:37 -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.24) id 1AhOcj-0003sM-Pq
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 02:42:33 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AhONy-0001yl-Vt
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 02:27:19 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-196.ewetel.net
	[80.228.75.196])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0G7QtHA005302
	for <commit-classpath@gnu.org>; Fri, 16 Jan 2004 08:26:55 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AhONq-0007kf-00
	for <commit-classpath@gnu.org>; Fri, 16 Jan 2004 08:27:10 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 16 Jan 2004 08:30:26 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_SM5BAnLR01sDbfz"
Message-Id: <200401160830.26694.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: acinclude.m4
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 07:44:45 -0000


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

Hi list,


I commited the attached patch to fix warnings when running aclocal (>= 1.8).
I have tested this patch with automake 1.7 too and it still works ;-)


Michael


2004-01-16  Michael Koch  <konqueror@gmx.de>

	* acinclude.m4: Fixed quotation to get rid of warnings with
	automake 1.8.x.


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

Index: acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/acinclude.m4,v
retrieving revision 1.28
diff -u -b -B -r1.28 acinclude.m4
--- acinclude.m4	24 Dec 2002 05:35:22 -0000	1.28
+++ acinclude.m4	16 Jan 2004 07:17:04 -0000
@@ -1,7 +1,7 @@
 dnl Used by aclocal to generate configure
 
 dnl JAPHAR_GREP_CFLAGS(flag, cmd_if_missing, cmd_if_present)
-AC_DEFUN(JAPHAR_GREP_CFLAGS,
+AC_DEFUN([JAPHAR_GREP_CFLAGS],
 [case "$CFLAGS" in
 "$1" | "$1 "* | *" $1" | *" $1 "* )
   ifelse($#, 3, [$3], [:])
@@ -13,7 +13,7 @@
 ])
 
 dnl CLASSPATH_CHECK_JAPHAR
-AC_DEFUN(CLASSPATH_CHECK_JAPHAR,
+AC_DEFUN([CLASSPATH_CHECK_JAPHAR],
 [
   if test "x$1" = x; then
     AC_PATH_PROG(JAPHAR_CONFIG, japhar-config, "", $PATH:/usr/local/japhar/bin:/usr/japhar/bin)
@@ -70,7 +70,7 @@
 ])
 
 dnl CLASSPATH_CHECK_KAFFE
-AC_DEFUN(CLASSPATH_CHECK_KAFFE,
+AC_DEFUN([CLASSPATH_CHECK_KAFFE],
 [
   AC_PATH_PROG(KAFFE_CONFIG, kaffe-config, "", $PATH:/usr/local/kaffe/bin:/usr/kaffe/bin)
   if test "x${KAFFE_CONFIG}" = x; then
@@ -154,7 +154,7 @@
 ])
 
 dnl CLASSPATH_WITH_JAPHAR - checks for japhar
-AC_DEFUN(CLASSPATH_WITH_JAPHAR,
+AC_DEFUN([CLASSPATH_WITH_JAPHAR],
 [
   AC_ARG_WITH(japhar, 
   [  --with-japhar		  configure GNU Classpath for Japhar [default=yes]],
@@ -173,7 +173,7 @@
 ])
 
 dnl CLASSPATH_WITH_KAFFE - checks for which java virtual machine to use
-AC_DEFUN(CLASSPATH_WITH_KAFFE,
+AC_DEFUN([CLASSPATH_WITH_KAFFE],
 [
   AC_ARG_WITH(kaffe, 
   [  --with-kaffe		  configure GNU Classpath for Kaffe [default=no]],
@@ -190,7 +190,7 @@
 
 dnl threads packages (mostly stolen from Japhar)
 dnl given that japhar-config gives -lpthread, may not need this (cbj)
-AC_DEFUN(CLASSPATH_CHECK_THREADS,
+AC_DEFUN([CLASSPATH_CHECK_THREADS],
 [
   threads=no
 
@@ -247,7 +247,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_FIND_JAVAC,
+AC_DEFUN([CLASSPATH_FIND_JAVAC],
 [
   user_specified_javac=
 
@@ -271,7 +271,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_WITH_GCJ,
+AC_DEFUN([CLASSPATH_WITH_GCJ],
 [
   AC_ARG_WITH(gcj,
   [  --with-gcj              bytecode compilation with gcj ],
@@ -293,7 +293,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_CHECK_GCJ,
+AC_DEFUN([CLASSPATH_CHECK_GCJ],
 [
   if test "x$1" != x; then
     if test -f "$1"; then
@@ -328,7 +328,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_WITH_JIKES,
+AC_DEFUN([CLASSPATH_WITH_JIKES],
 [
   AC_ARG_WITH(jikes,
   [  --with-jikes		  bytecode compilation with jikes ],
@@ -350,7 +350,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_CHECK_JIKES,
+AC_DEFUN([CLASSPATH_CHECK_JIKES],
 [
   if test "x$1" != x; then
     if test -f "$1"; then
@@ -364,7 +364,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_WITH_KJC,
+AC_DEFUN([CLASSPATH_WITH_KJC],
 [
   AC_ARG_WITH(kjc, 
   [  --with-kjc=<ksusu.jar>  bytecode compilation with kjc [default=no]],
@@ -396,7 +396,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_WITH_JAVA,
+AC_DEFUN([CLASSPATH_WITH_JAVA],
 [
   AC_ARG_WITH(java,
   [  --with-java		  specify path or name of a java-like program ],
@@ -417,7 +417,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_CHECK_JAVA,
+AC_DEFUN([CLASSPATH_CHECK_JAVA],
 [
   if test "x$1" != x; then
     if test -f "$1"; then
@@ -431,7 +431,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_FIND_JAVA,
+AC_DEFUN([CLASSPATH_FIND_JAVA],
 [
   dnl Place additional bytecode interpreter checks here
 
@@ -439,7 +439,7 @@
 ])
 
 
-AC_DEFUN(CLASSPATH_WITH_JAVAH,
+AC_DEFUN([CLASSPATH_WITH_JAVAH],
 [
   AC_ARG_WITH(javah,
   [  --with-javah		  specify path or name of a javah-like program ],
@@ -458,7 +458,7 @@
 ])
 
 dnl Checking for a javah like program 
-AC_DEFUN(CLASSPATH_CHECK_JAVAH,
+AC_DEFUN([CLASSPATH_CHECK_JAVAH],
 [
   if test "x$1" != x; then
     if test -f "$1"; then
@@ -482,7 +482,7 @@
 ])
 
 dnl CLASSPATH_WITH_CLASSLIB - checks for user specified classpath additions
-AC_DEFUN(CLASSPATH_WITH_CLASSLIB,
+AC_DEFUN([CLASSPATH_WITH_CLASSLIB],
 [
   AC_ARG_WITH(classpath,
   [  --with-classpath        specify path to a classes.zip like file ],
@@ -509,7 +509,7 @@
 
 
 dnl CLASSPATH_WITH_INCLUDEDIR - checks for user specified extra include directories
-AC_DEFUN(CLASSPATH_WITH_INCLUDEDIR,
+AC_DEFUN([CLASSPATH_WITH_INCLUDEDIR],
 [
   AC_ARG_WITH(includedir,
   [  --with-includedir=DIR   specify path to an extra include dir ],
@@ -538,7 +538,7 @@
 ])
 
 dnl CLASSPATH_WITH_ZIP - allow user to specify without zip
-AC_DEFUN(CLASSPATH_WITH_ZIP,
+AC_DEFUN([CLASSPATH_WITH_ZIP],
 [
   AC_ARG_WITH(zip, 
   [  --with-zip		  create glibj.zip [default=yes]],
@@ -563,7 +563,7 @@
 dnl has been compiled to an executable or a suitable script
 dnl is in your PATH
 dnl -----------------------------------------------------------
-AC_DEFUN(CLASSPATH_ENABLE_GJDOC,
+AC_DEFUN([CLASSPATH_ENABLE_GJDOC],
 [
   AC_ARG_ENABLE(gjdoc,
   [  --enable-gjdoc           enable API doc. generation [default=no]],

--Boundary-00=_SM5BAnLR01sDbfz--




From MAILER-DAEMON Fri Jan 16 03:38:06 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhPUT-0000BK-3i
	for mharc-commit-classpath@gnu.org; Fri, 16 Jan 2004 03:38:05 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhPUA-00009C-PV
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 03:37:46 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhPTX-0008V1-32
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 03:37:40 -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.24) id 1AhPTW-0008UY-4W
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 03:37:06 -0500
Received: from [195.8.69.18] (helo=oceanus2.uk.clara.net)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AhPHx-0002iq-CV
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 03:25:09 -0500
Received: from du-253-232.nat.adsl.claranet.fr ([212.43.253.232]
	helo=[10.0.0.2]) by oceanus2.uk.clara.net with esmtp (Exim 3.36 #2)
	id 1AhPHO-00098V-00; Fri, 16 Jan 2004 08:24:34 +0000
Mime-Version: 1.0 (Apple Message framework v609)
To: commit-classpath@gnu.org
Message-Id: <638C8C32-47FD-11D8-958A-003065B22A76@bluezoo.org>
Content-Type: multipart/signed; protocol="application/pgp-signature";
	micalg=pgp-sha1; boundary="Apple-Mail-2--702501116"
From: Chris Burdess <dog@bluezoo.org>
Date: Fri, 16 Jan 2004 09:24:22 +0100
Content-Transfer-Encoding: 7bit
X-Pgp-Agent: GPGMail 1.0.1 (v33, 10.3)
X-Mailer: Apple Mail (2.609)
Cc: =?ISO-8859-1?Q?=D8yvind_Harboe?= <oyvind.harboe@zylin.com>
Subject: null pointer check on Sasl.createSaslClient
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 08:37:50 -0000


--Apple-Mail-2--702501116
Content-Type: multipart/mixed; boundary=Apple-Mail-1--702501125


--Apple-Mail-1--702501125
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed

The attached diff checks for null pointers returned from 
Sasl.createSaslClient.
-- 
Chris Burdess

--Apple-Mail-1--702501125
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream; x-unix-mode=0664; name="inetlib.diff.3"
Content-Disposition: attachment;
	filename=inetlib.diff.3

? autom4te.cache
? classes
? config.log
? config.status
? inetlib.jar
? Makefile
Index: source/gnu/inet/imap/IMAPConnection.java
===================================================================
RCS file: /cvsroot/classpath/inetlib/source/gnu/inet/imap/IMAPConnection.java,v
retrieving revision 1.4
diff -u -r1.4 IMAPConnection.java
--- source/gnu/inet/imap/IMAPConnection.java	17 Nov 2003 17:41:31 -0000	1.4
+++ source/gnu/inet/imap/IMAPConnection.java	16 Jan 2004 08:20:26 -0000
@@ -78,7 +78,7 @@
    */
   protected static final String US_ASCII = "US-ASCII";
 
-        /**
+	/**
 	 * The default IMAP port.
 	 */
   protected static final int DEFAULT_PORT = 143;
@@ -155,14 +155,14 @@
       socket.setSoTimeout(timeout);
 
     InputStream in = socket.getInputStream();
-      in = new BufferedInputStream(in);
-      this.in = new IMAPResponseTokenizer(in);
+		in = new BufferedInputStream(in);
+		this.in = new IMAPResponseTokenizer(in);
     OutputStream out = socket.getOutputStream();
-      out = new BufferedOutputStream(out);
-      this.out = new CRLFOutputStream(out);
+		out = new BufferedOutputStream(out);
+		this.out = new CRLFOutputStream(out);
 
-      asyncResponses = new ArrayList();
-      alerts = new ArrayList();
+		asyncResponses = new ArrayList();
+		alerts = new ArrayList();
   }
 
   /**
@@ -189,7 +189,7 @@
     if (debug)
     {
       Logger logger = Logger.getInstance();
-        logger.log("imap", "> " + tag + " " + command);
+			logger.log("imap", "> " + tag + " " + command);
     }
     String cmd = new StringBuffer(tag).append(' ').append(command).toString();
     out.write(cmd);
@@ -206,7 +206,7 @@
   protected boolean invokeSimpleCommand(String command) throws IOException
   {
     String tag = newTag();
-      sendCommand(tag, command);
+		sendCommand(tag, command);
     while (true)
     {
       IMAPResponse response = readResponse();
@@ -330,7 +330,7 @@
   public MailboxStatus noop() throws IOException
   {
     String tag = newTag();
-      sendCommand(tag, NOOP);
+		sendCommand(tag, NOOP);
     boolean changed = false;
     MailboxStatus ms = new MailboxStatus();
     Iterator asyncIterator = asyncResponses.iterator();
@@ -344,7 +344,7 @@
         asyncIterator.remove();
       }
       else
-          response = readResponse();
+				response = readResponse();
       String id = response.getID();
       if (response.isUntagged())
       {
@@ -378,7 +378,7 @@
         (SSLSocketFactory) SSLSocketFactory.getDefault();
 
       String tag = newTag();
-        sendCommand(tag, STARTTLS);
+			sendCommand(tag, STARTTLS);
       while (true)
       {
         IMAPResponse response = readResponse();
@@ -392,7 +392,7 @@
             return false;
         }
         else
-            asyncResponses.add(response);
+					asyncResponses.add(response);
       }
 
       socket = factory.createSocket(socket,
@@ -422,14 +422,14 @@
   public boolean login(String username, String password) throws IOException
   {
     StringBuffer cmd = new StringBuffer(LOGIN);
-      cmd.append(' ');
-      cmd.append(quote(username));
-      cmd.append(' ');
-      cmd.append(quote(password));
-      return invokeSimpleCommand(cmd.toString());
+		cmd.append(' ');
+		cmd.append(quote(username));
+		cmd.append(' ');
+		cmd.append(quote(password));
+		return invokeSimpleCommand(cmd.toString());
   }
 
-        /**
+	/**
 	 * Authenticates the connection using the specified SASL mechanism,
 	 * username, and password.
 	 * @param mechanism a SASL authentication mechanism, e.g. LOGIN, PLAIN,
@@ -452,7 +452,9 @@
       SaslClient sasl = Sasl.createSaslClient(m, null, "smtp",
                                               socket.getInetAddress().
                                               getHostName(), p, ch);
-
+			if (sasl == null)
+				return false;
+			
       StringBuffer cmd = new StringBuffer(AUTHENTICATE);
       cmd.append(' ');
       cmd.append(mechanism);
@@ -636,7 +638,7 @@
   public void logout() throws IOException
   {
     String tag = newTag();
-      sendCommand(tag, LOGOUT);
+		sendCommand(tag, LOGOUT);
     while (true)
     {
       IMAPResponse response = readResponse();
@@ -650,7 +652,7 @@
           return;
         }
         else
-            throw new IMAPException(id, response.getText());
+					throw new IMAPException(id, response.getText());
       }
       else
         asyncResponses.add(response);
@@ -683,9 +685,9 @@
     throws IOException
   {
     String tag = newTag();
-      sendCommand(tag,
-                  new StringBuffer(command).append(' ').
-                  append(quote(UTF7imap.encode(mailbox))).toString());
+		sendCommand(tag,
+				new StringBuffer(command).append(' ').
+				append(quote(UTF7imap.encode(mailbox))).toString());
     MailboxStatus ms = new MailboxStatus();
     while (true)
     {
@@ -735,7 +737,7 @@
             if (oparam instanceof String)
             {
               String param = (String) oparam;
-                try
+							try
               {
                 if (cmd == UNSEEN)
                 {
@@ -883,11 +885,11 @@
     if (mailbox == null)
       mailbox = "";
     String tag = newTag();
-      sendCommand(tag,
-                  new StringBuffer(command).append(' ').
-                  append(quote(UTF7imap.encode(reference))).append(' ').
-                  append(quote(UTF7imap.encode(mailbox))).toString());
-    List acc = new ArrayList();
+		sendCommand(tag,
+				new StringBuffer(command).append(' ').
+				append(quote(UTF7imap.encode(reference))).append(' ').
+				append(quote(UTF7imap.encode(mailbox))).toString());
+		List acc = new ArrayList();
     while (true)
     {
       IMAPResponse response = readResponse();
@@ -911,14 +913,14 @@
           {
             String attribute = (String) code.get(i);
             if (attribute.equalsIgnoreCase(LIST_NOINFERIORS))
-                noinferiors = true;
+							noinferiors = true;
             else if (attribute.equalsIgnoreCase(LIST_NOSELECT))
-                noselect = true;
+							noselect = true;
             else if (attribute.equalsIgnoreCase(LIST_MARKED))
-                marked = true;
+							marked = true;
             else if (attribute.equalsIgnoreCase(LIST_UNMARKED))
-                unmarked = true;
-          }
+							unmarked = true;
+					}
           int si = text.indexOf(' ');
           char delimiter = '\u0000';
           String d = text.substring(0, si);
Index: source/gnu/inet/pop3/POP3Connection.java
===================================================================
RCS file: /cvsroot/classpath/inetlib/source/gnu/inet/pop3/POP3Connection.java,v
retrieving revision 1.4
diff -u -r1.4 POP3Connection.java
--- source/gnu/inet/pop3/POP3Connection.java	17 Nov 2003 17:41:33 -0000	1.4
+++ source/gnu/inet/pop3/POP3Connection.java	16 Jan 2004 08:20:26 -0000
@@ -102,33 +102,33 @@
   protected static final int ERR = 1;
   protected static final int READY = 2;
 
-        /**
+	/**
 	 * The socket used to communicate with the server.
 	 */
   protected Socket socket;
 
-        /**
+	/**
 	 * The socket input stream.
 	 */
   protected LineInputStream in;
 
-        /**
+	/**
 	 * The socket output stream.
 	 */
   protected CRLFOutputStream out;
 
-        /**
+	/**
 	 * The last response received from the server.
 	 * The status code (+OK or -ERR) is stripped from the line.
 	 */
   protected String response;
 
-        /**
+	/**
 	 * If true, print debugging information.
 	 */
   protected boolean debug;
 
-        /**
+	/**
 	 * The APOP timestamp, if sent by the server on connection.
 	 * Otherwise null.
 	 */
@@ -168,17 +168,17 @@
       socket.setSoTimeout(timeout);
 
     InputStream in = socket.getInputStream();
-      in = new BufferedInputStream(in);
-      in = new CRLFInputStream(in);
-      this.in = new LineInputStream(in);
+		in = new BufferedInputStream(in);
+		in = new CRLFInputStream(in);
+		this.in = new LineInputStream(in);
     OutputStream out = socket.getOutputStream();
-      out = new BufferedOutputStream(out);
-      this.out = new CRLFOutputStream(out);
+		out = new BufferedOutputStream(out);
+		this.out = new CRLFOutputStream(out);
 
     if (getResponse() != OK)
       throw new ProtocolException("Connect failed: " + response);
     // APOP timestamp
-      timestamp = parseTimestamp(response);
+		timestamp = parseTimestamp(response);
   }
 
   /**
@@ -195,21 +195,21 @@
   {
     try
     {
-      String[]m = new String[]
-      {
-      mechanism};
+      String[] m = new String[] { mechanism };
       CallbackHandler ch = new SaslCallbackHandler(username, password);
       // Avoid lengthy callback procedure for GNU Crypto
       Properties p = new Properties();
-        p.put("gnu.crypto.sasl.username", username);
-        p.put("gnu.crypto.sasl.password", password);
+			p.put("gnu.crypto.sasl.username", username);
+			p.put("gnu.crypto.sasl.password", password);
       SaslClient sasl = Sasl.createSaslClient(m, null, "smtp",
                                               socket.getInetAddress().
                                               getHostName(), p, ch);
-
+			if (sasl == null)
+				return false;
+			
       StringBuffer cmd = new StringBuffer(AUTH);
-        cmd.append(' ');
-        cmd.append(mechanism);
+			cmd.append(' ');
+			cmd.append(mechanism);
       if (sasl.hasInitialResponse())
       {
         cmd.append(' ');
@@ -221,8 +221,6 @@
       {
         switch (getResponse())
         {
-        case ERR:
-          return false;
         case OK:
           String qop = (String) sasl.getNegotiatedProperty(Sasl.QOP);
           if ("auth-int".equalsIgnoreCase(qop)
@@ -257,6 +255,8 @@
             out.write(0x0d);
             out.flush();
           }
+        default:
+          return false;
         }
       }
     }
@@ -290,15 +290,15 @@
       System.arraycopy(timestamp, 0, target, 0, timestamp.length);
       System.arraycopy(secret, 0, target, timestamp.length, secret.length);
       MessageDigest md5 = MessageDigest.getInstance("MD5");
-        byte[] db = md5.digest(target);
+			byte[] db = md5.digest(target);
       // create hexadecimal representation
       StringBuffer digest = new StringBuffer();
       for (int i = 0; i < db.length; i++)
       {
         int c = (int) db[i];
         if (c < 0)
-            c += 256;
-          digest.append(Integer.toHexString(c));
+					c += 256;
+				digest.append(Integer.toHexString(c));
       }
       // send command
       String cmd =
@@ -330,13 +330,13 @@
     // USER <username>
     String cmd =
       new StringBuffer(USER).append(' ').append(username).toString();
-      send(cmd);
+		send(cmd);
     if (getResponse() != OK)
-        return false;
+			return false;
     // PASS <password>
-      cmd = new StringBuffer(PASS).append(' ').append(password).toString();
-      send(cmd);
-      return getResponse() == OK;
+		cmd = new StringBuffer(PASS).append(' ').append(password).toString();
+		send(cmd);
+		return getResponse() == OK;
   }
 
   /**
@@ -353,24 +353,24 @@
       SSLSocketFactory factory =
         (SSLSocketFactory) SSLSocketFactory.getDefault();
 
-        send(STLS);
+			send(STLS);
       if (getResponse() != OK)
-          return false;
+				return false;
 
-        socket = factory.createSocket(socket,
-                                      socket.getInetAddress().getHostName(),
-                                      socket.getPort(), true);
+			socket = factory.createSocket(socket,
+					socket.getInetAddress().getHostName(),
+					socket.getPort(), true);
 
       // set up streams
       InputStream in = socket.getInputStream();
-        in = new BufferedInputStream(in);
-        in = new CRLFInputStream(in);
-        this.in = new LineInputStream(in);
+			in = new BufferedInputStream(in);
+			in = new CRLFInputStream(in);
+			this.in = new LineInputStream(in);
       OutputStream out = socket.getOutputStream();
-        out = new BufferedOutputStream(out);
-        this.out = new CRLFOutputStream(out);
+			out = new BufferedOutputStream(out);
+			this.out = new CRLFOutputStream(out);
 
-        return true;
+			return true;
     }
     catch (RuntimeException e)
     {
@@ -378,7 +378,7 @@
     }
   }
 
-        /**
+	/**
 	 * Returns the number of messages in the maildrop.
 	 */
   public int stat() throws IOException
@@ -386,7 +386,7 @@
     send(STAT);
     if (getResponse() != OK)
       throw new ProtocolException("STAT failed: " + response);
-      try
+		try
     {
       return Integer.parseInt(response.substring(0, response.indexOf(' ')));
     }
@@ -400,7 +400,7 @@
     }
   }
 
-        /**
+	/**
 	 * Returns the size of the specified message.
 	 * @param msgnum the message number
 	 */
@@ -410,7 +410,7 @@
       send(cmd);
     if (getResponse() != OK)
       throw new ProtocolException("LIST failed: " + response);
-      try
+		try
     {
       return Integer.parseInt(response.substring(response.indexOf(' ') + 1));
     }
@@ -420,7 +420,7 @@
     }
   }
 
-        /**
+	/**
 	 * Returns an input stream containing the entire message.
 	 * This input stream must be read in its entirety before further commands
 	 * can be issued on this connection.
@@ -429,25 +429,25 @@
   public InputStream retr(int msgnum) throws IOException
   {
     String cmd = new StringBuffer(RETR).append(' ').append(msgnum).toString();
-      send(cmd);
+		send(cmd);
     if (getResponse() != OK)
       throw new ProtocolException("RETR failed: " + response);
-      return new MessageInputStream(in);
+		return new MessageInputStream(in);
   }
 
-        /**
+	/**
 	 * Marks the specified message as deleted.
 	 * @param msgnum the message number
 	 */
   public void dele(int msgnum) throws IOException
   {
     String cmd = new StringBuffer(DELE).append(' ').append(msgnum).toString();
-      send(cmd);
+		send(cmd);
     if (getResponse() != OK)
       throw new ProtocolException("DELE failed: " + response);
   }
 
-        /**
+	/**
 	 * Does nothing.
 	 * This can be used to keep the connection alive.
 	 */
@@ -458,7 +458,7 @@
       throw new ProtocolException("NOOP failed: " + response);
   }
 
-        /**
+	/**
 	 * If any messages have been marked as deleted, they are unmarked.
 	 */
   public void rset() throws IOException
@@ -479,11 +479,11 @@
   {
     send(QUIT);
     int ret = getResponse();
-      socket.close();
-      return ret == OK;
+		socket.close();
+		return ret == OK;
   }
 
-        /**
+	/**
 	 * Returns just the headers of the specified message as an input stream.
 	 * The stream must be read in its entirety before further commands can be
 	 * issued.
@@ -494,23 +494,23 @@
     String cmd =
       new StringBuffer(TOP).append(' ').append(msgnum).append(' ').append(0).
       toString();
-      send(cmd);
+		send(cmd);
     if (getResponse() != OK)
       throw new ProtocolException("TOP failed: " + response);
-      return new MessageInputStream(in);
+		return new MessageInputStream(in);
   }
 
-        /**
+	/**
 	 * Returns a unique identifier for the specified message.
 	 * @param msgnum the message number
 	 */
   public String uidl(int msgnum) throws IOException
   {
     String cmd = new StringBuffer(UIDL).append(' ').append(msgnum).toString();
-      send(cmd);
+		send(cmd);
     if (getResponse() != OK)
       throw new ProtocolException("UIDL failed: " + response);
-      return response.substring(response.indexOf(' ') + 1);
+		return response.substring(response.indexOf(' ') + 1);
   }
 
   /**
@@ -528,7 +528,7 @@
       for (String line = in.readLine();
            !DOT.equals(line); line = in.readLine())
         list.add(line);
-        return list;
+			return list;
     }
     return null;
   }
@@ -543,7 +543,7 @@
     if (debug)
     {
       Logger logger = Logger.getInstance();
-        logger.log("pop3", "> " + command);
+			logger.log("pop3", "> " + command);
     }
     out.write(command);
     out.writeln();
@@ -587,7 +587,7 @@
   /*
    * Parse the APOP timestamp from the server's banner greeting.
    */
-  byte[]parseTimestamp(String greeting) throws IOException
+  byte[] parseTimestamp(String greeting) throws IOException
   {
     int bra = greeting.indexOf('<');
     if (bra != -1)
@@ -598,7 +598,7 @@
         String mid = greeting.substring(bra, ket + 1);
         int at = mid.indexOf('@');
         if (at != -1)           // This is a valid RFC822 msg-id
-            return mid.getBytes("US-ASCII");
+			 		return mid.getBytes("US-ASCII");
       }
     }
     return null;
Index: source/gnu/inet/smtp/SMTPConnection.java
===================================================================
RCS file: /cvsroot/classpath/inetlib/source/gnu/inet/smtp/SMTPConnection.java,v
retrieving revision 1.4
diff -u -r1.4 SMTPConnection.java
--- source/gnu/inet/smtp/SMTPConnection.java	17 Nov 2003 17:41:33 -0000	1.4
+++ source/gnu/inet/smtp/SMTPConnection.java	16 Jan 2004 08:20:26 -0000
@@ -172,12 +172,12 @@
 
     // Initialise streams
     InputStream in = socket.getInputStream();
-      in = new BufferedInputStream(in);
-      in = new CRLFInputStream(in);
-      this.in = new LineInputStream(in);
-    OutputStream out = socket.getOutputStream();
-      out = new BufferedOutputStream(out);
-      this.out = new CRLFOutputStream(out);
+		in = new BufferedInputStream(in);
+		in = new CRLFInputStream(in);
+		this.in = new LineInputStream(in);
+		OutputStream out = socket.getOutputStream();
+		out = new BufferedOutputStream(out);
+		this.out = new CRLFOutputStream(out);
 
     // Greeting
     if (getResponse() != READY)
@@ -204,9 +204,9 @@
     throws IOException
   {
     StringBuffer command = new StringBuffer(MAIL_FROM);
-      command.append('<');
-      command.append(reversePath);
-      command.append('>');
+		command.append('<');
+		command.append(reversePath);
+		command.append('>');
     if (parameters != null)
     {
       command.append(SP);
@@ -219,7 +219,8 @@
     case OK_NOT_LOCAL:
     case OK_UNVERIFIED:
       return true;
-      default:return false;
+		default:
+			return false;
     }
   }
 
@@ -233,9 +234,9 @@
     throws IOException
   {
     StringBuffer command = new StringBuffer(RCPT_TO);
-      command.append('<');
-      command.append(forwardPath);
-      command.append('>');
+		command.append('<');
+		command.append(forwardPath);
+		command.append('>');
     if (parameters != null)
     {
       command.append(SP);
@@ -269,7 +270,8 @@
     {
     case SEND_DATA:
       return new MessageOutputStream(out);
-      default:throw new ProtocolException(response);
+		default:
+			throw new ProtocolException(response);
     }
   }
 
@@ -285,7 +287,8 @@
     {
     case OK:
       return true;
-      default:return false;
+		default:
+			return false;
     }
   }
 
@@ -310,7 +313,7 @@
   {
     String command =
       new StringBuffer(VRFY).append(' ').append(address).toString();
-      send(command);
+		send(command);
     List list = new ArrayList();
     do
     {
@@ -342,7 +345,7 @@
   {
     String command =
       new StringBuffer(EXPN).append(' ').append(address).toString();
-      send(command);
+		send(command);
     List list = new ArrayList();
     do
     {
@@ -352,7 +355,8 @@
         response = response.trim();
         list.add(response);
         break;
-        default:return null;
+			default:
+				return null;
       }
     }
     while (continuation);
@@ -370,7 +374,7 @@
   {
     String command = (arg == null) ? HELP :
       new StringBuffer(HELP).append(' ').append(arg).toString();
-      send(command);
+		send(command);
     List list = new ArrayList();
     do
     {
@@ -430,9 +434,9 @@
   public boolean helo(String hostname) throws IOException
   {
     String command =
-      new StringBuffer(HELO).append(' ').append(hostname).toString();
-      send(command);
-      return (getResponse() == OK);
+		 	new StringBuffer(HELO).append(' ').append(hostname).toString();
+	 	send(command);
+ 		return (getResponse() == OK);
   }
 
   /**
@@ -446,7 +450,7 @@
   {
     String command =
       new StringBuffer(EHLO).append(' ').append(hostname).toString();
-      send(command);
+    send(command);
     List extensions = new ArrayList();
     do
     {
@@ -474,25 +478,25 @@
       // Use SSLSocketFactory to negotiate a TLS session and wrap the
       // current socket.
       SSLSocketFactory factory =
-        (SSLSocketFactory) SSLSocketFactory.getDefault();
-
-        send(STARTTLS);
-      if (getResponse() != OK)
-          return false;
-
-        socket = factory.createSocket(socket,
-                                      socket.getInetAddress().getHostName(),
-                                      socket.getPort(), true);
-      // Set up streams
-      InputStream in = socket.getInputStream();
-        in = new BufferedInputStream(in);
-        in = new CRLFInputStream(in);
-        this.in = new LineInputStream(in);
-      OutputStream out = socket.getOutputStream();
-        out = new BufferedOutputStream(out);
-        this.out = new CRLFOutputStream(out);
-        return true;
-    }
+				(SSLSocketFactory) SSLSocketFactory.getDefault();
+			
+			send(STARTTLS);
+			if (getResponse() != OK)
+				return false;
+			
+			socket = factory.createSocket(socket,
+					socket.getInetAddress().getHostName(),
+					socket.getPort(), true);
+			// Set up streams
+			InputStream in = socket.getInputStream();
+			in = new BufferedInputStream(in);
+			in = new CRLFInputStream(in);
+			this.in = new LineInputStream(in);
+			OutputStream out = socket.getOutputStream();
+			out = new BufferedOutputStream(out);
+			this.out = new CRLFOutputStream(out);
+			return true;
+		}
     catch (RuntimeException e)
     {
       return false;             // No javax.net classes in runtime
@@ -501,7 +505,7 @@
 
   // -- Authentication --
 
-        /**
+	/**
 	 * Authenticates the connection using the specified SASL mechanism,
 	 * username, and password.
 	 * @param mechanism a SASL authentication mechanism, e.g. LOGIN, PLAIN,
@@ -515,17 +519,17 @@
   {
     try
     {
-      String[]m = new String[]
-      {
-      mechanism};
+      String[] m = new String[] { mechanism };
       CallbackHandler ch = new SaslCallbackHandler(username, password);
       // Avoid lengthy callback procedure for GNU Crypto
       Properties p = new Properties();
       p.put("gnu.crypto.sasl.username", username);
       p.put("gnu.crypto.sasl.password", password);
       SaslClient sasl = Sasl.createSaslClient(m, null, "smtp",
-                                              socket.getInetAddress().
-                                              getHostName(), p, ch);
+					socket.getInetAddress().
+					getHostName(), p, ch);
+			if (sasl == null)
+				return false;
 
       StringBuffer cmd = new StringBuffer(AUTH);
       cmd.append(' ');
@@ -650,7 +654,7 @@
     if (debug)
     {
       Logger logger = Logger.getInstance();
-        logger.log("smtp", "> " + command);
+      logger.log("smtp", "> " + command);
     }
     out.write(command.getBytes("US-ASCII"));    // TODO check encoding
     out.write(0x0d);
@@ -668,13 +672,13 @@
       line = in.readLine();
       // Handle special case eg 334 where CRLF occurs after code.
       if (line.length() < 4)
-        line =
-          new StringBuffer(line).append('\n').append(in.readLine()).
+		 		line =
+		 			new StringBuffer(line).append('\n').append(in.readLine()).
           toString();
       if (debug)
       {
         Logger logger = Logger.getInstance();
-          logger.log("smtp", "< " + line);
+        logger.log("smtp", "< " + line);
       }
       int code = Integer.parseInt(line.substring(0, 3));
       continuation = (line.charAt(3) == '-');

--Apple-Mail-1--702501125--

--Apple-Mail-2--702501116
content-type: application/pgp-signature; x-mac-type=70674453;
	name=PGP.sig
content-description: This is a digitally signed message part
content-disposition: inline; filename=PGP.sig
content-transfer-encoding: 7bit

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)

iD8DBQFAB5+86dl1DEqHgrgRAi5eAJ0b6ppT5IWmj7ANZK4qS6fmDMCc0ACePSVb
rLG/i+UZW2fy+Nf9N5gkoRc=
=gljR
-----END PGP SIGNATURE-----

--Apple-Mail-2--702501116--




From MAILER-DAEMON Fri Jan 16 07:56:13 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhSeW-0004cE-Oa
	for mharc-commit-classpath@gnu.org; Fri, 16 Jan 2004 07:00:40 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhSFp-0001YJ-Rq
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 06:35:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhRsV-0005pS-86
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 06:11:34 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhRsT-0005p8-BU
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 06:11:01 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-196.ewetel.net
	[80.228.75.196])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0GBAvUa020516
	for <commit-classpath@gnu.org>; Fri, 16 Jan 2004 12:10:57 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AhRse-0008KP-00
	for <commit-classpath@gnu.org>; Fri, 16 Jan 2004 12:11:12 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 16 Jan 2004 12:14:28 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_Ue8BAJaPh6j86bM"
Message-Id: <200401161214.28567.konqueror@gmx.de>
X-CheckCompat: OK
Subject: Patch: autoconf/automake update
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 12:00:27 -0000


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

Hi list,


I wrote a little patch to port our autoconf/automake system to more recent 
versions of these software. Automake 1.8 printed some new warnings (and still 
does but the remaining ones can be blamed to libtool. I heard libtool 1.6 
will fix them).

Please review and comment. Okay to commit ?

Next steps:

We have to simply rename configure.in to configure.ac. Then the transition 
will be done. configure.in is only supported by current autoconf for
autoconf <= 2.13 compatibility. The recommended filename is configure.ac.

We should think about removing files generated by libtool. These are 
config.guess, config.sub and ltmain. These can be created by simple executing 
"libtoolize --force" if needed (compilation from CVS, creating tarballs).
What do you think ?


Michael


2004-01-16  Michael Koch  <konqueror@gmx.de>

	* HACKING: Updated autoconf and automake prerequisite descriptions.
	* acinclude.m4 (CLASSPATH_ENABLE_GJDOC): Use AS_HELP_STRING,
	fix quotation.
	* configure.in: Rewrote AC_ARG_ENABLE usage to use AC_HELP_STRING and
	to use a correct quotation. Use pkgconfig to search for glib, gtk and
	libart. Ported AC_OUTPUT() to new AC_CONFIG_FILES()/AC_OUTPUT.

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

Index: HACKING
===================================================================
RCS file: /cvsroot/classpath/classpath/HACKING,v
retrieving revision 1.20
diff -u -b -B -r1.20 HACKING
--- HACKING	21 Nov 2003 14:40:21 -0000	1.20
+++ HACKING	16 Jan 2004 11:01:10 -0000
@@ -12,9 +12,9 @@
 autoconf, automake, and libtool are required.
 
         - GNU autoconf 2.53
-	(2.57 also works)
+	(2.59 also works)
         - GNU automake 1.6
-	(1.7 also works)
+	(1.7 and 1.8 also works)
         - GNU libtool 1.4.2
 	(1.4.3 and 1.5a also work)
 
Index: acinclude.m4
===================================================================
RCS file: /cvsroot/classpath/classpath/acinclude.m4,v
retrieving revision 1.29
diff -u -b -B -r1.29 acinclude.m4
--- acinclude.m4	16 Jan 2004 07:25:11 -0000	1.29
+++ acinclude.m4	16 Jan 2004 11:01:10 -0000
@@ -565,8 +565,8 @@
 dnl -----------------------------------------------------------
 AC_DEFUN([CLASSPATH_ENABLE_GJDOC],
 [
-  AC_ARG_ENABLE(gjdoc,
-  [  --enable-gjdoc           enable API doc. generation [default=no]],
+  AC_ARG_ENABLE([gjdoc],
+                [AS_HELP_STRING([--enable-gjdoc],[enable API doc. generation [default=no]])],
   [
     case "${enableval}" in
       yes) ENABLE_GJDOC=yes ;;
Index: configure.in
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.in,v
retrieving revision 1.138
diff -u -b -B -r1.138 configure.in
--- configure.in	24 Dec 2003 22:09:47 -0000	1.138
+++ configure.in	16 Jan 2004 11:01:10 -0000
@@ -4,7 +4,7 @@
 dnl define([AC_CACHE_LOAD], )dnl
 dnl define([AC_CACHE_SAVE], )dnl
 
-AC_INIT([GNU Classpath], [0.07+cvs], [classpath@gnu.org], [classpath])
+AC_INIT([GNU Classpath],[0.07+cvs],[classpath@gnu.org],[classpath])
 AC_CONFIG_SRCDIR(java/lang/System.java)
 
 AC_CANONICAL_TARGET
@@ -14,66 +14,65 @@
 dnl at which time we'll have to be more anal about such things
 AC_SUBST(LIBVERSION, "0:0:0")
 
-AM_INIT_AUTOMAKE
-
-AM_CONFIG_HEADER(include/config.h)
-
+AC_PREREQ(2.53)
+AM_INIT_AUTOMAKE(1.6.0)
+AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)
 
 dnl required if SUBDIRS is used
 AC_PROG_MAKE_SET
 
-AC_ARG_ENABLE(java,
-[  --enable-java           compile Java source [default=yes]],
-[case "${enableval}" in 
+AC_ARG_ENABLE([java],
+              [AS_HELP_STRING(--enable-java,compile Java source [default=yes])],
+              [case "${enableval}" in 
   yes) COMPILE_JAVA=yes ;;
   no) COMPILE_JAVA=no ;;
   *) COMPILE_JAVA=yes ;;
-esac],
-[COMPILE_JAVA=yes])
+               esac],
+              [COMPILE_JAVA=yes])
 
-AC_ARG_ENABLE(jni,
-[  --enable-jni            compile JNI source [default=yes]],
-[case "${enableval}" in 
+AC_ARG_ENABLE([jni],
+              [AS_HELP_STRING(--enable-jni,compile JNI source [default=yes])],
+              [case "${enableval}" in 
   yes) COMPILE_JNI=yes; COMPILE_JAVA=yes ;;
   no) COMPILE_JNI=no ;;
   *) COMPILE_JNI=yes; COMPILE_JAVA=yes ;;
-esac],
-[COMPILE_JNI=yes])
+              esac],
+              [COMPILE_JNI=yes])
 
-AC_ARG_ENABLE(cni,
-[  --enable-cni            compile CNI source [default=no]],
-[case "${enableval}" in 
+AC_ARG_ENABLE([cni],
+              [AS_HELP_STRING(--enable-cni,compile CNI source [default=no])],
+              [case "${enableval}" in 
   yes) COMPILE_CNI=yes; COMPILE_JAVA=yes ;;
   no) COMPILE_CNI=no ;;
   *) COMPILE_CNI=yes; COMPILE_JAVA=yes ;;
-esac],
-[COMPILE_CNI=no])
+              esac],
+              [COMPILE_CNI=no])
 
 dnl -----------------------------------------------------------
 dnl GTK native peer
 dnl -----------------------------------------------------------
-AC_ARG_ENABLE(gtk-peer,
-[  --enable-gtk-peer       compile GTK native peers [default=yes]],
-[case "${enableval}" in
+AC_ARG_ENABLE([gtk-peer],
+              [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [default=yes])],
+              [case "${enableval}" in
   yes) COMPILE_GTK_PEER=yes ;;
   no) COMPILE_GTK_PEER=no ;;
   *) COMPILE_GTK_PEER=yes ;;
-esac],
-[COMPILE_GTK_PEER=yes])
+              esac],
+              [COMPILE_GTK_PEER=yes])
 
 AM_CONDITIONAL(CREATE_JNI_LIBRARIES, test "x${COMPILE_JNI}" = xyes)
 AM_CONDITIONAL(CREATE_CNI_LIBRARIES, test "x${COMPILE_CNI}" = xyes)
 AM_CONDITIONAL(CREATE_GTK_PEER_LIBRARIES, test "x${COMPILE_GTK_PEER}" = xyes)
 
-AC_ARG_ENABLE(regen-headers,
-[  --enable-regen-headers   automatically regenerate JNI headers [default=no]],
-[case "${enableval}" in
+AC_ARG_ENABLE([regen-headers],
+              [AS_HELP_STRING(--enable-regen-headers,automatically regenerate JNI headers [default=no])],
+              [case "${enableval}" in
   yes) REGENERATE_JNI_HEADERS=yes ;;
   no) REGENERATE_JNI_HEADERS=no ;;
   *) REGENERATE_JNI_HEADERS=no ;;
-esac],
-[REGENERATE_JNI_HEADERS=no])
+              esac],
+              [REGENERATE_JNI_HEADERS=no])
 
 AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${REGENERATE_JNI_HEADERS}" = xyes)
 
@@ -81,15 +80,13 @@
 AC_PROG_INSTALL
 
 dnl Checks for programs.
-  AC_PREREQ(2.52)
-
-  dnl AC_PROG_CXX
-  dnl Initialize libtool
-  AC_DISABLE_STATIC
-  AC_PROG_LIBTOOL
-  dnl AC_PROG_AWK
-  AC_PROG_CC
-  AC_PROG_CPP
+dnl AC_PROG_CXX
+dnl Initialize libtool
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+dnl AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_CPP
 
 if test "x${COMPILE_JNI}" = xyes; then
   AC_HEADER_STDC
@@ -125,17 +122,13 @@
 
   dnl Check for AWT related glib/gtk/libart_lgpl
   if test "x${COMPILE_GTK_PEER}" = xyes; then
-     m4_pattern_allow([AM_PATH_GTK_2_0])
-     m4_pattern_allow([AM_PATH_GLIB_2_0])
-     m4_ifdef([AM_PATH_GTK_2_0],
-       [AM_PATH_GTK_2_0(2.2.0,,exit 1)],
-       [AC_MSG_ERROR([No AM_PATH_GTK_2_0 macro found: use --disable-gtk-peer])])
-     m4_ifdef([AM_PATH_GTK_2_0],
-       [AM_PATH_GLIB_2_0(2.2.0,,exit 1,gthread)],
-       [AC_MSG_ERROR([No AM_PATH_GLIB_2_0 macro found: use --disable-gtk-peer])])
-    dnl XXX Fix me when libart.m4 has the compile test fixed!
-    dnl enable_libarttest=no
-    AM_PATH_LIBART(2.1.0,,exit 1)
+     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
+     AC_SUBST(GTK_CFLAGS)
+     AC_SUBST(GTK_LIBS)
+
+     PKG_CHECK_MODULES(LIBART, libart-2.0)
+     AC_SUBST(LIBART_CFLAGS)
+     AC_SUBST(LIBART_LIBS)
   fi
 
 fi
@@ -161,7 +154,14 @@
     target_os=linux-gnu 
     AC_MSG_WARN("no, using x86-linux-gnu")
   fi
-  AC_LINK_FILES(include/jni_md-${target_cpu}-${target_os}.h, include/jni_md.h)
+  ac_sources="include/jni_md-${target_cpu}-${target_os}.h"
+ac_dests="include/jni_md.h"
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+  ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"
+done
+AC_CONFIG_LINKS([$ac_config_links_1])
 fi
 
 CLASSPATH_FIND_JAVA
@@ -181,17 +181,17 @@
 dnl produced by an optimizing Java compiler and not hinder 
 dnl performance because debugging is turned off by default.
 dnl -----------------------------------------------------------
-AC_ARG_ENABLE(debug,
-[  --enable-debug          enable runtime debugging code],
-[case "${enableval}" in 
+AC_ARG_ENABLE([debug],
+              [AS_HELP_STRING(--enable-debug,enable runtime debugging code)],
+              [case "${enableval}" in 
   yes) 
 	LIBDEBUG="true"
         AC_DEFINE(DEBUG, 1, [Define to 1 if you want native library runtime debugging code enabled]) 
 	;;
   no)   LIBDEBUG="false" ;;
   *) 	AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
-esac],
-[LIBDEBUG="false"])
+              esac],
+              [LIBDEBUG="false"])
 AC_SUBST(LIBDEBUG)
 dnl -----------------------------------------------------------
 
@@ -202,21 +202,21 @@
 dnl want to disable this, but some VMs (gcj) don't need or want 
 dnl them.
 dnl -----------------------------------------------------------
-AC_ARG_ENABLE(load-library,
-[  --enable-load-library   enable to use JNI native methods [default=yes]
-                          (disabled automatically using --enable-cni)],
-[case "${enableval}" in 
+AC_ARG_ENABLE([load-library],
+              [AS_HELP_STRING(--enable-load-library,enable to use JNI native methods [default=yes]
+                                        (disabled automatically using --enable-cni))],
+              [case "${enableval}" in 
   yes) INIT_LOAD_LIBRARY="true" ;;
   no) INIT_LOAD_LIBRARY="false" ;;
   *) AC_MSG_ERROR(bad value ${enableval} for --enable-load-library) ;;
-esac],
-[
+              esac],
+              [
   if test "x${COMPILE_CNI}" = xyes; then
     INIT_LOAD_LIBRARY="false"
   else
     INIT_LOAD_LIBRARY="true"
   fi
-])
+              ])
 AC_SUBST(INIT_LOAD_LIBRARY)
 dnl -----------------------------------------------------------
 
@@ -242,7 +242,14 @@
 if test "x${JVM_REFERENCE}" = x; then
   JVM_REFERENCE=reference
 fi
-AC_LINK_FILES(vm/$JVM_REFERENCE, vm/current)
+ac_sources="vm/$JVM_REFERENCE"
+ac_dests="vm/current"
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+  ac_config_links_2="$ac_config_links_2 $ac_dest:$ac_source"
+done
+AC_CONFIG_LINKS([$ac_config_links_2])
 
 dnl avoiding automake complaints
 REMOVE=""
@@ -265,9 +272,9 @@
 
 dnl -----------------------------------------------------------
 dnl -----------------------------------------------------------
-AC_ARG_ENABLE(portable-native-sync,
-[  --enable-portable-native-sync  synchronize VM threads portably],
-[case "${enableval}" in 
+AC_ARG_ENABLE([portable-native-sync],
+              [AS_HELP_STRING(--enable-portable-native-sync,synchronize VM threads portably)],
+              [case "${enableval}" in 
   yes) 
        AC_DEFINE(PORTABLE_NATIVE_SYNC, 1, [Define to 1 if you want to synchronize VM threads portably])
        ;;
@@ -277,12 +282,11 @@
   *)   
        AC_MSG_ERROR(bad value ${enableval} for --enable-portable-native-sync) 
        ;;
-esac],
-[])
-
+              esac],
+              [])
 dnl -----------------------------------------------------------
 
-AC_OUTPUT(Makefile
+AC_CONFIG_FILES(Makefile
 doc/Makefile
 doc/api/Makefile
 external/Makefile
@@ -443,5 +447,4 @@
 lib/gen_nio.sh,
 [ chmod 755 lib/gen-classlist.sh
 ])
-
-
+AC_OUTPUT

--Boundary-00=_Ue8BAJaPh6j86bM--




From MAILER-DAEMON Fri Jan 16 10:49:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhWE4-0002xz-VM
	for mharc-commit-classpath@gnu.org; Fri, 16 Jan 2004 10:49:36 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhWDz-0002xU-SZ
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 10:49:31 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AhW5r-00028j-2y
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 10:41:38 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhUjz-0001UZ-EZ
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 09:14:27 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0GEEQg23691
	for <commit-classpath@gnu.org>; Fri, 16 Jan 2004 09:14:26 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0GEEOE22694
	for <commit-classpath@gnu.org>; Fri, 16 Jan 2004 09:14:25 -0500
Received: from toby.toronto.redhat.com (toby.toronto.redhat.com [172.16.14.35])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0GEEMXd002496
	for <commit-classpath@gnu.org>; Fri, 16 Jan 2004 09:14:22 -0500
From: Olga Rodimina <rodimina@redhat.com>
To: commit-classpath@gnu.org
In-Reply-To: <1074013613.18224.94.camel@toby.toronto.redhat.com>
References: <1074013613.18224.94.camel@toby.toronto.redhat.com>
Content-Type: multipart/mixed; boundary="=-A3bWmq8nwGpJKZ/JlgSh"
Organization: 
Message-Id: <1074262462.4728.24.camel@toby.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 16 Jan 2004 09:14:22 -0500
Subject: [PATCH] small bug in fill polygon
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 16 Jan 2004 15:49:34 -0000


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

On Tue, 2004-01-13 at 12:06, Olga Rodimina wrote:

> 
> I've also fixed a small bug that caused polygons to be filled
> incorrectly.
> 

I will be committing this patch.

Olga.

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

? .snprj
? classpath.proj
? patch
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1798
diff -c -p -u -r1.1798 ChangeLog
--- ChangeLog	16 Jan 2004 07:25:11 -0000	1.1798
+++ ChangeLog	16 Jan 2004 14:11:44 -0000
@@ -1,3 +1,9 @@
+2004-01-16 Olga Rodimina <rodimina@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
+	(doPolygon): set fill rule of polygon to
+	WIND_EVEN_ODD by default.
+                                                                                
 2004-01-16  Michael Koch  <konqueror@gmx.de>
 
 	* acinclude.m4: Fixed quotation to get rid of warnings with
Index: gnu/java/awt/peer/gtk/GdkGraphics2D.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GdkGraphics2D.java,v
retrieving revision 1.5
diff -c -p -u -r1.5 GdkGraphics2D.java
--- gnu/java/awt/peer/gtk/GdkGraphics2D.java	15 Jan 2004 22:24:03 -0000	1.5
+++ gnu/java/awt/peer/gtk/GdkGraphics2D.java	16 Jan 2004 14:11:44 -0000
@@ -774,7 +774,7 @@ public class GdkGraphics2D extends Graph
   {    
     if (nPoints < 1)
       return;
-    GeneralPath gp = new GeneralPath ();
+    GeneralPath gp = new GeneralPath (PathIterator.WIND_EVEN_ODD);
     gp.moveTo ((float)xPoints[0], (float)yPoints[0]);
     for (int i = 1; i < nPoints; i++)
       gp.lineTo ((float)xPoints[i], (float)yPoints[i]);

--=-A3bWmq8nwGpJKZ/JlgSh--




From MAILER-DAEMON Fri Jan 16 19:06:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ahdyh-00039C-Hc
	for mharc-commit-classpath@gnu.org; Fri, 16 Jan 2004 19:06:15 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ahdyd-00034p-I3
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 19:06:11 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ahdy5-0002lP-7o
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 19:06:08 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ahdwo-0001wa-97
	for commit-classpath@gnu.org; Fri, 16 Jan 2004 19:04:18 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id RAA30940
	for <commit-classpath@gnu.org>; Fri, 16 Jan 2004 17:04:16 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id DF60B4F844E; Fri, 16 Jan 2004 16:55:35 -0700 (MST)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: With YOU, I can be MYSELF..  We don't NEED Dan Rather..
Date: 16 Jan 2004 16:55:35 -0700
Message-ID: <874quvo3d4.fsf@fleche.redhat.com>
Lines: 120
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: indentation fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
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: Sat, 17 Jan 2004 00:06:13 -0000

I checked this in.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey@redhat.com>
	* java/awt/Container.java: Typo and indentation fixes.

Index: java/awt/Container.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Container.java,v
retrieving revision 1.29
diff -u -r1.29 Container.java
--- java/awt/Container.java 8 Jan 2004 03:52:52 -0000 1.29
+++ java/awt/Container.java 16 Jan 2004 23:58:09 -0000
@@ -1,5 +1,5 @@
 /* Container.java -- parent container class in AWT
-   Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation
+   Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -1516,7 +1516,7 @@
           (ACCESSIBLE_CHILD_PROPERTY, e.getChild(), null);
       }
     } // class AccessibleContainerHandler
-  } // class AccessibleAWTPanel
+  } // class AccessibleAWTContainer
 } // class Container
 
 /**
@@ -1562,26 +1562,26 @@
     Component candidate = mouseEventTarget;
 
     boolean candidate_is_container_with_children = 
-	    ((candidate != null)
-	     && (candidate instanceof Container)
-	     && (((Container)candidate).getComponentCount () > 0));
+      ((candidate != null)
+       && (candidate instanceof Container)
+       && (((Container)candidate).getComponentCount () > 0));
 
     boolean candidate_does_not_contain_point =
-	    ((candidate != null)
-	     && (! candidate.contains (x - candidate.getX (),
+      ((candidate != null)
+       && (! candidate.contains (x - candidate.getX (),
                                  y - candidate.getY ())));
 
     if (candidate == null
         || candidate_is_container_with_children
         || candidate_does_not_contain_point)
-  {
+      {
         // Try to reacquire.
         candidate = nativeContainer.findComponentAt (x, y);
-  }
+      }
 
     if (mouseEventTarget != null
         && mouseEventTarget != candidate)
-  {
+      {
         int nx = x - mouseEventTarget.getX ();
         int ny = y - mouseEventTarget.getY ();
         MouseEvent exited = new MouseEvent (mouseEventTarget, 
@@ -1594,15 +1594,15 @@
                                             me.getButton ());
         mouseEventTarget.dispatchEvent (exited); 
         mouseEventTarget = null;
-  }
+      }
 
     if (candidate != null)
-	    {
+      {
         // Possibly set new state.
         if (candidate.isLightweight() 
             && candidate != nativeContainer
             && candidate != mouseEventTarget)
-  {
+	  {
 			
             mouseEventTarget = candidate;
 			
@@ -1620,16 +1620,16 @@
                                                  me.getButton ());
             mouseEventTarget.dispatchEvent (entered);
           }
-	    }
+      }
   }
 
   boolean handleEvent (AWTEvent e)
   {
     if ((eventMask & e.getID ()) == 0)
-	    return false;
+      return false;
 
     if (e instanceof MouseEvent)
-  {
+      {
         MouseEvent me = (MouseEvent) e;
         acquireComponentForMouseEvent (me);
 
@@ -1640,11 +1640,11 @@
             mouseEventTarget.dispatchEvent (me);
             me.setSource (oldSource);
           }
-	    }
+      }
     else if (e instanceof KeyEvent && focus != null)
-  {
+      {
         focus.processKeyEvent ((KeyEvent) e);
-	    }
+      }
       
     return e.isConsumed();
   }



From MAILER-DAEMON Sat Jan 17 08:49:22 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhqpF-0000HG-VJ
	for mharc-commit-classpath@gnu.org; Sat, 17 Jan 2004 08:49:21 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AhqoS-0000Ak-07
	for commit-classpath@gnu.org; Sat, 17 Jan 2004 08:48:32 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ahqhe-0007WO-QJ
	for Commit-classpath@gnu.org; Sat, 17 Jan 2004 08:42:03 -0500
Received: from [200.223.73.2] (helo=gambit.cpunet.com.br)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AhqOV-0003sU-U5
	for Commit-classpath@gnu.org; Sat, 17 Jan 2004 08:21:44 -0500
Received: (qmail-ldap/ctrl 16244 invoked from network);
	17 Jan 2004 12:14:12 -0000
Received: from unknown (HELO localhost) (ve0703@[200.217.84.172])
	(envelope-sender <jccarv@pop.com.br>)
	by gambit.cpunet.com.br (qmail-ldap-1.03) with SMTP
	for <Commit-classpath@gnu.org>; 17 Jan 2004 12:14:12 -0000
X-Sender: jccarv@pop.com.br
From: Listas de e-mail para mala direta <jccarv@pop.com.br>
To: Commit-classpath@gnu.org
Date: Sat, 17 Jan 2004 09:14:32 -0200
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Message-Id: <E1AhqOV-0003sU-U5@monty-python.gnu.org>
Cc: 
Subject: Emails segmentados para Mala Direta: http://www.divulgamail.vze.com
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jan 2004 13:49:20 -0000

Fornece listas de milhares de e-mails para mala direta e propaganda. Serviço 
de envio de mensagens, programas gratis para divulgação. Criação de mensagens 
gráficas para e-mail marketing
http://www.divulgamail.vze.com

Mala Direta por E-mail - Segmentados ou genéricos. Cadastro mala-direta via E-mail 
de pessoas fisicas e juridicas anuncios e divulgação por e-mail. 
Publicidade por e-mail, listas, cadastros, email, E-mail marketing. Mala direta

http://www.divulgamail.vze.com





From MAILER-DAEMON Sat Jan 17 11:37:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AhtQ8-00046l-Gq
	for mharc-commit-classpath@gnu.org; Sat, 17 Jan 2004 11:35:36 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ahsq7-0003Nu-KG
	for commit-classpath@gnu.org; Sat, 17 Jan 2004 10:58:23 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ahshy-00016U-F8
	for Commit-classpath@gnu.org; Sat, 17 Jan 2004 10:50:29 -0500
Received: from [200.223.73.2] (helo=gambit.cpunet.com.br)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ahsgz-0000n3-Ke
	for Commit-classpath@gnu.org; Sat, 17 Jan 2004 10:48:57 -0500
Received: (qmail-ldap/ctrl 18350 invoked from network);
	17 Jan 2004 12:38:49 -0000
Received: from unknown (HELO localhost) (ve0703@[200.217.84.172])
	(envelope-sender <mala3direta@bol.com.br>)
	by gambit.cpunet.com.br (qmail-ldap-1.03) with SMTP
	for <Commit-classpath@gnu.org>; 17 Jan 2004 12:38:49 -0000
X-Sender: mala3direta@bol.com.br
From: Mala Direta Divulgamail <mala3direta@bol.com.br>
To: Commit-classpath@gnu.org
Date: Sat, 17 Jan 2004 09:38:55 -0200
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Message-Id: <E1Ahsgz-0000n3-Ke@monty-python.gnu.org>
Cc: 
Subject: Mala Direta por e-mail emails: http://www.divulgamail.vze.com
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 17 Jan 2004 16:35:34 -0000

Segmentados ou genéricos. Cadastro mala-direta via E-mail de pessoas fisicas 
e juridicas:

http://www.divulgamail.vze.com

Anuncios e divulgação por e-mail. Publicidade por e-mail, listas, cadastros, 
email, E-mail marketing. Mala direta, cadastramento em sites de busca, tudo em 
divulgação via internet. Mala direta por email.

http://www.divulgamail.vze.com







From MAILER-DAEMON Sun Jan 18 17:03:40 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiL19-0001BZ-QX
	for mharc-commit-classpath@gnu.org; Sun, 18 Jan 2004 17:03:39 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiL15-000199-Jt
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:03:35 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiL0Z-0000s9-9p
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:03:34 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AiL0Y-0000r6-Jb
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:03:02 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-65-029.ewetel.net
	[80.228.65.29])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0IM301h003449
	for <commit-classpath@gnu.org>; Sun, 18 Jan 2004 23:03:00 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AiL0o-0000df-00
	for <commit-classpath@gnu.org>; Sun, 18 Jan 2004 23:03:18 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 18 Jan 2004 23:06:33 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_pNwCAucI+SXaqk+"
Message-Id: <200401182306.33629.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: configure.in
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2004 22:03:36 -0000


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

Hi list,


I commited the attached patch to fix AC_CONFIG_FILES usage in configure.in.


Michael


2004-01-18  Michael Koch  <konqueror@gmx.de>

	* configure.in: Fix AC_CONFIG_FILES usage and use AC_OUTPUT_COMMANDS.


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

Index: configure.in
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.in,v
retrieving revision 1.139
diff -u -b -B -r1.139 configure.in
--- configure.in	18 Jan 2004 21:02:37 -0000	1.139
+++ configure.in	18 Jan 2004 21:57:53 -0000
@@ -444,7 +444,6 @@
 vm/reference/java/io/Makefile
 lib/Makefile
 lib/gen-classlist.sh
-lib/gen_nio.sh,
-[ chmod 755 lib/gen-classlist.sh
-])
+lib/gen_nio.sh)
+AC_OUTPUT_COMMANDS([chmod 755 lib/gen-classlist.sh])
 AC_OUTPUT

--Boundary-00=_pNwCAucI+SXaqk+--




From MAILER-DAEMON Sun Jan 18 17:25:07 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiLHk-0004VU-MU
	for mharc-commit-classpath@gnu.org; Sun, 18 Jan 2004 17:20:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiLHa-0004RQ-By
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:20:38 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiLH1-0003qw-8w
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:20:35 -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.24) id 1AiLH0-0003iZ-Ox
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:20:02 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AiLFx-0001hH-R3
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:18:57 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-65-029.ewetel.net
	[80.228.65.29])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0IMIsUa025356
	for <commit-classpath@gnu.org>; Sun, 18 Jan 2004 23:18:54 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AiLGD-0000eF-00
	for <commit-classpath@gnu.org>; Sun, 18 Jan 2004 23:19:13 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 18 Jan 2004 23:22:28 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_kcwCA0cDuU6ZCAm"
Message-Id: <200401182322.28037.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: scripts for regular classpath builds from CVS
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2004 22:20:41 -0000


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

Hi list,


I just commited two scripts to make building classpath from CVS easier.


Michael


2004-01-18  Michael Koch  <konqueror@gmx.de>

	* scripts/classpath-build,
	scripts/classpath-daily: New files for regular classpath
	compilation/testing.


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

Index: scripts/classpath-build
===================================================================
RCS file: scripts/classpath-build
diff -N scripts/classpath-build
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ scripts/classpath-build	18 Jan 2004 22:15:45 -0000
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+set -e
+
+export CVS_RSH=ssh
+
+CLASSPATH_CVSSRCDIR=$HOME/src/cvs/classpath
+CLASSPATH_SRCDIR=$HOME/src/classpath
+CLASSPATH_BUILDDIR=$HOME/src/classpath/build
+
+DATE=`date +"%Y%m%d"`
+OUTPUTDIR=$HOME/public_html/classpath/daily
+LOGFILE=$OUTPUTDIR/classpath-$DATE.log
+
+if [ -d $CLASSPATH_CVSSRCDIR ] ; then
+  echo "update cvs source tree" >> $LOGFILE
+  cd $CLASSPATH_CVSSRCDIR
+  cvs -z 3 update >> $LOGFILE 2>&1
+fi
+
+if [ -d $CLASSPATH_SRCDIR ] ; then
+
+  # delete old sources
+  echo "delete old source tree" >> $LOGFILE
+  rm -rf $CLASSPATH_SRCDIR
+ 
+fi
+
+echo "copy cvs tree to source tree" >> $LOGFILE
+cp -a $CLASSPATH_CVSSRCDIR $CLASSPATH_SRCDIR
+cd $CLASSPATH_SRCDIR
+
+# patch version in configure.ac
+if [ -f configure.ac ] ; then
+  mv configure.ac configure.ac.orig
+  sed "s/, \[.*cvs\]/, [$DATE]/" < configure.ac.orig > configure.ac
+fi
+
+# generate autofriends stuff
+aclocal -I /usr/local/share/aclocal -I . >> $LOGFILE 2>&1
+autoheader >> $LOGFILE 2>&1
+autoconf >> $LOGFILE 2>&1
+automake >> $LOGFILE 2>&1
+
+# create build directory
+mkdir build
+cd build
+  
+# configure and build classpath
+export LD_LIBRARY_PATH=/usr/local/lib
+../configure --prefix=$HOME/local/classpath --with-jikes=/usr/bin/jikes --enable-jni --enable-gtk-peer --enable-regen-headers >> $LOGFILE 2>&1
+make >> $LOGFILE 2>&1
+make install >> $LOGFILE 2>&1
+
+make dist >> $LOGFILE 2>&1
+#make distcheck >> $LOGFILE 2>&1
+cp classpath-$DATE.tar.gz $OUTPUTDIR
+
+cd $OUTPUTDIR
+ln -sf classpath-$DATE.tar.gz LATEST-SNAPSHOT
+ln -sf classpath-$DATE.log LATEST-BUILDLOG
Index: scripts/classpath-daily
===================================================================
RCS file: scripts/classpath-daily
diff -N scripts/classpath-daily
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ scripts/classpath-daily	18 Jan 2004 22:15:45 -0000
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+DATE=`date +"%Y%m%d"`
+OUTPUTDIR=$HOME/public_html/classpath/daily
+LOGFILE=$OUTPUTDIR/classpath-$DATE.log
+FAILEDLOG=$OUTPUTDIR/classpath-failed-$DATE.log
+MAIL="konqueror@gmx.de"
+
+/home/mkoch/bin/classpath-build
+
+if test "$?" = "1" ; then
+  tail --lines=100 $LOGFILE > $FAILEDLOG
+
+  mail $MAIL -s "classpath daily snapshot $DATE FAILED" < $FAILEDLOG
+else
+  mail $MAIL -s "classpath daily snapshot $DATE SUCCESSFUL" < /dev/null > /dev/null
+fi

--Boundary-00=_kcwCA0cDuU6ZCAm--




From MAILER-DAEMON Sun Jan 18 17:38:47 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiLIt-0005Ru-TH
	for mharc-commit-classpath@gnu.org; Sun, 18 Jan 2004 17:21:59 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiLIq-0005NE-PK
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:21:56 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiLHe-0004VC-O7
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:21:19 -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.24) id 1AiLAk-0007Qd-3x
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:13:34 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AiL6r-0000rr-79
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 17:09:33 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-65-029.ewetel.net
	[80.228.65.29])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0IM98Ua022054
	for <commit-classpath@gnu.org>; Sun, 18 Jan 2004 23:09:09 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AiL6l-0000e4-00
	for <commit-classpath@gnu.org>; Sun, 18 Jan 2004 23:09:27 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 18 Jan 2004 23:12:42 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_aTwCAwJSCSnP3Un"
Message-Id: <200401182312.42342.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: configure.in => configure.ac
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2004 22:21:58 -0000


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

Hi list,


I commited the attached patch to rename configure.in to configure.ac.
This patch is the last thing needed for the auto*tools migration ;-)


Michael


2004-01-18  Michael Koch  <konqueror@gmx.de>

	* configure.in: Removed.
	* configure.ac: New file.


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

Index: configure.in
===================================================================
RCS file: configure.in
diff -N configure.in
--- configure.in	18 Jan 2004 21:59:25 -0000	1.140
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,449 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-
-dnl Turning off cache for debug reasons
-dnl define([AC_CACHE_LOAD], )dnl
-dnl define([AC_CACHE_SAVE], )dnl
-
-AC_INIT([GNU Classpath],[0.07+cvs],[classpath@gnu.org],[classpath])
-AC_CONFIG_SRCDIR(java/lang/System.java)
-
-AC_CANONICAL_TARGET
-if expr match ${target_cpu} .*86 > /dev/null; then target_cpu=x86; fi
-
-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
-AC_SUBST(LIBVERSION, "0:0:0")
-
-AC_PREREQ(2.53)
-AM_INIT_AUTOMAKE(1.6.0)
-AC_CONFIG_HEADERS([include/config.h])
-AC_PREFIX_DEFAULT(/usr/local/classpath)
-
-dnl required if SUBDIRS is used
-AC_PROG_MAKE_SET
-
-AC_ARG_ENABLE([java],
-              [AS_HELP_STRING(--enable-java,compile Java source [default=yes])],
-              [case "${enableval}" in 
-                 yes) COMPILE_JAVA=yes ;;
-                 no) COMPILE_JAVA=no ;;
-                 *) COMPILE_JAVA=yes ;;
-               esac],
-              [COMPILE_JAVA=yes])
-
-AC_ARG_ENABLE([jni],
-              [AS_HELP_STRING(--enable-jni,compile JNI source [default=yes])],
-              [case "${enableval}" in 
-                yes) COMPILE_JNI=yes; COMPILE_JAVA=yes ;;
-                no) COMPILE_JNI=no ;;
-                *) COMPILE_JNI=yes; COMPILE_JAVA=yes ;;
-              esac],
-              [COMPILE_JNI=yes])
-
-AC_ARG_ENABLE([cni],
-              [AS_HELP_STRING(--enable-cni,compile CNI source [default=no])],
-              [case "${enableval}" in 
-                yes) COMPILE_CNI=yes; COMPILE_JAVA=yes ;;
-                no) COMPILE_CNI=no ;;
-                *) COMPILE_CNI=yes; COMPILE_JAVA=yes ;;
-              esac],
-              [COMPILE_CNI=no])
-
-dnl -----------------------------------------------------------
-dnl GTK native peer
-dnl -----------------------------------------------------------
-AC_ARG_ENABLE([gtk-peer],
-              [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [default=yes])],
-              [case "${enableval}" in
-                yes) COMPILE_GTK_PEER=yes ;;
-                no) COMPILE_GTK_PEER=no ;;
-                *) COMPILE_GTK_PEER=yes ;;
-              esac],
-              [COMPILE_GTK_PEER=yes])
-
-AM_CONDITIONAL(CREATE_JNI_LIBRARIES, test "x${COMPILE_JNI}" = xyes)
-AM_CONDITIONAL(CREATE_CNI_LIBRARIES, test "x${COMPILE_CNI}" = xyes)
-AM_CONDITIONAL(CREATE_GTK_PEER_LIBRARIES, test "x${COMPILE_GTK_PEER}" = xyes)
-
-AC_ARG_ENABLE([regen-headers],
-              [AS_HELP_STRING(--enable-regen-headers,automatically regenerate JNI headers [default=no])],
-              [case "${enableval}" in
-                yes) REGENERATE_JNI_HEADERS=yes ;;
-                no) REGENERATE_JNI_HEADERS=no ;;
-                *) REGENERATE_JNI_HEADERS=no ;;
-              esac],
-              [REGENERATE_JNI_HEADERS=no])
-
-AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${REGENERATE_JNI_HEADERS}" = xyes)
-
-AC_PROG_LN_S
-AC_PROG_INSTALL
-
-dnl Checks for programs.
-dnl AC_PROG_CXX
-dnl Initialize libtool
-AC_DISABLE_STATIC
-AC_PROG_LIBTOOL
-dnl AC_PROG_AWK
-AC_PROG_CC
-AC_PROG_CPP
-
-if test "x${COMPILE_JNI}" = xyes; then
-  AC_HEADER_STDC
-  AC_CHECK_HEADERS(unistd.h sys/types.h sys/config.h sys/ioctl.h asm/ioctls.h inttypes.h stdint.h utime.h sys/utime.h)
-  AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
-  AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
-  AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
-  AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
-
-  AC_CHECK_FUNCS(ftruncate fsync select)
-  AC_CHECK_FUNCS(gethostname socket strerror fork pipe execve open close lseek \
-	fstat read write htonl memset htons connect getsockname sizeof getpeername \
-  	bind listen accept recvfrom send sendto setsockopt getsockopt time mktime)
-
-  AC_HEADER_TIME
-  AC_STRUCT_TM
-  AC_STRUCT_TIMEZONE
-
-  AC_C_CONST
-
-  dnl FIXME - does not allow cross compiling
-  AC_C_BIGENDIAN
-
-  dnl We want to avoid -O2 at the moment, gcc 2.96 from Red Hat 7
-  dnl cannot compile some native functions (gcc errors) with this
-  dnl flag.
-  CFLAGS="-g" 
-
-  dnl We want warnings, lots of warnings :-)
-  if test "x${GCC}" = xyes; then
-    JAPHAR_GREP_CFLAGS(-Wall, [ CFLAGS="$CFLAGS -Wall" ])
-  fi
-
-  dnl Check for AWT related glib/gtk/libart_lgpl
-  if test "x${COMPILE_GTK_PEER}" = xyes; then
-     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
-     AC_SUBST(GTK_CFLAGS)
-     AC_SUBST(GTK_LIBS)
-
-     PKG_CHECK_MODULES(LIBART, libart-2.0)
-     AC_SUBST(LIBART_CFLAGS)
-     AC_SUBST(LIBART_LIBS)
-  fi
-
-fi
-
-CLASSPATH_WITH_JAVAH
-
-CLASSPATH_WITH_INCLUDEDIR
-
-dnl ----------------------------------------------------------- 
-dnl add the include files for the native abstraction layer
-dnl -----------------------------------------------------------
-
-EXTRA_INCLUDES="${EXTRA_INCLUDES} -I\$(top_srcdir)/native/target/Linux -I\$(top_srcdir)/native/target/generic"
-
-dnl -----------------------------------------------------------
-
-if test "x${COMPILE_JNI}" = xyes; then
-  AC_MSG_CHECKING("jni_md.h support")
-  if test -f ${srcdir}/include/jni_md-${target_cpu}-${target_os}.h; then
-    AC_MSG_RESULT("yes")
-  else
-    target_cpu=x86
-    target_os=linux-gnu 
-    AC_MSG_WARN("no, using x86-linux-gnu")
-  fi
-  ac_sources="include/jni_md-${target_cpu}-${target_os}.h"
-ac_dests="include/jni_md.h"
-while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
-  ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"
-done
-AC_CONFIG_LINKS([$ac_config_links_1])
-fi
-
-CLASSPATH_FIND_JAVA
-CLASSPATH_FIND_JAVAC
-
-CLASSPATH_WITH_CLASSLIB
-
-
-dnl -----------------------------------------------------------
-dnl Initialize maintainer mode
-dnl -----------------------------------------------------------
-AM_MAINTAINER_MODE
-
-dnl -----------------------------------------------------------
-dnl Enable debugging statements at compile time.  By default
-dnl these statements should be optimized out of the bytecode
-dnl produced by an optimizing Java compiler and not hinder 
-dnl performance because debugging is turned off by default.
-dnl -----------------------------------------------------------
-AC_ARG_ENABLE([debug],
-              [AS_HELP_STRING(--enable-debug,enable runtime debugging code)],
-              [case "${enableval}" in 
-                yes) 
-              	LIBDEBUG="true"
-                AC_DEFINE(DEBUG, 1, [Define to 1 if you want native library runtime debugging code enabled]) 
-              	;;
-                no)   LIBDEBUG="false" ;;
-                *) 	AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
-              esac],
-              [LIBDEBUG="false"])
-AC_SUBST(LIBDEBUG)
-dnl -----------------------------------------------------------
-
-
-dnl -----------------------------------------------------------
-dnl Enable execution of all static initializer loadLibrary() 
-dnl calls at compile time.  By default most people will not
-dnl want to disable this, but some VMs (gcj) don't need or want 
-dnl them.
-dnl -----------------------------------------------------------
-AC_ARG_ENABLE([load-library],
-              [AS_HELP_STRING(--enable-load-library,enable to use JNI native methods [default=yes]
-                                        (disabled automatically using --enable-cni))],
-              [case "${enableval}" in 
-                yes) INIT_LOAD_LIBRARY="true" ;;
-                no) INIT_LOAD_LIBRARY="false" ;;
-                *) AC_MSG_ERROR(bad value ${enableval} for --enable-load-library) ;;
-              esac],
-              [
-                if test "x${COMPILE_CNI}" = xyes; then
-                  INIT_LOAD_LIBRARY="false"
-                else
-                  INIT_LOAD_LIBRARY="true"
-                fi
-              ])
-AC_SUBST(INIT_LOAD_LIBRARY)
-dnl -----------------------------------------------------------
-
-
-dnl -----------------------------------------------------------
-dnl Small loop to add other things to EXTRA_INCLUDES from a VM
-dnl -----------------------------------------------------------
-dnl for i in $JAPHAR_CFLAGS $KAFFE_CFLAGS ; do
-dnl   add_to_extra_includes=1
-dnl   for j in $EXTRA_INCLUDES ; do
-dnl     if test $i = $j ; then
-dnl       add_to_extra_includes=0
-dnl     fi
-dnl   done
-dnl   if test $add_to_extra_includes -eq 1; then
-dnl     EXTRA_INCLUDES="$EXTRA_INCLUDES $i"
-dnl   fi
-dnl done
-dnl -----------------------------------------------------------
-
-
-dnl Create a link to the VM specific files we're compiling with
-if test "x${JVM_REFERENCE}" = x; then
-  JVM_REFERENCE=reference
-fi
-ac_sources="vm/$JVM_REFERENCE"
-ac_dests="vm/current"
-while test -n "$ac_sources"; do
-  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
-  set $ac_sources; ac_source=$1; shift; ac_sources=$*
-  ac_config_links_2="$ac_config_links_2 $ac_dest:$ac_source"
-done
-AC_CONFIG_LINKS([$ac_config_links_2])
-
-dnl avoiding automake complaints
-REMOVE=""
-AC_SUBST(REMOVE)
-
-dnl This is probably useless.
-AC_PATH_PROG(SH, sh)
-AC_PATH_PROG(MKDIR, mkdir)
-AC_PATH_PROG(CP, cp)
-AC_PATH_PROG(DATE, date)
-
-dnl According to the GNU coding guide, we shouldn't require find, 
-dnl and zip, however GNU provides both so it should be okay 
-AC_PATH_PROG(FIND, find)
-
-dnl Useful for disabling zip even if you have it
-CLASSPATH_WITH_ZIP
-
-CLASSPATH_ENABLE_GJDOC
-
-dnl -----------------------------------------------------------
-dnl -----------------------------------------------------------
-AC_ARG_ENABLE([portable-native-sync],
-              [AS_HELP_STRING(--enable-portable-native-sync,synchronize VM threads portably)],
-              [case "${enableval}" in 
-                yes) 
-                     AC_DEFINE(PORTABLE_NATIVE_SYNC, 1, [Define to 1 if you want to synchronize VM threads portably])
-                     ;;
-                no)  ;;
-                *)   
-                     AC_MSG_ERROR(bad value ${enableval} for --enable-portable-native-sync) 
-                     ;;
-              esac],
-              [])
-dnl -----------------------------------------------------------
-
-AC_CONFIG_FILES(Makefile
-doc/Makefile
-doc/api/Makefile
-external/Makefile
-gnu/Makefile
-gnu/classpath/Makefile
-gnu/classpath/Configuration.java
-gnu/java/Makefile
-gnu/java/awt/Makefile
-gnu/java/awt/image/Makefile
-gnu/java/awt/peer/Makefile
-gnu/java/awt/peer/gtk/Makefile
-gnu/java/beans/Makefile
-gnu/java/beans/editors/Makefile
-gnu/java/beans/info/Makefile
-gnu/java/io/Makefile
-gnu/java/io/decode/Makefile
-gnu/java/io/encode/Makefile
-gnu/java/lang/Makefile
-gnu/java/lang/reflect/Makefile
-gnu/java/locale/Makefile
-gnu/java/net/Makefile
-gnu/java/net/content/Makefile
-gnu/java/nio/Makefile
-gnu/java/nio/charset/Makefile
-gnu/java/net/content/text/Makefile
-gnu/java/net/protocol/Makefile
-gnu/java/net/protocol/file/Makefile
-gnu/java/net/protocol/http/Makefile
-gnu/java/net/protocol/jar/Makefile
-gnu/java/math/Makefile
-gnu/java/rmi/Makefile
-gnu/java/rmi/dgc/Makefile
-gnu/java/rmi/registry/Makefile
-gnu/java/rmi/rmic/Makefile
-gnu/java/rmi/server/Makefile
-gnu/java/security/Makefile
-gnu/java/security/der/Makefile
-gnu/java/security/provider/Makefile
-gnu/java/security/util/Makefile
-gnu/java/security/x509/Makefile
-gnu/java/text/Makefile
-gnu/java/util/Makefile
-gnu/java/util/prefs/Makefile
-gnu/javax/Makefile
-gnu/javax/rmi/Makefile
-gnu/javax/rmi/CORBA/Makefile
-include/Makefile
-include/jni.h
-java/Makefile
-java/applet/Makefile
-java/awt/Makefile
-java/awt/color/Makefile
-java/awt/datatransfer/Makefile
-java/awt/dnd/Makefile
-java/awt/dnd/peer/Makefile
-java/awt/event/Makefile
-java/awt/font/Makefile
-java/awt/geom/Makefile
-java/awt/im/Makefile
-java/awt/im/spi/Makefile
-java/awt/image/Makefile
-java/awt/image/renderable/Makefile
-java/awt/peer/Makefile
-java/awt/print/Makefile
-java/beans/Makefile
-java/beans/beancontext/Makefile
-java/io/Makefile
-java/lang/Makefile
-java/lang/ref/Makefile
-java/lang/reflect/Makefile
-java/math/Makefile
-java/net/Makefile
-java/nio/Makefile
-java/nio/channels/Makefile
-java/nio/channels/spi/Makefile
-java/nio/charset/Makefile
-java/nio/charset/spi/Makefile
-java/rmi/Makefile
-java/rmi/activation/Makefile
-java/rmi/dgc/Makefile
-java/rmi/registry/Makefile
-java/rmi/server/Makefile
-java/security/Makefile
-java/security/acl/Makefile
-java/security/cert/Makefile
-java/security/interfaces/Makefile
-java/security/spec/Makefile
-java/sql/Makefile
-java/text/Makefile
-java/util/Makefile
-java/util/logging/Makefile
-java/util/jar/Makefile
-java/util/prefs/Makefile
-java/util/regex/Makefile
-java/util/zip/Makefile
-javax/Makefile
-javax/accessibility/Makefile
-javax/naming/Makefile
-javax/naming/directory/Makefile
-javax/naming/event/Makefile
-javax/naming/ldap/Makefile
-javax/naming/spi/Makefile
-javax/print/Makefile
-javax/print/attribute/Makefile
-javax/rmi/Makefile
-javax/rmi/CORBA/Makefile
-javax/security/Makefile
-javax/security/auth/Makefile
-javax/security/auth/x500/Makefile
-javax/sql/Makefile
-javax/swing/Makefile
-javax/swing/border/Makefile
-javax/swing/colorchooser/Makefile
-javax/swing/event/Makefile
-javax/swing/filechooser/Makefile
-javax/swing/plaf/Makefile
-javax/swing/plaf/basic/Makefile
-javax/swing/plaf/metal/Makefile
-javax/swing/table/Makefile
-javax/swing/text/Makefile
-javax/swing/text/html/Makefile
-javax/swing/text/html/parser/Makefile
-javax/swing/tree/Makefile
-javax/swing/undo/Makefile
-javax/transaction/Makefile
-javax/transaction/xa/Makefile
-native/Makefile
-native/fdlibm/Makefile
-native/cni/Makefile
-native/jni/Makefile
-native/jni/classpath/Makefile
-native/jni/java-io/Makefile
-native/jni/java-lang/Makefile
-native/jni/java-net/Makefile
-native/jni/java-nio/Makefile
-native/jni/java-util/Makefile
-native/jni/gtk-peer/Makefile
-native/target/Makefile
-native/target/Linux/Makefile
-native/target/generic/Makefile
-resource/Makefile
-resource/gnu/Makefile
-resource/gnu/java/Makefile
-resource/gnu/java/awt/Makefile
-resource/gnu/java/awt/peer/Makefile
-resource/gnu/java/awt/peer/gtk/Makefile
-resource/java/Makefile
-resource/java/util/Makefile
-resource/java/security/Makefile
-vm/Makefile
-vm/reference/Makefile
-vm/reference/java/Makefile
-vm/reference/java/lang/Makefile
-vm/reference/java/lang/reflect/Makefile
-vm/reference/java/io/Makefile
-lib/Makefile
-lib/gen-classlist.sh
-lib/gen_nio.sh)
-AC_OUTPUT_COMMANDS([chmod 755 lib/gen-classlist.sh])
-AC_OUTPUT
Index: configure.ac
===================================================================
RCS file: configure.ac
diff -N configure.ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ configure.ac	18 Jan 2004 22:04:17 -0000
@@ -0,0 +1,449 @@
+dnl Process this file with autoconf to produce a configure script.
+
+dnl Turning off cache for debug reasons
+dnl define([AC_CACHE_LOAD], )dnl
+dnl define([AC_CACHE_SAVE], )dnl
+
+AC_INIT([GNU Classpath],[0.07+cvs],[classpath@gnu.org],[classpath])
+AC_CONFIG_SRCDIR(java/lang/System.java)
+
+AC_CANONICAL_TARGET
+if expr match ${target_cpu} .*86 > /dev/null; then target_cpu=x86; fi
+
+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
+AC_SUBST(LIBVERSION, "0:0:0")
+
+AC_PREREQ(2.53)
+AM_INIT_AUTOMAKE(1.6.0)
+AC_CONFIG_HEADERS([include/config.h])
+AC_PREFIX_DEFAULT(/usr/local/classpath)
+
+dnl required if SUBDIRS is used
+AC_PROG_MAKE_SET
+
+AC_ARG_ENABLE([java],
+              [AS_HELP_STRING(--enable-java,compile Java source [default=yes])],
+              [case "${enableval}" in 
+                 yes) COMPILE_JAVA=yes ;;
+                 no) COMPILE_JAVA=no ;;
+                 *) COMPILE_JAVA=yes ;;
+               esac],
+              [COMPILE_JAVA=yes])
+
+AC_ARG_ENABLE([jni],
+              [AS_HELP_STRING(--enable-jni,compile JNI source [default=yes])],
+              [case "${enableval}" in 
+                yes) COMPILE_JNI=yes; COMPILE_JAVA=yes ;;
+                no) COMPILE_JNI=no ;;
+                *) COMPILE_JNI=yes; COMPILE_JAVA=yes ;;
+              esac],
+              [COMPILE_JNI=yes])
+
+AC_ARG_ENABLE([cni],
+              [AS_HELP_STRING(--enable-cni,compile CNI source [default=no])],
+              [case "${enableval}" in 
+                yes) COMPILE_CNI=yes; COMPILE_JAVA=yes ;;
+                no) COMPILE_CNI=no ;;
+                *) COMPILE_CNI=yes; COMPILE_JAVA=yes ;;
+              esac],
+              [COMPILE_CNI=no])
+
+dnl -----------------------------------------------------------
+dnl GTK native peer
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([gtk-peer],
+              [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [default=yes])],
+              [case "${enableval}" in
+                yes) COMPILE_GTK_PEER=yes ;;
+                no) COMPILE_GTK_PEER=no ;;
+                *) COMPILE_GTK_PEER=yes ;;
+              esac],
+              [COMPILE_GTK_PEER=yes])
+
+AM_CONDITIONAL(CREATE_JNI_LIBRARIES, test "x${COMPILE_JNI}" = xyes)
+AM_CONDITIONAL(CREATE_CNI_LIBRARIES, test "x${COMPILE_CNI}" = xyes)
+AM_CONDITIONAL(CREATE_GTK_PEER_LIBRARIES, test "x${COMPILE_GTK_PEER}" = xyes)
+
+AC_ARG_ENABLE([regen-headers],
+              [AS_HELP_STRING(--enable-regen-headers,automatically regenerate JNI headers [default=no])],
+              [case "${enableval}" in
+                yes) REGENERATE_JNI_HEADERS=yes ;;
+                no) REGENERATE_JNI_HEADERS=no ;;
+                *) REGENERATE_JNI_HEADERS=no ;;
+              esac],
+              [REGENERATE_JNI_HEADERS=no])
+
+AM_CONDITIONAL(CREATE_JNI_HEADERS, test "x${REGENERATE_JNI_HEADERS}" = xyes)
+
+AC_PROG_LN_S
+AC_PROG_INSTALL
+
+dnl Checks for programs.
+dnl AC_PROG_CXX
+dnl Initialize libtool
+AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+dnl AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_CPP
+
+if test "x${COMPILE_JNI}" = xyes; then
+  AC_HEADER_STDC
+  AC_CHECK_HEADERS(unistd.h sys/types.h sys/config.h sys/ioctl.h asm/ioctls.h inttypes.h stdint.h utime.h sys/utime.h)
+  AC_EGREP_HEADER(uint32_t, stdint.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
+  AC_EGREP_HEADER(uint32_t, inttypes.h, AC_DEFINE(HAVE_INT32_DEFINED, 1, [Define to 1 if you have uint32_t]))
+  AC_EGREP_HEADER(u_int32_t, sys/types.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
+  AC_EGREP_HEADER(u_int32_t, sys/config.h, AC_DEFINE(HAVE_BSD_INT32_DEFINED, 1, [Define to 1 if you have BSD u_int32_t]))
+
+  AC_CHECK_FUNCS(ftruncate fsync select)
+  AC_CHECK_FUNCS(gethostname socket strerror fork pipe execve open close lseek \
+	fstat read write htonl memset htons connect getsockname sizeof getpeername \
+  	bind listen accept recvfrom send sendto setsockopt getsockopt time mktime)
+
+  AC_HEADER_TIME
+  AC_STRUCT_TM
+  AC_STRUCT_TIMEZONE
+
+  AC_C_CONST
+
+  dnl FIXME - does not allow cross compiling
+  AC_C_BIGENDIAN
+
+  dnl We want to avoid -O2 at the moment, gcc 2.96 from Red Hat 7
+  dnl cannot compile some native functions (gcc errors) with this
+  dnl flag.
+  CFLAGS="-g" 
+
+  dnl We want warnings, lots of warnings :-)
+  if test "x${GCC}" = xyes; then
+    JAPHAR_GREP_CFLAGS(-Wall, [ CFLAGS="$CFLAGS -Wall" ])
+  fi
+
+  dnl Check for AWT related glib/gtk/libart_lgpl
+  if test "x${COMPILE_GTK_PEER}" = xyes; then
+     PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.2)
+     AC_SUBST(GTK_CFLAGS)
+     AC_SUBST(GTK_LIBS)
+
+     PKG_CHECK_MODULES(LIBART, libart-2.0)
+     AC_SUBST(LIBART_CFLAGS)
+     AC_SUBST(LIBART_LIBS)
+  fi
+
+fi
+
+CLASSPATH_WITH_JAVAH
+
+CLASSPATH_WITH_INCLUDEDIR
+
+dnl ----------------------------------------------------------- 
+dnl add the include files for the native abstraction layer
+dnl -----------------------------------------------------------
+
+EXTRA_INCLUDES="${EXTRA_INCLUDES} -I\$(top_srcdir)/native/target/Linux -I\$(top_srcdir)/native/target/generic"
+
+dnl -----------------------------------------------------------
+
+if test "x${COMPILE_JNI}" = xyes; then
+  AC_MSG_CHECKING("jni_md.h support")
+  if test -f ${srcdir}/include/jni_md-${target_cpu}-${target_os}.h; then
+    AC_MSG_RESULT("yes")
+  else
+    target_cpu=x86
+    target_os=linux-gnu 
+    AC_MSG_WARN("no, using x86-linux-gnu")
+  fi
+  ac_sources="include/jni_md-${target_cpu}-${target_os}.h"
+ac_dests="include/jni_md.h"
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+  ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source"
+done
+AC_CONFIG_LINKS([$ac_config_links_1])
+fi
+
+CLASSPATH_FIND_JAVA
+CLASSPATH_FIND_JAVAC
+
+CLASSPATH_WITH_CLASSLIB
+
+
+dnl -----------------------------------------------------------
+dnl Initialize maintainer mode
+dnl -----------------------------------------------------------
+AM_MAINTAINER_MODE
+
+dnl -----------------------------------------------------------
+dnl Enable debugging statements at compile time.  By default
+dnl these statements should be optimized out of the bytecode
+dnl produced by an optimizing Java compiler and not hinder 
+dnl performance because debugging is turned off by default.
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([debug],
+              [AS_HELP_STRING(--enable-debug,enable runtime debugging code)],
+              [case "${enableval}" in 
+                yes) 
+              	LIBDEBUG="true"
+                AC_DEFINE(DEBUG, 1, [Define to 1 if you want native library runtime debugging code enabled]) 
+              	;;
+                no)   LIBDEBUG="false" ;;
+                *) 	AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
+              esac],
+              [LIBDEBUG="false"])
+AC_SUBST(LIBDEBUG)
+dnl -----------------------------------------------------------
+
+
+dnl -----------------------------------------------------------
+dnl Enable execution of all static initializer loadLibrary() 
+dnl calls at compile time.  By default most people will not
+dnl want to disable this, but some VMs (gcj) don't need or want 
+dnl them.
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([load-library],
+              [AS_HELP_STRING(--enable-load-library,enable to use JNI native methods [default=yes]
+                                        (disabled automatically using --enable-cni))],
+              [case "${enableval}" in 
+                yes) INIT_LOAD_LIBRARY="true" ;;
+                no) INIT_LOAD_LIBRARY="false" ;;
+                *) AC_MSG_ERROR(bad value ${enableval} for --enable-load-library) ;;
+              esac],
+              [
+                if test "x${COMPILE_CNI}" = xyes; then
+                  INIT_LOAD_LIBRARY="false"
+                else
+                  INIT_LOAD_LIBRARY="true"
+                fi
+              ])
+AC_SUBST(INIT_LOAD_LIBRARY)
+dnl -----------------------------------------------------------
+
+
+dnl -----------------------------------------------------------
+dnl Small loop to add other things to EXTRA_INCLUDES from a VM
+dnl -----------------------------------------------------------
+dnl for i in $JAPHAR_CFLAGS $KAFFE_CFLAGS ; do
+dnl   add_to_extra_includes=1
+dnl   for j in $EXTRA_INCLUDES ; do
+dnl     if test $i = $j ; then
+dnl       add_to_extra_includes=0
+dnl     fi
+dnl   done
+dnl   if test $add_to_extra_includes -eq 1; then
+dnl     EXTRA_INCLUDES="$EXTRA_INCLUDES $i"
+dnl   fi
+dnl done
+dnl -----------------------------------------------------------
+
+
+dnl Create a link to the VM specific files we're compiling with
+if test "x${JVM_REFERENCE}" = x; then
+  JVM_REFERENCE=reference
+fi
+ac_sources="vm/$JVM_REFERENCE"
+ac_dests="vm/current"
+while test -n "$ac_sources"; do
+  set $ac_dests; ac_dest=$1; shift; ac_dests=$*
+  set $ac_sources; ac_source=$1; shift; ac_sources=$*
+  ac_config_links_2="$ac_config_links_2 $ac_dest:$ac_source"
+done
+AC_CONFIG_LINKS([$ac_config_links_2])
+
+dnl avoiding automake complaints
+REMOVE=""
+AC_SUBST(REMOVE)
+
+dnl This is probably useless.
+AC_PATH_PROG(SH, sh)
+AC_PATH_PROG(MKDIR, mkdir)
+AC_PATH_PROG(CP, cp)
+AC_PATH_PROG(DATE, date)
+
+dnl According to the GNU coding guide, we shouldn't require find, 
+dnl and zip, however GNU provides both so it should be okay 
+AC_PATH_PROG(FIND, find)
+
+dnl Useful for disabling zip even if you have it
+CLASSPATH_WITH_ZIP
+
+CLASSPATH_ENABLE_GJDOC
+
+dnl -----------------------------------------------------------
+dnl -----------------------------------------------------------
+AC_ARG_ENABLE([portable-native-sync],
+              [AS_HELP_STRING(--enable-portable-native-sync,synchronize VM threads portably)],
+              [case "${enableval}" in 
+                yes) 
+                     AC_DEFINE(PORTABLE_NATIVE_SYNC, 1, [Define to 1 if you want to synchronize VM threads portably])
+                     ;;
+                no)  ;;
+                *)   
+                     AC_MSG_ERROR(bad value ${enableval} for --enable-portable-native-sync) 
+                     ;;
+              esac],
+              [])
+dnl -----------------------------------------------------------
+
+AC_CONFIG_FILES(Makefile
+doc/Makefile
+doc/api/Makefile
+external/Makefile
+gnu/Makefile
+gnu/classpath/Makefile
+gnu/classpath/Configuration.java
+gnu/java/Makefile
+gnu/java/awt/Makefile
+gnu/java/awt/image/Makefile
+gnu/java/awt/peer/Makefile
+gnu/java/awt/peer/gtk/Makefile
+gnu/java/beans/Makefile
+gnu/java/beans/editors/Makefile
+gnu/java/beans/info/Makefile
+gnu/java/io/Makefile
+gnu/java/io/decode/Makefile
+gnu/java/io/encode/Makefile
+gnu/java/lang/Makefile
+gnu/java/lang/reflect/Makefile
+gnu/java/locale/Makefile
+gnu/java/net/Makefile
+gnu/java/net/content/Makefile
+gnu/java/nio/Makefile
+gnu/java/nio/charset/Makefile
+gnu/java/net/content/text/Makefile
+gnu/java/net/protocol/Makefile
+gnu/java/net/protocol/file/Makefile
+gnu/java/net/protocol/http/Makefile
+gnu/java/net/protocol/jar/Makefile
+gnu/java/math/Makefile
+gnu/java/rmi/Makefile
+gnu/java/rmi/dgc/Makefile
+gnu/java/rmi/registry/Makefile
+gnu/java/rmi/rmic/Makefile
+gnu/java/rmi/server/Makefile
+gnu/java/security/Makefile
+gnu/java/security/der/Makefile
+gnu/java/security/provider/Makefile
+gnu/java/security/util/Makefile
+gnu/java/security/x509/Makefile
+gnu/java/text/Makefile
+gnu/java/util/Makefile
+gnu/java/util/prefs/Makefile
+gnu/javax/Makefile
+gnu/javax/rmi/Makefile
+gnu/javax/rmi/CORBA/Makefile
+include/Makefile
+include/jni.h
+java/Makefile
+java/applet/Makefile
+java/awt/Makefile
+java/awt/color/Makefile
+java/awt/datatransfer/Makefile
+java/awt/dnd/Makefile
+java/awt/dnd/peer/Makefile
+java/awt/event/Makefile
+java/awt/font/Makefile
+java/awt/geom/Makefile
+java/awt/im/Makefile
+java/awt/im/spi/Makefile
+java/awt/image/Makefile
+java/awt/image/renderable/Makefile
+java/awt/peer/Makefile
+java/awt/print/Makefile
+java/beans/Makefile
+java/beans/beancontext/Makefile
+java/io/Makefile
+java/lang/Makefile
+java/lang/ref/Makefile
+java/lang/reflect/Makefile
+java/math/Makefile
+java/net/Makefile
+java/nio/Makefile
+java/nio/channels/Makefile
+java/nio/channels/spi/Makefile
+java/nio/charset/Makefile
+java/nio/charset/spi/Makefile
+java/rmi/Makefile
+java/rmi/activation/Makefile
+java/rmi/dgc/Makefile
+java/rmi/registry/Makefile
+java/rmi/server/Makefile
+java/security/Makefile
+java/security/acl/Makefile
+java/security/cert/Makefile
+java/security/interfaces/Makefile
+java/security/spec/Makefile
+java/sql/Makefile
+java/text/Makefile
+java/util/Makefile
+java/util/logging/Makefile
+java/util/jar/Makefile
+java/util/prefs/Makefile
+java/util/regex/Makefile
+java/util/zip/Makefile
+javax/Makefile
+javax/accessibility/Makefile
+javax/naming/Makefile
+javax/naming/directory/Makefile
+javax/naming/event/Makefile
+javax/naming/ldap/Makefile
+javax/naming/spi/Makefile
+javax/print/Makefile
+javax/print/attribute/Makefile
+javax/rmi/Makefile
+javax/rmi/CORBA/Makefile
+javax/security/Makefile
+javax/security/auth/Makefile
+javax/security/auth/x500/Makefile
+javax/sql/Makefile
+javax/swing/Makefile
+javax/swing/border/Makefile
+javax/swing/colorchooser/Makefile
+javax/swing/event/Makefile
+javax/swing/filechooser/Makefile
+javax/swing/plaf/Makefile
+javax/swing/plaf/basic/Makefile
+javax/swing/plaf/metal/Makefile
+javax/swing/table/Makefile
+javax/swing/text/Makefile
+javax/swing/text/html/Makefile
+javax/swing/text/html/parser/Makefile
+javax/swing/tree/Makefile
+javax/swing/undo/Makefile
+javax/transaction/Makefile
+javax/transaction/xa/Makefile
+native/Makefile
+native/fdlibm/Makefile
+native/cni/Makefile
+native/jni/Makefile
+native/jni/classpath/Makefile
+native/jni/java-io/Makefile
+native/jni/java-lang/Makefile
+native/jni/java-net/Makefile
+native/jni/java-nio/Makefile
+native/jni/java-util/Makefile
+native/jni/gtk-peer/Makefile
+native/target/Makefile
+native/target/Linux/Makefile
+native/target/generic/Makefile
+resource/Makefile
+resource/gnu/Makefile
+resource/gnu/java/Makefile
+resource/gnu/java/awt/Makefile
+resource/gnu/java/awt/peer/Makefile
+resource/gnu/java/awt/peer/gtk/Makefile
+resource/java/Makefile
+resource/java/util/Makefile
+resource/java/security/Makefile
+vm/Makefile
+vm/reference/Makefile
+vm/reference/java/Makefile
+vm/reference/java/lang/Makefile
+vm/reference/java/lang/reflect/Makefile
+vm/reference/java/io/Makefile
+lib/Makefile
+lib/gen-classlist.sh
+lib/gen_nio.sh)
+AC_OUTPUT_COMMANDS([chmod 755 lib/gen-classlist.sh])
+AC_OUTPUT

--Boundary-00=_aTwCAwJSCSnP3Un--




From MAILER-DAEMON Sun Jan 18 18:39:14 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AiMVd-0000bK-So
	for mharc-commit-classpath@gnu.org; Sun, 18 Jan 2004 18:39:13 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiMVb-0000Zs-8T
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 18:39:11 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiMV3-0000GL-SB
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 18:39:09 -0500
Received: from [199.232.76.164] (helo=fencepost.gnu.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AiMV3-0000G5-2S
	for commit-classpath@gnu.org; Sun, 18 Jan 2004 18:38:37 -0500
Received: from monty-python.gnu.org ([199.232.76.173])
	by fencepost.gnu.org with esmtp (Exim 4.24) id 1AiMTM-0004jt-PQ
	for classpath-commits@gnu.org; Sun, 18 Jan 2004 18:36:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiMMl-0004jo-PO
	for classpath-commits@gnu.org; Sun, 18 Jan 2004 18:30:35 -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.24) id 1AiMMl-0004jJ-AE
	for classpath-commits@gnu.org; Sun, 18 Jan 2004 18:30:03 -0500
Received: from [212.101.4.135] (helo=mail01.solnet.ch)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AiMKU-000896-Kx
	for classpath-commits@gnu.org; Sun, 18 Jan 2004 18:27:42 -0500
Received: from localhost (localhost [127.0.0.1])
	by mail01.solnet.ch (Postfix) with ESMTP id E7A84623AB
	for <classpath-commits@gnu.org>; Sun, 18 Jan 2004 23:27: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 56310-06 for <classpath-commits@gnu.org>;
	Sun, 18 Jan 2004 23:27:38 +0000 (GMT)
Received: from reali.dnsalias.net (212-41-70-168.adsl.solnet.ch
	[212.41.70.168])
	by mail01.solnet.ch (Postfix) with ESMTP id 4B648623E7
	for <classpath-commits@gnu.org>; Sun, 18 Jan 2004 23:27:32 +0000 (GMT)
Received: from nbprr (reali.dnsalias.net [192.168.1.2])
	by reali.dnsalias.net (Postfix) with ESMTP id 4B7F85C3C1
	for <classpath-commits@gnu.org>; Mon, 19 Jan 2004 00:16:38 +0100 (CET)
Date: Mon, 19 Jan 2004 00:28:23 +0100
From: Patrik Reali <reali@acm.org>
To: Commits <classpath-commits@gnu.org>
Message-ID: <53254596.1074472103@[192.168.1.3]>
X-Mailer: Mulberry/3.1.0 (Win32)
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="==========56286DC30BEBA76DCAB7=========="
X-Virus-Scanned: by SolNet
Cc: 
Subject: FYI: doc/www.gnu.org/stories.wml
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2004 23:39:12 -0000

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

JNode and JamVM added to the list of JVM using classpath

-Patrik

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

--- temp.wml	2004-01-19 00:09:16.000000000 +0100+++ stories.wml	2004-01-18 =
23:43:41.000000000 +0100@@ -48,6 +48,28 @@ </td> </tr> <tr>+<td><createlink =
url=3D"http://sourceforge.net/projects/jamiga" name=3D"JAmiga"></td>+<td>+A =
JRE implementation for the Amiga Platform.+</td>+</tr>+<tr>+<td><createlink =
url=3D"http://jamvm.sourceforge.net/" name=3D"JamVM"></td>+<td>+JamVM is a =
Java Virtual Machine which conforms to the JVM specification version 2 =
(blue book). In comparison to most other VM's (free and commercial) it is =
extremely small, with a stripped executable on PowerPC of only ~100K, and =
Intel 80K. However, unlike other small VMs (e.g. KVM) it is designed to =
support the full specification, and includes support for object =
finalisation, the Java Native Interface (JNI) and the Reflection API. =
+</td>+</tr>+<tr>+<td><createlink url=3D"http://www.oberon.ethz.ch/jaos/" =
name=3D"Jaos"></td>+<td>+The Jaos VM is a JVM using GNU Classpath =
implemented on top of the+<createlink url=3D"http://bluebottle.ethz.ch/" =
name=3D"Aos/Bluebottle"> kernel.+This kernel offers many useful features =
like garbage collected memory+management, dynamic module loading, and =
object-oriented model. This makes the+implementation of a JVM particularly =
attractive and simple.+</td>+</tr>+<tr> <td><createlink =
url=3D"http://www.ibm.com/developerworks/oss/jikesrvm/" name=3D"Jikes =
RVM"></td> <td> Jikes RVM uses GNU Classpath for all of its libraries.  =
Instructions for using@@ -59,12 +81,28 @@ </td> </tr> <tr>+<td><createlink =
url=3D"http://jnode.sourceforge.net/" name=3D"JNode"></td>+<td>+JNode is a =
<i>Java New Operating System Design Effort</i>. +The goal is to get an =
simple to use and install Java operating system for personal use. Any java =
application should run on it, fast &amp; secure! +</td>+</tr>+<tr> =
<td><createlink url=3D"http://www.eecg.toronto.edu/~doylep/jupiter/" =
name=3D"Jupiter"></td> <td> This VM also uses a modified version of the GNU =
Classpath libraries. </td> </tr> <tr>+<td><createlink =
url=3D"http://www.kaffe.org/" name=3D"Kaffe"></td>+<td>+Kaffe OpenVM is a =
complete virtual machine, library framework and+tools for programming in =
the java language. It has its own+implementation of part of the core =
libraries, but uses large parts of+the GNU Classpath =
framework.+</td>+</tr>+<tr> <td><createlink =
url=3D"http://kissme.sourceforge.net/" name=3D"Kissme"></td> <td> This VM =
is almost always guaranteed to work with GNU Classpath CVS @@ -88,31 +126,6 =
@@ be the easiest to install and use. </td> </tr>-<tr>-<td><createlink =
url=3D"http://www.oberon.ethz.ch/jaos/" name=3D"Jaos"></td>-<td>-The Jaos =
VM is a JVM using GNU Classpath implemented on top of the-<createlink =
url=3D"http://bluebottle.ethz.ch/" name=3D"Aos/Bluebottle"> kernel.-This =
kernel offers many useful features like garbage collected =
memory-management, dynamic module loading, and object-oriented model. This =
makes the-implementation of a JVM particularly attractive and =
simple.-</td>-</tr>-<tr>-<td><createlink =
url=3D"http://sourceforge.net/projects/jamiga" name=3D"JAmiga"></td>-<td>-A =
JRE implementation for the Amiga Platform.-</td>-</tr>-<tr>-<td><createlink =
url=3D"http://www.kaffe.org/" name=3D"Kaffe"></td>-<td>-Kaffe OpenVM is a =
complete virtual machine, library framework and-tools for programming in =
the java language. It has its own-implementation of part of the core =
libraries, but uses large parts of-the GNU Classpath framework.-</td>-</tr> =
</table> </en> 
--==========56286DC30BEBA76DCAB7==========--




From MAILER-DAEMON Mon Jan 19 12:21:46 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aid5u-0005P5-Ca
	for mharc-commit-classpath@gnu.org; Mon, 19 Jan 2004 12:21:46 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aid5r-0005NY-Ay
	for commit-classpath@gnu.org; Mon, 19 Jan 2004 12:21:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aid5H-0005B7-Lo
	for commit-classpath@gnu.org; Mon, 19 Jan 2004 12:21:38 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aid5H-0005Ab-88
	for commit-classpath@gnu.org; Mon, 19 Jan 2004 12:21:07 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id KAA04066;
	Mon, 19 Jan 2004 10:20:58 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 9785C4F824A; Mon, 19 Jan 2004 10:12:09 -0700 (MST)
To: Michael Koch <konqueror@gmx.de>
References: <200401182322.28037.konqueror@gmx.de>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Do you need any MOUTH-TO-MOUTH resuscitation?
Date: 19 Jan 2004 10:12:09 -0700
In-Reply-To: <200401182322.28037.konqueror@gmx.de>
Message-ID: <87d69fn9qu.fsf@fleche.redhat.com>
Lines: 10
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: FYI: Patch: scripts for regular classpath builds from CVS
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
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: Mon, 19 Jan 2004 17:21:44 -0000

>>>>> "Michael" == Michael Koch <konqueror@gmx.de> writes:

Michael> I just commited two scripts to make building classpath from
Michael> CVS easier.

These need a little work to let them function anywhere, e.g.:

Michael> +/home/mkoch/bin/classpath-build

Tom



From MAILER-DAEMON Mon Jan 19 12:29:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AidDE-0001jW-LV
	for mharc-commit-classpath@gnu.org; Mon, 19 Jan 2004 12:29:20 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AidCh-00015k-ED
	for commit-classpath@gnu.org; Mon, 19 Jan 2004 12:28:47 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AidBk-0008D8-Hk
	for commit-classpath@gnu.org; Mon, 19 Jan 2004 12:28:20 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AidBR-0007qH-Aj
	for commit-classpath@gnu.org; Mon, 19 Jan 2004 12:27:29 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-81-082.ewetel.net
	[80.228.81.82])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0JHRHHA012693;
	Mon, 19 Jan 2004 18:27:20 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AidBZ-0005gt-00; Mon, 19 Jan 2004 18:27:37 +0100
Date: Mon, 19 Jan 2004 18:27:37 +0100
From: Michael Koch <konqueror@gmx.de>
To: Tom Tromey <tromey@redhat.com>
Message-ID: <20040119172737.GA21778@mail.konqueror.de>
References: <200401182322.28037.konqueror@gmx.de>
	<87d69fn9qu.fsf@fleche.redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87d69fn9qu.fsf@fleche.redhat.com>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: scripts for regular classpath builds from CVS
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Jan 2004 17:29:17 -0000

On Mon, Jan 19, 2004 at 10:12:09AM -0700, Tom Tromey wrote:
> >>>>> "Michael" == Michael Koch <konqueror@gmx.de> writes:
> 
> Michael> I just commited two scripts to make building classpath from
> Michael> CVS easier.
> 
> These need a little work to let them function anywhere, e.g.:
> 
> Michael> +/home/mkoch/bin/classpath-build

Yes, I know this. I put this into CVS to let other people help me to
make them more generic. These were an exact copy of the scripts used on
Patrick Reali's server.


Michael



From MAILER-DAEMON Mon Jan 19 21:55:28 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ailzq-0000YB-6y
	for mharc-commit-classpath@gnu.org; Mon, 19 Jan 2004 21:52:06 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AiltI-0007Br-0Y
	for commit-classpath@gnu.org; Mon, 19 Jan 2004 21:45:20 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AiljH-0004Lv-VZ
	for Commit-classpath@gnu.org; Mon, 19 Jan 2004 21:35:04 -0500
Received: from [200.223.73.2] (helo=gambit.cpunet.com.br)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AiljH-0004Le-GQ
	for Commit-classpath@gnu.org; Mon, 19 Jan 2004 21:34:59 -0500
Received: (qmail-ldap/ctrl 10349 invoked from network);
	20 Jan 2004 02:29:51 -0000
Received: from unknown (HELO localhost) (ve0703@[200.217.84.172])
	(envelope-sender <erica55@bol.com.br>)
	by gambit.cpunet.com.br (qmail-ldap-1.03) with SMTP
	for <Commit-classpath@gnu.org>; 20 Jan 2004 02:29:51 -0000
X-Sender: erica55@bol.com.br
From: Mercadinho Virtual <erica55@bol.com.br>
To: Commit-classpath@gnu.org
Date: Mon, 19 Jan 2004 23:34:35 -0200
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Message-Id: <E1AiljH-0004Le-GQ@monty-python.gnu.org>
Cc: 
Subject: =?iso-8859-1?q?Cursos_em_v=EDdeo_e_=E1udio_marketing=3A__http=3A?=
	=?iso-8859-1?q?//www=2Emercadinhovirtual=2Erg3=2Enet?=
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 02:52:03 -0000

Cursos de webmarketing, aulas de webdesign, e-books, cursos de musica, softwares 
gratis, cursos de marketing para internet, aulas de violao, cursos de guitarra, 
audio books, aulas de informatica, fotos de sexo, mp3, cursos em audio, programas 
gratuitos, ganhar dinheiro na internet

http://www.mercadinhovirtual.rg3.net

Cursos, webmarketing, aulas, tutorial, webdesign, e-books, cursos de musica, 
softwares, programas, gratis, CURSOS, marketing, internet, apostilas, GANHARaulas 
de violao, cursos de guitarra, mp3, TUTORIAIS, conquistar, cifras, tablaturas, 
cursos em audio, download, programas, ganhar, dinheiro

http://www.mercadinhovirtual.rg3.net




From MAILER-DAEMON Tue Jan 20 16:22:27 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aj3KK-0001cZ-VO
	for mharc-commit-classpath@gnu.org; Tue, 20 Jan 2004 16:22:24 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aj3KH-0001bc-Bz
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 16:22:21 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj3Ct-0000a3-A6
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 16:15:14 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aj3Cs-0000XX-MF
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 16:14:42 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0KLEal05566
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:14:36 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0KLEaa04720
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:14:36 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0KLEaXd011825
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:14:36 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-GYzica4hASEDs7JudfEq"
Message-Id: <1074633275.17501.295.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 20 Jan 2004 16:14:35 -0500
Subject: Patch: FYI: fix GtkTextFieldPeer's preferred and minimum size
	calculations
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Jan 2004 21:22:22 -0000


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

Hello,

I committed the following patch.

Tom

2004-01-20  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
	(native create): Add width parameter.
	(create): Calculate text entry width based on current font's
	metrics and number of columns.  Set TextField's font if not
	already set.  Call native create.
	(gtkEntryGetBorderWidth): New native method.
	(gtkEntryGetSize): Remove method.
	(getMinimumSize): Call minimumSize.
	(getPreferredSize): Call preferredSize.
	(minimumSize): Calculate minimum size based on backing
	GtkEntry's borders, font metrics and number of columns.
	(preferredSize): Likewise for preferred size.
	(get_border_width): New static function.



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

Index: gnu/java/awt/peer/gtk/GtkTextFieldPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,v
retrieving revision 1.8
diff -u -r1.8 GtkTextFieldPeer.java
--- gnu/java/awt/peer/gtk/GtkTextFieldPeer.java	8 Oct 2003 23:38:44 -0000	1.8
+++ gnu/java/awt/peer/gtk/GtkTextFieldPeer.java	14 Jan 2004 04:12:27 -0000
@@ -41,6 +41,7 @@
 import java.awt.AWTEvent;
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.FontMetrics;
 import java.awt.TextField;
 import java.awt.event.KeyEvent;
 import java.awt.peer.TextFieldPeer;
@@ -48,14 +49,38 @@
 public class GtkTextFieldPeer extends GtkTextComponentPeer
   implements TextFieldPeer
 {
+  native void create (int width);
 
-//    native void create (ComponentPeer parent, String text);
+  void create ()
+  {
+    Font f = awtComponent.getFont ();
+
+    // By default, Sun sets a TextField's font when its peer is
+    // created.  If f != null then the peer's font is set by
+    // GtkComponent.create.
+    if (f == null)
+      {
+	f = new Font ("Fixed", Font.PLAIN, 12);
+	awtComponent.setFont (f);
+      }
+
+    FontMetrics fm;
+    if (GtkToolkit.useGraphics2D ())
+      fm = new GdkClasspathFontPeerMetrics (f);
+    else
+      fm = new GdkFontMetrics (f);
 
-  native void create ();
+    TextField tf = ((TextField) awtComponent);
+    int cols = tf.getColumns ();
+
+    int text_width = cols * fm.getMaxAdvance ();
+
+    create (text_width);
+  }
 
-  native void gtkEntryGetSize (int dims[]);
+  native int gtkEntryGetBorderWidth ();
 
-  native void gtkSetFont(String name, int style, int size);
+  native void gtkSetFont (String name, int style, int size);
 
   public GtkTextFieldPeer (TextField tf)
   {
@@ -67,34 +92,61 @@
 
   public Dimension getMinimumSize (int cols)
   {
-    int dims[] = new int[2];
-
-    gtkEntryGetSize (dims);
-
-    return (new Dimension (dims[0], dims[1]));
+    return minimumSize (cols);
   }
 
   public Dimension getPreferredSize (int cols)
   {
-    int dims[] = new int[2];
-
-    gtkEntryGetSize (dims);
-
-    return (new Dimension (dims[0], dims[1]));
+    return preferredSize (cols);
   }
-  
-  public native void setEchoChar (char c);
 
-  /* Deprecated */
+  public native void setEchoChar (char c);
 
+  // Deprecated
   public Dimension minimumSize (int cols)
   {
-    return getMinimumSize (cols);
+    int dim[] = new int[2];
+
+    gtkWidgetGetPreferredDimensions (dim);
+
+    Font f = awtComponent.getFont ();
+    if (f == null)
+      return new Dimension (2 * gtkEntryGetBorderWidth (), dim[1]);
+
+    FontMetrics fm;
+    if (GtkToolkit.useGraphics2D ())
+      fm = new GdkClasspathFontPeerMetrics (f);
+    else
+      fm = new GdkFontMetrics (f);
+
+    int text_width = cols * fm.getMaxAdvance ();
+
+    int width = text_width + 2 * gtkEntryGetBorderWidth ();
+
+    return new Dimension (width, dim[1]);
   }
 
   public Dimension preferredSize (int cols)
   {
-    return getPreferredSize (cols);
+    int dim[] = new int[2];
+
+    gtkWidgetGetPreferredDimensions (dim);
+
+    Font f = awtComponent.getFont ();
+    if (f == null)
+      return new Dimension (2 * gtkEntryGetBorderWidth (), dim[1]);
+
+    FontMetrics fm;
+    if (GtkToolkit.useGraphics2D ())
+      fm = new GdkClasspathFontPeerMetrics (f);
+    else
+      fm = new GdkFontMetrics (f);
+
+    int text_width = cols * fm.getMaxAdvance ();
+
+    int width = text_width + 2 * gtkEntryGetBorderWidth ();
+
+    return new Dimension (width, dim[1]);
   }
 
   public void setEchoCharacter (char c)
@@ -104,18 +156,18 @@
 
   public void setFont (Font f)
   {
-    gtkSetFont(f.getName(), f.getStyle(), f.getSize());
+    gtkSetFont (f.getName (), f.getStyle (), f.getSize ());
   }
 
   public void handleEvent (AWTEvent e)
   {
     if (e.getID () == KeyEvent.KEY_PRESSED)
       {
-        KeyEvent ke = (KeyEvent)e;
+        KeyEvent ke = (KeyEvent) e;
 
-        if (!ke.isConsumed()
-            && ke.getKeyCode() == KeyEvent.VK_ENTER)
-          postActionEvent (getText(), ke.getModifiers ());
+        if (!ke.isConsumed ()
+            && ke.getKeyCode () == KeyEvent.VK_ENTER)
+          postActionEvent (getText (), ke.getModifiers ());
       }
 
     super.handleEvent (e);
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,v
retrieving revision 1.9
diff -u -r1.9 gnu_java_awt_peer_gtk_GtkTextFieldPeer.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c	13 Dec 2003 01:15:47 -0000	1.9
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c	14 Jan 2004 04:12:27 -0000
@@ -39,48 +39,74 @@
 #include "gtkpeer.h"
 #include "gnu_java_awt_peer_gtk_GtkTextFieldPeer.h"
 
+static jint
+get_border_width (GtkWidget *entry);
+
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create
-  (JNIEnv *env, jobject obj)
+  (JNIEnv *env, jobject obj, jint text_width)
 {
-  GtkWidget *widget;
+  GtkWidget *entry;
 
   /* Create global reference and save it for future use */
   NSA_SET_GLOBAL_REF (env, obj);
 
   gdk_threads_enter ();
-  
-  widget = gtk_entry_new ();
+
+  entry = gtk_entry_new ();
+  gtk_widget_set_size_request (entry,
+			       text_width + 2 * get_border_width (entry), -1);
 
   gdk_threads_leave ();
 
-  NSA_SET_PTR (env, obj, widget);
+  NSA_SET_PTR (env, obj, entry);
 }
 
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetSize
-  (JNIEnv *env, jobject obj, jintArray jdims)
+JNIEXPORT jint JNICALL
+Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetBorderWidth
+  (JNIEnv *env, jobject obj)
 {
   void *ptr;
-  jint *dims;
-  GtkRequisition myreq;
-  GtkWidget *entry;
-  
+  int border_width = 0;
+
   ptr = NSA_GET_PTR (env, obj);
-  dims = (*env)->GetIntArrayElements (env, jdims, 0);  
-  
+
   gdk_threads_enter ();
-  
-  entry = GTK_WIDGET (ptr);
-  gtk_widget_size_request(entry, &myreq);
-  dims[0]=myreq.width;
-  dims[1]=myreq.height;
-  
+
+  border_width = get_border_width (GTK_WIDGET (ptr));
+
   gdk_threads_leave ();
-  
-  (*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
+
+  return border_width;
+}
+
+/* GTK hard-codes this value.  It is the space between a GtkEntry's
+   frame and its text. */
+#define INNER_BORDER 2
+
+static jint
+get_border_width (GtkWidget *entry)
+{
+  gint focus_width;
+  gboolean interior_focus;
+  int x_border_width = INNER_BORDER;
+
+  gtk_widget_style_get (entry,
+			"interior-focus", &interior_focus,
+			"focus-line-width", &focus_width,
+			NULL);
+
+  if (GTK_ENTRY (entry)->has_frame)
+    x_border_width += entry->style->xthickness;
+
+  if (!interior_focus)
+    x_border_width += focus_width;
+
+  return x_border_width;
 }
 
+#undef INNER_BORDER
+
 JNIEXPORT void JNICALL 
 Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_setEchoChar
   (JNIEnv *env, jobject obj, jchar c)
@@ -93,10 +119,12 @@
   gdk_threads_enter ();
 
   entry = GTK_ENTRY (ptr);
-    
-  if (c!=0)
+
+  if (c != 0)
     {
-/*        gtk_entry_set_echo_char (entry, c); */
+      /* FIXME: use gtk_entry_set_invisible_char (GtkEntry *entry,
+	 gunichar ch) here.  That means we must convert from jchar
+	 (utf16) to gunichar (ucs4). */
       gtk_entry_set_visibility (entry, FALSE);
     }
   else

--=-GYzica4hASEDs7JudfEq--




From MAILER-DAEMON Tue Jan 20 20:35:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aj7Gq-0002Ge-Um
	for mharc-commit-classpath@gnu.org; Tue, 20 Jan 2004 20:35:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aj7Go-0002G7-0S
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 20:35:02 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj7GG-00026l-VO
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 20:35:00 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aj3IR-0001Rp-Oq
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 16:20:27 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0KLKRl07729
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:20:27 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0KLKQa06691
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:20:26 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0KLKQXd012078
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:20:26 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: text/plain
Message-Id: <1074633626.17501.300.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 20 Jan 2004 16:20:26 -0500
Content-Transfer-Encoding: 7bit
Subject: Patch: FYI: small fix in GtkWindowPeer implementation
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 01:35:02 -0000

Hi,

I committed the attached patch.

Tom

2004-01-20  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
	(window_property_changed_cb): Set id_set.

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.13
diff -u -r1.13 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	16 Jan 2004 20:05:41 -0000	1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	16 Jan 2004 21:49:50 -0000
@@ -702,6 +702,7 @@
 						      gtkwindowpeer,
 						      "postInsetsChangedEvent",
 						      "(IIII)V");
+      id_set = 1;
     }
 
   if (gdk_atom_intern ("_NET_FRAME_EXTENTS", FALSE) == event->atom





From MAILER-DAEMON Tue Jan 20 21:25:21 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aj83V-0004O6-CU
	for mharc-commit-classpath@gnu.org; Tue, 20 Jan 2004 21:25:21 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aj83T-0004Na-9d
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 21:25:19 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj82v-0004Ij-J4
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 21:25:15 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aj3X4-0003ei-WD
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 16:35:35 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0KLZYl13525
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:35:34 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0KLZXa11996
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:35:33 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0KLZVXd012560
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:35:32 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: text/plain
Message-Id: <1074634531.17501.303.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 20 Jan 2004 16:35:31 -0500
Content-Transfer-Encoding: 7bit
Subject: Patch: FYI: fix placing of heavyweights within lightweight
	containers
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 02:25:19 -0000

Hi,

I committed this patch.

Tom

2004-01-20  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java (setBounds):
	Calculate proper offsets for heavyweight components packed in
	lightweight containers.

Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file:
/cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.13
diff -u -r1.13 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java	13 Jan 2004 20:54:46
-0000	1.13
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java	16 Jan 2004 03:26:17
-0000
@@ -42,6 +42,7 @@
 import java.awt.BufferCapabilities;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Container;
 import java.awt.Cursor;
 import java.awt.Dimension;
 import java.awt.Font;
@@ -292,8 +293,34 @@
   public void setBounds (int x, int y, int width, int height)
   {
     Component parent = awtComponent.getParent ();
-    
-    if (parent instanceof Window)
+
+    // Heavyweight components that are children of one or more
+    // lightweight containers have to be handled specially.  Because
+    // calls to GLightweightPeer.setBounds do nothing, GTK has no
+    // knowledge of the lightweight containers' positions.  So we have
+    // to add the offsets manually when placing a heavyweight
+    // component within a lightweight container.  The lightweight
+    // container may itself be in a lightweight container and so on,
+    // so we need to continue adding offsets until we reach a
+    // container whose position GTK knows -- that is, the first
+    // non-lightweight.
+    boolean lightweightChild = false;
+    Insets i;
+    while (parent.isLightweight ())
+      {
+	lightweightChild = true;
+
+	i = ((Container) parent).getInsets ();
+
+	x += parent.getX () + i.left;
+	y += parent.getY () + i.top;
+
+	parent = parent.getParent ();
+      }
+
+    // We only need to convert from Java to GTK coordinates if we're
+    // placing a heavyweight component in a Window.
+    if (parent instanceof Window && !lightweightChild)
       {
 	Insets insets = ((Window) parent).getInsets ();
 	// Convert from Java coordinates to GTK coordinates.





From MAILER-DAEMON Wed Jan 21 00:21:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjAi6-0008RQ-97
	for mharc-commit-classpath@gnu.org; Wed, 21 Jan 2004 00:15:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjAK1-00005F-NL
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 23:50:33 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aj3hF-0004iB-AJ
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 16:46:36 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aj3YB-0003tX-9y
	for commit-classpath@gnu.org; Tue, 20 Jan 2004 16:36:43 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0KLagl13906
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:36:42 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0KLaga12321
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:36:42 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0KLafXd012579
	for <commit-classpath@gnu.org>; Tue, 20 Jan 2004 16:36:41 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: text/plain
Message-Id: <1074634601.17501.306.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 20 Jan 2004 16:36:41 -0500
Content-Transfer-Encoding: 7bit
Subject: Patch: FYI: regenerate header
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 05:15:16 -0000

Hi,

I committed this.

Tom

2004-01-20  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h: Regenerate.

Index: gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkTextFieldPeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkTextFieldPeer.h
--- gnu_java_awt_peer_gtk_GtkTextFieldPeer.h    8 Oct 2003 23:40:49 -0000       1.5
+++ gnu_java_awt_peer_gtk_GtkTextFieldPeer.h    20 Jan 2004 21:33:08 -0000
@@ -10,8 +10,8 @@
 {
 #endif
 
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_gtkEntryGetSize (JNIEnv *env, jobject, jintArray);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkTextFieldPeer_create__I (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);
 





From MAILER-DAEMON Wed Jan 21 05:21:10 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjFTy-0005yu-9E
	for mharc-commit-classpath@gnu.org; Wed, 21 Jan 2004 05:21:10 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjFTv-0005we-4D
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:21:07 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjFTP-0005b7-8m
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:21:06 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjFTO-0005aF-NV
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:20:34 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Wed, 21 Jan 2004 11:20:24 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C7C1@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Patch: FYI: gnu.java.io.PlatformHelper
Thread-Index: AcPgCC7iWAR3znUMT6aV/37V8ISjMA==
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: <commit-classpath@gnu.org>
Subject: Patch: FYI: gnu.java.io.PlatformHelper
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 10:21:07 -0000

Hi,

I committed this:

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

        * gnu/java/io/PlatformHelper.java (isRootDirectory): Fixed, by
        delegating to beginWithRootPathPrefix.

Index: gnu/java/io/PlatformHelper.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/io/PlatformHelper.java,v
retrieving revision 1.3
diff -u -r1.3 PlatformHelper.java
--- gnu/java/io/PlatformHelper.java	2 Dec 2003 16:53:48 -0000
1.3
+++ gnu/java/io/PlatformHelper.java	21 Jan 2004 10:05:42 -0000
@@ -92,18 +92,8 @@
    */
   public static final boolean isRootDirectory(String path)
   {
-    if (path.equals("/") || path.equals("\\"))
-      return true;
-   =20
-    if(!isWindows)
-      return false;
-   =20
-    if (path.length() > 2
-        && path.length() <=3D 3
-        && Character.isLetter(path.charAt(0)))
-      return true;
-   =20
-    return false;
+    int len =3D path.length();
+    return len > 0 && beginWithRootPathPrefix(path) =3D=3D len;
   }
=20
   /**



From MAILER-DAEMON Wed Jan 21 05:36:52 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjFj9-0008AQ-OG
	for mharc-commit-classpath@gnu.org; Wed, 21 Jan 2004 05:36:51 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjFj6-000889-2r
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:36:48 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjFh6-0006qr-K8
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:35:16 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjFgx-0006nA-S6
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:34:36 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-82-144.ewetel.net
	[80.228.82.144])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0LAYVHA001540;
	Wed, 21 Jan 2004 11:34:32 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AjFhF-0003D9-00; Wed, 21 Jan 2004 11:34:53 +0100
Date: Wed, 21 Jan 2004 11:34:53 +0100
From: Michael Koch <konqueror@gmx.de>
To: Jeroen Frijters <jeroen@sumatra.nl>
Message-ID: <20040121103453.GA11802@mail.konqueror.de>
References: <788B535AB1F9CB49BB9C229372B50ACC04C7C1@LEMBU.sumatrasoftware.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <788B535AB1F9CB49BB9C229372B50ACC04C7C1@LEMBU.sumatrasoftware.com>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: Patch: FYI: gnu.java.io.PlatformHelper
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 10:36:49 -0000

On Wed, Jan 21, 2004 at 11:20:24AM +0100, Jeroen Frijters wrote:

> +    int len = path.length();
> +    return len > 0 && beginWithRootPathPrefix(path) == len;

just a thought but wouldnt it be cleaner to write this:

   return (path.length() > 0 && beginWithRootPathPrefix(path) == path.length();

Compilers are/should be smart enough to optimize it to write path.length
into a register and use it twice.


Michael



From MAILER-DAEMON Wed Jan 21 06:07:14 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjGCB-00074o-Ev
	for mharc-commit-classpath@gnu.org; Wed, 21 Jan 2004 06:06:51 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjG4F-0004ai-Ap
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:58:39 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjG3Q-0004Cn-FF
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:58:19 -0500
Received: from [62.177.154.238] (helo=lembu.sumatrasoftware.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjG3P-0004CH-Mt
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 05:57:47 -0500
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Date: Wed, 21 Jan 2004 11:57:44 +0100
X-MIMEOLE: Produced By Microsoft Exchange V6.5.6944.0
Message-ID: <788B535AB1F9CB49BB9C229372B50ACC04C7C5@LEMBU.sumatrasoftware.com>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: Patch: FYI: gnu.java.io.PlatformHelper
Thread-Index: AcPgCilnrHYVMNehS1aUNwmWq8KbbgAAT9mw
From: "Jeroen Frijters" <jeroen@sumatra.nl>
To: "Michael Koch" <konqueror@gmx.de>
Cc: commit-classpath@gnu.org
Subject: RE: Patch: FYI: gnu.java.io.PlatformHelper
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 11:06:48 -0000

Michael Koch wrote:
> > +    int len =3D path.length();
> > +    return len > 0 && beginWithRootPathPrefix(path) =3D=3D len;
>=20
> just a thought but wouldnt it be cleaner to write this:
>=20
>    return (path.length() > 0 && beginWithRootPathPrefix(path)=20
> =3D=3D path.length();
>=20
> Compilers are/should be smart enough to optimize it to write=20
> path.length into a register and use it twice.

I'm used to "caching" the method result in cases like these, so I find
it a little easier to parse mentally.

I don't have any overriding objections to writing it out though.

Regards,
Jeroen



From MAILER-DAEMON Wed Jan 21 09:06:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjIzo-0004NS-8J
	for mharc-commit-classpath@gnu.org; Wed, 21 Jan 2004 09:06:16 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjIzl-0004Mn-Hn
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 09:06:13 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjIzE-0004F2-KB
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 09:06:11 -0500
Received: from [204.127.198.35] (helo=rwcrmhc11.comcast.net)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjIzE-0004El-9N
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 09:05:40 -0500
Received: from byu.net (c-24-10-254-137.client.comcast.net[24.10.254.137])
	by comcast.net (rwcrmhc11) with SMTP id <20040121140538013008o54pe>
	(Authid: ericblake); Wed, 21 Jan 2004 14:05:38 +0000
Message-ID: <400E8745.5000302@byu.net>
Date: Wed, 21 Jan 2004 07:05:57 -0700
From: Eric Blake <ebb9@byu.net>
User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US;
	rv:1.4) Gecko/20030624
X-Accept-Language: en-us, en
MIME-Version: 1.0
To: Michael Koch <konqueror@gmx.de>
References: <788B535AB1F9CB49BB9C229372B50ACC04C7C1@LEMBU.sumatrasoftware.com>
	<20040121103453.GA11802@mail.konqueror.de>
In-Reply-To: <20040121103453.GA11802@mail.konqueror.de>
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
Cc: commit-classpath@gnu.org
Subject: Re: Patch: FYI: gnu.java.io.PlatformHelper
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 14:06:14 -0000

Michael Koch wrote:
> On Wed, Jan 21, 2004 at 11:20:24AM +0100, Jeroen Frijters wrote:
> 
> 
>>+    int len = path.length();
>>+    return len > 0 && beginWithRootPathPrefix(path) == len;
> 
> 
> just a thought but wouldnt it be cleaner to write this:
> 
>    return (path.length() > 0 && beginWithRootPathPrefix(path) == path.length();
> 
> Compilers are/should be smart enough to optimize it to write path.length
> into a register and use it twice.

Actually, jikes does not do CSE when emitting bytecode; it assumes that any 
common subexpression elimination will be done by a JIT.  Therefore, Jeroen's 
style produces a smaller .class file than Michael's.  Besides, path.length() 
is a function call, and it becomes very hard for the compiler to guarantee 
that it will return the same value twice; manually caching the result 
generally results in fewer method invocations.

-- 
Someday, I might put a cute statement here.

Eric Blake             ebb9@byu.net




From MAILER-DAEMON Wed Jan 21 10:08:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AjJyK-0007gy-8Q
	for mharc-commit-classpath@gnu.org; Wed, 21 Jan 2004 10:08:48 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AjJyG-0007fP-J8
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 10:08:44 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AjJxi-0007To-0t
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 10:08:41 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AjJxg-0007Rj-Sm
	for commit-classpath@gnu.org; Wed, 21 Jan 2004 10:08:08 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0LF82l11112
	for <commit-classpath@gnu.org>; Wed, 21 Jan 2004 10:08:02 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0LF81a25812
	for <commit-classpath@gnu.org>; Wed, 21 Jan 2004 10:08:01 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0LF7vXd008278
	for <commit-classpath@gnu.org>; Wed, 21 Jan 2004 10:07:59 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-EToPd6KLaakZojHaf264"
Organization: 
Message-Id: <1074697677.4964.2.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 21 Jan 2004 10:07:57 -0500
Subject: Patch: FYI: Fix to java.awt.Container$LightweightDispatcher
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2004 15:08:46 -0000


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

Hello,

I'm committing this patch to merge changes from libgcj.

-David Jee


2004-01-21  David Jee  <djee@redhat.com>

        * java/awt/Container.java
        (LightweightDispatcher.handleEvent): Add an extra check to avoid
        dispatching MOUSE_ENTERED event twice. Translate the point for
        the mouse event target before dispatching the event.


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

Index: java/awt/Container.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Container.java,v
retrieving revision 1.30
diff -u -r1.30 Container.java
--- java/awt/Container.java	17 Jan 2004 00:01:59 -0000	1.30
+++ java/awt/Container.java	19 Jan 2004 18:35:54 -0000
@@ -1633,8 +1633,18 @@
         MouseEvent me = (MouseEvent) e;
         acquireComponentForMouseEvent (me);
 
-        if (mouseEventTarget != null)
+        // Avoid dispatching an ENTERED event twice
+        if (mouseEventTarget != null
+            && e.getID() != MouseEvent.MOUSE_ENTERED)
           {
+            // Calculate point translation for the event target.
+            // We use absolute location on screen rather than relative
+            // location because the event target might be a nested child.
+            Point parentLocation = nativeContainer.getLocationOnScreen();
+            Point childLocation = mouseEventTarget.getLocationOnScreen();
+            me.translatePoint(parentLocation.x - childLocation.x,
+                              parentLocation.y - childLocation.y);
+
             Component oldSource = (Component) me.getSource ();
             me.setSource (mouseEventTarget);
             mouseEventTarget.dispatchEvent (me);

--=-EToPd6KLaakZojHaf264--




From MAILER-DAEMON Fri Jan 23 09:14:23 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ak24h-0007EY-3f
	for mharc-commit-classpath@gnu.org; Fri, 23 Jan 2004 09:14:19 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ak24D-00072X-HF
	for commit-classpath@gnu.org; Fri, 23 Jan 2004 09:13:49 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ak22t-00050o-QV
	for commit-classpath@gnu.org; Fri, 23 Jan 2004 09:13:01 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ak22b-0004or-TI
	for commit-classpath@gnu.org; Fri, 23 Jan 2004 09:12:10 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-83-038.ewetel.net
	[80.228.83.38])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i0NEC79u010396
	for <commit-classpath@gnu.org>; Fri, 23 Jan 2004 15:12:07 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Ak22y-0000hq-00
	for <commit-classpath@gnu.org>; Fri, 23 Jan 2004 15:12:32 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 23 Jan 2004 15:15:45 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_RySEA4OlifOIcdv"
Message-Id: <200401231515.45842.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.io.FileDescriptor
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jan 2004 14:14:16 -0000


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

Hi list,

I just commited the attached patch to reformat java.io.FileDescriptor and make 
it a little more merged with libgcj's version.


Michael


2004-01-23  Michael Koch  <konqueror@gmx.de>

	* java/io/FileDescriptor.java: Reformated.


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

Index: java/io/FileDescriptor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/FileDescriptor.java,v
retrieving revision 1.18
diff -u -b -B -r1.18 FileDescriptor.java
--- java/io/FileDescriptor.java	15 May 2003 13:12:02 -0000	1.18
+++ java/io/FileDescriptor.java	23 Jan 2004 14:09:02 -0000
@@ -1,5 +1,6 @@
 /* FileDescriptor.java -- Opaque file handle class
-   Copyright (C) 1998,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.
 
@@ -46,6 +47,8 @@
  * type.  No system specific information can be obtained from this object.
  *
  * @author Aaron M. Renn (arenn@urbanophile.com)
+ * @author Tom Tromey (tromey@cygnus.com)
+ * @date September 24, 1998 
  */
 public final class FileDescriptor
 {
@@ -54,33 +57,33 @@
    * stream.  This will usually be accessed through the
    * <code>System.in</code>variable.
    */
-  public static final FileDescriptor in = new FileDescriptor ();
+  public static final FileDescriptor in = new FileDescriptor();
 
   /**
    * A <code>FileDescriptor</code> representing the system standard output
    * stream.  This will usually be accessed through the
    * <code>System.out</code>variable.
    */
-  public static final FileDescriptor out = new FileDescriptor ();
+  public static final FileDescriptor out = new FileDescriptor();
 
   /**
    * A <code>FileDescriptor</code> representing the system standard error
    * stream.  This will usually be accessed through the
    * <code>System.err</code>variable.
    */
-  public static final FileDescriptor err = new FileDescriptor ();
+  public static final FileDescriptor err = new FileDescriptor();
 
   static
     {
       if (Configuration.INIT_LOAD_LIBRARY)
         {
-          System.loadLibrary ("javaio");
+          System.loadLibrary("javaio");
         }
 
       nativeInit();
     }
 
-  // Use for seeking
+  // These are WHENCE values for seek.
   static final int SET = 0;
   static final int CUR = 1;
   static final int END = 2;
@@ -143,7 +147,7 @@
   public boolean valid()
   {
     if (nativeFd == -1L)
-      return(false);
+      return false;
 
     return nativeValid(nativeFd);
   }
@@ -211,7 +215,7 @@
     if (nativeFd == -1L)
       throw new IOException("Invalid FileDescriptor");
 
-    return(nativeReadByte(nativeFd));
+    return nativeReadByte(nativeFd);
   }
 
   int read(byte[] buf, int offset, int len) throws IOException
@@ -230,7 +234,7 @@
 
     // Note that above ops implicitly bomb if buf == null
 
-    return(nativeReadBuf(nativeFd, buf, offset, len));
+    return nativeReadBuf(nativeFd, buf, offset, len);
   }
 
   int available() throws IOException
@@ -238,7 +242,7 @@
     if (nativeFd == -1L)
       throw new IOException("Invalid FileDescriptor");
     
-    return(nativeAvailable(nativeFd));
+    return nativeAvailable(nativeFd);
   }
 
   long seek(long offset, int whence, boolean stopAtEof) throws IOException
@@ -249,7 +253,7 @@
     if ((whence != SET) && (whence != CUR) && (whence != END))
       throw new IllegalArgumentException("Invalid whence value: " + whence);
 
-    return(nativeSeek(nativeFd, offset, whence, stopAtEof));
+    return nativeSeek(nativeFd, offset, whence, stopAtEof);
   }
 
   long getFilePointer() throws IOException
@@ -257,7 +261,7 @@
     if (nativeFd == -1L)
       throw new IOException("Invalid FileDescriptor");
 
-    return(nativeGetFilePointer(nativeFd));
+    return nativeGetFilePointer(nativeFd);
   }
 
   long getLength() throws IOException
@@ -265,7 +269,7 @@
     if (nativeFd == -1L)
       throw new IOException("Invalid FileDescriptor");
 
-    return(nativeGetLength(nativeFd));
+    return nativeGetLength(nativeFd);
   }
 
   void setLength(long len) throws IOException
@@ -283,7 +287,7 @@
   // Don't do anything crazy with this
   long getNativeFd()
   {
-    return(nativeFd);
+    return nativeFd;
   }
 
   private void setNativeFd(long nativeFd)
@@ -324,7 +328,7 @@
    * @param path Name of the file to open
    * @param mode Mode to open
    *
-   * @returns The resulting file descriptor for the opened file, or -1
+   * @return The resulting file descriptor for the opened file, or -1
    * on failure (exception also signaled).
    *
    * @exception IOException If an error occurs.
@@ -337,7 +341,7 @@
    * 
    * @param fd The native file descriptor to close
    *
-   * @returns The return code of the native close command.
+   * @return The return code of the native close command.
    *
    * @exception IOException If an error occurs 
    */    
@@ -354,7 +358,6 @@
    * @exception IOException If an error occurs
    */
   private native long nativeWriteByte(long fd, int b) throws IOException;
-  // I hate name mangling.
 
   /**
    * Writes a byte buffer to the file
@@ -370,7 +373,6 @@
    */
   private native long nativeWriteBuf(long fd, byte[] buf, int offset, int len)
     throws IOException;
-  // I hate name mangling.
 
   /**
     * Reads a single byte from the file
@@ -383,7 +385,6 @@
     * @exception IOException If an error occurs
     */
   private native int nativeReadByte(long fd) throws IOException;
-  // I hate name mangling.
 
   /**
    * Reads a buffer of  bytes from the file
@@ -399,7 +400,6 @@
    */
   private native int nativeReadBuf(long fd, byte[] buf, int offset, int len) 
     throws IOException;
-  // I hate name mangling.
 
   /**
    * Returns the number of bytes available for reading
@@ -439,7 +439,6 @@
    * @exception IOException If an error occurs
    */
   private native long nativeGetFilePointer(long fd) throws IOException;
-  // Really could implement in terms of seek
 
   /**
    * Returns the length of the file in bytes
@@ -481,5 +480,4 @@
    * @exception IOException If an error occurs
    */
   private native void nativeSync(long fd) throws SyncFailedException;
-
-} // class FileDescriptor
+}

--Boundary-00=_RySEA4OlifOIcdv--




From MAILER-DAEMON Fri Jan 23 15:42:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ak85L-0004GD-C7
	for mharc-commit-classpath@gnu.org; Fri, 23 Jan 2004 15:39:23 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ak857-0004Al-RN
	for commit-classpath@gnu.org; Fri, 23 Jan 2004 15:39:09 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ak84U-0003oH-Ew
	for commit-classpath@gnu.org; Fri, 23 Jan 2004 15:39:01 -0500
Received: from [61.253.220.45] (helo=61.253.220.45)
	by monty-python.gnu.org with smtp (Exim 4.24) id 1Ak84T-0003lB-8A
	for commit-classpath@gnu.org; Fri, 23 Jan 2004 15:38:29 -0500
From: ivan_alb@agava.com
To: commit-classpath@gnu.org
Date: Fri, 23 Jan 2004 12:41:48 -0800
MIME-Version: 1.0
Content-Type: text/plain;
	charset="Windows-1252"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 6.00.2800.1158
X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1165
Message-Id: <E1Ak84T-0003lB-8A@monty-python.gnu.org>
Subject: Welcome to www.dumpsmarket.com
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Jan 2004 20:39:14 -0000

Welcome to www.dumpsmarket.com the site of stolen credit cards,child porno, fake money, passports and complete info about any US citizen!


You can get fresh stolen dumps here:

http://www.dumpsmarket.com/forum/viewtopic.php?t=77

Only using our site you can get every detail of any US citizen including SSN number:

http://www.dumpsmarket.com/forum/viewtopic.php?t=192

Credit cards with cvv2 information are available here:

http://www.dumpsmarket.com/forum/viewtopic.php?t=57

Our site will be usefull for the those who want to wash their money also.
If you don't want to pay taxes or you need to buy something illegal like weapons or drugs.

Quick contacts:
Panther  44007777 
Graph  146191522 


You can order by phone: 5092757151.

Best regards,
Vladimir V Panfilovich.





From MAILER-DAEMON Sat Jan 24 05:19:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AkKtD-0006wR-6z
	for mharc-commit-classpath@gnu.org; Sat, 24 Jan 2004 05:19:43 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AkKtA-0006v3-MV
	for commit-classpath@gnu.org; Sat, 24 Jan 2004 05:19:40 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AkKse-0006tO-St
	for commit-classpath@gnu.org; Sat, 24 Jan 2004 05:19:39 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AkKse-0006tG-G6
	for commit-classpath@gnu.org; Sat, 24 Jan 2004 05:19:08 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-75-215.ewetel.net
	[80.228.75.215])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0OAJ2l1004512;
	Sat, 24 Jan 2004 11:19:03 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1AkKsy-0003vO-00; Sat, 24 Jan 2004 11:19:28 +0100
Date: Sat, 24 Jan 2004 11:19:28 +0100
From: Michael Koch <konqueror@gmx.de>
To: Eric Blake <ebb9@byu.net>
Message-ID: <20040124101928.GB14578@mail.konqueror.de>
References: <788B535AB1F9CB49BB9C229372B50ACC04C7C1@LEMBU.sumatrasoftware.com>
	<20040121103453.GA11802@mail.konqueror.de>
	<400E8745.5000302@byu.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <400E8745.5000302@byu.net>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org, Michael Koch <konqueror@gmx.de>
Subject: Re: Patch: FYI: gnu.java.io.PlatformHelper
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 24 Jan 2004 10:19:41 -0000

On Wed, Jan 21, 2004 at 07:05:57AM -0700, Eric Blake wrote:
> Michael Koch wrote:
> >On Wed, Jan 21, 2004 at 11:20:24AM +0100, Jeroen Frijters wrote:
> >
> >
> >>+    int len = path.length();
> >>+    return len > 0 && beginWithRootPathPrefix(path) == len;
> >
> >
> >just a thought but wouldnt it be cleaner to write this:
> >
> >   return (path.length() > 0 && beginWithRootPathPrefix(path) == 
> >   path.length();
> >
> >Compilers are/should be smart enough to optimize it to write path.length
> >into a register and use it twice.
> 
> Actually, jikes does not do CSE when emitting bytecode; it assumes that any 
> common subexpression elimination will be done by a JIT.  Therefore, 
> Jeroen's style produces a smaller .class file than Michael's.  Besides, 
> path.length() is a function call, and it becomes very hard for the compiler 
> to guarantee that it will return the same value twice; manually caching the 
> result generally results in fewer method invocations.

Perhaps I think to gcj oriented. gcj inlines this at -O2 and this no
real method call is generated at all.


Michael



From MAILER-DAEMON Sat Jan 24 15:14:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AkUBB-0007Zg-Ta
	for mharc-commit-classpath@gnu.org; Sat, 24 Jan 2004 15:14:53 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AkUB0-0007Tq-70
	for commit-classpath@gnu.org; Sat, 24 Jan 2004 15:14:42 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AkUA5-000775-9G
	for commit-classpath@gnu.org; Sat, 24 Jan 2004 15:14:16 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AkU5M-0006KT-QW
	for commit-classpath@gnu.org; Sat, 24 Jan 2004 15:08:52 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id NAA30355;
	Sat, 24 Jan 2004 13:08:47 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 9AC854F8206; Sat, 24 Jan 2004 12:59:37 -0700 (MST)
To: Michael Koch <konqueror@gmx.de>
References: <788B535AB1F9CB49BB9C229372B50ACC04C7C1@LEMBU.sumatrasoftware.com>
	<20040121103453.GA11802@mail.konqueror.de> <400E8745.5000302@byu.net>
	<20040124101928.GB14578@mail.konqueror.de>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: We are now enjoying total mutual interaction in an imaginary hot
	tub...
Date: 24 Jan 2004 12:59:37 -0700
In-Reply-To: <20040124101928.GB14578@mail.konqueror.de>
Message-ID: <87ad4d15jq.fsf@fleche.redhat.com>
Lines: 22
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: FYI: gnu.java.io.PlatformHelper
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
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: Sat, 24 Jan 2004 20:14:43 -0000

>>>>> "Michael" == Michael Koch <konqueror@gmx.de> writes:

>> Actually, jikes does not do CSE when emitting bytecode; it assumes that any 
>> common subexpression elimination will be done by a JIT.  Therefore, 
>> Jeroen's style produces a smaller .class file than Michael's.  Besides, 
>> path.length() is a function call, and it becomes very hard for the compiler 
>> to guarantee that it will return the same value twice; manually caching the 
>> result generally results in fewer method invocations.

Michael> Perhaps I think to gcj oriented. gcj inlines this at -O2 and this no
Michael> real method call is generated at all.

We want to be careful here, since the new binary compatibility ABI
will mean we can't inline things like this by default.  We might still
omit the redundant calls to length() when generating native code, but
even that isn't assured (it depends on whether gcc can tell that the
callee is "pure").  IMO in most cases it is preferable to write code
not assuming gcj's various tricks -- this works better with all the
other classpath users, and it will work better once we turn on binary
compatibility by default.

Tom



From MAILER-DAEMON Sun Jan 25 08:15:51 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Akk7C-00005Q-Nf
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 08:15:50 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Akk77-0008VI-S0
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:15:45 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Akk6T-0008Lv-P4
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:15:38 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Akk2P-0007U2-Gd
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:10:53 -0500
Received: from elsschot.wildebeest.org ([192.168.1.26] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1Akk1q-00043c-00
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 14:10:18 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
In-Reply-To: <E1Ak84T-0003lB-8A@monty-python.gnu.org>
References: <E1Ak84T-0003lB-8A@monty-python.gnu.org>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-QdhE7yFLuop56G2r+/LL"
Message-Id: <1075036242.11534.349.camel@elsschot.wildebeest.org>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sun, 25 Jan 2004 14:10:42 +0100
Subject: Re: Welcome to www.dumpsmarket.com
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 13:15:47 -0000


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

Hi,

On Fri, 2004-01-23 at 21:41, ivan_alb@agava.com wrote:
> Our site will be usefull for the those who want to wash their money also.
> If you don't want to pay taxes or you need to buy something illegal like =
weapons or drugs.

Sorry about that. I have set the commit-classpath mailinglist to hold
messages from non-members. Which means that I have to moderate them, but
hopefully it will prevent spam from coming through.

Cheers,

mark

--=-QdhE7yFLuop56G2r+/LL
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)

iD8DBQBAE8BRxVhZCJWr9QwRAvfUAJ0RqerfjiA3CYJBitZn414gK6u3BQCeNjQ0
YxCSZXPgHhsVV/pCMYd4Ddk=
=9+L+
-----END PGP SIGNATURE-----

--=-QdhE7yFLuop56G2r+/LL--




From MAILER-DAEMON Sun Jan 25 08:34:53 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AkkPc-0005EC-8t
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 08:34:52 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AkkPX-0005Bp-Dg
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:34:47 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AkkOx-0004tX-5w
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:34:43 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AkkOw-0004tN-Ne
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:34:10 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-73-144.ewetel.net
	[80.228.73.144])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0PDY81h027405
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 14:34:09 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AkkOu-0005sU-00
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 14:34:08 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 25 Jan 2004 14:37:50 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ua8EA1xBbhdeGBD"
Message-Id: <200401251437.50329.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.io.FileDescriptor
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 13:34:50 -0000


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

Hi list,


I commited the attached patch to add some missing javadoc comments.


Michael


2004-01-25  Michael Koch  <konqueror@gmx.de>

	* java/io/FileDescriptor.java
	(open): Javadoc added.
	(close): Likewise.
	(write): Likewise.
	(read): Likewise.
	(available): Likewise.
	(seek): Likewise.
	(getFilePointer): Likewise.
	(getLength): Likewise.
	(setLength): Likewise.


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

Index: java/io/FileDescriptor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/FileDescriptor.java,v
retrieving revision 1.19
diff -u -b -B -r1.19 FileDescriptor.java
--- java/io/FileDescriptor.java	23 Jan 2004 14:10:35 -0000	1.19
+++ java/io/FileDescriptor.java	25 Jan 2004 13:28:58 -0000
@@ -152,6 +152,21 @@
     return nativeValid(nativeFd);
   }
 
+  /**
+   * Opens the specified file in the specified mode.  This can be done
+   * in one of the specified modes:
+   * <ul>
+   * <li>r - Read Only
+   * <li>rw - Read / Write
+   * <li>ra - Read / Write - append to end of file
+   * <li>rws - Read / Write - synchronous writes of data/metadata
+   * <li>rwd - Read / Write - synchronous writes of data.
+   *
+   * @param path Name of the file to open
+   * @param mode Mode to open
+   *
+   * @exception IOException If an error occurs.
+   */
   void open(String path, int mode) throws FileNotFoundException
   {
     // We don't want fd leakage.
@@ -169,6 +184,11 @@
     nativeFd = nativeOpen(path, mode);
   }
 
+  /**
+   * Closes this specified file descriptor
+   * 
+   * @exception IOException If an error occurs 
+   */    
   synchronized void close() throws IOException
   {
     if (nativeFd == -1L)
@@ -183,6 +203,13 @@
       }
   }
 
+  /**
+   * Writes a single byte to the file
+   *
+   * @param b The byte to write, encoded in the low eight bits
+   *
+   * @exception IOException If an error occurs
+   */
   void write(int b) throws IOException
   {
     if (nativeFd == -1L)
@@ -191,6 +218,15 @@
     nativeWriteByte(nativeFd, (b & 0xFF));
   }
 
+  /**
+   * Writes a byte buffer to the file
+   *
+   * @param buf The byte buffer to write from
+   * @param int The offset into the buffer to start writing from
+   * @param len The number of bytes to write.
+   *
+   * @exception IOException If an error occurs
+   */
   void write(byte[] buf, int offset, int len) throws IOException
   {
     if (nativeFd == -1L)
@@ -210,6 +246,14 @@
     nativeWriteBuf(nativeFd, buf, offset, len);
   }
 
+  /**
+   * Reads a single byte from the file
+   *
+   * @return The byte read, in the low eight bits on a long, or -1
+   * if end of file
+   *
+   * @exception IOException If an error occurs
+   */
   int read() throws IOException
   {
     if (nativeFd == -1L)
@@ -218,6 +262,17 @@
     return nativeReadByte(nativeFd);
   }
 
+  /**
+   * Reads a buffer of  bytes from the file
+   *
+   * @param buf The buffer to read bytes into
+   * @param offset The offset into the buffer to start storing bytes
+   * @param len The number of bytes to read.
+   *
+   * @return The number of bytes read, or -1 if end of file.
+   *
+   * @exception IOException If an error occurs
+   */
   int read(byte[] buf, int offset, int len) throws IOException
   {
     if (nativeFd == -1L)
@@ -237,6 +292,13 @@
     return nativeReadBuf(nativeFd, buf, offset, len);
   }
 
+  /**
+   * Returns the number of bytes available for reading
+   *
+   * @return The number of bytes available for reading
+   *
+   * @exception IOException If an error occurs
+   */
   int available() throws IOException
   {
     if (nativeFd == -1L)
@@ -245,6 +307,20 @@
     return nativeAvailable(nativeFd);
   }
 
+  /**
+   * Method to do a "seek" operation on the file
+   * 
+   * @param offset The number of bytes to seek
+   * @param whence The position to seek from, either
+   *    SET (0) for the beginning of the file, CUR (1) for the 
+   *    current position or END (2) for the end position.
+   * @param stopAtEof <code>true</code> to ensure that there is no
+   *    seeking past the end of the file, <code>false</code> otherwise.
+   *
+   * @return The new file position, or -1 if end of file.
+   *
+   * @exception IOException If an error occurs
+   */
   long seek(long offset, int whence, boolean stopAtEof) throws IOException
   {
     if (nativeFd == -1L)
@@ -256,6 +332,13 @@
     return nativeSeek(nativeFd, offset, whence, stopAtEof);
   }
 
+  /**
+   * Returns the current position of the file pointer in the file
+   *
+   * @param fd The native file descriptor
+   *
+   * @exception IOException If an error occurs
+   */
   long getFilePointer() throws IOException
   { 
     if (nativeFd == -1L)
@@ -264,6 +347,13 @@
     return nativeGetFilePointer(nativeFd);
   }
 
+  /**
+   * Returns the length of the file in bytes
+   *
+   * @return The length of the file in bytes
+   *
+   * @exception IOException If an error occurs
+   */
   long getLength() throws IOException
   {
     if (nativeFd == -1L)
@@ -272,6 +362,14 @@
     return nativeGetLength(nativeFd);
   }
 
+  /**
+   * Sets the length of the file to the specified number of bytes
+   * This can result in truncation or extension.
+   *
+   * @param len The new length of the file
+   *
+   * @exception IOException If an error occurs
+   */
   void setLength(long len) throws IOException
   {
     if (nativeFd == -1L)

--Boundary-00=_ua8EA1xBbhdeGBD--




From MAILER-DAEMON Sun Jan 25 08:38:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AkkS5-0006us-2n
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 08:37:25 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AkkRk-0006lu-3S
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:37:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AkkQf-00063j-8q
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:36:29 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AkkIl-0003uN-8D
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:27:47 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-73-144.ewetel.net
	[80.228.73.144])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0PDRhUa019249
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 14:27:44 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AkkIh-0005s9-00
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 14:27:43 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 25 Jan 2004 14:31:25 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_tU8EAUlifC5v3fj"
Message-Id: <200401251431.25347.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.nio.FileLockImpl
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 13:37:22 -0000


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

Hi list,


I just commited the attached little patch to merge gnu.java.nio.FileLockImpl 
with libgcj again.


Michael


2004-01-25  Michael Koch  <konqueror@gmx.de>

	* gnu/java/nio/FileLockImpl.java:
	Fixed filename in copyright.
	(released): Removed.
	(finalize): New method.


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

Index: gnu/java/nio/FileLockImpl.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/nio/FileLockImpl.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 FileLockImpl.java
--- gnu/java/nio/FileLockImpl.java	20 Oct 2003 15:32:56 -0000	1.3
+++ gnu/java/nio/FileLockImpl.java	25 Jan 2004 13:24:58 -0000
@@ -1,5 +1,5 @@
-/* FileChannelImpl.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+/* FileLockImpl.java -- 
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -60,20 +60,29 @@
   }
   
   private FileDescriptor fd;
-  private boolean released;
   
   public FileLockImpl (FileDescriptor fd, FileChannel channel, long position,
                        long size, boolean shared)
   {
     super (channel, position, size, shared);
     this.fd = fd;
-    this.released = false;
+  }
+
+  public void finalize()
+  {
+    try
+      {
+	release();
+      }
+    catch (IOException e)
+      {
+	// Ignore this.
+      }
   }
   
   public boolean isValid ()
   {
-    return (released
-            || !channel ().isOpen ());
+    return !channel().isOpen();
   }
 
   private native void releaseImpl () throws IOException;
@@ -81,6 +90,5 @@
   public synchronized void release () throws IOException
   {
     releaseImpl ();
-    released = true;
   }
 }

--Boundary-00=_tU8EAUlifC5v3fj--




From MAILER-DAEMON Sun Jan 25 08:42:14 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AkkWj-0008BX-M7
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 08:42:13 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AkkWg-000899-69
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:42:10 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AkkW5-0007z0-Iv
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:42:04 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AkkW5-0007yj-1M
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 08:41:33 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-73-144.ewetel.net
	[80.228.73.144])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0PDfV1h001689
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 14:41:32 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AkkW3-0005st-00
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 14:41:31 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 25 Jan 2004 14:45:12 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_oh8EAU7hZVESxTM"
Message-Id: <200401251445.13007.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.net.URLConnection
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 13:42:11 -0000


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

Hello list,


I just commited the attached patch to do lazy initialization of fileNameMap as 
mentionened in SUNs API docs.


Michael


2004-01-25  Michael Koch  <konqueror@gmx.de>

	* java/net/URLConnection.java
	(fileNameMap): Don't initialize. Initialization should be lazy.
	(guessContentTypeFromName): Get filename map from getFileNameMap().
	(getFileNameMap): Made it synchronized. Initialize fileNameMapa if
	needed.


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

Index: java/net/URLConnection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/net/URLConnection.java,v
retrieving revision 1.21
diff -u -b -B -r1.21 URLConnection.java
--- java/net/URLConnection.java	6 Jan 2004 10:07:59 -0000	1.21
+++ java/net/URLConnection.java	25 Jan 2004 13:35:11 -0000
@@ -1,5 +1,5 @@
 /* URLConnection.java -- Abstract superclass for reading from URL's
-   Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2002, 2003, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -94,7 +94,7 @@
    * to do this is implemented by this class, so just create an empty
    * instance and store it here.
    */
-  private static FileNameMap fileNameMap = new MimeTypeMapper();
+  private static FileNameMap fileNameMap;
  
   /**
    * This is the ContentHandlerFactory set by the caller, if any
@@ -888,7 +888,7 @@
    */
   public static String guessContentTypeFromName(String filename)
   {
-    return(fileNameMap.getContentTypeFor(filename.toLowerCase()));
+    return getFileNameMap().getContentTypeFor(filename.toLowerCase());
   }
 
   /**
@@ -921,8 +921,14 @@
    *
    * @since 1.2
    */
-  public static FileNameMap getFileNameMap()
+  public static synchronized FileNameMap getFileNameMap()
   {
+    // Delayed initialization.
+    if (fileNameMap == null)
+      {
+	fileNameMap = new MimeTypeMapper();
+      }
+
     return fileNameMap;
   }
 
@@ -947,5 +953,4 @@
 
     fileNameMap = map;
   }
-} // class URLConnection
-
+}

--Boundary-00=_oh8EAU7hZVESxTM--




From MAILER-DAEMON Sun Jan 25 09:14:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Akl27-0001ib-4O
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 09:14:39 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Akl22-0001gV-7i
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 09:14:34 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Akl1R-00019u-SO
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 09:14:30 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Akl1Q-00018K-Jq
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 09:13:56 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-73-144.ewetel.net
	[80.228.73.144])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i0PEDs9u008660
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 15:13:55 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Akl1O-0005zy-00
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 15:13:54 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 25 Jan 2004 15:17:35 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_//8EAt0okGOQQD2"
Message-Id: <200401251517.35482.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.Class
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 14:14:35 -0000


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

Hi list,


I just commited the attached patch to start merging java.lang.Class more with 
libgcj's version.


Michael


2004-01-25  Michael Koch  <konqueror@gmx.de>

	* gnu/java/lang/ClassHelper.java
	(getPackagePortion): Moved to java.lang.Class.
	* java/lang/Class.java: Merged more with libgcj, renamed some
	variables.
	(toString): Moved.
	(getPackagePortion): New method.
	

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

Index: java/lang/Class.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v
retrieving revision 1.11
diff -u -b -B -r1.11 Class.java
--- java/lang/Class.java	22 Oct 2003 18:29:05 -0000	1.11
+++ java/lang/Class.java	25 Jan 2004 14:02:24 -0000
@@ -1,5 +1,6 @@
-/* Class.java -- Reference implementation of access to object metadata
-   Copyright (C) 1998, 2002, 2003 Free Software Foundation
+/* Class.java -- Representation of a Java class.
+   Copyright (C) 1998, 1999, 2000, 2002, 2003, 2004
+   Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -55,13 +56,6 @@
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import gnu.java.lang.ClassHelper;
-
-/*
- * This class is a reference version, mainly for compiling a class library
- * jar.  It is likely that VM implementers replace this with their own
- * version that can communicate effectively with the VM.
- */
 
 /**
  * A Class represents a Java type.  There will never be multiple Class
@@ -86,6 +80,7 @@
  *
  * @author John Keiser
  * @author Eric Blake <ebb9@email.byu.edu>
+ * @author Tom Tromey <tromey@cygnus.com>
  * @since 1.0
  * @see ClassLoader
  */
@@ -125,20 +120,6 @@
   }
 
   /**
-   * Return the human-readable form of this Object.  For an object, this
-   * is either "interface " or "class " followed by <code>getName()</code>,
-   * for primitive types and void it is just <code>getName()</code>.
-   *
-   * @return the human-readable form of this Object
-   */
-  public String toString()
-  {
-    if (isPrimitive())
-      return getName();
-    return (isInterface() ? "interface " : "class ") + getName();
-  }
-
-  /**
    * Use the classloader of the current class to load, link, and initialize
    * a class. This is equivalent to your code calling
    * <code>Class.forName(name, true, getClass().getClassLoader())</code>.
@@ -282,8 +263,8 @@
 	if (caller != this &&
 	    (Modifier.isPrivate(modifiers)
 	     || getClassLoader() != caller.getClassLoader()
-	     || !ClassHelper.getPackagePortion(getName())
-	     .equals(ClassHelper.getPackagePortion(caller.getName()))))
+	     || !getPackagePortion(getName())
+	     .equals(getPackagePortion(caller.getName()))))
 	  throw new IllegalAccessException(getName()
 					   + " has an inaccessible constructor");
       }
@@ -465,7 +446,7 @@
   {
     ClassLoader cl = getClassLoader();
     if (cl != null)
-      return cl.getPackage(ClassHelper.getPackagePortion(getName()));
+      return cl.getPackage(getPackagePortion(getName()));
     return null;
   }
 
@@ -816,7 +796,7 @@
    * <code>checkMemberAccess(this, Member.PUBLIC)</code> as well as
    * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @param name the name of the method
+   * @param methodName the name of the method
    * @param types the type of each parameter
    * @return the method
    * @throws NoSuchMethodException if the method does not exist
@@ -824,36 +804,36 @@
    * @see #getMethods()
    * @since 1.1
    */
-  public Method getMethod(String name, Class[] args)
+  public Method getMethod(String methodName, Class[] args)
     throws NoSuchMethodException
   {
     memberAccessCheck(Member.PUBLIC);
-    Method method = internalGetMethod(name, args);
-    if (method != null)
+    Method method = internalGetMethod(methodName, args);
+    if (method == null)
+      throw new NoSuchMethodException(methodName);
       return method;
-    throw new NoSuchMethodException();
   }
 
   /**
    * Like <code>getMethod(String,Class[])</code> but without the security
    * checks and returns null instead of throwing NoSuchMethodException.
    */
-  public Method internalGetMethod(String name, Class[] args)
+  public Method internalGetMethod(String methodName, Class[] args)
   {
-    Method match = matchMethod(getDeclaredMethods(true), name, args);
+    Method match = matchMethod(getDeclaredMethods(true), methodName, args);
     if (match != null)
       return match;
     Class superClass = getSuperclass();
     if (superClass != null)
       {
-	match = superClass.internalGetMethod(name, args);
+	match = superClass.internalGetMethod(methodName, args);
 	if(match != null)
 	  return match;
       }
     Class[] interfaces = getInterfaces();
     for (int i = 0; i < interfaces.length; i++)
       {
-	match = interfaces[i].internalGetMethod(name, args);
+	match = interfaces[i].internalGetMethod(methodName, args);
 	if (match != null)
 	  return match;
       }
@@ -1139,7 +1119,7 @@
   public InputStream getResourceAsStream(String name)
   {
     if (name.length() > 0 && name.charAt(0) != '/')
-      name = ClassHelper.getPackagePortion(getName()).replace('.','/')
+      name = getPackagePortion(getName()).replace('.','/')
 	+ "/" + name;
     ClassLoader c = getClassLoader();
     if (c == null)
@@ -1168,7 +1148,7 @@
   public URL getResource(String name)
   {
     if(name.length() > 0 && name.charAt(0) != '/')
-      name = ClassHelper.getPackagePortion(getName()).replace('.','/')
+      name = getPackagePortion(getName()).replace('.','/')
         + "/" + name;
     ClassLoader c = getClassLoader();
     if (c == null)
@@ -1184,7 +1164,8 @@
    * <code>RuntimePermission("getProtectionDomain")</code>.
    *
    * @return the protection domain
-   * @throws SecurityException if the security check fails
+   * @throws SecurityException if the security manager exists and the caller
+   * does not have <code>RuntimePermission("getProtectionDomain")</code>.
    * @see RuntimePermission
    * @since 1.2
    */
@@ -1198,6 +1179,20 @@
   }
 
   /**
+   * Return the human-readable form of this Object.  For an object, this
+   * is either "interface " or "class " followed by <code>getName()</code>,
+   * for primitive types and void it is just <code>getName()</code>.
+   *
+   * @return the human-readable form of this Object
+   */
+  public String toString()
+  {
+    if (isPrimitive())
+      return getName();
+    return (isInterface() ? "interface " : "class ") + getName();
+  }
+
+  /**
    * Returns the desired assertion status of this class, if it were to be
    * initialized at this moment. The class assertion status, if set, is
    * returned; the backup is the default package status; then if there is
@@ -1235,14 +1230,14 @@
     if (c.packageAssertionStatus != null)
       synchronized (c)
         {
-          String name = ClassHelper.getPackagePortion(getName());
+          String name = getPackagePortion(getName());
           if ("".equals(name))
             status = c.packageAssertionStatus.get(null);
           else
             do
               {
                 status = c.packageAssertionStatus.get(name);
-                name = ClassHelper.getPackagePortion(name);
+                name = getPackagePortion(name);
               }
             while (! "".equals(name) && status == null);
           if (status != null)
@@ -1250,14 +1245,14 @@
         }
     else
       {
-        String name = ClassHelper.getPackagePortion(getName());
+        String name = getPackagePortion(getName());
         if ("".equals(name))
           status = ClassLoader.systemPackageAssertionStatus.get(null);
         else
           do
             {
               status = ClassLoader.systemPackageAssertionStatus.get(name);
-              name = ClassHelper.getPackagePortion(name);
+              name = getPackagePortion(name);
             }
           while (! "".equals(name) && status == null);
         if (status != null)
@@ -1266,4 +1261,17 @@
     return c.defaultAssertionStatus;
   }
 
-} // class Class
+  /**
+   * Strip the last portion of the name (after the last dot).
+   *
+   * @param name the name to get package of
+   * @return the package name, or "" if no package
+   */
+  public static String getPackagePortion(String name)
+  {
+    int lastInd = name.lastIndexOf('.');
+    if (lastInd == -1)
+      return "";
+    return name.substring(0, lastInd);
+  }
+}

--Boundary-00=_//8EAt0okGOQQD2--




From MAILER-DAEMON Sun Jan 25 09:50:54 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AklbC-0004yT-9I
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 09:50:54 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AklbA-0004xy-Ej
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 09:50:52 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Aklae-0004F9-MH
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 09:50:51 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Aklad-0004Cx-LG
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 09:50:19 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-73-144.ewetel.net
	[80.228.73.144])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0PEoFl1018956
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 15:50:15 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AklaY-00061o-00
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 15:50:14 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 25 Jan 2004 15:53:56 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_Ei9EATBQANn2f/Y"
Message-Id: <200401251553.56504.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.Class
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 14:50:53 -0000


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

Hi list,


I just commited the attached patch to move all methods around to get it in 
order with libgcj.


Michael


2004-01-25  Michael Koch  <konqueror@gmx.de>

	* java/lang/Class.java: Moved all methods to get it in order with
	libgcj.


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

Index: java/lang/Class.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v
retrieving revision 1.12
diff -u -b -B -r1.12 Class.java
--- java/lang/Class.java	25 Jan 2004 14:11:24 -0000	1.12
+++ java/lang/Class.java	25 Jan 2004 14:48:12 -0000
@@ -202,188 +202,34 @@
   }
   
   /**
-   * Get a new instance of this class by calling the no-argument constructor.
-   * The class is initialized if it has not been already. A security check
-   * may be performed, with <code>checkMemberAccess(this, Member.PUBLIC)</code>
-   * as well as <code>checkPackageAccess</code> both having to succeed.
+   * Get all the public member classes and interfaces declared in this
+   * class or inherited from superclasses. This returns an array of length
+   * 0 if there are no member classes, including for primitive types. A
+   * security check may be performed, with
+   * <code>checkMemberAccess(this, Member.PUBLIC)</code> as well as
+   * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @return a new instance of this class
-   * @throws InstantiationException if there is not a no-arg constructor
-   *         for this class, including interfaces, abstract classes, arrays,
-   *         primitive types, and void; or if an exception occurred during
-   *         the constructor
-   * @throws IllegalAccessException if you are not allowed to access the
-   *         no-arg constructor because of scoping reasons
+   * @return all public member classes in this class
    * @throws SecurityException if the security check fails
-   * @throws ExceptionInInitializerError if class initialization caused by
-   *         this call fails with an exception
-   */
-  public Object newInstance()
-    throws InstantiationException, IllegalAccessException
-  {
-    memberAccessCheck(Member.PUBLIC);
-    Constructor constructor;
-    synchronized(this)
-      {
-	constructor = this.constructor;
-      }
-    if (constructor == null)
-      {
-	Constructor[] constructors = getDeclaredConstructors(false);
-	for (int i = 0; i < constructors.length; i++)
-	  {
-	    if (constructors[i].getParameterTypes().length == 0)
-	      {
-		constructor = constructors[i];
-		break;
-	      }
-	  }
-	if (constructor == null)
-	  throw new InstantiationException(getName());
-	if (!Modifier.isPublic(constructor.getModifiers()))
-	  {
-	    final Constructor finalConstructor = constructor;
-	    AccessController.doPrivileged(new PrivilegedAction() {
-		public Object run() {
-		  finalConstructor.setAccessible(true);
-		  return null;
-		}
-	      });
-	  }
-	synchronized(this)
-	  {
-	    if (this.constructor == null)
-	      this.constructor = constructor;
-	  }	    
-      }
-    int modifiers = constructor.getModifiers();
-    if (!Modifier.isPublic(modifiers))
-      {
-	Class caller = VMSecurityManager.getClassContext()[1];
-	if (caller != this &&
-	    (Modifier.isPrivate(modifiers)
-	     || getClassLoader() != caller.getClassLoader()
-	     || !getPackagePortion(getName())
-	     .equals(getPackagePortion(caller.getName()))))
-	  throw new IllegalAccessException(getName()
-					   + " has an inaccessible constructor");
-      }
-    try
-      {
-        return constructor.newInstance(null);
-      }
-    catch (InvocationTargetException e)
-      {
-	VMClass.throwException(e.getTargetException());
-	throw (InternalError) new InternalError
-	  ("VMClass.throwException returned").initCause(e);
-      }
-  }
-
-  /**
-   * Discover whether an Object is an instance of this Class.  Think of it
-   * as almost like <code>o instanceof (this class)</code>.
-   *
-   * @param o the Object to check
-   * @return whether o is an instance of this class
    * @since 1.1
    */
-  public boolean isInstance(Object o)
-  {
-    return vmClass.isInstance (o);
-  }
-  
-  /**
-   * Discover whether an instance of the Class parameter would be an
-   * instance of this Class as well.  Think of doing
-   * <code>isInstance(c.newInstance())</code> or even
-   * <code>c.newInstance() instanceof (this class)</code>. While this
-   * checks widening conversions for objects, it must be exact for primitive
-   * types.
-   *
-   * @param c the class to check
-   * @return whether an instance of c would be an instance of this class
-   *         as well
-   * @throws NullPointerException if c is null
-   * @since 1.1
-   */
-  public boolean isAssignableFrom(Class c)
-  {
-    return vmClass.isAssignableFrom (c);
-  }
-
-  /**
-   * Check whether this class is an interface or not.  Array types are not
-   * interfaces.
-   *
-   * @return whether this class is an interface or not
-   */
-  public boolean isInterface()
-  {
-    return vmClass.isInterface ();
-  }
-
-  /**
-   * Return whether this class is an array type.
-   *
-   * @return whether this class is an array type
-   * @since 1.1
-   */
-  public boolean isArray()
-  {
-    int result = -1;
-    if ((result = vmClass.isArray ()) < 0)
-      return getName().charAt(0) == '[';
-
-    return result == 1;
-  }
-
-  /**
-   * Return whether this class is a primitive type.  A primitive type class
-   * is a class representing a kind of "placeholder" for the various
-   * primitive types, or void.  You can access the various primitive type
-   * classes through java.lang.Boolean.TYPE, java.lang.Integer.TYPE, etc.,
-   * or through boolean.class, int.class, etc.
-   *
-   * @return whether this class is a primitive type
-   * @see Boolean#TYPE
-   * @see Byte#TYPE
-   * @see Character#TYPE
-   * @see Short#TYPE
-   * @see Integer#TYPE
-   * @see Long#TYPE
-   * @see Float#TYPE
-   * @see Double#TYPE
-   * @see Void#TYPE
-   * @since 1.1
-   */
-  public boolean isPrimitive()
+  public Class[] getClasses()
   {
-    return vmClass.isPrimitive ();
+    memberAccessCheck(Member.PUBLIC);
+    return internalGetClasses();
   }
 
   /**
-   * Get the name of this class, separated by dots for package separators.
-   * Primitive types and arrays are encoded as:
-   * <pre>
-   * boolean             Z
-   * byte                B
-   * char                C
-   * short               S
-   * int                 I
-   * long                J
-   * float               F
-   * double              D
-   * void                V
-   * 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;;
-   *
-   * @return the name of this class
+   * Like <code>getClasses()</code> but without the security checks.
    */
-  public String getName()
+  private Class[] internalGetClasses()
   { 
-    return vmClass.getName ();
+    ArrayList list = new ArrayList();
+    list.addAll(Arrays.asList(getDeclaredClasses(true)));
+    Class superClass = getSuperclass();
+    if (superClass != null)
+      list.addAll(Arrays.asList(superClass.internalGetClasses()));
+    return (Class[])list.toArray(new Class[list.size()]);
   }
 
   /**
@@ -422,115 +268,243 @@
   }
   
   /**
-   * Get the direct superclass of this class.  If this is an interface,
-   * Object, a primitive type, or void, it will return null. If this is an
-   * array type, it will return Object.
+   * If this is an array, get the Class representing the type of array.
+   * Examples: "[[Ljava.lang.String;" would return "[Ljava.lang.String;", and
+   * calling getComponentType on that would give "java.lang.String".  If
+   * this is not an array, returns null.
    *
-   * @return the direct superclass of this class
+   * @return the array type of this class, or null
+   * @see Array
+   * @since 1.1
    */
-  public Class getSuperclass()
+  public Class getComponentType()
   {
-    return vmClass.getSuperclass ();
+    return vmClass.getComponentType ();
   }
 
   /**
-   * Returns the <code>Package</code> in which this class is defined
-   * Returns null when this information is not available from the
-   * classloader of this class or when the classloader of this class
-   * is null.
+   * Get a public constructor declared in this class. If the constructor takes
+   * no argument, an array of zero elements and null are equivalent for the
+   * types argument. A security check may be performed, with
+   * <code>checkMemberAccess(this, Member.PUBLIC)</code> as well as
+   * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @return the package for this class, if it is available
-   * @since 1.2
+   * @param types the type of each parameter
+   * @return the constructor
+   * @throws NoSuchMethodException if the constructor does not exist
+   * @throws SecurityException if the security check fails
+   * @see #getConstructors()
+   * @since 1.1
    */
-  public Package getPackage()
+  public Constructor getConstructor(Class[] args) throws NoSuchMethodException
   {
-    ClassLoader cl = getClassLoader();
-    if (cl != null)
-      return cl.getPackage(getPackagePortion(getName()));
-    return null;
+    memberAccessCheck(Member.PUBLIC);
+    Constructor[] constructors = getDeclaredConstructors(true);
+    for (int i = 0; i < constructors.length; i++)
+      {
+	Constructor constructor = constructors[i];
+	if (matchParameters(args, constructor.getParameterTypes()))
+	  return constructor;
+      }
+    throw new NoSuchMethodException();
   }
 
   /**
-   * Get the interfaces this class <EM>directly</EM> implements, in the
-   * order that they were declared. This returns an empty array, not null,
-   * for Object, primitives, void, and classes or interfaces with no direct
-   * superinterface. Array types return Cloneable and Serializable.
+   * Get all the public constructors of this class. This returns an array of
+   * length 0 if there are no constructors, including for primitive types,
+   * arrays, and interfaces. It does, however, include the default
+   * constructor if one was supplied by the compiler. A security check may
+   * be performed, with <code>checkMemberAccess(this, Member.PUBLIC)</code>
+   * as well as <code>checkPackageAccess</code> both having to succeed.
    *
-   * @return the interfaces this class directly implements
+   * @return all public constructors in this class
+   * @throws SecurityException if the security check fails
+   * @since 1.1
    */
-  public Class[] getInterfaces()
+  public Constructor[] getConstructors()
   {
-    return vmClass.getInterfaces ();
+    memberAccessCheck(Member.PUBLIC);
+    return getDeclaredConstructors(true);
   }
 
   /**
-   * If this is an array, get the Class representing the type of array.
-   * Examples: "[[Ljava.lang.String;" would return "[Ljava.lang.String;", and
-   * calling getComponentType on that would give "java.lang.String".  If
-   * this is not an array, returns null.
+   * Get a constructor declared in this class. If the constructor takes no
+   * argument, an array of zero elements and null are equivalent for the
+   * types argument. A security check may be performed, with
+   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
+   * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @return the array type of this class, or null
-   * @see Array
+   * @param types the type of each parameter
+   * @return the constructor
+   * @throws NoSuchMethodException if the constructor does not exist
+   * @throws SecurityException if the security check fails
+   * @see #getDeclaredConstructors()
    * @since 1.1
    */
-  public Class getComponentType()
+  public Constructor getDeclaredConstructor(Class[] args)
+    throws NoSuchMethodException
   {
-    return vmClass.getComponentType ();
+    memberAccessCheck(Member.DECLARED);
+    Constructor[] constructors = getDeclaredConstructors(false);
+    for (int i = 0; i < constructors.length; i++)
+      {
+	Constructor constructor = constructors[i];
+	if (matchParameters(args, constructor.getParameterTypes()))
+	  return constructor;
+      }
+    throw new NoSuchMethodException();
+  }
+  
+  /**
+   * Get all the declared member classes and interfaces in this class, but
+   * not those inherited from superclasses. This returns an array of length
+   * 0 if there are no member classes, including for primitive types. A
+   * security check may be performed, with
+   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
+   * <code>checkPackageAccess</code> both having to succeed.
+   *
+   * @return all declared member classes in this class
+   * @throws SecurityException if the security check fails
+   * @since 1.1
+   */
+  public Class[] getDeclaredClasses()
+  {
+    memberAccessCheck(Member.DECLARED);
+    return getDeclaredClasses(false);
+  }
+
+  Class[] getDeclaredClasses (boolean publicOnly)
+  {
+    return vmClass.getDeclaredClasses (publicOnly);
+  }
+
+  /**
+   * Get all the declared constructors of this class. This returns an array of
+   * length 0 if there are no constructors, including for primitive types,
+   * arrays, and interfaces. It does, however, include the default
+   * constructor if one was supplied by the compiler. A security check may
+   * be performed, with <code>checkMemberAccess(this, Member.DECLARED)</code>
+   * as well as <code>checkPackageAccess</code> both having to succeed.
+   *
+   * @return all constructors in this class
+   * @throws SecurityException if the security check fails
+   * @since 1.1
+   */
+  public Constructor[] getDeclaredConstructors()
+  {
+    memberAccessCheck(Member.DECLARED);
+    return getDeclaredConstructors(false);
+  }
+
+  Constructor[] getDeclaredConstructors (boolean publicOnly)
+  {
+    return vmClass.getDeclaredConstructors (publicOnly);
+  }
+  
+  /**
+   * Get a field declared in this class, where name is its simple name. The
+   * implicit length field of arrays is not available. A security check may
+   * be performed, with <code>checkMemberAccess(this, Member.DECLARED)</code>
+   * as well as <code>checkPackageAccess</code> both having to succeed.
+   *
+   * @param name the name of the field
+   * @return the field
+   * @throws NoSuchFieldException if the field does not exist
+   * @throws SecurityException if the security check fails
+   * @see #getDeclaredFields()
+   * @since 1.1
+   */
+  public Field getDeclaredField(String name) throws NoSuchFieldException
+  {
+    memberAccessCheck(Member.DECLARED);
+    Field[] fields = getDeclaredFields(false);
+    for (int i = 0; i < fields.length; i++)
+      {
+	if (fields[i].getName().equals(name))
+	  return fields[i];
+      }
+    throw new NoSuchFieldException();
   }
 
   /**
-   * Get the modifiers of this class.  These can be decoded using Modifier,
-   * and is limited to one of public, protected, or private, and any of
-   * final, static, abstract, or interface. An array class has the same
-   * public, protected, or private modifier as its component type, and is
-   * marked final but not an interface. Primitive types and void are marked
-   * public and final, but not an interface.
+   * Get all the declared fields in this class, but not those inherited from
+   * superclasses. This returns an array of length 0 if there are no fields,
+   * including for primitive types. This does not return the implicit length
+   * field of arrays. A security check may be performed, with
+   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
+   * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @return the modifiers of this class
-   * @see Modifer
+   * @return all declared fields in this class
+   * @throws SecurityException if the security check fails
    * @since 1.1
    */
-  public int getModifiers()
+  public Field[] getDeclaredFields()
   {
-    return vmClass.getModifiers ();
+    memberAccessCheck(Member.DECLARED);
+    return getDeclaredFields(false);
+  }
+
+  Field[] getDeclaredFields (boolean publicOnly)
+  {
+    return vmClass.getDeclaredFields (publicOnly);
   }
 
   /**
-   * Get the signers of this class. This returns null if there are no signers,
-   * such as for primitive types or void.
+   * 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
+   * 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
+   * elements and null are equivalent for the types argument. A security
+   * check may be performed, with
+   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
+   * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @return the signers of this class
+   * @param name the name of the method
+   * @param types the type of each parameter
+   * @return the method
+   * @throws NoSuchMethodException if the method does not exist
+   * @throws SecurityException if the security check fails
+   * @see #getDeclaredMethods()
    * @since 1.1
    */
-  public Object[] getSigners()
+  public Method getDeclaredMethod(String name, Class[] args)
+    throws NoSuchMethodException
   {
-    return signers == null ? null : (Object[]) signers.clone ();
+    memberAccessCheck(Member.DECLARED);
+    Method match = matchMethod(getDeclaredMethods(false), name, args);
+    if (match != null)
+      return match;
+    throw new NoSuchMethodException();
   }
 
   /**
-   * Set the signers of this class.
+   * Get all the declared methods in this class, but not those inherited from
+   * superclasses. This returns an array of length 0 if there are no methods,
+   * including for primitive types. This does include the implicit methods of
+   * arrays and interfaces which mirror methods of Object, nor does it
+   * include constructors or the class initialization methods. The Virtual
+   * Machine allows multiple methods with the same signature but differing
+   * return types; all such methods are in the returned array. A security
+   * check may be performed, with
+   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
+   * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @param signers the signers of this class
+   * @return all declared methods in this class
+   * @throws SecurityException if the security check fails
+   * @since 1.1
    */
-  void setSigners(Object[] signers)
+  public Method[] getDeclaredMethods()
   {
-    this.signers = signers;
+    memberAccessCheck(Member.DECLARED);
+    return getDeclaredMethods(false);
   }
 
-  /**
-   * Perform security checks common to all of the methods that
-   * get members of this Class.
-   */
-  private void memberAccessCheck(int which)
-  {
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null)
+  Method[] getDeclaredMethods (boolean publicOnly)
       {
-	sm.checkMemberAccess(this, which);
-	Package pkg = getPackage();
-	if (pkg != null)
-	  sm.checkPackageAccess(pkg.getName());
-      }
+    return vmClass.getDeclaredMethods (publicOnly);
   }
 
   /**
@@ -546,34 +520,27 @@
   }
 
   /**
-   * Get all the public member classes and interfaces declared in this
-   * class or inherited from superclasses. This returns an array of length
-   * 0 if there are no member classes, including for primitive types. A
-   * security check may be performed, with
+   * Get a public field declared or inherited in this class, where name is
+   * its simple name. If the class contains multiple accessible fields by
+   * that name, an arbitrary one is returned. The implicit length field of
+   * arrays is not available. A security check may be performed, with
    * <code>checkMemberAccess(this, Member.PUBLIC)</code> as well as
    * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @return all public member classes in this class
+   * @param name the name of the field
+   * @return the field
+   * @throws NoSuchFieldException if the field does not exist
    * @throws SecurityException if the security check fails
+   * @see #getFields()
    * @since 1.1
    */
-  public Class[] getClasses()
+  public Field getField(String name) throws NoSuchFieldException
   {
     memberAccessCheck(Member.PUBLIC);
-    return internalGetClasses();
-  }
-
-  /**
-   * Like <code>getClasses()</code> but without the security checks.
-   */
-  private Class[] internalGetClasses()
-  {
-    ArrayList list = new ArrayList();
-    list.addAll(Arrays.asList(getDeclaredClasses(true)));
-    Class superClass = getSuperclass();
-    if (superClass != null)
-      list.addAll(Arrays.asList(superClass.internalGetClasses()));
-    return (Class[])list.toArray(new Class[list.size()]);
+    Field field = internalGetField(name);
+    if(field != null)
+      return field;
+    throw new NoSuchFieldException();
   }
 
   /**
@@ -611,62 +578,33 @@
   }
 
   /**
-   * Get all the public methods declared in this class or inherited from
-   * superclasses. This returns an array of length 0 if there are no methods,
-   * including for primitive types. This does not include the implicit
-   * methods of interfaces which mirror methods of Object, nor does it
-   * include constructors or the class initialization methods. The Virtual
-   * Machine allows multiple methods with the same signature but differing
-   * return types; all such methods are in the returned array. A security
-   * check may be performed, with
-   * <code>checkMemberAccess(this, Member.PUBLIC)</code> as well as
-   * <code>checkPackageAccess</code> both having to succeed.
+   * Returns the <code>Package</code> in which this class is defined
+   * Returns null when this information is not available from the
+   * classloader of this class or when the classloader of this class
+   * is null.
    *
-   * @return all public methods in this class
-   * @throws SecurityException if the security check fails
-   * @since 1.1
+   * @return the package for this class, if it is available
+   * @since 1.2
    */
-  public Method[] getMethods()
+  public Package getPackage()
   {
-    memberAccessCheck(Member.PUBLIC);
-    // NOTE the API docs claim that no methods are returned for arrays,
-    // but Sun's implementation *does* return the public methods of Object
-    // (as would be expected), so we follow their implementation instead
-    // of their documentation.
-    return internalGetMethods();
+    ClassLoader cl = getClassLoader();
+    if (cl != null)
+      return cl.getPackage(getPackagePortion(getName()));
+    return null;
   }
 
   /**
-   * Like <code>getMethods()</code> but without the security checks.
+   * Get the interfaces this class <EM>directly</EM> implements, in the
+   * order that they were declared. This returns an empty array, not null,
+   * for Object, primitives, void, and classes or interfaces with no direct
+   * superinterface. Array types return Cloneable and Serializable.
+   *
+   * @return the interfaces this class directly implements
    */
-  private Method[] internalGetMethods()
-  {
-    HashMap map = new HashMap();
-    Method[] methods;
-    Class[] interfaces = getInterfaces();
-    for(int i = 0; i < interfaces.length; i++)
-      {
-	methods = interfaces[i].internalGetMethods();
-	for(int j = 0; j < methods.length; j++)
-	  {
-	    map.put(new MethodKey(methods[j]), methods[j]);
-	  }
-      }
-    Class superClass = getSuperclass();
-    if(superClass != null)
-      {
-	methods = superClass.internalGetMethods();
-	for(int i = 0; i < methods.length; i++)
-	  {
-	    map.put(new MethodKey(methods[i]), methods[i]);
-	  }
-      }
-    methods = getDeclaredMethods(true);
-    for(int i = 0; i < methods.length; i++)
+  public Class[] getInterfaces()
       {
-	map.put(new MethodKey(methods[i]), methods[i]);
-      }
-    return (Method[])map.values().toArray(new Method[map.size()]);
+    return vmClass.getInterfaces ();
   }
 
   private static final class MethodKey
@@ -702,84 +640,16 @@
 		      return false;
 		    }
 		}
-	      return true;
-	    }
-	}
-      return false;
-    }
-    
-    public int hashCode()
-    {
-      return hash;
-    }
-  }
-  
-  /**
-   * Get all the public constructors of this class. This returns an array of
-   * length 0 if there are no constructors, including for primitive types,
-   * arrays, and interfaces. It does, however, include the default
-   * constructor if one was supplied by the compiler. A security check may
-   * be performed, with <code>checkMemberAccess(this, Member.PUBLIC)</code>
-   * as well as <code>checkPackageAccess</code> both having to succeed.
-   *
-   * @return all public constructors in this class
-   * @throws SecurityException if the security check fails
-   * @since 1.1
-   */
-  public Constructor[] getConstructors()
-  {
-    memberAccessCheck(Member.PUBLIC);
-    return getDeclaredConstructors(true);
-  }
-
-  /**
-   * Get a public field declared or inherited in this class, where name is
-   * its simple name. If the class contains multiple accessible fields by
-   * that name, an arbitrary one is returned. The implicit length field of
-   * arrays is not available. A security check may be performed, with
-   * <code>checkMemberAccess(this, Member.PUBLIC)</code> as well as
-   * <code>checkPackageAccess</code> both having to succeed.
-   *
-   * @param name the name of the field
-   * @return the field
-   * @throws NoSuchFieldException if the field does not exist
-   * @throws SecurityException if the security check fails
-   * @see #getFields()
-   * @since 1.1
-   */
-  public Field getField(String name) throws NoSuchFieldException
-  {
-    memberAccessCheck(Member.PUBLIC);
-    Field field = internalGetField(name);
-    if(field != null)
-      return field;
-    throw new NoSuchFieldException();
-  }
-
-  /**
-   * Like <code>getField(String)</code> but without the security checks and returns null
-   * instead of throwing NoSuchFieldException.
-   */
-  private Field internalGetField(String name)
-  {
-    Field[] fields = getDeclaredFields(true);
-    for (int i = 0; i < fields.length; i++)
-      {
-	Field field = fields[i];
-	if (field.getName().equals(name))
-	  return field;
+	      return true;
       }
-    Class[] interfaces = getInterfaces();
-    for (int i = 0; i < interfaces.length; i++)
+	}
+      return false;
+    }
+    
+    public int hashCode()
       {
-	Field field = interfaces[i].internalGetField(name);
-	if(field != null)
-	  return field;
+      return hash;
       }
-    Class superClass = getSuperclass();
-    if (superClass != null)
-      return superClass.internalGetField(name);
-    return null;
   }
 
   /**
@@ -891,210 +761,132 @@
   }
   
   /**
-   * Get a public constructor declared in this class. If the constructor takes
-   * no argument, an array of zero elements and null are equivalent for the
-   * types argument. A security check may be performed, with
+   * Get all the public methods declared in this class or inherited from
+   * superclasses. This returns an array of length 0 if there are no methods,
+   * including for primitive types. This does not include the implicit
+   * methods of interfaces which mirror methods of Object, nor does it
+   * include constructors or the class initialization methods. The Virtual
+   * Machine allows multiple methods with the same signature but differing
+   * return types; all such methods are in the returned array. A security
+   * check may be performed, with
    * <code>checkMemberAccess(this, Member.PUBLIC)</code> as well as
    * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @param types the type of each parameter
-   * @return the constructor
-   * @throws NoSuchMethodException if the constructor does not exist
+   * @return all public methods in this class
    * @throws SecurityException if the security check fails
-   * @see #getConstructors()
    * @since 1.1
    */
-  public Constructor getConstructor(Class[] args) throws NoSuchMethodException
+  public Method[] getMethods()
   {
     memberAccessCheck(Member.PUBLIC);
-    Constructor[] constructors = getDeclaredConstructors(true);
-    for (int i = 0; i < constructors.length; i++)
-      {
-	Constructor constructor = constructors[i];
-	if (matchParameters(args, constructor.getParameterTypes()))
-	  return constructor;
-      }
-    throw new NoSuchMethodException();
+    // NOTE the API docs claim that no methods are returned for arrays,
+    // but Sun's implementation *does* return the public methods of Object
+    // (as would be expected), so we follow their implementation instead
+    // of their documentation.
+    return internalGetMethods();
   }
 
   /**
-   * Get all the declared member classes and interfaces in this class, but
-   * not those inherited from superclasses. This returns an array of length
-   * 0 if there are no member classes, including for primitive types. A
-   * security check may be performed, with
-   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
-   * <code>checkPackageAccess</code> both having to succeed.
-   *
-   * @return all declared member classes in this class
-   * @throws SecurityException if the security check fails
-   * @since 1.1
+   * Like <code>getMethods()</code> but without the security checks.
    */
-  public Class[] getDeclaredClasses()
+  private Method[] internalGetMethods()
   {
-    memberAccessCheck(Member.DECLARED);
-    return getDeclaredClasses(false);
-  }
-
-  Class[] getDeclaredClasses (boolean publicOnly)
+    HashMap map = new HashMap();
+    Method[] methods;
+    Class[] interfaces = getInterfaces();
+    for(int i = 0; i < interfaces.length; i++)
   {
-    return vmClass.getDeclaredClasses (publicOnly);
-  }
-
-  /**
-   * Get all the declared fields in this class, but not those inherited from
-   * superclasses. This returns an array of length 0 if there are no fields,
-   * including for primitive types. This does not return the implicit length
-   * field of arrays. A security check may be performed, with
-   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
-   * <code>checkPackageAccess</code> both having to succeed.
-   *
-   * @return all declared fields in this class
-   * @throws SecurityException if the security check fails
-   * @since 1.1
-   */
-  public Field[] getDeclaredFields()
+	methods = interfaces[i].internalGetMethods();
+	for(int j = 0; j < methods.length; j++)
   {
-    memberAccessCheck(Member.DECLARED);
-    return getDeclaredFields(false);
+	    map.put(new MethodKey(methods[j]), methods[j]);
   }
-
-  Field[] getDeclaredFields (boolean publicOnly)
-  {
-    return vmClass.getDeclaredFields (publicOnly);
   }
-
-  /**
-   * Get all the declared methods in this class, but not those inherited from
-   * superclasses. This returns an array of length 0 if there are no methods,
-   * including for primitive types. This does include the implicit methods of
-   * arrays and interfaces which mirror methods of Object, nor does it
-   * include constructors or the class initialization methods. The Virtual
-   * Machine allows multiple methods with the same signature but differing
-   * return types; all such methods are in the returned array. A security
-   * check may be performed, with
-   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
-   * <code>checkPackageAccess</code> both having to succeed.
-   *
-   * @return all declared methods in this class
-   * @throws SecurityException if the security check fails
-   * @since 1.1
-   */
-  public Method[] getDeclaredMethods()
+    Class superClass = getSuperclass();
+    if(superClass != null)
   {
-    memberAccessCheck(Member.DECLARED);
-    return getDeclaredMethods(false);
-  }
-
-  Method[] getDeclaredMethods (boolean publicOnly)
+	methods = superClass.internalGetMethods();
+	for(int i = 0; i < methods.length; i++)
   {
-    return vmClass.getDeclaredMethods (publicOnly);
+	    map.put(new MethodKey(methods[i]), methods[i]);
   }
-  
-  /**
-   * Get all the declared constructors of this class. This returns an array of
-   * length 0 if there are no constructors, including for primitive types,
-   * arrays, and interfaces. It does, however, include the default
-   * constructor if one was supplied by the compiler. A security check may
-   * be performed, with <code>checkMemberAccess(this, Member.DECLARED)</code>
-   * as well as <code>checkPackageAccess</code> both having to succeed.
-   *
-   * @return all constructors in this class
-   * @throws SecurityException if the security check fails
-   * @since 1.1
-   */
-  public Constructor[] getDeclaredConstructors()
-  {
-    memberAccessCheck(Member.DECLARED);
-    return getDeclaredConstructors(false);
   }
-
-  Constructor[] getDeclaredConstructors (boolean publicOnly)
+    methods = getDeclaredMethods(true);
+    for(int i = 0; i < methods.length; i++)
   {
-    return vmClass.getDeclaredConstructors (publicOnly);
+	map.put(new MethodKey(methods[i]), methods[i]);
+      }
+    return (Method[])map.values().toArray(new Method[map.size()]);
   }
   
   /**
-   * Get a field declared in this class, where name is its simple name. The
-   * implicit length field of arrays is not available. A security check may
-   * be performed, with <code>checkMemberAccess(this, Member.DECLARED)</code>
-   * as well as <code>checkPackageAccess</code> both having to succeed.
+   * Get the modifiers of this class.  These can be decoded using Modifier,
+   * and is limited to one of public, protected, or private, and any of
+   * final, static, abstract, or interface. An array class has the same
+   * public, protected, or private modifier as its component type, and is
+   * marked final but not an interface. Primitive types and void are marked
+   * public and final, but not an interface.
    *
-   * @param name the name of the field
-   * @return the field
-   * @throws NoSuchFieldException if the field does not exist
-   * @throws SecurityException if the security check fails
-   * @see #getDeclaredFields()
+   * @return the modifiers of this class
+   * @see Modifer
    * @since 1.1
    */
-  public Field getDeclaredField(String name) throws NoSuchFieldException
-  {
-    memberAccessCheck(Member.DECLARED);
-    Field[] fields = getDeclaredFields(false);
-    for (int i = 0; i < fields.length; i++)
+  public int getModifiers()
       {
-	if (fields[i].getName().equals(name))
-	  return fields[i];
-      }
-    throw new NoSuchFieldException();
+    return vmClass.getModifiers ();
   }
  
   /**
-   * 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
-   * 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
-   * elements and null are equivalent for the types argument. A security
-   * check may be performed, with
-   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
-   * <code>checkPackageAccess</code> both having to succeed.
+   * Get the name of this class, separated by dots for package separators.
+   * Primitive types and arrays are encoded as:
+   * <pre>
+   * boolean             Z
+   * byte                B
+   * char                C
+   * short               S
+   * int                 I
+   * long                J
+   * float               F
+   * double              D
+   * void                V
+   * 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;;
    *
-   * @param name the name of the method
-   * @param types the type of each parameter
-   * @return the method
-   * @throws NoSuchMethodException if the method does not exist
-   * @throws SecurityException if the security check fails
-   * @see #getDeclaredMethods()
-   * @since 1.1
+   * @return the name of this class
    */
-  public Method getDeclaredMethod(String name, Class[] args)
-    throws NoSuchMethodException
+  public String getName()
   {
-    memberAccessCheck(Member.DECLARED);
-    Method match = matchMethod(getDeclaredMethods(false), name, args);
-    if (match != null)
-      return match;
-    throw new NoSuchMethodException();
+    return vmClass.getName ();
   }
   
   /**
-   * Get a constructor declared in this class. If the constructor takes no
-   * argument, an array of zero elements and null are equivalent for the
-   * types argument. A security check may be performed, with
-   * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
-   * <code>checkPackageAccess</code> both having to succeed.
+   * Get a resource URL using this class's package using the
+   * getClassLoader().getResource() method.  If this class was loaded using
+   * the system classloader, ClassLoader.getSystemResource() is used instead.
    *
-   * @param types the type of each parameter
-   * @return the constructor
-   * @throws NoSuchMethodException if the constructor does not exist
-   * @throws SecurityException if the security check fails
-   * @see #getDeclaredConstructors()
+   * <p>If the name you supply is absolute (it starts with a <code>/</code>),
+   * then it is passed on to getResource() as is.  If it is relative, the
+   * package name is prepended, and <code>.</code>'s are replaced with
+   * <code>/</code>.
+   *
+   * <p>The URL returned is system- and classloader-dependent, and could
+   * change across implementations.
+   *
+   * @param name the name of the resource, generally a path
+   * @return the URL to the resource
+   * @throws NullPointerException if name is null
    * @since 1.1
    */
-  public Constructor getDeclaredConstructor(Class[] args)
-    throws NoSuchMethodException
-  {
-    memberAccessCheck(Member.DECLARED);
-    Constructor[] constructors = getDeclaredConstructors(false);
-    for (int i = 0; i < constructors.length; i++)
-      {
-	Constructor constructor = constructors[i];
-	if (matchParameters(args, constructor.getParameterTypes()))
-	  return constructor;
-      }
-    throw new NoSuchMethodException();
+  public URL getResource(String name)
+  {
+    if(name.length() > 0 && name.charAt(0) != '/')
+      name = getPackagePortion(getName()).replace('.','/')
+        + "/" + name;
+    ClassLoader c = getClassLoader();
+    if (c == null)
+      return ClassLoader.getSystemResource(name);
+    return c.getResource(name);
   }
   
   /**
@@ -1128,32 +920,198 @@
   }
   
   /**
-   * Get a resource URL using this class's package using the
-   * getClassLoader().getResource() method.  If this class was loaded using
-   * the system classloader, ClassLoader.getSystemResource() is used instead.
+   * Get the signers of this class. This returns null if there are no signers,
+   * such as for primitive types or void.
    *
-   * <p>If the name you supply is absolute (it starts with a <code>/</code>),
-   * then it is passed on to getResource() as is.  If it is relative, the
-   * package name is prepended, and <code>.</code>'s are replaced with
-   * <code>/</code>.
+   * @return the signers of this class
+   * @since 1.1
+   */
+  public Object[] getSigners()
+  {
+    return signers == null ? null : (Object[]) signers.clone ();
+  }
+
+  /**
+   * Set the signers of this class.
    *
-   * <p>The URL returned is system- and classloader-dependent, and could
-   * change across implementations.
+   * @param signers the signers of this class
+   */
+  void setSigners(Object[] signers)
+  {
+    this.signers = signers;
+  }
+
+  /**
+   * Get the direct superclass of this class.  If this is an interface,
+   * Object, a primitive type, or void, it will return null. If this is an
+   * array type, it will return Object.
    *
-   * @param name the name of the resource, generally a path
-   * @return the URL to the resource
-   * @throws NullPointerException if name is null
+   * @return the direct superclass of this class
+   */
+  public Class getSuperclass()
+  {
+    return vmClass.getSuperclass ();
+  }
+
+  /**
+   * Return whether this class is an array type.
+   *
+   * @return whether this class is an array type
    * @since 1.1
    */
-  public URL getResource(String name)
+  public boolean isArray()
   {
-    if(name.length() > 0 && name.charAt(0) != '/')
-      name = getPackagePortion(getName()).replace('.','/')
-        + "/" + name;
-    ClassLoader c = getClassLoader();
-    if (c == null)
-      return ClassLoader.getSystemResource(name);
-    return c.getResource(name);
+    int result = -1;
+    if ((result = vmClass.isArray ()) < 0)
+      return getName().charAt(0) == '[';
+
+    return result == 1;
+  }
+
+  /**
+   * Discover whether an instance of the Class parameter would be an
+   * instance of this Class as well.  Think of doing
+   * <code>isInstance(c.newInstance())</code> or even
+   * <code>c.newInstance() instanceof (this class)</code>. While this
+   * checks widening conversions for objects, it must be exact for primitive
+   * types.
+   *
+   * @param c the class to check
+   * @return whether an instance of c would be an instance of this class
+   *         as well
+   * @throws NullPointerException if c is null
+   * @since 1.1
+   */
+  public boolean isAssignableFrom(Class c)
+  {
+    return vmClass.isAssignableFrom (c);
+  }
+
+  /**
+   * Discover whether an Object is an instance of this Class.  Think of it
+   * as almost like <code>o instanceof (this class)</code>.
+   *
+   * @param o the Object to check
+   * @return whether o is an instance of this class
+   * @since 1.1
+   */
+  public boolean isInstance(Object o)
+  {
+    return vmClass.isInstance (o);
+  }
+  
+  /**
+   * Check whether this class is an interface or not.  Array types are not
+   * interfaces.
+   *
+   * @return whether this class is an interface or not
+   */
+  public boolean isInterface()
+  {
+    return vmClass.isInterface ();
+  }
+
+  /**
+   * Return whether this class is a primitive type.  A primitive type class
+   * is a class representing a kind of "placeholder" for the various
+   * primitive types, or void.  You can access the various primitive type
+   * classes through java.lang.Boolean.TYPE, java.lang.Integer.TYPE, etc.,
+   * or through boolean.class, int.class, etc.
+   *
+   * @return whether this class is a primitive type
+   * @see Boolean#TYPE
+   * @see Byte#TYPE
+   * @see Character#TYPE
+   * @see Short#TYPE
+   * @see Integer#TYPE
+   * @see Long#TYPE
+   * @see Float#TYPE
+   * @see Double#TYPE
+   * @see Void#TYPE
+   * @since 1.1
+   */
+  public boolean isPrimitive()
+  {
+    return vmClass.isPrimitive ();
+  }
+
+  /**
+   * Get a new instance of this class by calling the no-argument constructor.
+   * The class is initialized if it has not been already. A security check
+   * may be performed, with <code>checkMemberAccess(this, Member.PUBLIC)</code>
+   * as well as <code>checkPackageAccess</code> both having to succeed.
+   *
+   * @return a new instance of this class
+   * @throws InstantiationException if there is not a no-arg constructor
+   *         for this class, including interfaces, abstract classes, arrays,
+   *         primitive types, and void; or if an exception occurred during
+   *         the constructor
+   * @throws IllegalAccessException if you are not allowed to access the
+   *         no-arg constructor because of scoping reasons
+   * @throws SecurityException if the security check fails
+   * @throws ExceptionInInitializerError if class initialization caused by
+   *         this call fails with an exception
+   */
+  public Object newInstance()
+    throws InstantiationException, IllegalAccessException
+  {
+    memberAccessCheck(Member.PUBLIC);
+    Constructor constructor;
+    synchronized(this)
+      {
+	constructor = this.constructor;
+      }
+    if (constructor == null)
+      {
+	Constructor[] constructors = getDeclaredConstructors(false);
+	for (int i = 0; i < constructors.length; i++)
+	  {
+	    if (constructors[i].getParameterTypes().length == 0)
+	      {
+		constructor = constructors[i];
+		break;
+	      }
+	  }
+	if (constructor == null)
+	  throw new InstantiationException(getName());
+	if (!Modifier.isPublic(constructor.getModifiers()))
+	  {
+	    final Constructor finalConstructor = constructor;
+	    AccessController.doPrivileged(new PrivilegedAction() {
+		public Object run() {
+		  finalConstructor.setAccessible(true);
+		  return null;
+		}
+	      });
+	  }
+	synchronized(this)
+	  {
+	    if (this.constructor == null)
+	      this.constructor = constructor;
+	  }	    
+      }
+    int modifiers = constructor.getModifiers();
+    if (!Modifier.isPublic(modifiers))
+      {
+	Class caller = VMSecurityManager.getClassContext()[1];
+	if (caller != this &&
+	    (Modifier.isPrivate(modifiers)
+	     || getClassLoader() != caller.getClassLoader()
+	     || !getPackagePortion(getName())
+	     .equals(getPackagePortion(caller.getName()))))
+	  throw new IllegalAccessException(getName()
+					   + " has an inaccessible constructor");
+      }
+    try
+      {
+        return constructor.newInstance(null);
+      }
+    catch (InvocationTargetException e)
+      {
+	VMClass.throwException(e.getTargetException());
+	throw (InternalError) new InternalError
+	  ("VMClass.throwException returned").initCause(e);
+      }
   }
 
   /**
@@ -1259,6 +1217,48 @@
           return status.equals(Boolean.TRUE);
       }
     return c.defaultAssertionStatus;
+  }
+
+  /**
+   * Like <code>getField(String)</code> but without the security checks and returns null
+   * instead of throwing NoSuchFieldException.
+   */
+  private Field internalGetField(String name)
+  {
+    Field[] fields = getDeclaredFields(true);
+    for (int i = 0; i < fields.length; i++)
+      {
+	Field field = fields[i];
+	if (field.getName().equals(name))
+	  return field;
+      }
+    Class[] interfaces = getInterfaces();
+    for (int i = 0; i < interfaces.length; i++)
+      {
+	Field field = interfaces[i].internalGetField(name);
+	if(field != null)
+	  return field;
+      }
+    Class superClass = getSuperclass();
+    if (superClass != null)
+      return superClass.internalGetField(name);
+    return null;
+  }
+
+  /**
+   * Perform security checks common to all of the methods that
+   * get members of this Class.
+   */
+  private void memberAccessCheck(int which)
+  {
+    SecurityManager sm = System.getSecurityManager();
+    if (sm != null)
+      {
+	sm.checkMemberAccess(this, which);
+	Package pkg = getPackage();
+	if (pkg != null)
+	  sm.checkPackageAccess(pkg.getName());
+      }
   }
 
   /**

--Boundary-00=_Ei9EATBQANn2f/Y--




From MAILER-DAEMON Sun Jan 25 10:07:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Aklqp-0005pL-QM
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 10:07:03 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Aklqm-0005p8-Ji
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 10:07:00 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AklqG-0005Mf-5j
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 10:06:59 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AklqF-0005MW-Pe
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 10:06:27 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-73-144.ewetel.net
	[80.228.73.144])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0PF6PHA003666
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 16:06:26 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AklqD-00068Y-00
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 16:06:25 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 25 Jan 2004 16:10:07 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_Px9EA6TwFxkunJy"
Message-Id: <200401251610.07086.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.Class
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 15:07:01 -0000


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

Hi list,


I commited the attached little patch to merge more with libgcj's version. It 
simply renames some variables and puts a code duplication into its own 
method.


Michael


2004-01-25  Michael Koch  <konqueror@gmx.de>

	* java/lang/Class.java
	(getDeclaredMethod): Renamed argument "name" to "methodName".
	(getField): Renamed argument "name" to "fieldName".
	(getResource): Renamed argument "name" to "resourceName".
	Call resourcePath() instead of doing the work here.
	(getResourceAsStream): Renamed argument "name" to "resourceName".
	Call resourcePath() instead of doing the work here.
	(resourcePath): New method.


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

Index: java/lang/Class.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 Class.java
--- java/lang/Class.java	25 Jan 2004 14:49:00 -0000	1.13
+++ java/lang/Class.java	25 Jan 2004 15:03:14 -0000
@@ -462,7 +462,7 @@
    * <code>checkMemberAccess(this, Member.DECLARED)</code> as well as
    * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @param name the name of the method
+   * @param methodName the name of the method
    * @param types the type of each parameter
    * @return the method
    * @throws NoSuchMethodException if the method does not exist
@@ -470,14 +470,14 @@
    * @see #getDeclaredMethods()
    * @since 1.1
    */
-  public Method getDeclaredMethod(String name, Class[] args)
+  public Method getDeclaredMethod(String methodName, Class[] args)
     throws NoSuchMethodException
   {
     memberAccessCheck(Member.DECLARED);
-    Method match = matchMethod(getDeclaredMethods(false), name, args);
-    if (match != null)
+    Method match = matchMethod(getDeclaredMethods(false), methodName, args);
+    if (match == null)
+      throw new NoSuchMethodException(methodName);
       return match;
-    throw new NoSuchMethodException();
   }
   
   /**
@@ -527,20 +527,21 @@
    * <code>checkMemberAccess(this, Member.PUBLIC)</code> as well as
    * <code>checkPackageAccess</code> both having to succeed.
    *
-   * @param name the name of the field
+   * @param fieldName the name of the field
    * @return the field
    * @throws NoSuchFieldException if the field does not exist
    * @throws SecurityException if the security check fails
    * @see #getFields()
    * @since 1.1
    */
-  public Field getField(String name) throws NoSuchFieldException
+  public Field getField(String fieldName)
+    throws NoSuchFieldException
   {
     memberAccessCheck(Member.PUBLIC);
-    Field field = internalGetField(name);
-    if(field != null)
+    Field field = internalGetField(fieldName);
+    if (field == null)
+      throw new NoSuchFieldException(fieldName);
       return field;
-    throw new NoSuchFieldException();
   }
 
   /**
@@ -873,20 +874,18 @@
    * <p>The URL returned is system- and classloader-dependent, and could
    * change across implementations.
    *
-   * @param name the name of the resource, generally a path
+   * @param resourceName the name of the resource, generally a path
    * @return the URL to the resource
    * @throws NullPointerException if name is null
    * @since 1.1
    */
-  public URL getResource(String name)
+  public URL getResource(String resourceName)
   {
-    if(name.length() > 0 && name.charAt(0) != '/')
-      name = getPackagePortion(getName()).replace('.','/')
-        + "/" + name;
-    ClassLoader c = getClassLoader();
-    if (c == null)
+    String name = resourcePath(resourceName);
+    ClassLoader loader = getClassLoader();
+    if (loader == null)
       return ClassLoader.getSystemResource(name);
-    return c.getResource(name);
+    return loader.getResource(name);
   }
 
   /**
@@ -903,20 +902,26 @@
    * <p>The URL returned is system- and classloader-dependent, and could
    * change across implementations.
    *
-   * @param name the name of the resource, generally a path
+   * @param resourceName the name of the resource, generally a path
    * @return an InputStream with the contents of the resource in it, or null
    * @throws NullPointerException if name is null
    * @since 1.1
    */
-  public InputStream getResourceAsStream(String name)
+  public InputStream getResourceAsStream(String resourceName)
   {
-    if (name.length() > 0 && name.charAt(0) != '/')
-      name = getPackagePortion(getName()).replace('.','/')
-	+ "/" + name;
-    ClassLoader c = getClassLoader();
-    if (c == null)
+    String name = resourcePath(resourceName);
+    ClassLoader loader = getClassLoader();
+    if (loader == null)
       return ClassLoader.getSystemResourceAsStream(name);
-    return c.getResourceAsStream(name);
+    return loader.getResourceAsStream(name);
+  }
+  
+  private String resourcePath(String resourceName)
+  {
+    if (resourceName.length() > 0 && resourceName.charAt(0) != '/')
+      resourceName = getPackagePortion(getName()).replace('.','/')
+        + "/" + resourceName;
+    return resourceName;
   }
   
   /**

--Boundary-00=_Px9EA6TwFxkunJy--




From MAILER-DAEMON Sun Jan 25 13:27:29 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Akoyn-0002qX-42
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 13:27:29 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Akoyg-0002pq-NM
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:27:22 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Akoy9-0002kQ-4o
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:27:21 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Akoy8-0002kN-Ko
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:26:48 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-73-144.ewetel.net
	[80.228.73.144])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0PIQk1h010011
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 19:26:47 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Akoy6-0006Zv-00
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 19:26:46 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sun, 25 Jan 2004 19:30:26 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_CtAFAB95ZvKWLtU"
Message-Id: <200401251930.27848.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.Class
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 18:27:23 -0000


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

Hi list,


I just commited a little fix to java.lang.Class.


Michael


2004-01-25  Michael Koch  <konqueror@gmx.de>

	* java/lang/Class.java
	(getInterfaces): Change html tags to lower case.
	(getPackagePortion): Made private, moved around.


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

Index: java/lang/Class.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v
retrieving revision 1.14
diff -u -b -B -r1.14 Class.java
--- java/lang/Class.java	25 Jan 2004 15:04:08 -0000	1.14
+++ java/lang/Class.java	25 Jan 2004 18:23:20 -0000
@@ -38,8 +38,8 @@
 
 package java.lang;
 
-import java.io.Serializable;
 import java.io.InputStream;
+import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -596,7 +596,7 @@
   }
 
   /**
-   * Get the interfaces this class <EM>directly</EM> implements, in the
+   * Get the interfaces this class <em>directly</em> implements, in the
    * order that they were declared. This returns an empty array, not null,
    * for Object, primitives, void, and classes or interfaces with no direct
    * superinterface. Array types return Cloneable and Serializable.
@@ -1251,6 +1251,20 @@
   }
 
   /**
+   * Strip the last portion of the name (after the last dot).
+   *
+   * @param name the name to get package of
+   * @return the package name, or "" if no package
+   */
+  private static String getPackagePortion(String name)
+  {
+    int lastInd = name.lastIndexOf('.');
+    if (lastInd == -1)
+      return "";
+    return name.substring(0, lastInd);
+  }
+
+  /**
    * Perform security checks common to all of the methods that
    * get members of this Class.
    */
@@ -1264,19 +1278,5 @@
 	if (pkg != null)
 	  sm.checkPackageAccess(pkg.getName());
       }
-  }
-
-  /**
-   * Strip the last portion of the name (after the last dot).
-   *
-   * @param name the name to get package of
-   * @return the package name, or "" if no package
-   */
-  public static String getPackagePortion(String name)
-  {
-    int lastInd = name.lastIndexOf('.');
-    if (lastInd == -1)
-      return "";
-    return name.substring(0, lastInd);
   }
 }

--Boundary-00=_CtAFAB95ZvKWLtU--




From MAILER-DAEMON Sun Jan 25 13:52:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AkpMe-0006gf-Hm
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 13:52:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AkpMa-0006fM-J4
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:52:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AkpM3-0006V4-IY
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:52:02 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AkpM3-0006SO-1I
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:51:31 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0PIpPr27814
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 13:51:25 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0PIpPa26296
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 13:51:25 -0500
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
	i0PIpNXd012049
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 13:51:24 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: text/plain
Message-Id: <1075056743.6693.4.camel@localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Sun, 25 Jan 2004 13:52:23 -0500
Content-Transfer-Encoding: 7bit
Subject: Patch: FYI: GtkToolkit image loading fixes
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 18:52:06 -0000

Hi,

I merged this patch from libgcj.

Tom

2004-01-25  Thomas Fitzsimmons  <fitzsim@redhat.com>

        * gnu/java/awt/peer/gtk/GtkToolkit.java (checkImage): Inform
        image observer of image loading status.
        (getImage (String)): Start image production.
        (getImage (URL)): Likewise.


Index: gnu/java/awt/peer/gtk/GtkToolkit.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkToolkit.java,v
retrieving revision 1.7
diff -u -r1.7 GtkToolkit.java
--- gnu/java/awt/peer/gtk/GtkToolkit.java	10 Jan 2004 21:32:23 -0000	1.7
+++ gnu/java/awt/peer/gtk/GtkToolkit.java	23 Jan 2004 18:28:34 -0000
@@ -115,7 +115,15 @@
   public int checkImage (Image image, int width, int height, 
 			 ImageObserver observer) 
   {
-    return ((GtkImage) image).checkImage ();
+    int status = ((GtkImage) image).checkImage ();
+
+    if (observer != null)
+      observer.imageUpdate (image, status,
+                            -1, -1,
+                            image.getWidth (observer),
+                            image.getHeight (observer));
+
+    return status;
   }
 
   public Image createImage (String filename)
@@ -166,12 +174,18 @@
 
   public Image getImage (String filename) 
   {
-    return new GtkImage (new GdkPixbufDecoder (filename), null);
+    GdkPixbufDecoder d = new GdkPixbufDecoder (filename);
+    GtkImage image = new GtkImage (d, null);
+    d.startProduction (image);
+    return image;
   }
 
   public Image getImage (URL url) 
   {
-    return new GtkImage (new GdkPixbufDecoder (url), null);
+    GdkPixbufDecoder d = new GdkPixbufDecoder (url);
+    GtkImage image = new GtkImage (d, null);
+    d.startProduction (image);
+    return image;
   }
 
   public PrintJob getPrintJob (Frame frame, String jobtitle, Properties props) 





From MAILER-DAEMON Sun Jan 25 13:59:32 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AkpTo-0003eZ-DX
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 13:59:32 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AkpTm-0003eN-8A
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:59:30 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AkpTG-0003UT-48
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:59:29 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AkpTF-0003UQ-IK
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 13:58:57 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0PIwvr29699
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 13:58:57 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0PIwua27758
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 13:58:56 -0500
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
	i0PIwqXd012210
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 13:58:52 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-OXp4yYr/b4ZW715uiis5"
Message-Id: <1075057191.6693.7.camel@localhost.localdomain>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-7) 
Date: Sun, 25 Jan 2004 13:59:51 -0500
Subject: Patch: FYI: TextArea cleanups
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Jan 2004 18:59:30 -0000


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

Hi,

I merged the following  patch from libgcj.

Tom

2004-01-25  Thomas Fitzsimmons  <fitzsim@redhat.com>

        * java/awt/TextArea.java: Fix indentation.  Flesh out javadocs.
        (getMinimumSize (int, int)): Fix FIXME -- return Dimension (0,0)
        when peer is null.
        (setColumns): Remove FIXME -- peer will retrieve number of
        columns by calling getColumns.
        (setRows): Likewise for number of rows.
        (next_text_number): New field.
        (paramString): Fix param string.
        (generateName): New method.
        (getUniqueLong): New method.


--=-OXp4yYr/b4ZW715uiis5
Content-Disposition: attachment; filename=textarea-javadocs.patch
Content-Type: text/x-patch; name=textarea-javadocs.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: java/awt/TextArea.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/TextArea.java,v
retrieving revision 1.8
diff -u -r1.8 TextArea.java
--- java/awt/TextArea.java	5 Jun 2003 19:58:39 -0000	1.8
+++ java/awt/TextArea.java	20 Jan 2004 23:57:52 -0000
@@ -1,565 +1,589 @@
-/* TextArea.java -- A multi-line text entry widget
-   Copyright (C) 1999 Free Software Foundation, Inc.
+/* TextArea.java -- A multi-line text entry component
+   Copyright (C) 1999, 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. */
+   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;
 
 import java.awt.peer.ComponentPeer;
 import java.awt.peer.TextAreaPeer;
 
-/**
-  * This implements a multi-line text entry widget.
-  *
-  * @author Aaron M. Renn (arenn@urbanophile.com)
-  */
-public class TextArea extends TextComponent implements java.io.Serializable
-{
-
-/*
- * Static Variables
- */
-
-/**
-  * Use both horiztonal and vertical scroll bars.
-  */
-public static final int SCROLLBARS_BOTH = 0;
-
-/**
-  * Use vertical scroll bars only.
-  */
-public static final int SCROLLBARS_VERTICAL_ONLY = 1;
-
-/**
-  * Use horizatonal scroll bars only.
-  */
-public static final int SCROLLBARS_HORIZONTAL_ONLY = 2;
-
-/**
-  * Use no scrollbars.
-  */
-public static final int SCROLLBARS_NONE = 3;
-
-// Serialization constant
-private static final long serialVersionUID = 3692302836626095722L;
-
-/*************************************************************************/
-
-/*
- * Instance Variables
- */
-
-/**
-  * @serial The number of columns in this text area.
-  */
-private int columns;
-
-/**
-  * @serial The number of rows in this text area.
-  */
-private int rows;
 
 /**
-  * @serial The type of scrollbars to display, which will be one of
-  * the contstants from this class.
-  */
-private int scrollbarVisibility;
-
-/*************************************************************************/
-
-/*
- * Constructors
+ * A TextArea is a text component capable of displaying multiple lines
+ * of user-editable text.  A TextArea handles its own scrolling and
+ * can display vertical and horizontal scrollbars as navigation aids.
+ *
+ * @author Aaron M. Renn (arenn@urbanophile.com)
  */
-
-/**
-  * Initialize a new instance of <code>TextArea</code> that is empty
-  * and is one row and one column.  Both horizontal and vertical
-  * scrollbars will be used.
-  *
-  * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true,
-  */
-public
-TextArea()
-{
-  this("", 1, 1, SCROLLBARS_BOTH);
-}
-
-/*************************************************************************/
-
-/**
-  * Initializes a new instance of <code>TextArea</code> that 
-  * contains the specified string.  Both horizontal and veritcal
-  * scrollbars will be used.
-  *
-  * @param text The text to display in this text area.
-  *
-  * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true,
-  */
-public
-TextArea(String text)
-{
-  this(text, 1, text.length(), SCROLLBARS_BOTH);
-}
-
-/*************************************************************************/
-
-/**
-  * Initializes a new instance of <code>TextArea</code> that is empty
-  * and has the specified number of rows and columns.  Both
-  * horizontal and vertical scrollbars will be used.
-  *
-  * @param rows The number of rows in this text area.
-  * @param columns The number of columns in this text area.
-  *
-  * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true,
-  */
-public
-TextArea(int rows, int columns)
-{
-  this("", rows, columns, SCROLLBARS_BOTH);
-}
-
-/*************************************************************************/
-
-/**
-  * Initializes a new instance of <code>TextArea</code> that is the
-  * specified size and has the specified text.
-  *
-  * @param text The text to display in this text area.
-  * @param rows The number of rows in this text area.
-  * @param columns The number of columns in this text area.
-  *
-  * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true,
-  */
-public
-TextArea(String text, int rows, int columns)
-{
-  this(text, rows, columns, SCROLLBARS_BOTH);
-}
-
-/*************************************************************************/
-
-/** 
-  * Initializes a new instance of <code>TextArea</code> with the
-  * specified values.  The scrollbar visibility value must be one
-  * of the constants in this class.
-  *
-  * @param text The text to display in this text area.
-  * @param rows The number of rows in this text area.
-  * @param columns The number of columns in this text area.
-  * @param scrollbarVisibility Which scrollbars to display.
-  *
-  * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true,
-  */
-public
-TextArea(String text, int rows, int columns, int scrollbarVisibility)
-{
-  super(text);
-
-  if (GraphicsEnvironment.isHeadless())
-    throw new HeadlessException ();
-
-  if ((rows < 1) || (columns < 0))
-    throw new IllegalArgumentException("Bad row or column value");
-
-  if ((scrollbarVisibility != SCROLLBARS_BOTH) &&
-      (scrollbarVisibility != SCROLLBARS_VERTICAL_ONLY) &&
-      (scrollbarVisibility != SCROLLBARS_HORIZONTAL_ONLY) &&
-      (scrollbarVisibility != SCROLLBARS_NONE))
-    throw new IllegalArgumentException("Bad scrollbar visibility value");
-
-  this.rows = rows;
-  this.columns = columns;
-  this.scrollbarVisibility = scrollbarVisibility;
-}
-
-/*************************************************************************/
-
-/*
- * Instance Variables
- */
-
-/**
-  * Returns the number of columns in the field.
-  *
-  * @return The number of columns in the field.
-  */
-public int
-getColumns()
-{
-  return(columns);
-}
-
-/*************************************************************************/
-
-/**
-  * Sets the number of columns in this field to the specified value.
-  *
-  * @param columns The new number of columns in the field.
-  *
-  * @exception IllegalArgumentException If columns is less than zero.
-  */
-public synchronized void
-setColumns(int columns)
-{
-  if (columns < 0)
-    throw new IllegalArgumentException("Value is less than zero: " +
-                                       columns);
-
-  this.columns = columns;
-  // FIXME: How to we communicate this to our peer?
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the number of rows in the field.
-  *
-  * @return The number of rows in the field.
-  */
-public int
-getRows()
-{
-  return(rows);
-}
-
-/*************************************************************************/
-
-/**
-  * Sets the number of rows in this field to the specified value.
-  *
-  * @param rows The new number of rows in the field.
-  *
-  * @exception IllegalArgumentException If rows is less than zero.
-  */
-public synchronized void
-setRows(int rows)
-{
-  if (rows < 1)
-    throw new IllegalArgumentException("Value is less than one: " +
-                                       rows);
-
-  this.rows = rows;
-  // FIXME: How to we communicate this to our peer?
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the minimum size for this text field.
-  *
-  * @return The minimum size for this text field.
-  */
-public Dimension
-getMinimumSize()
-{
-  return(getMinimumSize(getRows(), getColumns()));
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the minimum size of a text field with the specified number
-  * of rows and columns.
-  *
-  * @param rows The number of rows to get the minimum size for.
-  * @param columns The number of columns to get the minimum size for.
-  */
-public Dimension
-getMinimumSize(int rows, int columns)
-{
-  TextAreaPeer tap = (TextAreaPeer)getPeer();
-  if (tap == null)
-    return(null); // FIXME: What do we do if there is no peer?
-
-  return(tap.getMinimumSize(rows, columns));
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the minimum size for this text field.
-  *
-  * @return The minimum size for this text field.
-  *
-  * @deprecated This method is depcreated in favor of
-  * <code>getMinimumSize()</code>.
-  */
-public Dimension
-minimumSize()
-{
-  return(getMinimumSize(getRows(), getColumns()));
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the minimum size of a text field with the specified number
-  * of rows and columns.
-  *
-  * @param rows The number of rows to get the minimum size for.
-  * @param columns The number of columns to get the minimum size for.
-  *
-  * @deprecated This method is deprecated in favor of 
-  * <code>getMinimumSize(int)</code>.
-  */
-public Dimension
-minimumSize(int rows, int columns)
-{
-  return(getMinimumSize(rows, columns));
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the preferred size for this text field.
-  *
-  * @return The preferred size for this text field.
-  */
-public Dimension
-getPreferredSize()
-{
-  return(getPreferredSize(getRows(), getColumns()));
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the preferred size of a text field with the specified number
-  * of rows and columns.
-  *
-  * @param rows The number of rows to get the preferred size for.
-  * @param columns The number of columns to get the preferred size for.
-  */
-public Dimension
-getPreferredSize(int rows, int columns)
-{
-  TextAreaPeer tap = (TextAreaPeer)getPeer();
-  if (tap == null)
-    {
-      // Sun's JDK just seems to return Dimension(0,0) in this case.
-      // we do the same.
-      return new Dimension(0, 0);
-    }
-
-  return(tap.getPreferredSize(rows, columns));
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the preferred size for this text field.
-  *
-  * @return The preferred size for this text field.
-  *
-  * @deprecated This method is deprecated in favor of 
-  * <code>getPreferredSize()</code>.
-  */
-public Dimension
-preferredSize()
-{
-  return(getPreferredSize(getRows(), getColumns()));
-}
-
-/*************************************************************************/
-
-/**
-  * Returns the preferred size of a text field with the specified number
-  * of rows and columns.
-  *
-  * @param rows The number of rows to get the preferred size for.
-  * @param columns The number of columns to get the preferred size for.
-  *
-  * @deprecated This method is deprecated in favor of 
-  * <code>getPreferredSize(int)</code>.
-  */
-public Dimension
-preferredSize(int rows, int columns)
-{
-  return(getPreferredSize(rows, columns));
-}
-
-/*************************************************************************/
-
-/**
-  * Returns one of the constants from this class indicating which
-  * types of scrollbars this object uses, if any.
-  *
-  * @return The scrollbar type constant for this object.
-  */
-public int
-getScrollbarVisibility()
-{
-  return(scrollbarVisibility);
-}
-
-/*************************************************************************/
-
-/**
-  * Notify this object that it should create its native peer.
-  */
-public void
-addNotify()
-{
-  if (getPeer() != null)
-    return;
-
-  setPeer((ComponentPeer)getToolkit().createTextArea(this));
-}
-
-/*************************************************************************/
-
-/**
-  * Appends the specified text to the end of the current text.
-  *
-  * @param text The text to append.
-  */
-public void
-append(String str)
-{
-  TextAreaPeer tap = (TextAreaPeer)getPeer();
-  if (tap == null) 
-    return;
-
-  tap.insert(str, tap.getText().length());
-}
-
-/*************************************************************************/
-
-/**
-  * Appends the specified text to the end of the current text.
-  *
-  * @param text The text to append.
-  *
-  * @deprecated This method is deprecated in favor of 
-  * <code>append()</code>.
-  */
-public void
-appendText(String text)
-{
-  append(text);
-}
- 
-/*************************************************************************/
-
-/**
-  * Inserts the specified text at the specified location.
-  *
-  * @param text The text to insert.
-  * @param pos The insert position.
-  */
-public void
-insert(String text, int pos)
-{
-  TextAreaPeer tap = (TextAreaPeer)getPeer();
-  if (tap == null)
-    return;
-
-  tap.insert(text, pos);
-}
-
-/*************************************************************************/
-
-/**
-  * Inserts the specified text at the specified location.
-  *
-  * @param text The text to insert.
-  * @param pos The insert position.
-  *
-  * @deprecated This method is depcreated in favor of <code>insert()</code>.
-  */
-public void
-insertText(String text, int pos)
-{
-  insert(text, pos);
-}
-
-/*************************************************************************/
-
-/**
-  * Replaces the text bounded by the specified start and end positions
-  * with the specified text.
-  *
-  * @param text The new text for the range.
-  * @param start The start position of the replacement range.
-  * @param end The end position of the replacement range.
-  */
-public void
-replaceRange(String text, int start, int end)
-{
-  TextAreaPeer tap = (TextAreaPeer)getPeer();
-  if (tap == null)
-    return;
-
-  tap.replaceRange(text, start, end);
-}
-
-/*************************************************************************/
-
-/**
-  * Replaces the text bounded by the specified start and end positions
-  * with the specified text.
-  *
-  * @param text The new text for the range.
-  * @param start The start position of the replacement range.
-  * @param end The end position of the replacement range.
-  *
-  * @deprecated This method is deprecated in favor of
-  * <code>replaceRange()</code>.
-  */
-public void
-replaceText(String text, int start, int end)
-{
-  replaceRange(text, start, end);
-}
-
-/*************************************************************************/
-
-/**
-  * Returns a debugging string for this text area.
-  *
-  * @return A debugging string for this text area.
-  */
-protected String
-paramString()
+public class TextArea extends TextComponent implements java.io.Serializable
 {
-  return(getClass().getName() + "(rows=" + getRows() + ",columns=" +
-         getColumns() + ",scrollbars=" + getScrollbarVisibility() +
-         ")");
+  /**
+   * Display both horiztonal and vertical scroll bars.
+   */
+  public static final int SCROLLBARS_BOTH = 0;
+
+  /**
+   * Display vertical scroll bar only.
+   */
+  public static final int SCROLLBARS_VERTICAL_ONLY = 1;
+
+  /**
+   * Display horizatonal scroll bar only.
+   */
+  public static final int SCROLLBARS_HORIZONTAL_ONLY = 2;
+
+  /**
+   * Do not display scrollbars.
+   */
+  public static final int SCROLLBARS_NONE = 3;
+
+  /**
+   * Serialization constant.
+   */
+  private static final long serialVersionUID = 3692302836626095722L;
+
+  /**
+   * @serial The number of columns used in this text area's preferred
+   * and minimum size calculations.
+   */
+  private int columns;
+
+  /**
+   * @serial The number of rows used in this text area's preferred and
+   * minimum size calculations.
+   */
+  private int rows;
+
+  /**
+   * @serial The scrollbar display policy.  One of SCROLLBARS_BOTH,
+   * SCROLLBARS_VERTICAL_ONLY, SCROLLBARS_HORIZONTAL_ONLY,
+   * SCROLLBARS_NONE.
+   */
+  private int scrollbarVisibility;
+
+  /*
+   * The number used to generate the name returned by getName.
+   */
+  private static transient long next_text_number = 0;
+
+  /**
+   * Initialize a new instance of <code>TextArea</code> that is empty
+   * and is one row by one column.  Both horizontal and vertical
+   * scrollbars will be displayed.
+   *
+   * @exception HeadlessException If GraphicsEnvironment.isHeadless () is true,
+   */
+  public TextArea ()
+  {
+    this ("", 1, 1, SCROLLBARS_BOTH);
+  }
+
+  /**
+   * Initialize a new instance of <code>TextArea</code> that initially
+   * contains the specified text.  Both horizontal and veritcal
+   * scrollbars will be displayed.
+   *
+   * @param text The text to display in this text area.
+   *
+   * @exception HeadlessException If GraphicsEnvironment.isHeadless () is true,
+   */
+  public TextArea (String text)
+  {
+    this (text, 1, text.length (), SCROLLBARS_BOTH);
+  }
+
+  /**
+   * Initialize a new instance of <code>TextArea</code> that is empty
+   * and can display the specified number of rows and columns of text,
+   * without the need to scroll.  Both horizontal and vertical
+   * scrollbars will be displayed.
+   *
+   * @param rows The number of rows in this text area.
+   * @param columns The number of columns in this text area.
+   *
+   * @exception HeadlessException If GraphicsEnvironment.isHeadless () is true,
+   */
+  public TextArea (int rows, int columns)
+  {
+    this ("", rows, columns, SCROLLBARS_BOTH);
+  }
+
+  /**
+   * Initialize a new instance of <code>TextArea</code> that can
+   * display the specified number of rows and columns of text, without
+   * the need to scroll.  The TextArea initially contains the
+   * specified text.
+   *
+   * @param text The text to display in this text area.
+   * @param rows The number of rows in this text area.
+   * @param columns The number of columns in this text area.
+   *
+   * @exception HeadlessException If GraphicsEnvironment.isHeadless () is true,
+   */
+  public TextArea (String text, int rows, int columns)
+  {
+    this (text, rows, columns, SCROLLBARS_BOTH);
+  }
+
+  /**
+   * Initialize a new instance of <code>TextArea</code> that initially
+   * contains the specified text.  The TextArea can display the
+   * specified number of rows and columns of text, without the need to
+   * scroll.  This constructor allows specification of the scroll bar
+   * display policy.
+   *
+   * @param text The text to display in this text area.
+   * @param rows The number of rows in this text area.
+   * @param columns The number of columns in this text area.
+   * @param scrollbarVisibility The scroll bar display policy. One of
+   * SCROLLBARS_BOTH, SCROLLBARS_VERTICAL_ONLY,
+   * SCROLLBARS_HORIZONTAL_ONLY, SCROLLBARS_NONE.
+   *
+   * @exception HeadlessException If GraphicsEnvironment.isHeadless () is true,
+   */
+  public TextArea (String text, int rows, int columns, int scrollbarVisibility)
+  {
+    super (text);
+
+    if (GraphicsEnvironment.isHeadless ())
+      throw new HeadlessException ();
+
+    if (rows < 1 || columns < 0)
+      throw new IllegalArgumentException ("Bad row or column value");
+
+    if (scrollbarVisibility != SCROLLBARS_BOTH
+        && scrollbarVisibility != SCROLLBARS_VERTICAL_ONLY
+        && scrollbarVisibility != SCROLLBARS_HORIZONTAL_ONLY
+        && scrollbarVisibility != SCROLLBARS_NONE)
+      throw new IllegalArgumentException ("Bad scrollbar visibility value");
+
+    this.rows = rows;
+    this.columns = columns;
+    this.scrollbarVisibility = scrollbarVisibility;
+  }
+
+  /*
+   * Instance Variables
+   */
+
+  /**
+   * Retrieve the number of columns that this text area would prefer
+   * to display.  This value may or may not correspond to the number
+   * of columns that are actually displayed.
+   *
+   * @return The preferred number of columns.
+   */
+  public int getColumns ()
+  {
+    return columns;
+  }
+
+  /**
+   * Set the preferred number of columns for this text area.  This
+   * method does not cause the number of columns displayed by the text
+   * area to be updated, if the text area is currently visible.
+   *
+   * @param columns The preferred number of columns.
+   *
+   * @exception IllegalArgumentException If columns is less than zero.
+   */
+  public synchronized void setColumns (int columns)
+  {
+    if (columns < 0)
+      throw new IllegalArgumentException ("Value is less than zero: "
+                                          + columns);
+
+    this.columns = columns;
+  }
+
+  /**
+   * Retrieve the number of rows that this text area would prefer to
+   * display.  This value may or may not correspond to the number of
+   * rows that are actually displayed.
+   *
+   * @return The preferred number of rows.
+   */
+  public int getRows ()
+  {
+    return rows;
+  }
+
+  /**
+   * Set the preferred number of rows for this text area.  This method
+   * does not cause the number of columns displayed by the text area
+   * to be updated, if the text area is currently visible.
+   *
+   * @param rows The preferred number of rows.
+   *
+   * @exception IllegalArgumentException If rows is less than zero.
+   */
+  public synchronized void setRows (int rows)
+  {
+    if (rows < 1)
+      throw new IllegalArgumentException ("Value is less than one: " + rows);
+
+    this.rows = rows;
+  }
+
+  /**
+   * Retrieve the minimum size for this text area, considering the
+   * text area's current row and column values.  A text area's minimum
+   * size depends on the number of rows and columns of text it would
+   * prefer to display, and on the size of the font in which the text
+   * would be displayed.
+   *
+   * @return The minimum size for this text field.
+   */
+  public Dimension getMinimumSize ()
+  {
+    return getMinimumSize (getRows (), getColumns ());
+  }
+
+  /**
+   * Retrieve the minimum size that this text area would have if its
+   * row and column values were equal to those specified.  A text
+   * area's minimum size depends on the number of rows and columns of
+   * text it would prefer to display, and on the size of the font in
+   * which the text would be displayed.
+   *
+   * @param rows The number of rows to use in the minimum size
+   * calculation.
+   * @param columns The number of columns to use in the minimum size
+   * calculation.
+   *
+   * @return The minimum size for this text area.
+   */
+  public Dimension getMinimumSize (int rows, int columns)
+  {
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+
+    // Sun returns Dimension (0,0) in this case.
+    if (peer == null)
+      return new Dimension (0, 0);
+
+    return peer.getMinimumSize (rows, columns);
+  }
+
+  /**
+   * Retrieve the minimum size for this text area, considering the
+   * text area's current row and column values.  A text area's minimum
+   * size depends on the number of rows and columns of text it would
+   * prefer to display, and on the size of the font in which the text
+   * would be displayed.
+   *
+   * @return The minimum size for this text area.
+   *
+   * @deprecated This method is deprecated in favor of
+   * <code>getMinimumSize ()</code>.
+   */
+  public Dimension minimumSize ()
+  {
+    return getMinimumSize (getRows (), getColumns ());
+  }
+
+  /**
+   * Retrieve the minimum size that this text area would have if its
+   * row and column values were equal to those specified.  A text
+   * area's minimum size depends on the number of rows and columns of
+   * text it would prefer to display, and on the size of the font in
+   * which the text would be displayed.
+   *
+   * @param rows The number of rows to use in the minimum size
+   * calculation.
+   * @param columns The number of columns to use in the minimum size
+   * calculation.
+   *
+   * @return The minimum size for this text area.
+   *
+   * @deprecated This method is deprecated in favor of
+   * <code>getMinimumSize (int, int)</code>.
+   */
+  public Dimension minimumSize (int rows, int columns)
+  {
+    return getMinimumSize (rows, columns);
+  }
+
+  /**
+   * Retrieve the preferred size for this text area, considering the
+   * text area's current row and column values.  A text area's preferred
+   * size depends on the number of rows and columns of text it would
+   * prefer to display, and on the size of the font in which the text
+   * would be displayed.
+   *
+   * @return The preferred size for this text field.
+   */
+  public Dimension getPreferredSize ()
+  {
+    return getPreferredSize (getRows (), getColumns ());
+  }
+
+  /**
+   * Retrieve the preferred size that this text area would have if its
+   * row and column values were equal to those specified.  A text
+   * area's preferred size depends on the number of rows and columns
+   * of text it would prefer to display, and on the size of the font
+   * in which the text would be displayed.
+   *
+   * @param rows The number of rows to use in the preferred size
+   * calculation.
+   * @param columns The number of columns to use in the preferred size
+   * calculation.
+   *
+   * @return The preferred size for this text area.
+   */
+  public Dimension getPreferredSize (int rows, int columns)
+  {
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+
+    // Sun returns Dimension (0,0) in this case.
+    if (peer == null)
+      return new Dimension (0, 0);
+
+    return peer.getPreferredSize (rows, columns);
+  }
+
+  /**
+   * Retrieve the preferred size for this text area, considering the
+   * text area's current row and column values.  A text area's preferred
+   * size depends on the number of rows and columns of text it would
+   * prefer to display, and on the size of the font in which the text
+   * would be displayed.
+   *
+   * @return The preferred size for this text field.
+   *
+   * @deprecated This method is deprecated in favor of
+   * <code>getPreferredSize ()</code>.
+   */
+  public Dimension preferredSize ()
+  {
+    return getPreferredSize (getRows (), getColumns ());
+  }
+
+  /**
+   * Retrieve the preferred size that this text area would have if its
+   * row and column values were equal to those specified.  A text
+   * area's preferred size depends on the number of rows and columns
+   * of text it would prefer to display, and on the size of the font
+   * in which the text would be displayed.
+   *
+   * @param rows The number of rows to use in the preferred size
+   * calculation.
+   * @param columns The number of columns to use in the preferred size
+   * calculation.
+   *
+   * @return The preferred size for this text area.
+   *
+   * @deprecated This method is deprecated in favor of
+   * <code>getPreferredSize (int, int)</code>.
+   */
+  public Dimension preferredSize (int rows, int columns)
+  {
+    return getPreferredSize (rows, columns);
+  }
+
+  /**
+   * Retrieve the scroll bar display policy -- one of SCROLLBARS_BOTH,
+   * SCROLLBARS_VERTICAL_ONLY, SCROLLBARS_HORIZONTAL_ONLY,
+   * SCROLLBARS_NONE.
+   *
+   * @return The current scroll bar display policy.
+   */
+  public int getScrollbarVisibility ()
+  {
+    return scrollbarVisibility;
+  }
+
+  /**
+   * Notify this object that it should create its native peer.
+   */
+  public void addNotify ()
+  {
+    if (getPeer () != null)
+      return;
+
+    setPeer ((ComponentPeer) getToolkit().createTextArea (this));
+  }
+
+  /**
+   * Append the specified text to the end of the current text.
+   *
+   * @param text The text to append.
+   */
+  public void append (String str)
+  {
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+    if (peer == null)
+      return;
+
+    peer.insert (str, peer.getText().length ());
+  }
+
+  /**
+   * Append the specified text to the end of the current text.
+   *
+   * @param text The text to append.
+   *
+   * @deprecated This method is deprecated in favor of
+   * <code>append ()</code>.
+   */
+  public void appendText (String text)
+  {
+    append (text);
+  }
+
+  /**
+   * Insert the specified text at the specified position.  The first
+   * character in the text area is at position zero.
+   *
+   * @param text The text to insert.
+   * @param pos The position at which to insert text.
+   */
+  public void insert (String text, int pos)
+  {
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+    if (peer == null)
+      return;
+
+    peer.insert (text, pos);
+  }
+
+  /**
+   * Insert the specified text at the specified position.  The first
+   * character in the text area is at position zero.
+   *
+   * @param text The text to insert.
+   * @param pos The position at which to insert text.
+   *
+   * @deprecated This method is depcreated in favor of
+   * <code>insert ()</code>.
+   */
+  public void insertText (String text, int pos)
+  {
+    insert (text, pos);
+  }
+
+  /**
+   * Replace a range of characters with the specified text.  The
+   * character at the start position will be replaced, unless start ==
+   * end.  The character at the end posistion will not be replaced.
+   * The first character in the text area is at position zero.  The
+   * length of the replacement text may differ from the length of the
+   * text that is replaced.
+   *
+   * @param text The new text for the range.
+   * @param start The start position of the replacement range.
+   * @param end The end position of the replacement range.
+   */
+  public void replaceRange (String text, int start, int end)
+  {
+    TextAreaPeer peer = (TextAreaPeer) getPeer ();
+    if (peer == null)
+      return;
+
+    peer.replaceRange (text, start, end);
+  }
+
+  /**
+   * Replace a range of characters with the specified text.  The
+   * character at the start position will be replaced, unless start ==
+   * end.  The character at the end posistion will not be replaced.
+   * The first character in the text area is at position zero.  The
+   * length of the replacement text may differ from the length of the
+   * text that is replaced.
+   *
+   * @param text The new text for the range.
+   * @param start The start position of the replacement range.
+   * @param end The end position of the replacement range.
+   *
+   * @deprecated This method is deprecated in favor of
+   * <code>replaceRange ()</code>.
+   */
+  public void replaceText (String text, int start, int end)
+  {
+    replaceRange (text, start, end);
+  }
+
+  /**
+   * Retrieve a debugging string for this text area.
+   *
+   * @return A debugging string for this text area.
+   */
+  protected String paramString ()
+  {
+    String sbVisibility = "";
+
+    switch (scrollbarVisibility)
+      {
+      case SCROLLBARS_BOTH:
+	sbVisibility = "both";
+	break;
+      case SCROLLBARS_VERTICAL_ONLY:
+	sbVisibility = "vertical-only";
+	break;
+      case SCROLLBARS_HORIZONTAL_ONLY:
+	sbVisibility = "horizontal-only";
+	break;
+      case SCROLLBARS_NONE:
+	sbVisibility = "none";
+	break;
+      }
+
+    String editable = "";
+    if (isEditable ())
+      editable = "editable,";
+
+    return getName () + "," + getX () + "," + getY () + "," + getWidth ()
+           + "x" + getHeight () + "," + "text=" + getText () + "," + editable
+           + "selection=" + getSelectionStart () + "-" + getSelectionEnd ()
+           + ",rows=" + rows + ",columns=" + columns + ",scrollbarVisibility="
+           + sbVisibility;
+  }
+
+  /**
+   * Generate a unique name for this text area.
+   *
+   * @return A unique name for this text area.
+   */
+  String generateName ()
+  {
+    return "text" + getUniqueLong ();
+  }
+
+  private static synchronized long getUniqueLong ()
+  {
+    return next_text_number++;
+  }
 }
-
-} // class TextArea 
-

--=-OXp4yYr/b4ZW715uiis5--




From MAILER-DAEMON Sun Jan 25 18:16:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AktUi-0006rh-6H
	for mharc-commit-classpath@gnu.org; Sun, 25 Jan 2004 18:16:44 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AktUX-0006jW-4f
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 18:16:33 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AktTs-0005TX-H8
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 18:16:24 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AktTc-0005KK-1P
	for commit-classpath@gnu.org; Sun, 25 Jan 2004 18:15:36 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id QAA02433
	for <commit-classpath@gnu.org>; Sun, 25 Jan 2004 16:15:29 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 05DDA4F82B3; Sun, 25 Jan 2004 16:06:13 -0700 (MST)
To: commit-classpath <commit-classpath@gnu.org>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: Thank god!!..  It's HENNY YOUNGMAN!!
Date: 25 Jan 2004 16:06:13 -0700
Message-ID: <87zncby6fu.fsf@fleche.redhat.com>
Lines: 26
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: Class bug fix
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
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: Sun, 25 Jan 2004 23:16:41 -0000

I'm checking this in.  I noticed this while looking at an earlier
patch of Michael's.  (He didn't introduce it, it was there before.)

Tom

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

	* java/lang/Class.java (internalGetMethod): Now private.

Index: java/lang/Class.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Class.java,v
retrieving revision 1.15
diff -u -r1.15 Class.java
--- java/lang/Class.java 25 Jan 2004 18:25:09 -0000 1.15
+++ java/lang/Class.java 25 Jan 2004 23:14:12 -0000
@@ -689,7 +689,7 @@
    * Like <code>getMethod(String,Class[])</code> but without the security
    * checks and returns null instead of throwing NoSuchMethodException.
    */
-  public Method internalGetMethod(String methodName, Class[] args)
+  private Method internalGetMethod(String methodName, Class[] args)
   {
     Method match = matchMethod(getDeclaredMethods(true), methodName, args);
     if (match != null)



From MAILER-DAEMON Mon Jan 26 16:36:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlEOq-00049r-Bh
	for mharc-commit-classpath@gnu.org; Mon, 26 Jan 2004 16:36:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlEOj-00043q-SR
	for commit-classpath@gnu.org; Mon, 26 Jan 2004 16:35:57 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlEO8-0003WX-2F
	for commit-classpath@gnu.org; Mon, 26 Jan 2004 16:35:51 -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.24) id 1AlE6R-0003MG-8b
	for commit-classpath@gnu.org; Mon, 26 Jan 2004 16:17:03 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AlE3m-0003MT-Ew
	for commit-classpath@gnu.org; Mon, 26 Jan 2004 16:14:18 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0QLECr10684
	for <commit-classpath@gnu.org>; Mon, 26 Jan 2004 16:14:12 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0QLEBa02659
	for <commit-classpath@gnu.org>; Mon, 26 Jan 2004 16:14:11 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0QLEBXd023716
	for <commit-classpath@gnu.org>; Mon, 26 Jan 2004 16:14:11 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-WLSHX/riH/W+w8oETL0Z"
Organization: 
Message-Id: <1075151651.3650.15.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 26 Jan 2004 16:14:11 -0500
Subject: Patch: FYI: Fix setForeground for CheckBox
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Jan 2004 21:36:01 -0000


--=-WLSHX/riH/W+w8oETL0Z
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hello,

I'm committing the following patch to merge a recent change in libgcj.

-David Jee

2004-01-26  David Jee  <djee@redhat.com>

        * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
        (find_bg_color_widget): For GtkButton, return its child.



--=-WLSHX/riH/W+w8oETL0Z
Content-Disposition: attachment; filename=CheckBoxForeground.patch
Content-Type: text/x-patch; name=CheckBoxForeground.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.12
diff -u -r1.12 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	5 Jan 2004 21:13:46 -0000	1.12
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	26 Jan 2004 20:06:04 -0000
@@ -621,7 +621,7 @@
 {
   GtkWidget *fg_color_widget;
 
-  if (GTK_IS_EVENT_BOX (widget))
+  if (GTK_IS_EVENT_BOX (widget) || GTK_IS_BUTTON (widget))
     fg_color_widget = gtk_bin_get_child (GTK_BIN(widget));
   else
     fg_color_widget = widget;

--=-WLSHX/riH/W+w8oETL0Z--




From MAILER-DAEMON Tue Jan 27 11:19:34 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlVs2-0002dC-Pa
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 11:15:22 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlVrt-0002Zz-OC
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 11:15:13 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlVrJ-0002OO-8M
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 11:15:08 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlVhw-0008Ud-G8
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 11:04:56 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0RG4tr26228
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 11:04:55 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0RG4ta20902
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 11:04:55 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0RG4sXd023002
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 11:04:54 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-iyJE99WqcrgI0GfqEE2Y"
Organization: 
Message-Id: <1075219494.14610.3.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 27 Jan 2004 11:04:54 -0500
Subject: Patch: FYI: Fixes to AWT PaintEvent handling
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 16:15:16 -0000


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

Hello,

I committed the following patch to merge recent changes from libgcj.

-David Jee

2004-01-27  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(handleEvent): Implemented. Handles PaintEvents.
	(paint): Implemented. Use GTK native methods to queue updates
        for this heavyweight peer.
	* gnu/java/awt/peer/gtk/GtkContainerPeer.java
	(handleEvent): Removed.
	* include/gnu_java_awt_peer_gtk_GtkComponentPeer.h: Regenerated.
	* java/awt/Component.java
	(paint): Implemented. Explictly paint the heavyweight peer.
	(update): Clear the background for heavyweight components.
	(paintAll): No need to call peer.paint() anymore.
	(processEvent): Don't process PaintEvents here. It's now done in
	the peer's handleEvent().
	(processPaintEvent): Removed.
	* java/awt/Container.java
	(paint): No need to call super.paint(). Visit heavyweight
	children as well.
	(update): Don't clear the background here.  It's done in
	Component.update().
	(visitChildren): Added check to not recurse into Containers.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(filter_expose_event_handler): New method.  Filter unwanted
	expose events while painting heavyweight peers.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter):
	New method. Connect filter and block pre_event_handler.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter):
	New method. Disconnect filter and unblock pre_event_handler.
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea):
	New method. Invalidate and update given area.
	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
	(pre_event_handler): Add checks for unwanted expose events.


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

Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.58
diff -u -r1.58 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java	20 Jan 2004 21:31:58 -0000	1.58
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java	27 Jan 2004 15:59:11 -0000
@@ -91,6 +91,9 @@
   native void gtkWidgetSetCursor (int type);
   native void gtkWidgetSetBackground (int red, int green, int blue);
   native void gtkWidgetSetForeground (int red, int green, int blue);
+  native void gtkWidgetQueueDrawArea(int x, int y, int width, int height);
+  native void addExposeFilter();
+  native void removeExposeFilter();
 
   void create ()
   {
@@ -207,6 +210,37 @@
   
   public void handleEvent (AWTEvent event)
   {
+    int id = event.getID();
+
+    switch (id)
+      {
+      case PaintEvent.PAINT:
+      case PaintEvent.UPDATE:
+        {
+          try 
+            {
+              Graphics g = getGraphics ();
+          
+              // Some peers like GtkFileDialogPeer are repainted by Gtk itself
+              if (g == null)
+                break;
+
+              g.setClip (((PaintEvent)event).getUpdateRect());
+
+              if (id == PaintEvent.PAINT)
+                awtComponent.paint (g);
+              else
+                awtComponent.update (g);
+
+              g.dispose ();
+            }
+          catch (InternalError e)
+            {
+              System.err.println (e);
+            }
+        }
+        break;
+      }
   }
   
   public boolean isFocusTraversable () 
@@ -225,7 +259,21 @@
 
   public void paint (Graphics g)
   {
-    awtComponent.paint (g);
+    Component parent = awtComponent.getParent();
+    GtkComponentPeer parentPeer = null;
+    if ((parent instanceof Container) && !parent.isLightweight())
+      parentPeer = (GtkComponentPeer) parent.getPeer();
+
+    addExposeFilter();
+    if (parentPeer != null)
+      parentPeer.addExposeFilter();
+
+    Rectangle clip = g.getClipBounds();
+    gtkWidgetQueueDrawArea(clip.x, clip.y, clip.width, clip.height);
+
+    removeExposeFilter();
+    if (parentPeer != null)
+      parentPeer.removeExposeFilter();
   }
 
   public Dimension preferredSize ()
Index: gnu/java/awt/peer/gtk/GtkContainerPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkContainerPeer.java,v
retrieving revision 1.21
diff -u -r1.21 GtkContainerPeer.java
--- gnu/java/awt/peer/gtk/GtkContainerPeer.java	13 Jan 2004 21:30:47 -0000	1.21
+++ gnu/java/awt/peer/gtk/GtkContainerPeer.java	27 Jan 2004 15:59:11 -0000
@@ -100,41 +100,6 @@
     return new GdkGraphics (this);
   }
 
-  public void handleEvent (AWTEvent event)
-  {
-    int id = event.getID();
-      
-    switch (id)
-      {
-      case PaintEvent.PAINT:
-      case PaintEvent.UPDATE:
-	{
-	  try 
-	    {
-	      Graphics g = getGraphics ();
-
-	      // Some peers like GtkFileDialogPeer are repainted by Gtk itself
-	      if (g == null)
-	        break;
-
-	      g.setClip (((PaintEvent)event).getUpdateRect());
-
-	      if (id == PaintEvent.PAINT)
-		awtComponent.paint (g);
-	      else
-		awtComponent.update (g);
-	      
-	      g.dispose ();
-	    } 
-	  catch (InternalError e)
-	    { 
-	      System.err.println (e);
-	    }
-	}
-	break;
-      }
-  }
-
   public void beginLayout () { }
   public void endLayout () { }
   public boolean isPaintPending () { return false; }
Index: include/gnu_java_awt_peer_gtk_GtkComponentPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkComponentPeer.h,v
retrieving revision 1.7
diff -u -r1.7 gnu_java_awt_peer_gtk_GtkComponentPeer.h
--- include/gnu_java_awt_peer_gtk_GtkComponentPeer.h	7 Jan 2004 02:23:37 -0000	1.7
+++ include/gnu_java_awt_peer_gtk_GtkComponentPeer.h	27 Jan 2004 15:59:11 -0000
@@ -21,6 +21,9 @@
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetCursor (JNIEnv *env, jobject, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetBackground (JNIEnv *env, jobject, jint, jint, jint);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetSetForeground (JNIEnv *env, jobject, jint, jint, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea (JNIEnv *env, jobject, jint, jint, jint, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectSignals (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_requestFocus__ (JNIEnv *env, jobject);
Index: java/awt/Component.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v
retrieving revision 1.25
diff -u -r1.25 Component.java
--- java/awt/Component.java	27 Jan 2004 09:46:25 -0000	1.25
+++ java/awt/Component.java	27 Jan 2004 15:59:11 -0000
@@ -1702,6 +1702,9 @@
    */
   public void paint(Graphics g)
   {
+    // Paint the heavyweight peer
+    if (!isLightweight() && peer != null)
+      peer.paint(g);
   }
 
   /**
@@ -1719,6 +1722,15 @@
    */
   public void update(Graphics g)
   {
+    if (!isLightweight())
+      {
+        Rectangle clip = g.getClipBounds();
+        if (clip == null)
+          g.clearRect(0, 0, width, height);
+        else
+          g.clearRect(clip.x, clip.y, clip.width, clip.height);
+      }
+
     paint(g);
   }
 
@@ -1732,8 +1744,6 @@
   {
     if (! visible)
       return;
-    if (peer != null)
-      peer.paint(g);
     paint(g);
   }
 
@@ -2787,8 +2797,6 @@
 
     if (e instanceof FocusEvent)
       processFocusEvent((FocusEvent) e);
-    else if (e instanceof PaintEvent)
-      processPaintEvent((PaintEvent) e);
     else if (e instanceof MouseWheelEvent)
       processMouseWheelEvent((MouseWheelEvent) e);
     else if (e instanceof MouseEvent)
@@ -4222,42 +4230,6 @@
 
     newEvent.setUpdateRect(union);
     return newEvent;
-  }
-
-  /**
-   * Does the work for a paint event.
-   *
-   * @param event the event to process
-   */
-  private void processPaintEvent(PaintEvent event)
-  {
-    // Can't do graphics without peer
-    if (peer == null)
-      return;
-
-    Graphics gfx = getGraphics();
-    try
-      {
-	Shape clip = event.getUpdateRect();
-	gfx.setClip(clip);
-
-	switch (event.id)
-	  {
-	  case PaintEvent.PAINT:
-	    paint(gfx);
-	    break;
-	  case PaintEvent.UPDATE:
-	    update(gfx);
-	    break;
-	  default:
-	    throw new IllegalArgumentException("unknown paint event");
-	  }
-	event.consume ();
-      }
-    finally
-      {
-	gfx.dispose();
-      }
   }
 
   /**
Index: java/awt/Container.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.27
diff -u -r1.27 Container.java
--- java/awt/Container.java	21 Jan 2004 15:14:23 -0000	1.27
+++ java/awt/Container.java	27 Jan 2004 15:59:13 -0000
@@ -663,8 +663,9 @@
   {
     if (!isShowing())
       return;
-    super.paint(g);
-    visitChildren(g, GfxPaintVisitor.INSTANCE, true);
+    // Visit heavyweights as well, in case they were
+    // erased when we cleared the background for this container.
+    visitChildren(g, GfxPaintVisitor.INSTANCE, false);
   }
 
   /**
@@ -678,11 +679,6 @@
    */
   public void update(Graphics g)
   {
-    Rectangle clip = g.getClipBounds();
-    if (clip == null)
-      g.clearRect(0, 0, width, height);
-    else
-      g.clearRect(clip.x, clip.y, clip.width, clip.height);
     super.update(g);
   }
 
@@ -1204,8 +1200,12 @@
         for (int i = ncomponents - 1; i >= 0; --i)
           {
             Component comp = component[i];
+            // If we're visiting heavyweights as well,
+            // don't recurse into Containers here. This avoids
+            // painting the same nested child multiple times.
             boolean applicable = comp.isVisible()
-              && (comp.isLightweight() || !lightweightOnly);
+              && (comp.isLightweight()
+                  || !lightweightOnly && ! (comp instanceof Container));
 
             if (applicable)
               visitChild(gfx, visitor, comp);
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.17
diff -u -r1.17 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	26 Jan 2004 21:20:12 -0000	1.17
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	27 Jan 2004 15:59:13 -0000
@@ -575,6 +575,80 @@
   (*env)->ReleaseStringUTFChars (env, jname, name);
 }
 
+gboolean
+filter_expose_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer)
+{
+  // Prevent the default event handler from getting this signal if applicable
+  // FIXME: I came up with these filters by looking for patterns in the unwanted
+  //        expose events that are fed back to us from gtk/X. Perhaps there is
+  //        a way to prevent them from occuring in the first place.
+  if (event->type == GDK_EXPOSE && (!GTK_IS_LAYOUT(widget)
+                                    || event->any.window != widget->window))
+    {
+      g_signal_stop_emission_by_name(GTK_OBJECT(widget), "event");
+      return FALSE;
+    }
+  else
+    {
+      // There may be non-expose events that are triggered while we're
+      // painting a heavyweight peer.
+      return pre_event_handler(widget, event, peer);
+    }
+}
+
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
+
+  gdk_threads_enter ();
+
+  g_signal_handlers_block_by_func (GTK_OBJECT(ptr), *pre_event_handler, *gref);
+  g_signal_connect( GTK_OBJECT(ptr), "event",
+                    G_CALLBACK(filter_expose_event_handler), *gref);
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter
+  (JNIEnv *env, jobject obj)
+{
+  void *ptr = NSA_GET_PTR (env, obj);
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  g_assert (gref);
+
+  gdk_threads_enter ();
+
+  g_signal_handlers_disconnect_by_func (GTK_OBJECT(ptr),
+                                        *filter_expose_event_handler, *gref);
+  g_signal_handlers_unblock_by_func (GTK_OBJECT(ptr), *pre_event_handler, *gref);
+
+  gdk_threads_leave ();
+}
+
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkWidgetQueueDrawArea
+  (JNIEnv *env, jobject obj, jint x, jint y, jint width, jint height)
+{
+  GdkRectangle rect;
+  void *ptr;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  rect.x = x + GTK_WIDGET(ptr)->allocation.x;
+  rect.y = y + GTK_WIDGET(ptr)->allocation.y;
+  rect.width = width;
+  rect.height = height;
+
+  gdk_threads_enter ();
+
+  gdk_window_invalidate_rect (GTK_WIDGET (ptr)->window, &rect, 0);
+  gdk_window_process_all_updates();
+
+  gdk_threads_leave ();
+}
+
 JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkComponentPeer_connectJObject
   (JNIEnv *env, jobject obj)
 {
Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,v
retrieving revision 1.20
diff -u -r1.20 gnu_java_awt_peer_gtk_GtkEvents.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c	26 Jan 2004 16:22:22 -0000	1.20
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c	27 Jan 2004 15:59:13 -0000
@@ -1012,12 +1012,21 @@
       break;
     case GDK_EXPOSE:
       {
-	(*gdk_env)->CallVoidMethod (gdk_env, peer,
-				    postExposeEventID,
-				    (jint)event->expose.area.x,
-				    (jint)event->expose.area.y,
-				    (jint)event->expose.area.width,
-				    (jint)event->expose.area.height);
+        // This filters out unwanted feedback expose events from gtk/X
+        // when we explictly invalidate and update heavyweight components,
+        // thus avoiding an infinite loop.
+        // FIXME: I'm not quite sure why we're getting these expose events. 
+        //        Maybe there is a way to avoid them?
+        if((event->any.window == widget->window && event->any.send_event)
+           || GTK_IS_LAYOUT(widget))
+          {
+	    (*gdk_env)->CallVoidMethod (gdk_env, peer,
+				        postExposeEventID,
+				        (jint)event->expose.area.x,
+				        (jint)event->expose.area.y,
+				        (jint)event->expose.area.width,
+				        (jint)event->expose.area.height);
+          }
       }
       break;
     case GDK_FOCUS_CHANGE:

--=-iyJE99WqcrgI0GfqEE2Y--




From MAILER-DAEMON Tue Jan 27 13:13:09 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlXi1-0006za-AQ
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 13:13:09 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlXhw-0006wT-4j
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:13:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlXgJ-0006DD-9j
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:11:54 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlXgI-0006Cg-Gd
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:11:22 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RIBHVM006360
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 19:11:20 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AlXgD-0004Zc-00
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 19:11:17 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 27 Jan 2004 19:15:00 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_kqqFA3CUNow77iq"
Message-Id: <200401271915.00250.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 18:13:05 -0000


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

Hi list,


I just commited the attached patch to merge in some fixes I did in libgcj some 
time ago.


Michael


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

	* javax/swing/AbstractAction.java: Reformated.
	(getPropertyChangeListeners): New method.
	* javax/swing/AbstractCellEditor.java: Reformated.
	(getCellEditorListeners): New method.
	* javax/swing/DefaultListSelectionModel.java
	(listenerList): New field.
	(listeners): Removed.
	(get_listeners): Removed.
	(addListSelectionListener): Rewritten.
	(removeListSelectionListener): Rewritten.
	(getListSelectionListeners): New method.
	(getListeners): New method.
	* javax/swing/JComboBox.java: Imports reworked.
	(addActionListener): Implemented.
	(removeActionListener): Implemented.
	(addItemListener): Implemented.
	(removeItemListener): Implemented.
	(addPopupMenuListener): Implemented.
	(removePopupMenuListener): Implemented.
	(getActionListeners): New method.
	(getItemListeners): New method.
	(getPopupMenuListeners): New method.


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

Index: javax/swing/AbstractAction.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractAction.java,v
retrieving revision 1.7
diff -u -b -B -r1.7 AbstractAction.java
--- javax/swing/AbstractAction.java	9 Jan 2004 10:19:16 -0000	1.7
+++ javax/swing/AbstractAction.java	27 Jan 2004 18:09:13 -0000
@@ -56,10 +56,6 @@
 {
   static final long serialVersionUID = -6803159439231523484L;
 
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * enabled
 	 */
@@ -76,11 +72,6 @@
 	 */
 	private transient HashMap store = new HashMap();
 
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * Constructor AbstractAction
 	 */
@@ -106,11 +97,6 @@
 		putValue(SMALL_ICON, icon);
 	} // AbstractAction()
 
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * readObject
 	 * @param stream TODO
@@ -185,28 +171,46 @@
 
 	/**
 	 * firePropertyChange
+   *
 	 * @param propertyName TODO
 	 * @param oldValue TODO
 	 * @param newValue TODO
 	 */
-	protected void firePropertyChange(String propertyName,
-			Object oldValue, Object newValue) {
+  protected void firePropertyChange(String propertyName, Object oldValue,
+                                    Object newValue)
+  {
 		changeSupport.firePropertyChange(propertyName, oldValue, newValue);
-	} // firePropertyChange()
+  }
 
 	/**
 	 * addPropertyChangeListener
-	 * @param listener TODO
+   *
+   * @param listener the listener to add
 	 */
-	public synchronized void addPropertyChangeListener(PropertyChangeListener listener) {
+  public void addPropertyChangeListener(PropertyChangeListener listener)
+  {
 		changeSupport.addPropertyChangeListener(listener);
-	} // addPropertyChangeListener()
+  }
 
 	/**
 	 * removePropertyChangeListener
-	 * @param listener TODO
+   *
+   * @param listener the listener to remove
 	 */
-	public synchronized void removePropertyChangeListener(PropertyChangeListener listener) {
+  public void removePropertyChangeListener(PropertyChangeListener listener)
+  {
 		changeSupport.removePropertyChangeListener(listener);
-	} // removePropertyChangeListener()
+  }
+
+  /**
+   * Returns all registered listeners.
+   *
+   * @return array of listeners.
+   * 
+   * @since 1.4
+   */
+  public PropertyChangeListener[] getPropertyChangeListeners()
+  {
+    return changeSupport.getPropertyChangeListeners();
+  }
 }
Index: javax/swing/AbstractCellEditor.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/AbstractCellEditor.java,v
retrieving revision 1.3
diff -u -b -B -r1.3 AbstractCellEditor.java
--- javax/swing/AbstractCellEditor.java	8 Jun 2003 11:20:06 -0000	1.3
+++ javax/swing/AbstractCellEditor.java	27 Jan 2004 18:09:13 -0000
@@ -1,5 +1,5 @@
 /* AbstractCellEditor.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -54,10 +54,6 @@
 {
   static final long serialVersionUID = -1048006551406220959L;
 
-	//-------------------------------------------------------------
-	// Variables --------------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * listenerList
 	 */
@@ -68,11 +64,6 @@
 	 */
 	protected transient ChangeEvent changeEvent;
 
-
-	//-------------------------------------------------------------
-	// Initialization ---------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * Constructor AbstractCellEditor
 	 */
@@ -80,11 +71,6 @@
 		// TODO
 	} // AbstractCellEditor()
 
-
-	//-------------------------------------------------------------
-	// Methods ----------------------------------------------------
-	//-------------------------------------------------------------
-
 	/**
 	 * isCellEditable
 	 * @param event TODO
@@ -119,40 +105,64 @@
 	} // cancelCellEditing()
 
 	/**
+	 * getCellEditorValue
+	 * @returns Object
+	 */
+	public abstract Object getCellEditorValue();
+
+  /**
 	 * addCellEditorListener
-	 * @param listener TODO
+   *
+   * @param listener The listener to add
 	 */
-	public void addCellEditorListener(CellEditorListener listener) {
-		// TODO
-	} // addCellEditorListener()
+  public void addCellEditorListener (CellEditorListener listener)
+  {
+    listenerList.add (CellEditorListener.class, listener);
+  }
 
 	/**
 	 * removeCellEditorListener
-	 * @param listener TODO
+   *
+   * @param listener The listener to remove
 	 */
-	public void removeCellEditorListener(CellEditorListener listener) {
-		// TODO
-	} // removeCellEditorListener()
+  public void removeCellEditorListener (CellEditorListener listener)
+  {
+    listenerList.remove (CellEditorListener.class, listener);
+  }
+	
+  /**
+   * getCellEditorListeners
+   *
+   * @since 1.4
+   */
+  public CellEditorListener[] getCellEditorListeners()
+  {
+    return (CellEditorListener[]) listenerList.getListeners (CellEditorListener.class);
+  }
 
 	/**
 	 * fireEditingStopped
 	 */
-	protected void fireEditingStopped() {
-		// TODO
-	} // fireEditingStopped()
+  protected void fireEditingStopped()
+  {
+    CellEditorListener[] listeners = getCellEditorListeners();
+
+    for (int index = 0; index < listeners.length; index++)
+      {
+	listeners [index].editingStopped (changeEvent);
+      }
+  }
 
 	/**
 	 * fireEditingCanceled
 	 */
-	protected void fireEditingCanceled() {
-		// TODO
-	} // fireEditingCanceled()
-
-	/**
-	 * getCellEditorValue
-	 * @returns Object
-	 */
-	public abstract Object getCellEditorValue();
-
-
-} // AbstractCellEditor
+  protected void fireEditingCanceled()
+  {
+    CellEditorListener[] listeners = getCellEditorListeners();
+
+    for (int index = 0; index < listeners.length; index++)
+      {
+	listeners [index].editingCanceled (changeEvent);
+      }
+  }
+}
Index: javax/swing/DefaultListSelectionModel.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/DefaultListSelectionModel.java,v
retrieving revision 1.4
diff -u -b -B -r1.4 DefaultListSelectionModel.java
--- javax/swing/DefaultListSelectionModel.java	8 Jun 2003 11:43:14 -0000	1.4
+++ javax/swing/DefaultListSelectionModel.java	27 Jan 2004 18:09:13 -0000
@@ -1,5 +1,5 @@
 /* DefaultListSelectionModel.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -42,34 +42,17 @@
 import java.util.EventListener;
 import java.util.Vector;
 import javax.swing.event.EventListenerList;
+import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
 public class DefaultListSelectionModel implements Cloneable, ListSelectionModel, Serializable
 {
+  protected EventListenerList listenerList = new EventListenerList();
+  
     int mode = SINGLE_SELECTION;
 
     Vector sel = new Vector();
 
-    Vector listeners;
-
-    Vector get_listeners()
-    {
-	if (listeners == null)
-	    listeners = new Vector();
-	return listeners;
-    }
-    
-
-    public void addListSelectionListener(ListSelectionListener listener)
-    {
-	get_listeners().addElement(listener);
-    }
-
-    public void removeListSelectionListener(ListSelectionListener listener)
-    {
-	get_listeners().removeElement(listener);
-    }
-    
     class Range
     {
 	int i0, i1;
@@ -182,4 +165,60 @@
 
 	sel.addElement(new Range(index0, index1));
     }
+
+  /**
+   * Adds a listener.
+   *
+   * @param listener the listener to add
+   *
+   * @see removeListSelectionListener
+   * @see getListSelectionListeners
+   */
+  public void addListSelectionListener(ListSelectionListener listener)
+  {
+    listenerList.add (ListSelectionListener.class, listener);
+  }
+
+  /**
+   * Removes a registered listener.
+   *
+   * @param listener the listener to remove
+   *
+   * @see addListSelectionListener
+   * @see getListSelectionListeners
+   */
+  public void removeListSelectionListener(ListSelectionListener listener)
+  {
+    listenerList.remove (ListSelectionListener.class, listener);
+  }
+  
+  /**
+   * Returns an array of all registerers listeners.
+   * 
+   * @return the array
+   * 
+   * @since 1.3
+   *
+   * @see getListSelectionListener
+   */
+  public EventListener[] getListeners (Class listenerType)
+  {
+    return listenerList.getListeners (listenerType);
+  }
+
+  /**
+   * Returns an array of all registerd list selection listeners.
+   *
+   * @return the array
+   * 
+   * @since 1.4
+   *
+   * @see addListSelectionListener
+   * @see removeListSelectionListener
+   * @see getListeners
+   */
+  public ListSelectionListener[] getListSelectionListeners()
+  {
+    return (ListSelectionListener[]) getListeners (ListSelectionListener.class);
+  }
 }
Index: javax/swing/JComboBox.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComboBox.java,v
retrieving revision 1.5
diff -u -b -B -r1.5 JComboBox.java
--- javax/swing/JComboBox.java	12 Oct 2003 16:44:39 -0000	1.5
+++ javax/swing/JComboBox.java	27 Jan 2004 18:09:13 -0000
@@ -1,5 +1,5 @@
 /* JComboBox.java --
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -38,14 +38,27 @@
 
 package javax.swing;
 
-import java.awt.*;
-import java.awt.event.*;
-import java.beans.*;
-import java.io.*;
-import java.util.*;
-import javax.accessibility.*;
-import javax.swing.event.*;
-import javax.swing.plaf.*;
+import java.awt.ItemSelectable;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import java.awt.event.KeyEvent;
+import java.beans.PropertyChangeListener;
+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.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;
+import javax.swing.plaf.ComboBoxUI;
 
 /**
  * JComboBox
@@ -580,38 +593,6 @@
 	} // isPopupVisible()
 
 	/**
-	 * addItemListener
-	 * @param value0 TODO
-	 */
-	public void addItemListener(ItemListener value0) {
-		// TODO
-	} // addItemListener()
-
-	/**
-	 * removeItemListener
-	 * @param value0 TODO
-	 */
-	public void removeItemListener(ItemListener value0) {
-		// TODO
-	} // removeItemListener()
-
-	/**
-	 * addActionListener
-	 * @param value0 TODO
-	 */
-	public void addActionListener(ActionListener value0) {
-		// TODO
-	} // addActionListener()
-
-	/**
-	 * removeActionListener
-	 * @param value0 TODO
-	 */
-	public void removeActionListener(ActionListener value0) {
-		// TODO
-	} // removeActionListener()
-
-	/**
 	 * setActionCommand
 	 * @param value0 TODO
 	 */
@@ -834,6 +815,73 @@
 		} // if
 		return accessibleContext;
 	} // getAccessibleContext()
+  /**
+   * addActionListener
+   * @param listener TODO
+   */
+  public void addActionListener (ActionListener listener)
+  {
+    listenerList.add (ActionListener.class, listener);
+  }
+
+  /**
+   * removeActionListener
+   * @param listener TODO
+   */
+  public void removeActionListener (ActionListener listener)
+  {
+    listenerList.remove (ActionListener.class, listener);
+  }
+
+  /**
+   * @since 1.4
+   */
+  public ActionListener[] getActionListeners()
+  {
+    return (ActionListener[]) getListeners (ActionListener.class);
+  }
+
+  /**
+   * addItemListener
+   * @param listener TODO
+   */
+  public void addItemListener(ItemListener listener)
+  {
+    listenerList.add (ItemListener.class, listener);
+  }
+
+  /**
+   * removeItemListener
+   * @param listener TODO
+   */
+  public void removeItemListener(ItemListener listener)
+  {
+    listenerList.remove (ItemListener.class, listener);
+  }
 
+  /**
+   * @since 1.4
+   */
+  public ItemListener[] getItemListeners()
+  {
+    return (ItemListener[]) getListeners (ItemListener.class);
+  }
+
+  public void addPopupMenuListener (PopupMenuListener listener)
+  {
+    listenerList.add (PopupMenuListener.class, listener);
+  }
 
-} // JComboBox
+  public void removePopupMenuListener (PopupMenuListener listener)
+  {
+    listenerList.remove (PopupMenuListener.class, listener);
+  }
+
+  /**
+   * @since 1.4
+   */
+  public PopupMenuListener[] getPopupMenuListeners()
+  {
+    return (PopupMenuListener[]) getListeners (PopupMenuListener.class);
+  }
+}

--Boundary-00=_kqqFA3CUNow77iq--




From MAILER-DAEMON Tue Jan 27 13:16:18 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlXkJ-0008Dp-00
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 13:15:31 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlXjv-0007yo-NJ
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:15:07 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlXgu-0006T8-Mh
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:12:33 -0500
Received: from [212.6.122.126] (helo=mail3.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlXaT-0004wO-1R
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:05:21 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail3.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RI5H1h006146
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 19:05:18 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AlXaN-0004Yg-00
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 19:05:15 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 27 Jan 2004 19:08:58 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_6kqFA9LdeZ/NaA9"
Message-Id: <200401271908.58695.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing.table.JTableHeader
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 18:15:29 -0000


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

Hi list,


I commited the attached patch to merge a little change by Andrew Haley in 
libgcj.


Michael


2004-01-27  Andrew Haley  <aph@redhat.com>

	* javax/swing/table/JTableHeader.java: Extend JComponent


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

Index: javax/swing/table/JTableHeader.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/table/JTableHeader.java,v
retrieving revision 1.1
diff -u -b -B -r1.1 JTableHeader.java
--- javax/swing/table/JTableHeader.java	8 Jun 2003 14:43:06 -0000	1.1
+++ javax/swing/table/JTableHeader.java	27 Jan 2004 18:02:06 -0000
@@ -60,7 +60,7 @@
 import javax.swing.event.TableColumnModelListener;
 import javax.swing.plaf.TableHeaderUI;
 
-public class JTableHeader
+public class JTableHeader extends JComponent
 {
   protected class AccessibleJTableHeader
   {

--Boundary-00=_6kqFA9LdeZ/NaA9--




From MAILER-DAEMON Tue Jan 27 13:19:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlXno-0001tW-E8
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 13:19:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlXnm-0001tJ-5y
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:19:06 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlXnG-0001fC-8f
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:19:05 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlXnF-0001f2-M5
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 13:18:33 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RIIWVM010167
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 19:18:32 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AlXnB-0004ap-00
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 19:18:29 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 27 Jan 2004 19:22:12 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_UxqFAV6VD+smjTI"
Message-Id: <200401271922.12243.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: include file
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 18:19:06 -0000


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

Hi list,


I just commited an updated include file. This file changed because a change to 
its java file was made.


Michael


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

	* include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h: Updated with
	current gnu.java.awt.peer.gtk.GtkFileDialogPeer class.


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

Index: include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h,v
retrieving revision 1.4
diff -u -b -B -r1.4 gnu_java_awt_peer_gtk_GtkFileDialogPeer.h
--- include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h	7 Jan 2004 02:23:37 -0000	1.4
+++ include/gnu_java_awt_peer_gtk_GtkFileDialogPeer.h	27 Jan 2004 18:16:04 -0000
@@ -11,8 +11,9 @@
 #endif
 
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_create (JNIEnv *env, jobject);
-extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_setFile (JNIEnv *env, jobject, jstring);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectJObject (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_connectSignals (JNIEnv *env, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFile (JNIEnv *env, jobject, jstring);
 
 #ifdef __cplusplus
 }

--Boundary-00=_UxqFAV6VD+smjTI--




From MAILER-DAEMON Tue Jan 27 16:06:35 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlaPq-00034w-OR
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 16:06:34 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlaPn-00034K-Qw
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:06:31 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlaPH-0002yY-0z
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:06:30 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlaPG-0002x2-KL
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:05:58 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0RL5qr00733
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:05:52 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0RL5qa31567
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:05:52 -0500
Received: from tomaluk.toronto.redhat.com (tomaluk.toronto.redhat.com
	[172.16.14.15])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0RL5pXd000456
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:05:51 -0500
From: Kim Ho <kho@redhat.com>
To: classpath-commits <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-Hc/SvkBYCE4hoC4XmaGv"
Organization: 
Message-Id: <1075237551.13902.29.camel@tomaluk.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 27 Jan 2004 16:05:51 -0500
Subject: [PATCH] FYI: Initial implementation of menubars
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 21:06:32 -0000


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

Hi,

I'm committing the patch attached below to merge changes from libgcj.

Cheers,

Kim 

2004-01-16  Kim Ho  <kho@redhat.com>
 
        * gnu/java/awt/peer/gtk/GtkFramePeer.java (getMenuBarHeight):
Added
        MenuBarPeer parameter.
        (removeMenuBarPeer): New native method.
        (setMenuBar): Call remove if menu bar is null. Adjust insets
        appropriately.
        (postSizeAllocateEvent): New method. Called when menu bar size
is
        allocated. Adjust insets and redo layout.
        (GtkFramePeer): Set menu bar during frame creation.
        (postConfigureEvent): Adjust position and size to accomodate
        menu bar.
        * java/awt/Frame.java (setMenuBar): addNotify to create menu
bar.
        * java/awt/Menu.java (addSeparator): Use peer's addSeparator.
        (addNotify): Create the peer if it doesn't exist and call
addNotify
        for the menu's items.
        * java/awt/MenuBar.java (addNotify): Create this menu bar's
menus.
        * java/awt/MenuItem.java (addNotify): Create the peer if it
        doesn't exist.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (removeMenuBarPeer): New method. Remove menu bar on the current
        frame.
        (setMenuBarPeer): Add the menu bar to the current frame and the
        callback for size-allocate events on the menu bar.
        (getMenuBarHeight): Add menu bar parameter.
        (menubar_resize_cb): New callback method for postSizeAllocate
events. 




--=-Hc/SvkBYCE4hoC4XmaGv
Content-Disposition: attachment; filename=AWT-menu.patch.classpath
Content-Type: text/x-patch; name=AWT-menu.patch.classpath; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1840
diff -u -r1.1840 ChangeLog
--- ChangeLog	27 Jan 2004 18:38:10 -0000	1.1840
+++ ChangeLog	27 Jan 2004 20:58:39 -0000
@@ -1,3 +1,30 @@
+2004-01-16  Kim Ho  <kho@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkFramePeer.java (getMenuBarHeight): Added
+	MenuBarPeer parameter.
+	(removeMenuBarPeer): New native method.
+	(setMenuBar): Call remove if menu bar is null. Adjust insets
+	appropriately.
+	(postSizeAllocateEvent): New method. Called when menu bar size is
+	allocated. Adjust insets and redo layout.
+	(GtkFramePeer): Set menu bar during frame creation.
+	(postConfigureEvent): Adjust position and size to accomodate
+	menu bar.
+	* java/awt/Frame.java (setMenuBar): addNotify to create menu bar.
+	* java/awt/Menu.java (addSeparator): Use peer's addSeparator.
+	(addNotify): Create the peer if it doesn't exist and call addNotify
+	for the menu's items.
+	* java/awt/MenuBar.java (addNotify): Create this menu bar's menus.
+	* java/awt/MenuItem.java (addNotify): Create the peer if it
+	doesn't exist.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(removeMenuBarPeer): New method. Remove menu bar on the current
+	frame.
+	(setMenuBarPeer): Add the menu bar to the current frame and the
+	callback for size-allocate events on the menu bar.
+	(getMenuBarHeight): Add menu bar parameter.
+	(menubar_resize_cb): New callback method for postSizeAllocate events.
+
 2004-01-27  Michael Koch  <konqueror@gmx.de>
 
 	* javax/swing/AbstractAction.java: Reformated.
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.18
diff -u -r1.18 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	13 Jan 2004 22:29:35 -0000	1.18
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	27 Jan 2004 20:58:40 -0000
@@ -1,5 +1,5 @@
 /* GtkFramePeer.java -- Implements FramePeer with GTK
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -45,6 +45,7 @@
 import java.awt.Image;
 import java.awt.MenuBar;
 import java.awt.Rectangle;
+import java.awt.Window;
 import java.awt.event.PaintEvent;
 import java.awt.peer.FramePeer;
 import java.awt.peer.MenuBarPeer;
@@ -53,16 +54,41 @@
     implements FramePeer
 {
   int menuBarHeight = 0;
-  native int getMenuBarHeight ();
+  private MenuBarPeer menuBar;
+  native int getMenuBarHeight (MenuBarPeer bar);
 
   native public void setMenuBarPeer (MenuBarPeer bar);
+  native public void removeMenuBarPeer (MenuBarPeer bar);
 
   public void setMenuBar (MenuBar bar)
   {
-    if (bar == null)
-      setMenuBarPeer (null);
-    else
-      setMenuBarPeer ((MenuBarPeer) bar.getPeer ());
+    if (bar == null && menuBar != null)
+    {    
+      removeMenuBarPeer(menuBar); 
+      menuBar = null;
+      insets.top -= menuBarHeight;
+      menuBarHeight = 0;      
+      awtComponent.doLayout();
+    }
+    else if (bar != null)
+    {
+      if (menuBar != null)
+        removeMenuBarPeer(menuBar);
+      menuBar = (MenuBarPeer) ((MenuBar) bar).getPeer();
+      setMenuBarPeer(menuBar);      
+    }
+  }
+
+  protected void postSizeAllocateEvent()
+  {
+    if (menuBar != null)
+    {
+      if (menuBarHeight != 0)
+        insets.top -= menuBarHeight;
+      menuBarHeight = getMenuBarHeight(menuBar);
+      insets.top += menuBarHeight;
+    }
+    awtComponent.doLayout();
   }
 
   public GtkFramePeer (Frame frame)
@@ -74,6 +100,7 @@
   {
     // Create a normal decorated window.
     create (GDK_WINDOW_TYPE_HINT_NORMAL, true);
+    setMenuBar(((Frame) awtComponent).getMenuBar());
   }
 
   public void getArgs (Component component, GtkArgList args)
@@ -102,10 +129,31 @@
     g.translate (-insets.left, -insets.top);
     return g;
   }
-
-  // FIXME: When MenuBars work, override postConfigureEvent and
-  // setBounds to account for MenuBar dimensions.
-
+  
+  protected void postConfigureEvent (int x, int y, int width, int height)
+  {
+    int frame_x = x - insets.left;
+    // Add the height of the menubar (if none, menuBarHeight is 0 and has no
+    // effect). To move the frame down a bit so as to still fit in the window.
+    int frame_y = y - insets.top + menuBarHeight;
+    int frame_width = width + insets.left + insets.right;
+    // Add the height of the menubar to adjust the height so it still fits in
+    // the window.
+    int frame_height = height + insets.top + insets.bottom - menuBarHeight;
+    if (frame_x != awtComponent.getX()
+        || frame_y != awtComponent.getY()
+        || frame_width != awtComponent.getWidth()
+        || frame_height != awtComponent.getHeight())
+      {
+        setBoundsCallback ((Window) awtComponent,
+                           frame_x,
+                           frame_y,
+                           frame_width,
+                           frame_height);
+      }
+    awtComponent.validate();
+  }
+  
   protected void postMouseEvent(int id, long when, int mods, int x, int y, 
 				int clickCount, boolean popupTrigger)
   {
Index: include/gnu_java_awt_peer_gtk_GtkFramePeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h,v
retrieving revision 1.3
diff -u -r1.3 gnu_java_awt_peer_gtk_GtkFramePeer.h
--- include/gnu_java_awt_peer_gtk_GtkFramePeer.h	30 Jul 2003 16:47:19 -0000	1.3
+++ include/gnu_java_awt_peer_gtk_GtkFramePeer.h	27 Jan 2004 20:58:40 -0000
@@ -10,8 +10,9 @@
 {
 #endif
 
-extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight (JNIEnv *env, jobject);
+extern JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer (JNIEnv *env, jobject, jobject);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer (JNIEnv *env, jobject, jobject);
 
 #ifdef __cplusplus
 }
Index: java/awt/Frame.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Frame.java,v
retrieving revision 1.18
diff -u -r1.18 Frame.java
--- java/awt/Frame.java	25 Sep 2003 18:01:38 -0000	1.18
+++ java/awt/Frame.java	27 Jan 2004 20:58:41 -0000
@@ -1,5 +1,5 @@
 /* Frame.java -- AWT toplevel window
-   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.
 
@@ -342,6 +342,8 @@
 setMenuBar(MenuBar menuBar)
 {
   this.menuBar = menuBar;
+  if (menuBar != null)
+    menuBar.addNotify(); 
   if (peer != null)
     ((FramePeer) peer).setMenuBar(menuBar);
 }
Index: java/awt/Menu.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Menu.java,v
retrieving revision 1.11
diff -u -r1.11 Menu.java
--- java/awt/Menu.java	8 Jun 2003 10:48:59 -0000	1.11
+++ java/awt/Menu.java	27 Jan 2004 20:58:41 -0000
@@ -1,5 +1,5 @@
 /* Menu.java -- A Java AWT Menu
-   Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -294,7 +294,8 @@
 public void
 addSeparator()
 {
-  add(separator);
+  if (peer != null)
+    ((MenuPeer) peer).addSeparator();
 }
 
 /*************************************************************************/
@@ -376,8 +377,14 @@
 public void
 addNotify()
 {
-  if (peer != null)
+  if (peer == null)
     peer = getToolkit().createMenu(this);
+  java.util.Enumeration e = items.elements();
+  while (e.hasMoreElements())
+  {
+    MenuItem mi = (MenuItem)e.nextElement();
+    mi.addNotify();
+  }    
   super.addNotify ();
 }
 
Index: java/awt/MenuBar.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/MenuBar.java,v
retrieving revision 1.7
diff -u -r1.7 MenuBar.java
--- java/awt/MenuBar.java	23 Dec 2002 12:45:46 -0000	1.7
+++ java/awt/MenuBar.java	27 Jan 2004 20:58:41 -0000
@@ -1,5 +1,5 @@
 /* MenuBar.java -- An AWT menu bar class
-   Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -263,6 +263,12 @@
 {
   if (getPeer() == null)
     setPeer((MenuComponentPeer)getToolkit().createMenuBar(this));
+  Enumeration e = menus.elements();
+  while (e.hasMoreElements())
+  {
+    Menu mi = (Menu)e.nextElement();
+    mi.addNotify();
+  }
 }
 
 /*************************************************************************/
Index: java/awt/MenuItem.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/MenuItem.java,v
retrieving revision 1.11
diff -u -r1.11 MenuItem.java
--- java/awt/MenuItem.java	26 Dec 2003 16:37:27 -0000	1.11
+++ java/awt/MenuItem.java	27 Jan 2004 20:58:41 -0000
@@ -1,5 +1,5 @@
 /* MenuItem.java -- An item in a menu
-   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.
 
@@ -361,7 +361,7 @@
 public void
 addNotify()
 {
-  if (peer != null)
+  if (peer == null)
     peer = getToolkit ().createMenuItem (this);
 }
 
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.18
diff -u -r1.18 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	27 Jan 2004 09:46:25 -0000	1.18
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	27 Jan 2004 20:58:43 -0000
@@ -72,6 +72,8 @@
 static gboolean window_property_changed_cb (GtkWidget *widget,
 					    GdkEventProperty *event,
 					    jobject peer);
+static void menubar_resize_cb (GtkWidget *widget, GtkAllocation *alloc, 
+                               jobject peer);					    
 
 /*
  * Make a new window.
@@ -371,45 +373,61 @@
 }
 
 JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer
   (JNIEnv *env, jobject obj, jobject menubar)
 {
-  void *wptr, *mptr;
-  GtkBox *box;
+  void *wptr;
+  GtkWidget *box;
+  GtkWidget *mptr;
 
-  if (!menubar) return;
+  wptr = NSA_GET_PTR (env, obj);
+  mptr = NSA_GET_PTR (env, menubar);
+  
+  gdk_threads_enter ();
 
+  box = GTK_BIN (wptr)->child;
+  gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (mptr));  
+  
+  gdk_threads_leave();
+}  
+  
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer
+  (JNIEnv *env, jobject obj, jobject menubar)
+{
+  void *wptr;
+  GtkWidget *mptr;
+  GtkWidget *box;
+  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
+  
   wptr = NSA_GET_PTR (env, obj);
   mptr = NSA_GET_PTR (env, menubar);
+  
+  gdk_threads_enter ();
 
-  if (!mptr) return; /* this case should remove a menu */
+  g_signal_connect (G_OBJECT (mptr), "size-allocate", 
+                    G_CALLBACK (menubar_resize_cb), *gref);    
+  box = GTK_BIN (wptr)->child;		    
+  gtk_box_pack_start (GTK_BOX (box), mptr, 0, 0, 0);
+ 
+  gtk_widget_show (mptr);
 
-  gdk_threads_enter ();
-  box = GTK_BOX (GTK_BIN (wptr)->child);
-  gtk_box_pack_start (box, GTK_WIDGET (mptr), 0, 0, 0);
+ 
   gdk_threads_leave ();
 }
 
 JNIEXPORT jint JNICALL
 Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight
-  (JNIEnv *env, jobject obj)
+  (JNIEnv *env, jobject obj, jobject menubar)
 {
-  void *ptr;
-  GList *children;
-  jint height = 0;
-
-  ptr = NSA_GET_PTR (env, obj);
+  GtkWidget *ptr;
+  jint height;
+  
+  ptr = NSA_GET_PTR (env, menubar);
 
   gdk_threads_enter ();
-  children = gtk_container_children (GTK_CONTAINER (GTK_BIN (ptr)->child));
-  if (g_list_length (children) == 2)
-    {
-      GtkWidget *menubar = GTK_WIDGET (children->data);
-      height = menubar->allocation.height;
-
-    }
+  height = ptr->allocation.height;
   gdk_threads_leave ();
-
   return height;
 }
 
@@ -710,4 +728,26 @@
 				(jint) extents[1]); /* right */
 
   return FALSE;
+}
+
+static void menubar_resize_cb (GtkWidget *widget, GtkAllocation *alloc, 
+                               jobject peer)
+{
+  static int id_set = 0;
+  static jmethodID postSizeAllocateEventID;
+  
+  if (!id_set)
+    {
+      jclass gtkframepeer = (*gdk_env)->FindClass (gdk_env,
+                                "gnu/java/awt/peer/gtk/GtkFramePeer");
+      postSizeAllocateEventID = (*gdk_env)->GetMethodID (gdk_env,
+                                                     gtkframepeer,
+                                                     "postSizeAllocateEvent",
+                                                     "()V");
+      id_set = 1;
+    }
+  gdk_threads_leave();
+  (*gdk_env)->CallVoidMethod (gdk_env, peer,
+                              postSizeAllocateEventID);
+  gdk_threads_enter();
 }

--=-Hc/SvkBYCE4hoC4XmaGv--




From MAILER-DAEMON Tue Jan 27 16:07:05 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlaQK-0003DG-J0
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 16:07:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlaQF-0003B2-S2
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:06:59 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlaPe-00032Q-B5
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:06:54 -0500
Received: from [212.6.122.116] (helo=mail2.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlaPd-000327-Hf
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:06:21 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail2.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RL6JUb022184
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 22:06:20 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AlaCa-0004yq-00
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 21:52:52 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 27 Jan 2004 21:56:35 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_DCtFA4PTASm23/e"
Message-Id: <200401272156.35457.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: O_SYNC/O_FSYNC
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 21:07:02 -0000


--Boundary-00=_DCtFA4PTASm23/e
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 problem found by Archie Cobbs on 
FreeBSD. 


Michael


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

	* native/target/generic/target_generic_file.h:
	Include fcntl.h


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

Index: native/target/generic/target_generic_file.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/target/generic/target_generic_file.h,v
retrieving revision 1.12
diff -u -b -B -r1.12 target_generic_file.h
--- native/target/generic/target_generic_file.h	26 Dec 2003 16:55:53 -0000	1.12
+++ native/target/generic/target_generic_file.h	27 Jan 2004 20:47:27 -0000
@@ -58,6 +58,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
+#include <fcntl.h>
 
 #include "target_native.h"
 #include "target_native_math_int.h"

--Boundary-00=_DCtFA4PTASm23/e--




From MAILER-DAEMON Tue Jan 27 16:16:28 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlaYr-0006jL-0I
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 16:15:53 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlaYh-0006YY-H4
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:15:43 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlaXR-0005v4-7N
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:14:56 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlaXQ-0005ug-Qn
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:14:24 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0RLELr06090
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:14:21 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0RLELa03039
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:14:21 -0500
Received: from tomaluk.toronto.redhat.com (tomaluk.toronto.redhat.com
	[172.16.14.15])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0RLEKXd000707
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:14:20 -0500
From: Kim Ho <kho@redhat.com>
To: classpath-commits <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-JbbdC1t3fPTz4TdfPyNU"
Organization: 
Message-Id: <1075238060.13902.36.camel@tomaluk.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 27 Jan 2004 16:14:20 -0500
Subject: [PATCH] FYI: find the layout in a frame instead of guessing
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 21:15:45 -0000


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

Hi,

I committed the patch below to merge changes from libgcj, as well as
fixing the date from the last commit.

Cheers,

Kim

2004-01-27  Kim Ho  <kho@redhat.com>
 
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (connectJObject): Iterate through the vbox's children to find
	layout.


--=-JbbdC1t3fPTz4TdfPyNU
Content-Disposition: attachment; filename=AWT-findlayout.patch.classpath
Content-Type: text/x-patch; name=AWT-findlayout.patch.classpath; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1842
diff -u -r1.1842 ChangeLog
--- ChangeLog	27 Jan 2004 21:03:44 -0000	1.1842
+++ ChangeLog	27 Jan 2004 21:11:38 -0000
@@ -1,4 +1,10 @@
-2004-01-16  Kim Ho  <kho@redhat.com>
+2004-01-27  Kim Ho  <kho@redhat.com>
+
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(connectJObject): Iterate through the vbox's children to find layout.
+	And fixed date on last Changelog entry.
+
+2004-01-27  Kim Ho  <kho@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GtkFramePeer.java (getMenuBarHeight): Added
 	MenuBarPeer parameter.
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.19
diff -u -r1.19 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	27 Jan 2004 21:03:44 -0000	1.19
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	27 Jan 2004 21:11:39 -0000
@@ -196,7 +196,12 @@
       printf("*** this is not a vbox\n");
     }
   children = gtk_container_get_children(GTK_CONTAINER(vbox));
-  layout = children->data;
+  do
+  {
+    layout = children->data;
+    children = children->next;
+  }
+  while (!GTK_IS_LAYOUT (layout) && children != NULL);
 
   if(!GTK_IS_LAYOUT(layout))
     {

--=-JbbdC1t3fPTz4TdfPyNU--




From MAILER-DAEMON Tue Jan 27 16:43:08 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlazE-000435-3g
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 16:43:08 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlazA-00041X-L2
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:43:04 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Alayd-0003qP-4T
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:43:03 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Alasq-0001ph-5B
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 16:36:32 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0RLaQr19493
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:36:26 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0RLaPa12505
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:36:25 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0RLaPXd001560
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 16:36:25 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-HnqlLw8J0jFuN8LhKJpy"
Organization: 
Message-Id: <1075239385.14610.18.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 27 Jan 2004 16:36:25 -0500
Subject: Patch: FYI: Fix to add/removeExposeFilter in GtkComponentPeer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 21:43:05 -0000


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

Hello,

I'm committing the following patch to merge a recent bug fix in libgcj.

-David Jee

2004-01-27  David Jee  <djee@redhat.com>

        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
        (addExposeFilter): Handle GtkFramePeer separately.
        (removeExposeFilter): Likewise.


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

Index: native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,v
retrieving revision 1.14
diff -u -r1.14 gnu_java_awt_peer_gtk_GtkComponentPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	26 Jan 2004 21:55:42 -0000	1.14
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c	27 Jan 2004 20:13:17 -0000
@@ -602,11 +602,38 @@
   void *ptr = NSA_GET_PTR (env, obj);
   jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
   g_assert (gref);
+  GtkObject *filterobj;
+  GtkWidget *vbox, *layout;
+  GList *children;
 
   gdk_threads_enter ();
 
-  g_signal_handlers_block_by_func (GTK_OBJECT(ptr), *pre_event_handler, *gref);
-  g_signal_connect( GTK_OBJECT(ptr), "event",
+  // GtkFramePeer is built as a GtkLayout inside a GtkVBox inside a GtkWindow.
+  // Events go to the GtkLayout layer, so we filter them there.
+  if (GTK_IS_WINDOW(ptr))
+    {
+      children = gtk_container_get_children(GTK_CONTAINER(ptr));
+      vbox = children->data;
+      g_assert (GTK_IS_VBOX(vbox));
+
+      children = gtk_container_get_children(GTK_CONTAINER(vbox));
+      do
+      {
+        layout = children->data;
+        children = children->next;
+      }
+      while (!GTK_IS_LAYOUT (layout) && children != NULL);
+      g_assert (GTK_IS_LAYOUT(layout));
+
+      filterobj = GTK_OBJECT(layout);
+    }
+  else
+    {
+      filterobj = GTK_OBJECT(ptr);
+    }
+
+  g_signal_handlers_block_by_func (filterobj, *pre_event_handler, *gref);
+  g_signal_connect( filterobj, "event",
                     G_CALLBACK(filter_expose_event_handler), *gref);
 
   gdk_threads_leave ();
@@ -618,12 +645,39 @@
   void *ptr = NSA_GET_PTR (env, obj);
   jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
   g_assert (gref);
+  GtkObject *filterobj;
+  GtkWidget *vbox, *layout;
+  GList *children;
 
   gdk_threads_enter ();
 
-  g_signal_handlers_disconnect_by_func (GTK_OBJECT(ptr),
+  // GtkFramePeer is built as a GtkLayout inside a GtkVBox inside a GtkWindow.
+  // Events go to the GtkLayout layer, so we filter them there.
+  if (GTK_IS_WINDOW(ptr))
+    {
+      children = gtk_container_get_children(GTK_CONTAINER(ptr));
+      vbox = children->data;
+      g_assert (GTK_IS_VBOX(vbox));
+
+      children = gtk_container_get_children(GTK_CONTAINER(vbox));
+      do
+      {
+        layout = children->data;
+        children = children->next;
+      }
+      while (!GTK_IS_LAYOUT (layout) && children != NULL);
+      g_assert (GTK_IS_LAYOUT(layout));
+
+      filterobj = GTK_OBJECT(layout);
+    }
+  else
+    {
+      filterobj = GTK_OBJECT(ptr);
+    }
+
+  g_signal_handlers_disconnect_by_func (filterobj,
                                         *filter_expose_event_handler, *gref);
-  g_signal_handlers_unblock_by_func (GTK_OBJECT(ptr), *pre_event_handler, *gref);
+  g_signal_handlers_unblock_by_func (filterobj, *pre_event_handler, *gref);
 
   gdk_threads_leave ();
 }

--=-HnqlLw8J0jFuN8LhKJpy--




From MAILER-DAEMON Tue Jan 27 17:03:44 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlbJA-0000Vn-Da
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 17:03:44 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlbJ7-0000UT-Re
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:03:41 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlbIb-00008w-Nz
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:03:40 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlbIb-00008t-6W
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:03:09 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RM2DVM017328
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 23:03:07 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AlbHh-0005Ha-00
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 23:02:13 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 27 Jan 2004 23:05:56 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_EDuFAhXmUzikUpa"
Message-Id: <200401272305.56158.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: autoconf/automake update
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 22:03:42 -0000


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

Hi list,


I just commited the attached patch to update the autotools versions.


Michael.


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

	* HACKING, INSTALL, configure.ac, doc/hacking.texinfo:
	Updated to depend on autoconf 2.59 and automake 1.7.
	Also depend on GCJ 3.3 in all files.


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

Index: HACKING
===================================================================
RCS file: /cvsroot/classpath/classpath/HACKING,v
retrieving revision 1.21
diff -u -b -B -r1.21 HACKING
--- HACKING	18 Jan 2004 21:02:37 -0000	1.21
+++ HACKING	27 Jan 2004 21:58:19 -0000
@@ -11,10 +11,9 @@
 For any build environment involving native libraries, these new versions of 
 autoconf, automake, and libtool are required.
 
-        - GNU autoconf 2.53
-	(2.59 also works)
-        - GNU automake 1.6
-	(1.7 and 1.8 also works)
+        - GNU autoconf 2.59
+        - GNU automake 1.7.x
+	(1.8.x also works)
         - GNU libtool 1.4.2
 	(1.4.3 and 1.5a also work)
 
Index: INSTALL
===================================================================
RCS file: /cvsroot/classpath/classpath/INSTALL,v
retrieving revision 1.16
diff -u -b -B -r1.16 INSTALL
--- INSTALL	2 May 2003 02:55:07 -0000	1.16
+++ INSTALL	27 Jan 2004 21:58:19 -0000
@@ -16,8 +16,8 @@
         if changes are made that require rebuilding configure, Makefile.in,
         aclocal.m4, or config.h.in.
 
-        - GNU autoconf 2.53
-        - GNU automake 1.6
+        - GNU autoconf 2.59
+        - GNU automake 1.7
         - GNU libtool 1.4.2
 
 	For building the Java bytecode (.class files), one of these
@@ -27,8 +27,8 @@
 	included in any of Sun's JDKs will not work, as it will not
 	compile java.lang.Object.
 
-        - GCJ 3.2+ (part of the GNU GCC package).  Note that GCC
-	  3.3 (from CVS) is currently unreleased.  
+        - GCJ 3.3+ (part of the GNU GCC package).  Note that GCC
+	  3.4 (from CVS) is currently unreleased.  
         - IBM jikes 1.18+.  
         - The kjc compiler is supported with configure but we have
           been unable to successfully compile with it.
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.1
diff -u -b -B -r1.1 configure.ac
--- configure.ac	18 Jan 2004 22:06:42 -0000	1.1
+++ configure.ac	27 Jan 2004 21:58:19 -0000
@@ -14,8 +14,8 @@
 dnl at which time we'll have to be more anal about such things
 AC_SUBST(LIBVERSION, "0:0:0")
 
-AC_PREREQ(2.53)
-AM_INIT_AUTOMAKE(1.6.0)
+AC_PREREQ(2.59)
+AM_INIT_AUTOMAKE(1.7.0)
 AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)
 
Index: doc/hacking.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/hacking.texinfo,v
retrieving revision 1.15
diff -u -b -B -r1.15 hacking.texinfo
--- doc/hacking.texinfo	9 Jan 2004 20:55:58 -0000	1.15
+++ doc/hacking.texinfo	27 Jan 2004 21:58:20 -0000
@@ -274,9 +274,9 @@
 @item
 CVS 1.11
 @item
-automake 1.6+
+automake 1.7+
 @item
-autoconf 2.53+
+autoconf 2.59+
 @item
 libtool 1.4.2+
 @item

--Boundary-00=_EDuFAhXmUzikUpa--




From MAILER-DAEMON Tue Jan 27 17:36:11 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlboZ-0004GE-GT
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 17:36:11 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlboW-0004G1-AJ
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:36:08 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Albo0-000489-S7
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:36:07 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Albo0-000486-4l
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:35:36 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0RMZZr20108
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 17:35:35 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0RMZZa05418
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 17:35:35 -0500
Received: from tomaluk.toronto.redhat.com (tomaluk.toronto.redhat.com
	[172.16.14.15])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0RMZYXd003496
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 17:35:34 -0500
From: Kim Ho <kho@redhat.com>
To: classpath-commits <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-3pFuCeoUzocjBun0pPgE"
Organization: 
Message-Id: <1075242934.13902.49.camel@tomaluk.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 27 Jan 2004 17:35:34 -0500
Subject: [PATCH] FYI: merge menubars to current state in libgcj
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 22:36:09 -0000


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

Hi,

I merged the following patches from libgcj.

Cheers,

Kim

2004-01-27  Kim Ho  <kho@redhat.com>
                                                                               
        * gnu/java/awt/peer/gtk/GtkFramePeer.java (moveLayout): New
        method.
        (setMenuBar): Shift the Gtk layout up/down by the MenuBar
        height and let the Layout Managers readjust anything that
        needs to move.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (moveLayout): New method. Shift everything in the Gtk
        layout in the Y direction by an offset.
                                                                               
        * gnu/java/awt/peer/gtk/GtkFramePeer.java
        (removeMenuBarPeer): Remove MenuBarPeer argument.
        * gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
        (dispose): Call native method.
        * java/awt/Frame.java (setMenuBar): Create and remove
        MenuBar peers only if the Frame has a peer.
        (addNotify): Create the MenuBar peer if one exists.
        (removeNotify): Remove MenuBar peer if one exists.
        * java/awt/Menu.java: Fix imports.
        (addNotify): Don't use full class name.
        (removeNotify): Call removeNotify on all children.
        * java/awt/MenuBar.java (removeNotify): Call
        removeNotify on all children.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (removeMenuBarPeer): Remove MenuBarPeer argument.
        Iterate through children to find the Frame's MenuBar.
        *
native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c
        New file.
        (dispose): Remove references to the MenuComponent.
                                                                               
        * gnu/java/awt/peer/gtk/GtkFramePeer.java (menuBarHeight): Mark
        private.
        (setMenuBar): Grab MenuBar height and change insets.
        (setBounds): Account for MenuBar height.
        (postInsetsChangedEvent): Ditto.
        (postSizeAllocateEvent): Remove.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (menubar_resize_cb): Remove
        (setMenuBarPeer): Remove callback.
        (getMenuBarHeight): Use size requisition instead of
        allocation.
                                                                               
        * gnu/java/awt/peer/gtk/GtkFramePeer.java (postConfigureEvent):
        Fix comments.
        (removeMenuBarPeer): Make package private.
        (setMenuBarPeer): Make package private.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (menubar_resize_cb): Mark attributes unused.
        (getMenuBarHeight): Ditto.


--=-3pFuCeoUzocjBun0pPgE
Content-Disposition: attachment; filename=AWT-misc.patch
Content-Type: text/plain; name=AWT-misc.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

? plaf
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2582
diff -u -r1.2582 ChangeLog
--- ChangeLog	21 Jan 2004 14:39:14 -0000	1.2582
+++ ChangeLog	21 Jan 2004 20:09:45 -0000
@@ -1,3 +1,13 @@
+2004-01-21  Kim Ho  <kho@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkFramePeer.java (postConfigureEvent):
+	Fix comments.
+	(removeMenuBarPeer): Make package private.
+	(setMenuBarPeer): Make package private.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(menubar_resize_cb): Mark attributes unused.
+	(getMenuBarHeight): ditto.
+
 2004-01-21  David Jee  <djee@redhat.com>
 
 	* java/awt/Container.java
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.10
diff -u -r1.10 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	20 Jan 2004 20:56:53 -0000	1.10
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	21 Jan 2004 20:09:45 -0000
@@ -57,8 +57,8 @@
   private MenuBarPeer menuBar;
   native int getMenuBarHeight (MenuBarPeer bar);
 
-  native public void setMenuBarPeer (MenuBarPeer bar);
-  native public void removeMenuBarPeer (MenuBarPeer bar);
+  native void setMenuBarPeer (MenuBarPeer bar);
+  native void removeMenuBarPeer (MenuBarPeer bar);
 
   public void setMenuBar (MenuBar bar)
   {
@@ -145,12 +145,13 @@
   protected void postConfigureEvent (int x, int y, int width, int height)
   {
     int frame_x = x - insets.left;
-    // Add the height of the menubar (if none, menuBarHeight is 0 and has no
-    // effect). To move the frame down a bit so as to still fit in the window.
+    // Since insets.top includes the MenuBar height, we need to add back
+    // the MenuBar height to the frame's y position.
+    // If no MenuBar exists in this frame, the MenuBar height will be 0.
     int frame_y = y - insets.top + menuBarHeight;
     int frame_width = width + insets.left + insets.right;
-    // Add the height of the menubar to adjust the height so it still fits in
-    // the window.
+    // Ditto as above. Since insets.top already includes the MenuBar's height,
+    // we need to subtract the MenuBar's height from the top inset.
     int frame_height = height + insets.top + insets.bottom - menuBarHeight;
     if (frame_x != awtComponent.getX()
         || frame_y != awtComponent.getY()
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.17
diff -u -r1.17 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	19 Jan 2004 18:41:52 -0000	1.17
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	21 Jan 2004 20:09:46 -0000
@@ -410,7 +410,7 @@
 
 JNIEXPORT jint JNICALL
 Java_gnu_java_awt_peer_gtk_GtkFramePeer_getMenuBarHeight
-  (JNIEnv *env, jobject obj, jobject menubar)
+  (JNIEnv *env, jobject obj __attribute__((unused)), jobject menubar)
 {
   GtkWidget *ptr;
   jint height;
@@ -722,7 +722,8 @@
   return FALSE;
 }
 
-static void menubar_resize_cb (GtkWidget *widget, GtkAllocation *alloc, 
+static void menubar_resize_cb (GtkWidget *widget __attribute__((unused)), 
+                               GtkAllocation *alloc __attribute__((unused)), 
                                jobject peer)
 {
   static int id_set = 0;

--=-3pFuCeoUzocjBun0pPgE
Content-Disposition: attachment; filename=AWT-movelayout.patch
Content-Type: text/plain; name=AWT-movelayout.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

? plaf
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2612
diff -u -r1.2612 ChangeLog
--- ChangeLog	26 Jan 2004 21:55:39 -0000	1.2612
+++ ChangeLog	27 Jan 2004 14:01:07 -0000
@@ -1,3 +1,14 @@
+2004-01-26  Kim Ho  <kho@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkFramePeer.java (moveLayout): New
+	method.
+	(setMenuBar): Shift the Gtk layout up/down by the MenuBar
+	height and let the Layout Managers readjust anything that
+	needs to move.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(moveLayout): New method. Shift everything in the Gtk
+	layout in the Y direction by an offset.
+
 2004-01-26  David Jee  <djee@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.12
diff -u -r1.12 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	26 Jan 2004 13:56:59 -0000	1.12
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	27 Jan 2004 14:01:08 -0000
@@ -59,24 +59,36 @@
 
   native void setMenuBarPeer (MenuBarPeer bar);
   native void removeMenuBarPeer (MenuBarPeer bar);
+  native void moveLayout (int offset);
 
   public void setMenuBar (MenuBar bar)
   {
-    if (bar == null && menuBar != null)
+    if (bar == null)
     {    
-      removeMenuBarPeer(menuBar); 
-      menuBar = null;
-      insets.top -= menuBarHeight;
-      menuBarHeight = 0;      
-      awtComponent.doLayout();
+      if (menuBar != null)
+      {
+        removeMenuBarPeer(menuBar); 
+        menuBar = null;
+        moveLayout(menuBarHeight);
+        insets.top -= menuBarHeight;
+        menuBarHeight = 0;      
+        awtComponent.doLayout();
+      }
     }
-    else if (bar != null)
+    else
     {
+      int oldHeight = 0;
       if (menuBar != null)
+      {
         removeMenuBarPeer(menuBar);
+        oldHeight = menuBarHeight;
+        insets.top -= menuBarHeight;
+      }
       menuBar = (MenuBarPeer) ((MenuBar) bar).getPeer();
-      setMenuBarPeer(menuBar);      
+      setMenuBarPeer(menuBar);
       menuBarHeight = getMenuBarHeight (menuBar);
+      if (oldHeight != menuBarHeight)
+        moveLayout(oldHeight-menuBarHeight);
       insets.top += menuBarHeight;
       awtComponent.doLayout();
     }
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.21
diff -u -r1.21 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	26 Jan 2004 13:56:59 -0000	1.21
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	27 Jan 2004 14:01:13 -0000
@@ -433,6 +433,46 @@
   return height;
 }
 
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_moveLayout
+  (JNIEnv *env, jobject obj, jint offset)
+{
+  void* ptr;
+  GList* children;
+  GtkBox* vbox;
+  GtkLayout* layout;
+  GtkWidget* widget;
+
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  children = gtk_container_get_children (GTK_CONTAINER (ptr));
+  vbox = children->data;
+  g_assert (GTK_IS_VBOX (vbox));
+
+  children = gtk_container_get_children (GTK_CONTAINER (vbox));
+  do
+  {
+    layout = children->data;
+    children = children->next;
+  }
+  while (!GTK_IS_LAYOUT (layout) && children != NULL);
+  g_assert (GTK_IS_LAYOUT (layout));  
+  children = gtk_container_get_children (GTK_CONTAINER (layout));
+  
+  while (children != NULL)
+  {
+    widget = children->data;
+    gtk_layout_move (layout, widget, widget->allocation.x,
+                     widget->allocation.y+offset);
+    children = children->next;
+  }
+  
+  gdk_threads_leave ();
+}
+  
+
 static void
 window_get_frame_extents (GtkWidget *window,
                           int *top, int *left, int *bottom, int *right)

--=-3pFuCeoUzocjBun0pPgE
Content-Disposition: attachment; filename=AWT-menu-resize.patch
Content-Type: text/plain; name=AWT-menu-resize.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

? plaf
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2609
diff -u -r1.2609 ChangeLog
--- ChangeLog	25 Jan 2004 18:36:03 -0000	1.2609
+++ ChangeLog	26 Jan 2004 13:56:31 -0000
@@ -1,3 +1,17 @@
+2004-01-26  Kim Ho  <kho@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkFramePeer.java (menuBarHeight): Mark
+	private.
+	(setMenuBar): Grab MenuBar height and change insets.
+	(setBounds): Account for MenuBar height.
+	(postInsetsChangedEvent): Ditto.
+	(postSizeAllocateEvent): Remove.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(menubar_resize_cb): Remove
+	(setMenuBarPeer): Remove callback.
+	(getMenuBarHeight): Use size requisition instead of
+	allocation.
+
 2004-01-25  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* java/awt/TextArea.java: Fix indentation.  Flesh out javadocs.
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.11
diff -u -r1.11 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	21 Jan 2004 20:11:07 -0000	1.11
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	26 Jan 2004 13:56:32 -0000
@@ -53,7 +53,7 @@
 public class GtkFramePeer extends GtkWindowPeer
     implements FramePeer
 {
-  int menuBarHeight = 0;
+  private int menuBarHeight;
   private MenuBarPeer menuBar;
   native int getMenuBarHeight (MenuBarPeer bar);
 
@@ -76,9 +76,20 @@
         removeMenuBarPeer(menuBar);
       menuBar = (MenuBarPeer) ((MenuBar) bar).getPeer();
       setMenuBarPeer(menuBar);      
+      menuBarHeight = getMenuBarHeight (menuBar);
+      insets.top += menuBarHeight;
+      awtComponent.doLayout();
     }
   }
 
+  public void setBounds (int x, int y, int width, int height)
+  {
+    nativeSetBounds (x, y,
+		     width - insets.left - insets.right,
+		     height - insets.top - insets.bottom
+		     + menuBarHeight);
+  }  
+  
   public void setResizable (boolean resizable)
   {
     // Call setSize; otherwise when resizable is changed from true to
@@ -89,18 +100,15 @@
              + menuBarHeight);
     set ("allow_shrink", resizable);
     set ("allow_grow", resizable);
-  }
-
-  protected void postSizeAllocateEvent()
+  }  
+  
+  protected void postInsetsChangedEvent (int top, int left,
+					 int bottom, int right)
   {
-    if (menuBar != null)
-    {
-      if (menuBarHeight != 0)
-        insets.top -= menuBarHeight;
-      menuBarHeight = getMenuBarHeight(menuBar);
-      insets.top += menuBarHeight;
-    }
-    awtComponent.doLayout();
+    insets.top = top + menuBarHeight;
+    insets.left = left;
+    insets.bottom = bottom;
+    insets.right = right;
   }
 
   public GtkFramePeer (Frame frame)
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.20
diff -u -r1.20 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	22 Jan 2004 20:17:43 -0000	1.20
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	26 Jan 2004 13:56:33 -0000
@@ -72,8 +72,6 @@
 static gboolean window_property_changed_cb (GtkWidget *widget,
 					    GdkEventProperty *event,
 					    jobject peer);
-static void menubar_resize_cb (GtkWidget *widget, GtkAllocation *alloc, 
-                               jobject peer);					    
 
 /*
  * Make a new window.
@@ -402,15 +400,12 @@
   void *wptr;
   GtkWidget *mptr;
   GtkWidget *box;
-  jobject *gref = NSA_GET_GLOBAL_REF (env, obj);
-  
+
   wptr = NSA_GET_PTR (env, obj);
   mptr = NSA_GET_PTR (env, menubar);
   
   gdk_threads_enter ();
 
-  g_signal_connect (G_OBJECT (mptr), "size-allocate", 
-                    G_CALLBACK (menubar_resize_cb), *gref);    
   box = GTK_BIN (wptr)->child;		    
   gtk_box_pack_start (GTK_BOX (box), mptr, 0, 0, 0);
  
@@ -426,11 +421,14 @@
 {
   GtkWidget *ptr;
   jint height;
+  GtkRequisition gtkreq;
   
   ptr = NSA_GET_PTR (env, menubar);
 
   gdk_threads_enter ();
-  height = ptr->allocation.height;
+  gtk_widget_size_request (ptr, &gtkreq);
+
+  height = gtkreq.height;
   gdk_threads_leave ();
   return height;
 }
@@ -732,27 +730,4 @@
 				(jint) extents[1]); /* right */
 
   return FALSE;
-}
-
-static void menubar_resize_cb (GtkWidget *widget __attribute__((unused)), 
-                               GtkAllocation *alloc __attribute__((unused)), 
-                               jobject peer)
-{
-  static int id_set = 0;
-  static jmethodID postSizeAllocateEventID;
-  
-  if (!id_set)
-    {
-      jclass gtkframepeer = (*gdk_env)->FindClass (gdk_env,
-                                "gnu/java/awt/peer/gtk/GtkFramePeer");
-      postSizeAllocateEventID = (*gdk_env)->GetMethodID (gdk_env,
-                                                     gtkframepeer,
-                                                     "postSizeAllocateEvent",
-                                                     "()V");
-      id_set = 1;
-    }
-  gdk_threads_leave();
-  (*gdk_env)->CallVoidMethod (gdk_env, peer,
-                              postSizeAllocateEventID);
-  gdk_threads_enter();
 }

--=-3pFuCeoUzocjBun0pPgE
Content-Disposition: attachment; filename=AWT-menu-disposal.patch
Content-Type: text/plain; name=AWT-menu-disposal.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

? plaf
Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2617
diff -u -r1.2617 ChangeLog
--- ChangeLog	27 Jan 2004 18:55:10 -0000	1.2617
+++ ChangeLog	27 Jan 2004 19:26:18 -0000
@@ -1,3 +1,25 @@
+2004-01-27  Kim Ho  <kho@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkFramePeer.java
+	(removeMenuBarPeer): Remove MenuBarPeer argument.
+	* gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
+	(dispose): Call native method.
+	* java/awt/Frame.java (setMenuBar): Create and remove
+	MenuBar peers only if the Frame has a peer.
+	(addNotify): Create the MenuBar peer if one exists.
+	(removeNotify): Remove MenuBar peer if one exists.
+	* java/awt/Menu.java: Fix imports.
+	(addNotify): Don't use full class name.
+	(removeNotify): Call removeNotify on all children.
+	* java/awt/MenuBar.java (removeNotify): Call
+	removeNotify on all children.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(removeMenuBarPeer): Remove MenuBarPeer argument.
+	Iterate through children to find the Frame's MenuBar.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c
+	New file.
+	(dispose): Remove references to the MenuComponent.
+
 2004-01-27  Michael Koch  <konqueror@gmx.de>
 
 	* javax/swing/AbstractCellEditor.java: Reformated.
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.14
diff -u -r1.14 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	27 Jan 2004 16:43:12 -0000	1.14
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	27 Jan 2004 19:26:22 -0000
@@ -58,7 +58,7 @@
   native int getMenuBarHeight (MenuBarPeer bar);
 
   native void setMenuBarPeer (MenuBarPeer bar);
-  native void removeMenuBarPeer (MenuBarPeer bar);
+  native void removeMenuBarPeer ();
   native void moveLayout (int offset);
 
   public void setMenuBar (MenuBar bar)
@@ -67,7 +67,7 @@
     {    
       if (menuBar != null)
       {
-        removeMenuBarPeer(menuBar); 
+        removeMenuBarPeer(); 
         menuBar = null;
         moveLayout(menuBarHeight);
         insets.top -= menuBarHeight;
@@ -80,7 +80,7 @@
       int oldHeight = 0;
       if (menuBar != null)
       {
-        removeMenuBarPeer(menuBar);
+        removeMenuBarPeer();
         oldHeight = menuBarHeight;
         insets.top -= menuBarHeight;
       }
Index: gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,v
retrieving revision 1.2
diff -u -r1.2 GtkMenuComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java	13 Jul 2003 15:09:20 -0000	1.2
+++ gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java	27 Jan 2004 19:26:22 -0000
@@ -47,8 +47,6 @@
   {
     super (awtWidget);
   }
-
-  public void dispose ()
-  {
-  }
+  
+  public native void dispose();
 }
Index: java/awt/Frame.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Frame.java,v
retrieving revision 1.19
diff -u -r1.19 Frame.java
--- java/awt/Frame.java	19 Jan 2004 14:27:45 -0000	1.19
+++ java/awt/Frame.java	27 Jan 2004 19:26:23 -0000
@@ -341,11 +341,15 @@
 public synchronized void
 setMenuBar(MenuBar menuBar)
 {
-  this.menuBar = menuBar;
-  if (menuBar != null)
-    menuBar.addNotify(); 
   if (peer != null)
+  {
+    if (this.menuBar != null)
+      this.menuBar.removeNotify();  
+    if (menuBar != null)
+      menuBar.addNotify();
     ((FramePeer) peer).setMenuBar(menuBar);
+  }
+  this.menuBar = menuBar;
 }
 
 /*************************************************************************/
@@ -432,9 +436,18 @@
 public void
 addNotify()
 {
+  if (menuBar != null)
+    menuBar.addNotify();
   if (peer == null)
     peer = getToolkit ().createFrame (this);
   super.addNotify();
+}
+
+public void removeNotify()
+{
+  if (menuBar != null)
+    menuBar.removeNotify();
+  super.removeNotify();
 }
 
 /*************************************************************************/
Index: java/awt/Menu.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Menu.java,v
retrieving revision 1.14
diff -u -r1.14 Menu.java
--- java/awt/Menu.java	19 Jan 2004 14:27:45 -0000	1.14
+++ java/awt/Menu.java	27 Jan 2004 19:26:23 -0000
@@ -41,6 +41,7 @@
 import java.awt.peer.MenuPeer;
 import java.io.Serializable;
 import java.util.Vector;
+import java.util.Enumeration;
 
 /**
   * This class represents a pull down or tear off menu in Java's AWT.
@@ -379,7 +380,7 @@
 {
   if (peer == null)
     peer = getToolkit().createMenu(this);
-  java.util.Enumeration e = items.elements();
+  Enumeration e = items.elements();
   while (e.hasMoreElements())
   {
     MenuItem mi = (MenuItem)e.nextElement();
@@ -396,6 +397,12 @@
 public void
 removeNotify()
 {
+  Enumeration e = items.elements();
+  while (e.hasMoreElements())
+  {
+    MenuItem mi = (MenuItem) e.nextElement();
+    mi.removeNotify();
+  }
   super.removeNotify();
 }
 
Index: java/awt/MenuBar.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/MenuBar.java,v
retrieving revision 1.11
diff -u -r1.11 MenuBar.java
--- java/awt/MenuBar.java	19 Jan 2004 14:27:45 -0000	1.11
+++ java/awt/MenuBar.java	27 Jan 2004 19:26:23 -0000
@@ -279,6 +279,12 @@
 public void
 removeNotify()
 {
+  Enumeration e = menus.elements();
+  while (e.hasMoreElements())
+  {
+    Menu mi = (Menu) e.nextElement();
+    mi.removeNotify();
+  }
   super.removeNotify();
 }
 
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c
===================================================================
RCS file: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c
diff -N jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuComponentPeer.c	27 Jan 2004 19:26:24 -0000
@@ -0,0 +1,56 @@
+/* gtkmenucomponentpeer.c -- Native implementation of GtkMenuComponentPeer
+   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 "gtkpeer.h"
+#include "gnu_java_awt_peer_gtk_GtkMenuComponentPeer.h"
+
+JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkMenuComponentPeer_dispose
+  (JNIEnv *env, jobject obj)
+{
+  /* For MenuComponents and its subclasses, the widgets are
+     automatically destroyed by Gtk when the parent MenuBar
+     is removed from the Frame. So we avoid the widget
+     destruction in GtkGenericPeer dispose() by overriding
+     it here. */
+     
+  /* However, references to the Java objects still exist in the
+     state tables, so we still have to remove those. */
+     
+  NSA_DEL_GLOBAL_REF (env, obj);
+  NSA_DEL_PTR (env, obj);  
+}
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.22
diff -u -r1.22 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	27 Jan 2004 16:39:45 -0000	1.22
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	27 Jan 2004 19:26:24 -0000
@@ -376,18 +376,37 @@
 
 JNIEXPORT void JNICALL
 Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer
-  (JNIEnv *env, jobject obj, jobject menubar)
+  (JNIEnv *env, jobject obj)
 {
   void *wptr;
   GtkWidget *box;
   GtkWidget *mptr;
+  GList* children;
 
   wptr = NSA_GET_PTR (env, obj);
-  mptr = NSA_GET_PTR (env, menubar);
   
   gdk_threads_enter ();
 
   box = GTK_BIN (wptr)->child;
+  
+  children = gtk_container_get_children (GTK_CONTAINER (box));
+  
+  while (children != NULL && !GTK_IS_MENU_SHELL (children->data)) 
+  {
+    children = children->next;
+  }
+  
+  /* If there isn't a MenuBar in this Frame's list of children
+     then we can just return. */
+  if (!GTK_IS_MENU_SHELL (children->data))
+    return;
+  else
+    mptr = children->data;
+    
+  /* This will actually destroy the MenuBar. By removing it from
+     its parent, the reference count for the MenuBar widget will
+     decrement to 0. The widget will be automatically destroyed 
+     by Gtk. */
   gtk_container_remove (GTK_CONTAINER (box), GTK_WIDGET (mptr));  
   
   gdk_threads_leave();

--=-3pFuCeoUzocjBun0pPgE--




From MAILER-DAEMON Tue Jan 27 17:38:39 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Albqx-0004lz-2y
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 17:38:39 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Albqu-0004l2-5w
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:38:36 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlbqH-0004bA-MZ
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:38:30 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlbqG-0004aH-Gh
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:37:56 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RMbtl1023672
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 23:37:55 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AlbqE-0005Jp-00
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 23:37:54 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Tue, 27 Jan 2004 23:41:37 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_hkuFAVcmF8d4P3N"
Message-Id: <200401272341.37590.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu/java/awt/peer/gtk/GtkFileDialogPeer
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 22:38:37 -0000


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

Hi list,


I just commited the attached patch to merge gnu/java/awt/peer/gtk/
GtkFileDialogPeer with libgcj.


Michael


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

	* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java: Merged copyright year.


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

Index: gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,v
retrieving revision 1.13
diff -u -b -B -r1.13 GtkFileDialogPeer.java
--- gnu/java/awt/peer/gtk/GtkFileDialogPeer.java	26 Jan 2004 15:41:09 -0000	1.13
+++ gnu/java/awt/peer/gtk/GtkFileDialogPeer.java	27 Jan 2004 22:35:07 -0000
@@ -1,5 +1,5 @@
 /* GtkFileDialogPeer.java -- Implements FileDialogPeer with GTK
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

--Boundary-00=_hkuFAVcmF8d4P3N--




From MAILER-DAEMON Tue Jan 27 17:49:42 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Alc1d-0007tI-GX
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 17:49:41 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Alc1V-0007jv-Ns
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:49:33 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Alc0v-0007Vg-Hb
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:49:28 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Alc0u-0007VX-Sx
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:48:56 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0RMmur26497
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 17:48:56 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0RMmta10117
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 17:48:55 -0500
Received: from tomaluk.toronto.redhat.com (tomaluk.toronto.redhat.com
	[172.16.14.15])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0RMmrXd003871
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 17:48:53 -0500
From: Kim Ho <kho@redhat.com>
To: classpath-commits <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-DAw/fWSnoBuxCn2vET+Q"
Organization: 
Message-Id: <1075243733.13902.53.camel@tomaluk.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 27 Jan 2004 17:48:53 -0500
Subject: [PATCH] FYI: change file dialog default sizes.
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 22:49:37 -0000


--=-DAw/fWSnoBuxCn2vET+Q
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi,

I committed the following changes from libgcj.

Cheers,

Kim

2004-01-27  Kim Ho  <kho@redhat.com>
 
        * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
        (gtkWidgetGetDimensions): Remove.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (gtkWidgetGetDimensions): Remove.
 
        * gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(GtkComponentPeer): If it is a FileDialog and has dimensions 
	of 0 by 0, then the initial size is set to size 
	request plus insets.
        * gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
        (gtkWidgetGetDimensions): Override method.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (gtkWidgetGetDimensions): Override method. Returns size request
	plus insets.


--=-DAw/fWSnoBuxCn2vET+Q
Content-Disposition: attachment; filename=AWT-fdsize.patch
Content-Type: text/x-patch; name=AWT-fdsize.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2559
diff -u -r1.2559 ChangeLog
--- ChangeLog	15 Jan 2004 21:59:59 -0000	1.2559
+++ ChangeLog	16 Jan 2004 13:57:50 -0000
@@ -1,3 +1,14 @@
+2004-01-16  Kim Ho  <kho@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): If
+	it is a FileDialog and has dimensions of 0 by 0, then the initial
+	size is set to size request plus insets.
+	* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java 
+	(gtkWidgetGetDimensions): Override method.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(gtkWidgetGetDimensions): Override method. Returns size request plus
+	insets.
+
 2004-01-15  Olga Rodimina <rodimina@redhat.com>
 
 	* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.13
diff -u -r1.13 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java	13 Jan 2004 20:54:46 -0000	1.13
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java	16 Jan 2004 13:57:50 -0000
@@ -1,5 +1,5 @@
 /* GtkComponentPeer.java -- Implements ComponentPeer with GTK
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -124,6 +124,16 @@
 	setFont(awtComponent.getFont());
 
       setCursor (awtComponent.getCursor ());
+      if (this instanceof GtkFileDialogPeer && awtComponent.getHeight() == 0
+          && awtComponent.getWidth() == 0)
+      {
+        int[] dims = new int[2];
+        gtkWidgetGetDimensions(dims);
+        ((GtkFileDialogPeer) this).setBoundsCallback((Window)awtComponent, 
+                                                     awtComponent.getX(), 
+                                                     awtComponent.getY(),
+                                                     dims[0], dims[1]);
+      }      
       Rectangle bounds = awtComponent.getBounds ();
       setBounds (bounds.x, bounds.y, bounds.width, bounds.height);
 
Index: gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,v
retrieving revision 1.4
diff -u -r1.4 GtkFileDialogPeer.java
--- gnu/java/awt/peer/gtk/GtkFileDialogPeer.java	8 Jan 2004 21:12:25 -0000	1.4
+++ gnu/java/awt/peer/gtk/GtkFileDialogPeer.java	16 Jan 2004 13:57:50 -0000
@@ -1,5 +1,5 @@
 /* GtkFileDialogPeer.java -- Implements FileDialogPeer with GTK
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -63,6 +63,7 @@
   native void connectJObject ();
   native void connectSignals ();
   native void nativeSetFile (String file);
+  native void gtkWidgetGetDimensions (int[] dims);
 
   public void setFile (String fileName)
   {
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.12
diff -u -r1.12 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	13 Jan 2004 20:54:46 -0000	1.12
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	16 Jan 2004 13:57:51 -0000
@@ -1,5 +1,5 @@
 /* gtkwindowpeer.c -- Native implementation of GtkWindowPeer
-   Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -399,6 +399,33 @@
 
   return height;
 }
+
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_gtkWidgetGetDimensions
+  (JNIEnv *env, jobject obj, jintArray jdims)
+{
+  void *ptr;
+  jint *dims;
+  int top, left, bottom, right;
+  GtkRequisition req;
+  
+  ptr = NSA_GET_PTR (env, obj);
+  dims = (*env)->GetIntArrayElements (env, jdims, 0);
+  dims[0] = dims[1] = 0;
+  
+  gdk_threads_enter ();
+  
+  gtk_widget_size_request (GTK_WIDGET (ptr), &req);
+  
+  window_get_frame_extents (GTK_WIDGET (ptr), &top, &left, &bottom, &right);
+
+  dims[0] = req.width + left + right;
+  dims[1] = req.height + top + bottom;
+  
+  gdk_threads_leave ();
+    
+  (*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
+} 
 
 static void
 window_get_frame_extents (GtkWidget *window,

--=-DAw/fWSnoBuxCn2vET+Q
Content-Disposition: attachment; filename=AWT-fd.patch2
Content-Type: text/x-patch; name=AWT-fd.patch2; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2563
diff -u -r1.2563 ChangeLog
--- ChangeLog	16 Jan 2004 20:05:39 -0000	1.2563
+++ ChangeLog	16 Jan 2004 21:41:58 -0000
@@ -1,4 +1,11 @@
 2004-01-16  Kim Ho  <kho@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
+	(gtkWidgetGetDimensions): Remove.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(gtkWidgetGetDimensions): Remove.
+
+2004-01-16  Kim Ho  <kho@redhat.com>
  
         * gnu/java/awt/peer/gtk/GtkComponentPeer.java (GtkComponentPeer): If
         it is a FileDialog and has dimensions of 0 by 0, then the initial
Index: gnu/java/awt/peer/gtk/GtkFileDialogPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,v
retrieving revision 1.5
diff -u -r1.5 GtkFileDialogPeer.java
--- gnu/java/awt/peer/gtk/GtkFileDialogPeer.java	16 Jan 2004 20:05:41 -0000	1.5
+++ gnu/java/awt/peer/gtk/GtkFileDialogPeer.java	16 Jan 2004 21:41:58 -0000
@@ -63,7 +63,6 @@
   native void connectJObject ();
   native void connectSignals ();
   native void nativeSetFile (String file);
-  native void gtkWidgetGetDimensions (int[] dims);
 
   public void setFile (String fileName)
   {
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
===================================================================
RCS file: /cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,v
retrieving revision 1.13
diff -u -r1.13 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	16 Jan 2004 20:05:41 -0000	1.13
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	16 Jan 2004 21:42:04 -0000
@@ -400,33 +400,6 @@
   return height;
 }
 
-JNIEXPORT void JNICALL
-Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_gtkWidgetGetDimensions
-  (JNIEnv *env, jobject obj, jintArray jdims)
-{
-  void *ptr;
-  jint *dims;
-  int top, left, bottom, right;
-  GtkRequisition req;
-  
-  ptr = NSA_GET_PTR (env, obj);
-  dims = (*env)->GetIntArrayElements (env, jdims, 0);
-  dims[0] = dims[1] = 0;
-  
-  gdk_threads_enter ();
-  
-  gtk_widget_size_request (GTK_WIDGET (ptr), &req);
-  
-  window_get_frame_extents (GTK_WIDGET (ptr), &top, &left, &bottom, &right);
-
-  dims[0] = req.width + left + right;
-  dims[1] = req.height + top + bottom;
-  
-  gdk_threads_leave ();
-    
-  (*env)->ReleaseIntArrayElements (env, jdims, dims, 0);
-} 
-
 static void
 window_get_frame_extents (GtkWidget *window,
                           int *top, int *left, int *bottom, int *right)

--=-DAw/fWSnoBuxCn2vET+Q--




From MAILER-DAEMON Tue Jan 27 17:57:24 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Alc96-0004Wu-F0
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 17:57:24 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Alc94-0004W8-II
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:57:22 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Alc8X-0004LS-Kr
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:57:20 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Alc8X-0004L5-4l
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 17:56:49 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-80-148.ewetel.net
	[80.228.80.148])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0RMull1001823
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 23:56:48 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Alc8V-0005Lr-00
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 23:56:47 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 28 Jan 2004 00:00:28 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_M2uFAJyx0U47KMu"
Message-Id: <200401280000.30168.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.awt.Container
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 22:57:23 -0000


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

Hi list,


I commited the attached patch to merge it with libgcj. This just fixes 
formating.


Michael


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

	* java/awt/Container.java: Merged formating with libgcj.


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

Index: java/awt/Container.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v
retrieving revision 1.28
diff -u -b -B -r1.28 Container.java

--Boundary-00=_M2uFAJyx0U47KMu--




From MAILER-DAEMON Tue Jan 27 18:25:16 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Alca4-0004uB-DY
	for mharc-commit-classpath@gnu.org; Tue, 27 Jan 2004 18:25:16 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Alca2-0004tu-4c
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 18:25:14 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlcZW-0004jo-72
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 18:25:13 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlcZV-0004fK-QN
	for commit-classpath@gnu.org; Tue, 27 Jan 2004 18:24:41 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0RNOZb12340
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 18:24:35 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0RNOZa23171
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 18:24:35 -0500
Received: from tortoise.toronto.redhat.com (tortoise.toronto.redhat.com
	[172.16.14.92])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0RNOZXd004953
	for <commit-classpath@gnu.org>; Tue, 27 Jan 2004 18:24:35 -0500
From: Thomas Fitzsimmons <fitzsim@redhat.com>
To: commit classpath <commit-classpath@gnu.org>
Content-Type: text/plain
Message-Id: <1075245874.20201.147.camel@tortoise.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 (1.4.5-1) 
Date: Tue, 27 Jan 2004 18:24:35 -0500
Content-Transfer-Encoding: 7bit
Subject: Patch: FYI: small GtkFramePeer fix
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jan 2004 23:25:14 -0000

Hi,

I merged this change in from libgcj.

Tom

2004-01-27  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkFramePeer.java (setResizable):
	Override GtkWindowPeer's setResizable method to account for menu
	bar height when setting the frame's size.


Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file:
/cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.20
diff -u -r1.20 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	27 Jan 2004 22:30:38
-0000	1.20
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	27 Jan 2004 23:21:14 -0000
@@ -149,7 +149,19 @@
     g.translate (-insets.left, -insets.top);
     return g;
   }
-  
+
+  public void setResizable (boolean resizable)
+  {
+    // Call setSize; otherwise when resizable is changed from true to
+    // false the frame will shrink to the dimensions it had before it
+    // was resizable.
+    setSize (awtComponent.getWidth() - insets.left - insets.right,
+             awtComponent.getHeight() - insets.top - insets.bottom
+             + menuBarHeight);
+    set ("allow_shrink", resizable);
+    set ("allow_grow", resizable);
+  }
+
   protected void postConfigureEvent (int x, int y, int width, int
height)
   {
     int frame_x = x - insets.left;





From MAILER-DAEMON Wed Jan 28 11:42:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlslQ-00080o-Cj
	for mharc-commit-classpath@gnu.org; Wed, 28 Jan 2004 11:42:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlslN-000802-KZ
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 11:42:01 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlseF-0005OI-6M
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 11:35:11 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlseD-0005NF-TN
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 11:34:38 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0SGYab01566
	for <commit-classpath@gnu.org>; Wed, 28 Jan 2004 11:34:36 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0SGYaa22505
	for <commit-classpath@gnu.org>; Wed, 28 Jan 2004 11:34:36 -0500
Received: from to-dhcp4.toronto.redhat.com (to-dhcp4.toronto.redhat.com
	[172.16.14.104])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0SGYZXd000709
	for <commit-classpath@gnu.org>; Wed, 28 Jan 2004 11:34:35 -0500
From: David Jee <djee@redhat.com>
To: commit-classpath@gnu.org
Content-Type: multipart/mixed; boundary="=-s03/Gjjhj1U6hI1UYGAB"
Organization: 
Message-Id: <1075307675.16469.10.camel@tomboy.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 28 Jan 2004 11:34:35 -0500
Subject: Patch: FYI: Set Frame's default foreground color
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2004 16:42:02 -0000


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

Hi,

I'm committing the following patch to merge a fix from libgcj.

-David Jee

2004-01-28  David Jee  <djee@redhat.com>

        * gnu/java/awt/peer/gtk/GtkFramePeer.java
        (create): Set the default foreground color to
        java.awt.SystemColor.windowText.



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

Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.15
diff -u -r1.15 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	27 Jan 2004 19:29:56 -0000	1.15
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	28 Jan 2004 16:21:36 -0000
@@ -133,6 +133,7 @@
     // Create a normal decorated window.
     create (GDK_WINDOW_TYPE_HINT_NORMAL, true);
     setMenuBar(((Frame) awtComponent).getMenuBar());
+    awtComponent.setForeground(java.awt.SystemColor.windowText);
   }
 
   public void getArgs (Component component, GtkArgList args)

--=-s03/Gjjhj1U6hI1UYGAB--




From MAILER-DAEMON Wed Jan 28 14:23:19 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Alv7r-0005Ht-9h
	for mharc-commit-classpath@gnu.org; Wed, 28 Jan 2004 14:13:23 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Alv7V-00059B-0I
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 14:13:01 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Alv6p-0004uu-KN
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 14:12:51 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Alv6o-0004tN-IA
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 14:12:18 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-159.ewetel.net
	[80.228.94.159])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0SJCEl1020185
	for <commit-classpath@gnu.org>; Wed, 28 Jan 2004 20:12:14 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Alv6j-0000Eb-00
	for <commit-classpath@gnu.org>; Wed, 28 Jan 2004 20:12:13 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 28 Jan 2004 20:15:55 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_rpAGABXo1fBj8t2"
Message-Id: <200401282015.56651.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: javax.swing
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2004 19:13:05 -0000


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

Hi list,


I just commited a fix to javax.swing.JComponent and javax.swing.JEditorPane.


Michael


2004-01-28  Michael Koch  <konqueror@gmx.de>

	* javax/swing/JComponent.java
	(listenerList): Initalize globally.
	(ancestor_list): Removed.
	(veto_list): Removed.
	(change_list): Removed.
	(get_veto_list): Removed.
	(get_change_list): Removed.
	(get_ancestor_list): Removed.
	(removeAncestorListener): Reimplemented.
	(removePropertyChangeListener): Likewise.
	(removeVetoableChangeListener): Likewise.
	(addAncestorListener): Likewise.
	(addPropertyChangeListener): Likewise.
	(addVetoableChangeListener): Likewise.
	(getListeners): New method.
	(getAncestorListeners): Likewise.
	(getVetoableChangeListeners): Likewise.
	(fireVetoableChange): Throws PropertyVetoException.
	* javax/swing/JEditorPane.java
	(JEditorPane): Throws IOException.


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

Index: javax/swing/JComponent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JComponent.java,v
retrieving revision 1.10
diff -u -b -B -r1.10 JComponent.java
--- javax/swing/JComponent.java	27 Jan 2004 09:46:25 -0000	1.10
+++ javax/swing/JComponent.java	28 Jan 2004 18:26:24 -0000
@@ -1,5 +1,5 @@
 /* JComponent.java -- Every component in swing inherits from this class.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -63,8 +63,9 @@
 import java.beans.PropertyVetoException;
 import java.beans.VetoableChangeListener;
 import java.io.Serializable;
-import java.util.Vector;
+import java.util.EventListener;
 import java.util.Hashtable;
+import java.util.Vector;
 import javax.accessibility.Accessible;
 import javax.accessibility.AccessibleContext;
 import javax.accessibility.AccessibleExtendedComponent;
@@ -86,6 +87,9 @@
 public abstract class JComponent extends Container implements Serializable
 {
   static final long serialVersionUID = -5242478962609715464L;
+
+  protected EventListenerList listenerList = new EventListenerList();
+
         /**
          * accessibleContext
          */
@@ -98,9 +102,6 @@
 	boolean use_double_buffer, opaque;
 	protected ComponentUI ui;
 
-	Vector ancestor_list;
-	Vector veto_list;
-	Vector change_list;
 	Hashtable prop_hash;
 
 	/**
@@ -273,16 +274,12 @@
 		super();
 		super.setLayout(new FlowLayout());
 		
-		listenerList = new EventListenerList();
-    
 		//eventMask |= AWTEvent.COMP_KEY_EVENT_MASK;
 		// enableEvents( AWTEvent.KEY_EVENT_MASK );
 
 		//updateUI(); // get a proper ui
 	}
 
-	protected EventListenerList listenerList;
-
 	public boolean contains(int x, int y)
 	{
 		//return dims.contains(x,y);
@@ -301,24 +298,6 @@
 			prop_hash = new Hashtable();
 		return prop_hash;
 	}
-	public Vector get_veto_list()
-	{
-		if (veto_list == null)
-			veto_list = new Vector();
-		return veto_list;
-	}
-	public Vector get_change_list()
-	{
-		if (change_list == null)
-			change_list = new Vector();
-		return change_list;
-	}
-	public Vector get_ancestor_list()
-	{
-		if (ancestor_list == null)
-			ancestor_list = new Vector();
-		return ancestor_list;
-	}
 
 	public Object getClientProperty(Object key)
         {	return get_prop_hash().get(key);    }
@@ -326,29 +305,99 @@
 	public void putClientProperty(Object key, Object value)
 	{    get_prop_hash().put(key, value);   }
 
+  /**
+   * Unregister an <code>AncestorListener</code>.
+   */
 	public void removeAncestorListener(AncestorListener listener)
-	{  get_ancestor_list().removeElement(listener);  }
+  {
+    listenerList.remove(AncestorListener.class, listener);
+  }
 
+  /**
+   * Unregister a <code>PropertyChangeListener</code>.
+   */
         public void removePropertyChangeListener(PropertyChangeListener listener)
-	{  get_change_list().removeElement(listener);   }
+  {
+    listenerList.remove(PropertyChangeListener.class, listener);
+  }
 
+  /**
+   * Unregister a <code>PropertyChangeListener</code>.
+   */
 	public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener)
-	{  /* FIXME */   get_change_list().removeElement(listener);   }
+  {
+    listenerList.remove(PropertyChangeListener.class, listener);
+  }
 
+  /**
+   * Unregister a <code>VetoableChangeChangeListener</code>.
+   */
 	public void removeVetoableChangeListener(VetoableChangeListener listener)
-	{  get_veto_list().removeElement(listener);   }
+  {
+    listenerList.remove(VetoableChangeListener.class, listener);
+  }
 
+  /**
+   * Register an <code>AncestorListener</code>.
+   */
 	public void addAncestorListener(AncestorListener listener)
-	{   get_ancestor_list().addElement(listener);  }
+  {
+    listenerList.add(AncestorListener.class, listener);
+  }
 
+  /**
+   * Register a <code>PropertyChangeListener</code>.
+   */
 	public void addPropertyChangeListener(PropertyChangeListener listener)
-	{  get_change_list().addElement(listener);   }
+  {
+    listenerList.add(PropertyChangeListener.class, listener);
+  }
 
+  /**
+   * Register a <code>PropertyChangeListener</code>.
+   */
 	public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener)
-	{ /* FIXME */ get_change_list().addElement(listener);   }
+  {
+    listenerList.add(PropertyChangeListener.class, listener);
+  }
 
+  /**
+   * Register a <code>VetoableChangeListener</code>.
+   */
 	public void addVetoableChangeListener(VetoableChangeListener listener)
-	{  get_veto_list().addElement(listener);    }
+  {
+    listenerList.add(VetoableChangeListener.class, listener);
+  }
+
+  /**
+   * Return all registered listeners of a special type.
+   * 
+   * @since 1.3
+   */
+  public EventListener[] getListeners (Class listenerType)
+  {
+    return listenerList.getListeners (listenerType);
+  }
+  
+  /**
+   * Return all registered <code>Ancestor</code> objects.
+   * 
+   * @since 1.4
+   */
+  public AncestorListener[] getAncestorListeners()
+  {
+    return (AncestorListener[]) getListeners (AncestorListener.class);
+  }
+
+  /**
+   * Return all registered <code>VetoableChangeListener</code> objects.
+   * 
+   * @since 1.4
+   */
+  public VetoableChangeListener[] getVetoableChangeListeners()
+  {
+    return (VetoableChangeListener[]) getListeners (VetoableChangeListener.class);
+  }
 
 	public void computeVisibleRect(Rectangle rect)
 	{
@@ -397,6 +446,7 @@
 	}
 
 	protected  void fireVetoableChange(String propertyName, Object oldValue, Object newValue)
+          throws PropertyVetoException
 	{
 		//       Support for reporting constrained property changes.
 	}
Index: javax/swing/JEditorPane.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/JEditorPane.java,v
retrieving revision 1.6
diff -u -b -B -r1.6 JEditorPane.java
--- javax/swing/JEditorPane.java	8 Jun 2003 11:20:07 -0000	1.6
+++ javax/swing/JEditorPane.java	28 Jan 2004 18:26:24 -0000
@@ -1,5 +1,5 @@
 /* JEditorPane.java -- 
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,6 +41,7 @@
 import java.awt.Dimension;
 import java.awt.event.KeyEvent;
 import java.io.InputStream;
+import java.io.IOException;
 import java.net.URL;
 import javax.accessibility.AccessibleContext;
 import javax.swing.text.EditorKit;
@@ -63,6 +64,7 @@
     }
 
     public JEditorPane(String url)
+      throws IOException
     {
 	this();
 	setPage(url);
@@ -75,6 +77,7 @@
     }
     
     public JEditorPane(URL url)
+      throws IOException
     {
 	setPage(url);
     }

--Boundary-00=_rpAGABXo1fBj8t2--




From MAILER-DAEMON Wed Jan 28 14:41:25 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AlvYy-0007p7-Jm
	for mharc-commit-classpath@gnu.org; Wed, 28 Jan 2004 14:41:24 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AlvYu-0007mI-TM
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 14:41:20 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AlvYL-0007W7-9n
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 14:41:16 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AlvYK-0007U9-58
	for commit-classpath@gnu.org; Wed, 28 Jan 2004 14:40:44 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-159.ewetel.net
	[80.228.94.159])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0SJedl1005918
	for <commit-classpath@gnu.org>; Wed, 28 Jan 2004 20:40:40 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AlvYF-0000HP-00
	for <commit-classpath@gnu.org>; Wed, 28 Jan 2004 20:40:39 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Wed, 28 Jan 2004 20:44:22 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_WEBGAFKHZ3Z+Qkm"
Message-Id: <200401282044.22373.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: java.lang.Thread
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Jan 2004 19:41:21 -0000


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

Hi list,


I just commited the attached patch to reorder the methods in java.lang.Thread 
to match libgcj more.


Michael


2004-01-28  Michael Koch  <konqueror@gmx.de>

	* java/lang/Thread.java: Reordered methods to match libgcj.


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

Index: java/lang/Thread.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/lang/Thread.java,v
retrieving revision 1.2
diff -u -b -B -r1.2 Thread.java
--- java/lang/Thread.java	21 Nov 2003 08:08:00 -0000	1.2
+++ java/lang/Thread.java	28 Jan 2004 19:37:34 -0000
@@ -1,5 +1,6 @@
 /* Thread -- an independent thread of executable code
-   Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Free Software Foundation
 
 This file is part of GNU Classpath.
 
@@ -37,6 +38,14 @@
 
 package java.lang;
 
+/* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
+ * "The Java Language Specification", ISBN 0-201-63451-1
+ * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
+ * Status:  Believed complete to version 1.4, with caveats. We do not 
+ *          implement the deprecated (and dangerous) stop, suspend, and resume
+ *          methods. Security implementation is not complete.
+ */
+
 /**
  * Thread represents a single thread of execution in the VM. When an
  * application VM starts up, it creates a non-daemon Thread which calls the
@@ -65,6 +74,7 @@
  * or interrupted?  The only thing that is clear is that the Thread should be
  * removed when it is stopped.
  *
+ * @author Tom Tromey
  * @author John Keiser
  * @author Eric Blake <ebb9@email.byu.edu>
  * @see Runnable
@@ -310,6 +320,51 @@
   }
 
   /**
+   * Get the number of active threads in the current Thread's ThreadGroup.
+   * This implementation calls
+   * <code>currentThread().getThreadGroup().activeCount()</code>.
+   *
+   * @return the number of active threads in the current ThreadGroup
+   * @see ThreadGroup#activeCount()
+   */
+  public static int activeCount()
+  {
+    return currentThread().group.activeCount();
+  }
+
+  /**
+   * Check whether the current Thread is allowed to modify this Thread. This
+   * passes the check on to <code>SecurityManager.checkAccess(this)</code>.
+   *
+   * @throws SecurityException if the current Thread cannot modify this Thread
+   * @see SecurityManager#checkAccess(Thread)
+   */
+  public final void checkAccess()
+  {
+    // Bypass System.getSecurityManager, for bootstrap efficiency.
+    SecurityManager sm = Runtime.securityManager;
+    if (sm != null)
+      sm.checkAccess(this);
+  }
+
+  /**
+   * Count the number of stack frames in this Thread.  The Thread in question
+   * must be suspended when this occurs.
+   *
+   * @return the number of stack frames in this Thread
+   * @throws IllegalThreadStateException if this Thread is not suspended
+   * @deprecated pointless, since suspend is deprecated
+   */
+  public int countStackFrames()
+  {
+    VMThread t = vmThread;
+    if (t == null || group == null)
+	throw new IllegalThreadStateException();
+
+    return t.countStackFrames();
+  }
+
+  /**
    * Get the currently executing Thread. In the situation that the
    * currently running thread was created by native code and doesn't
    * have an associated Thread object yet, a new Thread object is
@@ -323,162 +378,88 @@
   }
 
   /**
-   * Yield to another thread. The Thread will not lose any locks it holds
-   * during this time. There are no guarantees which thread will be
-   * next to run, and it could even be this one, but most VMs will choose
-   * the highest priority thread that has been waiting longest.
+   * Originally intended to destroy this thread, this method was never
+   * implemented by Sun, and is hence a no-op.
    */
-  public static void yield()
+  public void destroy()
   {
-    VMThread.yield();
   }
 
   /**
-   * Suspend the current Thread's execution for the specified amount of
-   * time. The Thread will not lose any locks it has during this time. There
-   * are no guarantees which thread will be next to run, but most VMs will
-   * choose the highest priority thread that has been waiting longest.
+   * Print a stack trace of the current thread to stderr using the same
+   * format as Throwable's printStackTrace() method.
    *
-   * @param ms the number of milliseconds to sleep, or 0 for forever
-   * @throws InterruptedException if the Thread is interrupted; it's
-   *         <i>interrupted status</i> will be cleared
-   * @see #notify()
-   * @see #wait(long)
+   * @see Throwable#printStackTrace()
    */
-  public static void sleep(long ms) throws InterruptedException
+  public static void dumpStack()
   {
-    sleep(ms, 0);
+    new Throwable().printStackTrace();
   }
 
   /**
-   * Suspend the current Thread's execution for the specified amount of
-   * time. The Thread will not lose any locks it has during this time. There
-   * are no guarantees which thread will be next to run, but most VMs will
-   * choose the highest priority thread that has been waiting longest.
-   *
-   * <p>Note that 1,000,000 nanoseconds == 1 millisecond, but most VMs do
-   * not offer that fine a grain of timing resolution. Besides, there is
-   * no guarantee that this thread can start up immediately when time expires,
-   * because some other thread may be active.  So don't expect real-time
-   * performance.
+   * Copy every active thread in the current Thread's ThreadGroup into the
+   * array. Extra threads are silently ignored. This implementation calls
+   * <code>getThreadGroup().enumerate(array)</code>, which may have a
+   * security check, <code>checkAccess(group)</code>.
    *
-   * @param ms the number of milliseconds to sleep, or 0 for forever
-   * @param ns the number of extra nanoseconds to sleep (0-999999)
-   * @throws InterruptedException if the Thread is interrupted; it's
-   *         <i>interrupted status</i> will be cleared
-   * @throws IllegalArgumentException if ns is invalid
-   * @see #notify()
-   * @see #wait(long, int)
+   * @param array the array to place the Threads into
+   * @return the number of Threads placed into the array
+   * @throws NullPointerException if array is null
+   * @throws SecurityException if you cannot access the ThreadGroup
+   * @see ThreadGroup#enumerate(Thread[])
+   * @see #activeCount()
+   * @see SecurityManager#checkAccess(ThreadGroup)
    */
-  public static void sleep(long ms, int ns) throws InterruptedException
+  public static int enumerate(Thread[] array)
   {
-    VMThread.sleep(ms, ns);
+    return currentThread().group.enumerate(array);
   }
 
   /**
-   * Start this Thread, calling the run() method of the Runnable this Thread
-   * was created with, or else the run() method of the Thread itself. This
-   * is the only way to start a new thread; calling run by yourself will just
-   * stay in the same thread. The virtual machine will remove the thread from
-   * its thread group when the run() method completes.
+   * Get this Thread's name.
    *
-   * @throws IllegalThreadStateException if the thread has already started
-   * @see #run()
+   * @return this Thread's name
    */
-  public synchronized void start()
+  public final String getName()
   {
-    if (vmThread != null || group == null)
-	throw new IllegalThreadStateException();
-
-    VMThread.create(this, stacksize);
+    VMThread t = vmThread;
+    return t == null ? name : t.getName();
   }
 
   /**
-   * The method of Thread that will be run if there is no Runnable object
-   * associated with the Thread. Thread's implementation does nothing at all.
+   * Get this Thread's priority.
    *
-   * @see #start()
-   * @see #Thread(ThreadGroup, Runnable, String)
+   * @return the Thread's priority
    */
-  public void run()
+  public final synchronized int getPriority()
   {
-    if (toRun != null)
-      toRun.run();
+    VMThread t = vmThread;
+    return t == null ? priority : t.getPriority();
   }
 
   /**
-   * Cause this Thread to stop abnormally because of the throw of a ThreadDeath
-   * error. If you stop a Thread that has not yet started, it will stop
-   * immediately when it is actually started.
-   *
-   * <p>This is inherently unsafe, as it can interrupt synchronized blocks and
-   * leave data in bad states.  Hence, there is a security check:
-   * <code>checkAccess(this)</code>, plus another one if the current thread
-   * is not this: <code>RuntimePermission("stopThread")</code>. If you must
-   * catch a ThreadDeath, be sure to rethrow it after you have cleaned up.
-   * ThreadDeath is the only exception which does not print a stack trace when
-   * the thread dies.
+   * Get the ThreadGroup this Thread belongs to. If the thread has died, this
+   * returns null.
    *
-   * @throws SecurityException if you cannot stop the Thread
-   * @see #interrupt()
-   * @see #checkAccess()
-   * @see #start()
-   * @see ThreadDeath
-   * @see ThreadGroup#uncaughtException(Thread, Throwable)
-   * @see SecurityManager#checkAccess(Thread)
-   * @see SecurityManager#checkPermission(Permission)
-   * @deprecated unsafe operation, try not to use
+   * @return this Thread's ThreadGroup
    */
-  public final void stop()
+  public final ThreadGroup getThreadGroup()
   {
-    stop(new ThreadDeath());
+    return group;
   }
 
   /**
-   * Cause this Thread to stop abnormally and throw the specified exception.
-   * If you stop a Thread that has not yet started, the stop is ignored
-   * (contrary to what the JDK documentation says).
-   * <b>WARNING</b>This bypasses Java security, and can throw a checked
-   * exception which the call stack is unprepared to handle. Do not abuse 
-   * this power.
-   *
-   * <p>This is inherently unsafe, as it can interrupt synchronized blocks and
-   * leave data in bad states.  Hence, there is a security check:
-   * <code>checkAccess(this)</code>, plus another one if the current thread
-   * is not this: <code>RuntimePermission("stopThread")</code>. If you must
-   * catch a ThreadDeath, be sure to rethrow it after you have cleaned up.
-   * ThreadDeath is the only exception which does not print a stack trace when
-   * the thread dies.
+   * Checks whether the current thread holds the monitor on a given object.
+   * This allows you to do <code>assert Thread.holdsLock(obj)</code>.
    *
-   * @param t the Throwable to throw when the Thread dies
-   * @throws SecurityException if you cannot stop the Thread
-   * @throws NullPointerException in the calling thread, if t is null
-   * @see #interrupt()
-   * @see #checkAccess()
-   * @see #start()
-   * @see ThreadDeath
-   * @see ThreadGroup#uncaughtException(Thread, Throwable)
-   * @see SecurityManager#checkAccess(Thread)
-   * @see SecurityManager#checkPermission(Permission)
-   * @deprecated unsafe operation, try not to use
+   * @param obj the object to check
+   * @return true if the current thread is currently synchronized on obj
+   * @throws NullPointerException if obj is null
+   * @since 1.4
    */
-  public final synchronized void stop(Throwable t)
-  {
-    if (t == null)
-      throw new NullPointerException();
-    // Bypass System.getSecurityManager, for bootstrap efficiency.
-    SecurityManager sm = Runtime.securityManager;
-    if (sm != null)
+  public static boolean holdsLock(Object obj)
       {
-        sm.checkAccess(this);
-        if (this != currentThread())
-          sm.checkPermission(new RuntimePermission("stopThread"));
-      }
-    VMThread vt = vmThread;
-    if (vt != null)
-	vt.stop(t);
-    else
-	stillborn = t;
+    return VMThread.holdsLock(obj);
   }
 
   /**
@@ -537,14 +518,6 @@
   }
 
   /**
-   * Originally intended to destroy this thread, this method was never
-   * implemented by Sun, and is hence a no-op.
-   */
-  public void destroy()
-  {
-  }
-
-  /**
    * Determine whether this Thread is alive. A thread which is alive has
    * started and not yet died.
    *
@@ -556,188 +529,213 @@
   }
 
   /**
-   * Suspend this Thread.  It will not come back, ever, unless it is resumed.
-   *
-   * <p>This is inherently unsafe, as the suspended thread still holds locks,
-   * and can potentially deadlock your program.  Hence, there is a security
-   * check: <code>checkAccess</code>.
+   * Tell whether this is a daemon Thread or not.
    *
-   * @throws SecurityException if you cannot suspend the Thread
-   * @see #checkAccess()
-   * @see #resume()
-   * @deprecated unsafe operation, try not to use
+   * @return whether this is a daemon Thread or not
+   * @see #setDaemon(boolean)
    */
-  public final synchronized void suspend()
+  public final boolean isDaemon()
   {
-    checkAccess();
     VMThread t = vmThread;
-    if (t != null)
-	t.suspend();
+    return t == null ? daemon : t.isDaemon();
   }
 
   /**
-   * Resume this Thread.  If the thread is not suspended, this method does
-   * nothing. To mirror suspend(), there may be a security check:
-   * <code>checkAccess</code>.
+   * Wait forever for the Thread in question to die.
    *
-   * @throws SecurityException if you cannot resume the Thread
-   * @see #checkAccess()
-   * @see #suspend()
-   * @deprecated pointless, since suspend is deprecated
+   * @throws InterruptedException if the Thread is interrupted; it's
+   *         <i>interrupted status</i> will be cleared
    */
-  public final synchronized void resume()
+  public final void join() throws InterruptedException
   {
-    checkAccess();
-    VMThread t = vmThread;
-    if (t != null)
-	t.resume();
+    join(0, 0);
   }
 
   /**
-   * Set this Thread's priority. There may be a security check,
-   * <code>checkAccess</code>, then the priority is set to the smaller of
-   * priority and the ThreadGroup maximum priority.
+   * Wait the specified amount of time for the Thread in question to die.
    *
-   * @param priority the new priority for this Thread
-   * @throws IllegalArgumentException if priority exceeds MIN_PRIORITY or
-   *         MAX_PRIORITY
-   * @throws SecurityException if you cannot modify this Thread
-   * @see #getPriority()
-   * @see #checkAccess()
-   * @see ThreadGroup#getMaxPriority()
-   * @see #MIN_PRIORITY
-   * @see #MAX_PRIORITY
+   * @param ms the number of milliseconds to wait, or 0 for forever
+   * @throws InterruptedException if the Thread is interrupted; it's
+   *         <i>interrupted status</i> will be cleared
    */
-  public final synchronized void setPriority(int priority)
+  public final void join(long ms) throws InterruptedException
   {
-    checkAccess();
-    if (priority < MIN_PRIORITY || priority > MAX_PRIORITY)
-      throw new IllegalArgumentException("Invalid thread priority value "
-                                         + priority + ".");
-    priority = Math.min(priority, group.getMaxPriority());
-    VMThread t = vmThread;
-    if (t != null)
-	t.setPriority(priority);
-    else
-	this.priority = priority;
+    join(ms, 0);
   }
 
   /**
-   * Get this Thread's priority.
+   * Wait the specified amount of time for the Thread in question to die.
    *
-   * @return the Thread's priority
+   * <p>Note that 1,000,000 nanoseconds == 1 millisecond, but most VMs do
+   * not offer that fine a grain of timing resolution. Besides, there is
+   * no guarantee that this thread can start up immediately when time expires,
+   * because some other thread may be active.  So don't expect real-time
+   * performance.
+   *
+   * @param ms the number of milliseconds to wait, or 0 for forever
+   * @param ns the number of extra nanoseconds to sleep (0-999999)
+   * @throws InterruptedException if the Thread is interrupted; it's
+   *         <i>interrupted status</i> will be cleared
+   * @throws IllegalArgumentException if ns is invalid
    */
-  public final synchronized int getPriority()
+  public final void join(long ms, int ns) throws InterruptedException
   {
+    if(ms < 0 || ns < 0 || ns > 999999)
+	throw new IllegalArgumentException();
+
     VMThread t = vmThread;
-    return t == null ? priority : t.getPriority();
+    if(t != null)
+        t.join(ms, ns);
   }
 
   /**
-   * Set this Thread's name.  There may be a security check,
+   * Resume this Thread.  If the thread is not suspended, this method does
+   * nothing. To mirror suspend(), there may be a security check:
    * <code>checkAccess</code>.
    *
-   * @param name the new name for this Thread
-   * @throws NullPointerException if name is null
-   * @throws SecurityException if you cannot modify this Thread
+   * @throws SecurityException if you cannot resume the Thread
+   * @see #checkAccess()
+   * @see #suspend()
+   * @deprecated pointless, since suspend is deprecated
    */
-  public final synchronized void setName(String name)
+  public final synchronized void resume()
   {
     checkAccess();
-    // Use toString hack to detect null.
-    name = name.toString();
     VMThread t = vmThread;
     if (t != null)
-	t.setName(name);
-    else
-	this.name = name;
+	t.resume();
   }
 
   /**
-   * Get this Thread's name.
+   * The method of Thread that will be run if there is no Runnable object
+   * associated with the Thread. Thread's implementation does nothing at all.
    *
-   * @return this Thread's name
+   * @see #start()
+   * @see #Thread(ThreadGroup, Runnable, String)
    */
-  public final String getName()
+  public void run()
   {
-    VMThread t = vmThread;
-    return t == null ? name : t.getName();
+    if (toRun != null)
+      toRun.run();
   }
 
   /**
-   * Get the ThreadGroup this Thread belongs to. If the thread has died, this
-   * returns null.
+   * Set the daemon status of this Thread.  If this is a daemon Thread, then
+   * the VM may exit even if it is still running.  This may only be called
+   * while the Thread is not running. There may be a security check,
+   * <code>checkAccess</code>.
    *
-   * @return this Thread's ThreadGroup
+   * @param daemon whether this should be a daemon thread or not
+   * @throws SecurityException if you cannot modify this Thread
+   * @throws IllegalThreadStateException if the Thread is active
+   * @see #isDaemon()
+   * @see #checkAccess()
    */
-  public final ThreadGroup getThreadGroup()
+  public final synchronized void setDaemon(boolean daemon)
   {
-    return group;
+    if (vmThread != null || group == null)
+      throw new IllegalThreadStateException();
+    checkAccess();
+    this.daemon = daemon;
   }
 
   /**
-   * Get the number of active threads in the current Thread's ThreadGroup.
-   * This implementation calls
-   * <code>currentThread().getThreadGroup().activeCount()</code>.
+   * Returns the context classloader of this Thread. The context
+   * classloader can be used by code that want to load classes depending
+   * on the current thread. Normally classes are loaded depending on
+   * the classloader of the current class. There may be a security check
+   * for <code>RuntimePermission("getClassLoader")</code> if the caller's
+   * class loader is not null or an ancestor of this thread's context class
+   * loader.
    *
-   * @return the number of active threads in the current ThreadGroup
-   * @see ThreadGroup#activeCount()
+   * @return the context class loader
+   * @throws SecurityException when permission is denied
+   * @see setContextClassLoader(ClassLoader)
+   * @since 1.2
    */
-  public static int activeCount()
+  public ClassLoader getContextClassLoader()
   {
-    return currentThread().group.activeCount();
+    // Bypass System.getSecurityManager, for bootstrap efficiency.
+    SecurityManager sm = Runtime.securityManager;
+    if (sm != null)
+      // XXX Don't check this if the caller's class loader is an ancestor.
+      sm.checkPermission(new RuntimePermission("getClassLoader"));
+    return contextClassLoader;
   }
 
   /**
-   * Copy every active thread in the current Thread's ThreadGroup into the
-   * array. Extra threads are silently ignored. This implementation calls
-   * <code>getThreadGroup().enumerate(array)</code>, which may have a
-   * security check, <code>checkAccess(group)</code>.
+   * Sets the context classloader for this Thread. When not explicitly set,
+   * the context classloader for a thread is the same as the context
+   * classloader of the thread that created this thread. The first thread has
+   * as context classloader the system classloader. There may be a security
+   * check for <code>RuntimePermission("setContextClassLoader")</code>.
    *
-   * @param array the array to place the Threads into
-   * @return the number of Threads placed into the array
-   * @throws NullPointerException if array is null
-   * @throws SecurityException if you cannot access the ThreadGroup
-   * @see ThreadGroup#enumerate(Thread[])
-   * @see #activeCount()
-   * @see SecurityManager#checkAccess(ThreadGroup)
+   * @param classloader the new context class loader
+   * @throws SecurityException when permission is denied
+   * @see getContextClassLoader()
+   * @since 1.2
    */
-  public static int enumerate(Thread[] array)
+  public void setContextClassLoader(ClassLoader classloader)
   {
-    return currentThread().group.enumerate(array);
+    SecurityManager sm = System.getSecurityManager();
+    if (sm != null)
+      sm.checkPermission(new RuntimePermission("setContextClassLoader"));
+    this.contextClassLoader = classloader;
   }
 
   /**
-   * Count the number of stack frames in this Thread.  The Thread in question
-   * must be suspended when this occurs.
+   * Set this Thread's name.  There may be a security check,
+   * <code>checkAccess</code>.
    *
-   * @return the number of stack frames in this Thread
-   * @throws IllegalThreadStateException if this Thread is not suspended
-   * @deprecated pointless, since suspend is deprecated
+   * @param name the new name for this Thread
+   * @throws NullPointerException if name is null
+   * @throws SecurityException if you cannot modify this Thread
    */
-  public int countStackFrames()
+  public final synchronized void setName(String name)
   {
+    checkAccess();
+    // Use toString hack to detect null.
+    name = name.toString();
     VMThread t = vmThread;
-    if (t == null || group == null)
-	throw new IllegalThreadStateException();
+    if (t != null)
+	t.setName(name);
+    else
+	this.name = name;
+  }
 
-    return t.countStackFrames();
+  /**
+   * Yield to another thread. The Thread will not lose any locks it holds
+   * during this time. There are no guarantees which thread will be
+   * next to run, and it could even be this one, but most VMs will choose
+   * the highest priority thread that has been waiting longest.
+   */
+  public static void yield()
+  {
+    VMThread.yield();
   }
 
   /**
-   * Wait the specified amount of time for the Thread in question to die.
+   * Suspend the current Thread's execution for the specified amount of
+   * time. The Thread will not lose any locks it has during this time. There
+   * are no guarantees which thread will be next to run, but most VMs will
+   * choose the highest priority thread that has been waiting longest.
    *
-   * @param ms the number of milliseconds to wait, or 0 for forever
+   * @param ms the number of milliseconds to sleep, or 0 for forever
    * @throws InterruptedException if the Thread is interrupted; it's
    *         <i>interrupted status</i> will be cleared
+   * @see #notify()
+   * @see #wait(long)
    */
-  public final void join(long ms) throws InterruptedException
+  public static void sleep(long ms) throws InterruptedException
   {
-    join(ms, 0);
+    sleep(ms, 0);
   }
 
   /**
-   * Wait the specified amount of time for the Thread in question to die.
+   * Suspend the current Thread's execution for the specified amount of
+   * time. The Thread will not lose any locks it has during this time. There
+   * are no guarantees which thread will be next to run, but most VMs will
+   * choose the highest priority thread that has been waiting longest.
    *
    * <p>Note that 1,000,000 nanoseconds == 1 millisecond, but most VMs do
    * not offer that fine a grain of timing resolution. Besides, there is
@@ -745,162 +743,174 @@
    * because some other thread may be active.  So don't expect real-time
    * performance.
    *
-   * @param ms the number of milliseconds to wait, or 0 for forever
+   * @param ms the number of milliseconds to sleep, or 0 for forever
    * @param ns the number of extra nanoseconds to sleep (0-999999)
    * @throws InterruptedException if the Thread is interrupted; it's
    *         <i>interrupted status</i> will be cleared
    * @throws IllegalArgumentException if ns is invalid
+   * @see #notify()
+   * @see #wait(long, int)
    */
-  public final void join(long ms, int ns) throws InterruptedException
+  public static void sleep(long ms, int ns) throws InterruptedException
   {
-    if(ms < 0 || ns < 0 || ns > 999999)
-	throw new IllegalArgumentException();
-
-    VMThread t = vmThread;
-    if(t != null)
-        t.join(ms, ns);
+    VMThread.sleep(ms, ns);
   }
 
   /**
-   * Wait forever for the Thread in question to die.
+   * Start this Thread, calling the run() method of the Runnable this Thread
+   * was created with, or else the run() method of the Thread itself. This
+   * is the only way to start a new thread; calling run by yourself will just
+   * stay in the same thread. The virtual machine will remove the thread from
+   * its thread group when the run() method completes.
    *
-   * @throws InterruptedException if the Thread is interrupted; it's
-   *         <i>interrupted status</i> will be cleared
+   * @throws IllegalThreadStateException if the thread has already started
+   * @see #run()
    */
-  public final void join() throws InterruptedException
+  public synchronized void start()
   {
-    join(0, 0);
-  }
+    if (vmThread != null || group == null)
+	throw new IllegalThreadStateException();
 
-  /**
-   * Print a stack trace of the current thread to stderr using the same
-   * format as Throwable's printStackTrace() method.
-   *
-   * @see Throwable#printStackTrace()
-   */
-  public static void dumpStack()
-  {
-    new Throwable().printStackTrace();
+    VMThread.create(this, stacksize);
   }
 
   /**
-   * Set the daemon status of this Thread.  If this is a daemon Thread, then
-   * the VM may exit even if it is still running.  This may only be called
-   * while the Thread is not running. There may be a security check,
-   * <code>checkAccess</code>.
+   * Cause this Thread to stop abnormally because of the throw of a ThreadDeath
+   * error. If you stop a Thread that has not yet started, it will stop
+   * immediately when it is actually started.
    *
-   * @param daemon whether this should be a daemon thread or not
-   * @throws SecurityException if you cannot modify this Thread
-   * @throws IllegalThreadStateException if the Thread is active
-   * @see #isDaemon()
+   * <p>This is inherently unsafe, as it can interrupt synchronized blocks and
+   * leave data in bad states.  Hence, there is a security check:
+   * <code>checkAccess(this)</code>, plus another one if the current thread
+   * is not this: <code>RuntimePermission("stopThread")</code>. If you must
+   * catch a ThreadDeath, be sure to rethrow it after you have cleaned up.
+   * ThreadDeath is the only exception which does not print a stack trace when
+   * the thread dies.
+   *
+   * @throws SecurityException if you cannot stop the Thread
+   * @see #interrupt()
    * @see #checkAccess()
+   * @see #start()
+   * @see ThreadDeath
+   * @see ThreadGroup#uncaughtException(Thread, Throwable)
+   * @see SecurityManager#checkAccess(Thread)
+   * @see SecurityManager#checkPermission(Permission)
+   * @deprecated unsafe operation, try not to use
    */
-  public final synchronized void setDaemon(boolean daemon)
+  public final void stop()
   {
-    if (vmThread != null || group == null)
-      throw new IllegalThreadStateException();
-    checkAccess();
-    this.daemon = daemon;
+    stop(new ThreadDeath());
   }
 
   /**
-   * Tell whether this is a daemon Thread or not.
+   * Cause this Thread to stop abnormally and throw the specified exception.
+   * If you stop a Thread that has not yet started, the stop is ignored
+   * (contrary to what the JDK documentation says).
+   * <b>WARNING</b>This bypasses Java security, and can throw a checked
+   * exception which the call stack is unprepared to handle. Do not abuse 
+   * this power.
    *
-   * @return whether this is a daemon Thread or not
-   * @see #setDaemon(boolean)
-   */
-  public final boolean isDaemon()
-  {
-    VMThread t = vmThread;
-    return t == null ? daemon : t.isDaemon();
-  }
-
-  /**
-   * Check whether the current Thread is allowed to modify this Thread. This
-   * passes the check on to <code>SecurityManager.checkAccess(this)</code>.
+   * <p>This is inherently unsafe, as it can interrupt synchronized blocks and
+   * leave data in bad states.  Hence, there is a security check:
+   * <code>checkAccess(this)</code>, plus another one if the current thread
+   * is not this: <code>RuntimePermission("stopThread")</code>. If you must
+   * catch a ThreadDeath, be sure to rethrow it after you have cleaned up.
+   * ThreadDeath is the only exception which does not print a stack trace when
+   * the thread dies.
    *
-   * @throws SecurityException if the current Thread cannot modify this Thread
+   * @param t the Throwable to throw when the Thread dies
+   * @throws SecurityException if you cannot stop the Thread
+   * @throws NullPointerException in the calling thread, if t is null
+   * @see #interrupt()
+   * @see #checkAccess()
+   * @see #start()
+   * @see ThreadDeath
+   * @see ThreadGroup#uncaughtException(Thread, Throwable)
    * @see SecurityManager#checkAccess(Thread)
+   * @see SecurityManager#checkPermission(Permission)
+   * @deprecated unsafe operation, try not to use
    */
-  public final void checkAccess()
+  public final synchronized void stop(Throwable t)
   {
+    if (t == null)
+      throw new NullPointerException();
     // Bypass System.getSecurityManager, for bootstrap efficiency.
     SecurityManager sm = Runtime.securityManager;
     if (sm != null)
+      {
       sm.checkAccess(this);
+        if (this != currentThread())
+          sm.checkPermission(new RuntimePermission("stopThread"));
   }
-
-  /**
-   * Return a human-readable String representing this Thread. The format of
-   * the string is:<br>
-   * <code>"Thread[" + getName() + ',' + getPriority() + ','
-   *  + (getThreadGroup() == null ? "" : getThreadGroup().getName())
-   + ']'</code>.
-   *
-   * @return a human-readable String representing this Thread
-   */
-  public String toString()
-  {
-    return "Thread[" + name + ',' + priority + ','
-      + (group == null ? "" : group.name) + ']';
+    VMThread vt = vmThread;
+    if (vt != null)
+	vt.stop(t);
+    else
+	stillborn = t;
   }
 
   /**
-   * Returns the context classloader of this Thread. The context
-   * classloader can be used by code that want to load classes depending
-   * on the current thread. Normally classes are loaded depending on
-   * the classloader of the current class. There may be a security check
-   * for <code>RuntimePermission("getClassLoader")</code> if the caller's
-   * class loader is not null or an ancestor of this thread's context class
-   * loader.
+   * Suspend this Thread.  It will not come back, ever, unless it is resumed.
    *
-   * @return the context class loader
-   * @throws SecurityException when permission is denied
-   * @see setContextClassLoader(ClassLoader)
-   * @since 1.2
+   * <p>This is inherently unsafe, as the suspended thread still holds locks,
+   * and can potentially deadlock your program.  Hence, there is a security
+   * check: <code>checkAccess</code>.
+   *
+   * @throws SecurityException if you cannot suspend the Thread
+   * @see #checkAccess()
+   * @see #resume()
+   * @deprecated unsafe operation, try not to use
    */
-  public ClassLoader getContextClassLoader()
+  public final synchronized void suspend()
   {
-    // Bypass System.getSecurityManager, for bootstrap efficiency.
-    SecurityManager sm = Runtime.securityManager;
-    if (sm != null)
-      // XXX Don't check this if the caller's class loader is an ancestor.
-      sm.checkPermission(new RuntimePermission("getClassLoader"));
-    return contextClassLoader;
+    checkAccess();
+    VMThread t = vmThread;
+    if (t != null)
+	t.suspend();
   }
 
   /**
-   * Sets the context classloader for this Thread. When not explicitly set,
-   * the context classloader for a thread is the same as the context
-   * classloader of the thread that created this thread. The first thread has
-   * as context classloader the system classloader. There may be a security
-   * check for <code>RuntimePermission("setContextClassLoader")</code>.
+   * Set this Thread's priority. There may be a security check,
+   * <code>checkAccess</code>, then the priority is set to the smaller of
+   * priority and the ThreadGroup maximum priority.
    *
-   * @param classloader the new context class loader
-   * @throws SecurityException when permission is denied
-   * @see getContextClassLoader()
-   * @since 1.2
+   * @param priority the new priority for this Thread
+   * @throws IllegalArgumentException if priority exceeds MIN_PRIORITY or
+   *         MAX_PRIORITY
+   * @throws SecurityException if you cannot modify this Thread
+   * @see #getPriority()
+   * @see #checkAccess()
+   * @see ThreadGroup#getMaxPriority()
+   * @see #MIN_PRIORITY
+   * @see #MAX_PRIORITY
    */
-  public void setContextClassLoader(ClassLoader classloader)
+  public final synchronized void setPriority(int priority)
   {
-    SecurityManager sm = System.getSecurityManager();
-    if (sm != null)
-      sm.checkPermission(new RuntimePermission("setContextClassLoader"));
-    this.contextClassLoader = classloader;
+    checkAccess();
+    if (priority < MIN_PRIORITY || priority > MAX_PRIORITY)
+      throw new IllegalArgumentException("Invalid thread priority value "
+                                         + priority + ".");
+    priority = Math.min(priority, group.getMaxPriority());
+    VMThread t = vmThread;
+    if (t != null)
+	t.setPriority(priority);
+    else
+	this.priority = priority;
   }
 
   /**
-   * Checks whether the current thread holds the monitor on a given object.
-   * This allows you to do <code>assert Thread.holdsLock(obj)</code>.
+   * Return a human-readable String representing this Thread. The format of
+   * the string is:<br>
+   * <code>"Thread[" + getName() + ',' + getPriority() + ','
+   *  + (getThreadGroup() == null ? "" : getThreadGroup().getName())
+   + ']'</code>.
    *
-   * @param obj the object to check
-   * @return true if the current thread is currently synchronized on obj
-   * @throws NullPointerException if obj is null
-   * @since 1.4
+   * @return a human-readable String representing this Thread
    */
-  public static boolean holdsLock(Object obj)
+  public String toString()
   {
-    return VMThread.holdsLock(obj);
+    return ("Thread[" + name + "," + priority + "," + 
+	    (group == null ? "" : group.getName()) + "]");
   }
 
   /**
@@ -911,4 +921,4 @@
     group.removeThread(this);
     vmThread = null;
   }
-} // class Thread
+}

--Boundary-00=_WEBGAFKHZ3Z+Qkm--




From MAILER-DAEMON Thu Jan 29 09:55:45 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AmDYI-0001eb-7w
	for mharc-commit-classpath@gnu.org; Thu, 29 Jan 2004 09:53:54 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AmDXi-0001KW-Ap
	for commit-classpath@gnu.org; Thu, 29 Jan 2004 09:53:18 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmDWo-000130-MT
	for commit-classpath@gnu.org; Thu, 29 Jan 2004 09:52:54 -0500
Received: from [66.187.233.31] (helo=mx1.redhat.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AmDWo-0000yX-6E
	for commit-classpath@gnu.org; Thu, 29 Jan 2004 09:52:22 -0500
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by mx1.redhat.com (8.11.6/8.11.6) with ESMTP id i0TEq8b12556
	for <commit-classpath@gnu.org>; Thu, 29 Jan 2004 09:52:08 -0500
Received: from pobox.toronto.redhat.com (pobox.toronto.redhat.com
	[172.16.14.4])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i0TEq8a15685
	for <commit-classpath@gnu.org>; Thu, 29 Jan 2004 09:52:08 -0500
Received: from tomaluk.toronto.redhat.com (tomaluk.toronto.redhat.com
	[172.16.14.15])
	by pobox.toronto.redhat.com (8.12.8/8.12.8) with ESMTP id
	i0TEq7Xd006985
	for <commit-classpath@gnu.org>; Thu, 29 Jan 2004 09:52:07 -0500
From: Kim Ho <kho@redhat.com>
To: classpath-commits <commit-classpath@gnu.org>
Content-Type: multipart/mixed; boundary="=-CnMDssA+kNDyKhj2cra2"
Organization: 
Message-Id: <1075387927.4904.2.camel@tomaluk.toronto.redhat.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.2 (1.2.2-5) 
Date: 29 Jan 2004 09:52:07 -0500
Subject: [PATCH] FYI: hide layout when setting menubar
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jan 2004 14:53:51 -0000


--=-CnMDssA+kNDyKhj2cra2
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi,

I committed this patch to merge changes from libgcj.

Cheers,

Kim

2004-01-29  Kim Ho  <kho@redhat.com>
                                                                                
        * gnu/java/awt/peer/gtk/GtkFramePeer.java
        (gtkLayoutSetVisible): New method
        (setMenuBar): Hide layout before setting MenuBar
        and reshow it after.
        * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
        (gtkLayoutSetVisible): Hide or show the Gtk Layout.
        * include/gnu_java_awt_peer_gtk_GtkFramePeer.h:
        Regenerated.

--=-CnMDssA+kNDyKhj2cra2
Content-Disposition: attachment; filename=AWT-flicker.patch
Content-Type: text/x-patch; name=AWT-flicker.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.1854
diff -u -r1.1854 ChangeLog
--- ChangeLog	28 Jan 2004 19:38:24 -0000	1.1854
+++ ChangeLog	29 Jan 2004 14:43:06 -0000
@@ -1,3 +1,14 @@
+2004-01-29  Kim Ho  <kho@redhat.com>
+
+	* gnu/java/awt/peer/gtk/GtkFramePeer.java
+	(gtkLayoutSetVisible): New method
+	(setMenuBar): Hide layout before setting MenuBar
+	and reshow it after.
+	* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
+	(gtkLayoutSetVisible): Hide or show the Gtk Layout.
+	* include/gnu_java_awt_peer_gtk_GtkFramePeer.h:
+	Regenerated.
+
 2004-01-28  Michael Koch  <konqueror@gmx.de>
 
 	* java/lang/Thread.java: Reordered methods to match libgcj.
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.23
diff -u -r1.23 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java	28 Jan 2004 16:36:38 -0000	1.23
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java	29 Jan 2004 14:43:06 -0000
@@ -60,6 +60,7 @@
   native void setMenuBarPeer (MenuBarPeer bar);
   native void removeMenuBarPeer ();
   native void moveLayout (int offset);
+  native void gtkLayoutSetVisible (boolean vis);
 
   public void setMenuBar (MenuBar bar)
   {
@@ -67,16 +68,19 @@
     {    
       if (menuBar != null)
       {
+        gtkLayoutSetVisible(false);
         removeMenuBarPeer(); 
         menuBar = null;
         moveLayout(menuBarHeight);
         insets.top -= menuBarHeight;
         menuBarHeight = 0;      
         awtComponent.doLayout();
+        gtkLayoutSetVisible(true);
       }
     }
     else
     {
+      gtkLayoutSetVisible(false);
       int oldHeight = 0;
       if (menuBar != null)
       {
@@ -91,6 +95,7 @@
         moveLayout(oldHeight - menuBarHeight);
       insets.top += menuBarHeight;
       awtComponent.doLayout();
+      gtkLayoutSetVisible(true);
     }
   }
 
Index: include/gnu_java_awt_peer_gtk_GtkFramePeer.h
===================================================================
RCS file: /cvsroot/classpath/classpath/include/gnu_java_awt_peer_gtk_GtkFramePeer.h,v
retrieving revision 1.5
diff -u -r1.5 gnu_java_awt_peer_gtk_GtkFramePeer.h
--- include/gnu_java_awt_peer_gtk_GtkFramePeer.h	27 Jan 2004 22:30:38 -0000	1.5
+++ include/gnu_java_awt_peer_gtk_GtkFramePeer.h	29 Jan 2004 14:43:06 -0000
@@ -14,6 +14,7 @@
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_setMenuBarPeer (JNIEnv *env, jobject, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_removeMenuBarPeer (JNIEnv *env, jobject);
 extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_moveLayout (JNIEnv *env, jobject, jint);
+extern JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkLayoutSetVisible (JNIEnv *env, jobject, jboolean);
 
 #ifdef __cplusplus
 }
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.21
diff -u -r1.21 gnu_java_awt_peer_gtk_GtkWindowPeer.c
--- native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	27 Jan 2004 22:30:38 -0000	1.21
+++ native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c	29 Jan 2004 14:43:08 -0000
@@ -492,7 +492,38 @@
   gdk_threads_leave ();
 }
   
+JNIEXPORT void JNICALL
+Java_gnu_java_awt_peer_gtk_GtkFramePeer_gtkLayoutSetVisible
+  (JNIEnv *env, jobject obj, jboolean vis)
+{
+  void* ptr;
+  GList* children;
+  GtkBox* vbox;
+  GtkLayout* layout;
 
+  ptr = NSA_GET_PTR (env, obj);
+
+  gdk_threads_enter ();
+
+  children = gtk_container_get_children (GTK_CONTAINER (ptr));
+  vbox = children->data;
+  g_assert (GTK_IS_VBOX (vbox));
+
+  children = gtk_container_get_children (GTK_CONTAINER (vbox));
+  do
+  {
+    layout = children->data;
+    children = children->next;
+  }
+  while (!GTK_IS_LAYOUT (layout) && children != NULL);
+  g_assert (GTK_IS_LAYOUT (layout));  
+  
+  if (vis)
+    gtk_widget_show (GTK_WIDGET (layout));
+  else
+    gtk_widget_hide (GTK_WIDGET (layout));
+  gdk_threads_leave ();
+}
 static void
 window_get_frame_extents (GtkWidget *window,
                           int *top, int *left, int *bottom, int *right)

--=-CnMDssA+kNDyKhj2cra2--




From MAILER-DAEMON Fri Jan 30 16:45:04 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AmgRk-0005rg-Cw
	for mharc-commit-classpath@gnu.org; Fri, 30 Jan 2004 16:45:04 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AmgRi-0005r0-9W
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 16:45:02 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmgR9-0005gx-UI
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 16:44:59 -0500
Received: from [212.6.122.106] (helo=mail1.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AmgR9-0005fx-EA
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 16:44:27 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-202.ewetel.net
	[80.228.94.202])
	by mail1.ewetel.de (8.12.1/8.12.9) with ESMTP id i0ULiPl1017225
	for <commit-classpath@gnu.org>; Fri, 30 Jan 2004 22:44:25 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AmgR6-0000wi-00
	for <commit-classpath@gnu.org>; Fri, 30 Jan 2004 22:44:24 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 30 Jan 2004 22:48:09 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_ZEtGAIPk/ofgxaz"
Message-Id: <200401302248.10008.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: gnu.java.net.protocol.http.Connection
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2004 21:45:03 -0000


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

Hi list,


I commited the attached patch to fix a typo and merge 
gnu.java.net.protocol.http.Connection again with libgcj.


Michael


2004-01-30  Michael Koch  <konqueror@gmx.de>

	* gnu/java/net/protocol/http/Connection.java
	(getOutputStream): Fixed typo.


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

Index: gnu/java/net/protocol/http/Connection.java
===================================================================
RCS file: /cvsroot/classpath/classpath/gnu/java/net/protocol/http/Connection.java,v
retrieving revision 1.14
diff -u -b -B -r1.14 Connection.java
--- gnu/java/net/protocol/http/Connection.java	12 Jan 2004 22:08:55 -0000	1.14
+++ gnu/java/net/protocol/http/Connection.java	30 Jan 2004 21:41:46 -0000
@@ -387,7 +387,7 @@
   {
     if (connected)
       throw new ProtocolException
-	("You cannot get an outputstream for an existing http connection");
+	("You cannot get an output stream for an existing http connection");
 
     if (!doOutput)
       throw new ProtocolException

--Boundary-00=_ZEtGAIPk/ofgxaz--




From MAILER-DAEMON Fri Jan 30 16:49:43 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AmgWF-00077B-EN
	for mharc-commit-classpath@gnu.org; Fri, 30 Jan 2004 16:49:43 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AmgWC-00075u-5a
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 16:49:40 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmgVe-0006p2-IY
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 16:49:37 -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.24) id 1AmgVd-0006oe-V9
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 16:49:06 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1AmgLx-0001OY-Nk
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 16:39:05 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-202.ewetel.net
	[80.228.94.202])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i0ULcwqM000626
	for <commit-classpath@gnu.org>; Fri, 30 Jan 2004 22:38:58 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AmgLq-0000wc-00
	for <commit-classpath@gnu.org>; Fri, 30 Jan 2004 22:38:58 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 30 Jan 2004 22:42:41 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_R/sGAgOQGzgbLAe"
Message-Id: <200401302242.42996.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: generic NIO buffers
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2004 21:49:41 -0000


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

Hi list,


I commited the attached patch which removes the generic NIO buffer code. This 
is unused as the buffer classes are too different.


Michael


2004-01-30  Michael Koch  <konqueror@gmx.de>

	* configure.ac (AC_CONFIG_FILES): Removed lib/gen_nio.sh and fixed
	quotation.
	* java/nio/GenericBuffer.cpp: Removed.
	* lib/gen_nio.sh.in: Removed.
	* lib/Makefile.am: Removed rule to regenerate NIO buffer classes.


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

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.2
diff -u -b -B -r1.2 configure.ac
--- configure.ac	27 Jan 2004 22:00:42 -0000	1.2
+++ configure.ac	30 Jan 2004 21:35:54 -0000
@@ -286,7 +286,7 @@
               [])
 dnl -----------------------------------------------------------
 
-AC_CONFIG_FILES(Makefile
+AC_CONFIG_FILES([Makefile
 doc/Makefile
 doc/api/Makefile
 external/Makefile
@@ -443,7 +443,6 @@
 vm/reference/java/lang/reflect/Makefile
 vm/reference/java/io/Makefile
 lib/Makefile
-lib/gen-classlist.sh
-lib/gen_nio.sh)
+lib/gen-classlist.sh])
 AC_OUTPUT_COMMANDS([chmod 755 lib/gen-classlist.sh])
 AC_OUTPUT
Index: java/nio/GenericBuffer.cpp
===================================================================
RCS file: java/nio/GenericBuffer.cpp
diff -N java/nio/GenericBuffer.cpp
--- java/nio/GenericBuffer.cpp	8 Apr 2002 10:14:49 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,210 +0,0 @@
-package java.nio;
-
-#include "temp.h"
-
-    /*
-     *    Watch it though, this thing is generated from GenericBuffer.cpp
-     *    with "C"'s preprocessor !
-     *
-     *    The C preprocessor needs to define:
-     *
-     *            TYPE, SIZE, ELT
-     *          
-     */
-
-
-public abstract class BUFFER extends Buffer
-{ 
-    private ByteOrder endian = ByteOrder.BIG_ENDIAN;
-
-   protected ELT [] backing_buffer;
-    
-    public static BUFFER allocateDirect(int capacity)
-    {
-	BUFFER b = new gnu.java.nio. BUFFERImpl(capacity, 0, capacity);
-	return b;
-    }
-
-    public static BUFFER allocate(int capacity)
-    {
-	BUFFER b = new gnu.java.nio. BUFFERImpl(capacity, 0, capacity);
-	return b;
-    }
-
-   final public static BUFFER wrap(ELT[] array,
-			      int offset,
-			      int length)
-    {
-        gnu.java.nio.BUFFERImpl b = new gnu.java.nio. BUFFERImpl(array, offset, length);
-	return b;
-    }
-
-  final  public static BUFFER wrap(String a)
-    {
-#if SIZE == 1
-	return wrap(a.getBytes(), 0, a.length());
-#else
-	int len = a.length();
-	ELT[] buffer = new ELT[len];
-	for (int i=0;i<len;i++)
-	    {
-		buffer[i] = (ELT) a.charAt(i);
-	    }
-	return wrap(buffer, 0, len);
-#endif
-    }
-
-   final public static BUFFER wrap(ELT[] array)
-    {
-	return wrap(array, 0, array.length);
-    }
-    
-    final public BUFFER get(ELT[] dst,
-			    int offset,
-			    int length)
-    {
-
-	  for (int i = offset; i < offset + length; i++)
-	      {
-		  dst[i] = get(); 
-	      }
-	  return this;
-    }
-
-  final  public BUFFER get(ELT[] dst)
-    {
-	return get(dst, 0, dst.length);
-    }
-
-  final  public BUFFER put(BUFFER src)
-    {
-	while (src.hasRemaining())
-	    put(src.get());
-	return this;
-    }
-
-  final public BUFFER put(ELT[] src,
-			  int offset,
-			  int length)
-    {
-	  for (int i = offset; i < offset + length; i++)
-	      put(src[i]); 
-	  return this;
-    }
-
-public final BUFFER put(ELT[] src)
-    {
-	return put(src, 0, src.length);
-    }
-
-public final boolean hasArray()
-    {
-      return (backing_buffer != null);
-    }
-
-public final ELT[] array()
-    {
-      return backing_buffer;
-    }
-
-    public final int arrayOffset()
-    {
-      return 0;
-    }
-
-    public int hashCode()
-    {
-	return super.hashCode();
-    }
-
-    public boolean equals(Object obj)
-    {
-	if (obj instanceof BUFFER)
-	    {
-		return compareTo(obj) == 0;
-	    }	
-	return false;
-    }
-
-    public int compareTo(Object ob)
-    {
-	BUFFER a = (BUFFER) ob;
-	if (a.remaining() != remaining())
-	    return 1;
-
-	if (! hasArray() ||
-	    ! a.hasArray())
-	  {
-	    return 1;
-	  }
-	
-	int r = remaining();
-	int i1 = pos;
-	int i2 = a.pos;
-	for (int i=0;i<r;i++)
-	    {
-		int t = (int) (get(i1)- a.get(i2));
-		if (t != 0)
-		    {
-			return (int) t;
-		    }
-	    }
-	return 0;
-    }
-
-    public final ByteOrder order()
-    {
-	return endian;
-    }
-
-    public final BUFFER order(ByteOrder bo)
-    {
-	endian = bo;
-	return this;
-    }
-
-
-    // abstract functions:
-  
-    public abstract  ELT get();    
-    public abstract  java.nio. BUFFER put(ELT  b);
-    public abstract  ELT get(int index);
-    public abstract  java.nio. BUFFER put(int index, ELT  b);
-    public abstract BUFFER compact();
-    public abstract boolean isDirect();
-    public abstract BUFFER slice();
-    public abstract BUFFER duplicate();
-    public abstract BUFFER asReadOnlyBuffer();
-    public abstract ShortBuffer asShortBuffer();
-    public abstract CharBuffer asCharBuffer();
-    public abstract IntBuffer asIntBuffer();
-    public abstract LongBuffer asLongBuffer();
-    public abstract FloatBuffer asFloatBuffer();
-    public abstract DoubleBuffer asDoubleBuffer();
-
-    public abstract char getChar();
-    public abstract BUFFER putChar(char value);
-    public abstract char getChar(int index);
-    public abstract BUFFER putChar(int index, char value);
-    public abstract short getShort();
-    public abstract BUFFER putShort(short value);
-    public abstract short getShort(int index);
-    public abstract BUFFER putShort(int index, short value);
-    public abstract int getInt();
-    public abstract BUFFER putInt(int value);
-    public abstract int getInt(int index);
-    public abstract BUFFER putInt(int index, int value);
-    public abstract long getLong();
-    public abstract BUFFER putLong(long value);
-    public abstract long getLong(int index);
-    public abstract BUFFER putLong(int index, long value);
-    public abstract float getFloat();
-    public abstract BUFFER putFloat(float value);
-    public abstract float getFloat(int index);
-    public abstract BUFFER putFloat(int index, float value);
-    public abstract double getDouble();
-    public abstract BUFFER putDouble(double value);
-    public abstract double getDouble(int index);
-    public abstract BUFFER putDouble(int index, double value);
-}
-    
Index: lib/gen_nio.sh.in
===================================================================
RCS file: lib/gen_nio.sh.in
diff -N lib/gen_nio.sh.in
--- lib/gen_nio.sh.in	13 Mar 2002 13:05:23 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,137 +0,0 @@
-#! /bin/sh
-
-export CLASSPATH_SRC=@top_srcdir@
-
-# generate java.nio.ByteBuffer etc
-
-echo "#define TYPE Byte"  > ${top_builddir}/include/temp.h
-echo "#define ELT  byte"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 1"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/ByteBuffer/g > $CLASSPATH_SRC/java/nio/ByteBuffer.java
-
-
-echo "#define TYPE Short"  > ${top_builddir}/include/temp.h
-echo "#define ELT  short"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/ShortBuffer/g > $CLASSPATH_SRC/java/nio/ShortBuffer.java
-
-
-echo "#define TYPE Char"  > ${top_builddir}/include/temp.h
-echo "#define ELT  char"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/CharBuffer/g > $CLASSPATH_SRC/java/nio/CharBuffer.java
-
-
-echo "#define TYPE Int"  > ${top_builddir}/include/temp.h
-echo "#define ELT  int"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 4"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/IntBuffer/g > $CLASSPATH_SRC/java/nio/IntBuffer.java
-
-
-echo "#define TYPE Long"  > ${top_builddir}/include/temp.h
-echo "#define ELT  long"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 8"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/LongBuffer/g > $CLASSPATH_SRC/java/nio/LongBuffer.java
-
-
-echo "#define TYPE Float"  > ${top_builddir}/include/temp.h
-echo "#define ELT  float"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 4"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/FloatBuffer/g > $CLASSPATH_SRC/java/nio/FloatBuffer.java
-
-
-echo "#define TYPE Double"  > ${top_builddir}/include/temp.h
-echo "#define ELT  double"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 8"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/DoubleBuffer/g > $CLASSPATH_SRC/java/nio/DoubleBuffer.java
-
-#generate the implementation classes of the above:
-
-echo "#define TYPE Byte"  > ${top_builddir}/include/temp.h
-echo "#define ELT  byte"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 1"     >> ${top_builddir}/include/temp.h
-echo "#define BYTE 1"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/ByteBuffer/g > $CLASSPATH_SRC/gnu/java/nio/ByteBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Byte/g > $CLASSPATH_SRC/gnu/java/nio/MappedByteFileBuffer.java
-
-
-echo "#define TYPE Short"  > ${top_builddir}/include/temp.h
-echo "#define ELT  short"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 2"     >> ${top_builddir}/include/temp.h
-echo "#define SHORT 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/ShortBuffer/g > $CLASSPATH_SRC/gnu/java/nio/ShortBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Short/g > $CLASSPATH_SRC/gnu/java/nio/MappedShortFileBuffer.java
-
-
-echo "#define TYPE Char"  > ${top_builddir}/include/temp.h
-echo "#define ELT  char"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 2"     >> ${top_builddir}/include/temp.h
-echo "#define CHAR 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/CharBuffer/g > $CLASSPATH_SRC/gnu/java/nio/CharBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Char/g > $CLASSPATH_SRC/gnu/java/nio/MappedCharFileBuffer.java
-
-
-
-echo "#define TYPE Int"  > ${top_builddir}/include/temp.h
-echo "#define ELT  int"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 4"     >> ${top_builddir}/include/temp.h
-echo "#define INT 2"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/IntBuffer/g > $CLASSPATH_SRC/gnu/java/nio/IntBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Int/g > $CLASSPATH_SRC/gnu/java/nio/MappedIntFileBuffer.java
-
-
-
-echo "#define TYPE Long"  > ${top_builddir}/include/temp.h
-echo "#define ELT  long"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 8"     >> ${top_builddir}/include/temp.h
-echo "#define LONG"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/LongBuffer/g > $CLASSPATH_SRC/gnu/java/nio/LongBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Long/g > $CLASSPATH_SRC/gnu/java/nio/MappedLongFileBuffer.java
-
-
-
-
-echo "#define TYPE Float"  > ${top_builddir}/include/temp.h
-echo "#define ELT  float"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 4"     >> ${top_builddir}/include/temp.h
-echo "#define FLOAT"     >> ${top_builddir}/include/temp.h
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/FloatBuffer/g > $CLASSPATH_SRC/gnu/java/nio/FloatBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Float/g > $CLASSPATH_SRC/gnu/java/nio/MappedFloatFileBuffer.java
-
-
-
-echo "#define TYPE Double"  > ${top_builddir}/include/temp.h
-echo "#define ELT  double"  >> ${top_builddir}/include/temp.h
-echo "#define SIZE 8"     >> ${top_builddir}/include/temp.h
-echo "#define DOUBLE 8"     >> ${top_builddir}/include/temp.h
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/BUFFER/DoubleBuffer/g > $CLASSPATH_SRC/gnu/java/nio/DoubleBufferImpl.java
-
-gcc  $CLASSPATH_SRC/gnu/java/nio/GenericMappedByteFileBuffer.cpp  -E -P -I${top_builddir}/include    > temp
-cat temp | sed s/TYPE/Double/g > $CLASSPATH_SRC/gnu/java/nio/MappedDoubleFileBuffer.java
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.52
diff -u -b -B -r1.52 Makefile.am
--- lib/Makefile.am	24 Aug 2003 18:10:56 -0000	1.52
+++ lib/Makefile.am	30 Jan 2004 21:35:54 -0000
@@ -111,9 +111,6 @@
 genclasses: gen-classlist.sh standard.omit
 	top_builddir=$(top_builddir) $(SHELL) ./gen-classlist.sh standard
 
-gennio:
-	top_builddir=$(top_builddir) $(SHELL) ./gen_nio.sh
-
 $(JAVA_DEPEND): genclasses
 
 compile-classes: classes $(JAVA_SRCS) Makefile

--Boundary-00=_R/sGAgOQGzgbLAe--




From MAILER-DAEMON Fri Jan 30 17:36:12 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AmhFE-0006oc-Dl
	for mharc-commit-classpath@gnu.org; Fri, 30 Jan 2004 17:36:12 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AmhFA-0006mi-LO
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 17:36:08 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmhEc-0006ZI-H2
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 17:36:06 -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.24) id 1AmhEc-0006Yx-2N
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 17:35:34 -0500
Received: from [212.6.122.96] (helo=mail0.ewetel.de)
	by mx20.gnu.org with esmtp (Exim 4.24) id 1Amgs4-0004s7-6r
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 17:12:16 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-94-202.ewetel.net
	[80.228.94.202])
	by mail0.ewetel.de (8.12.1/8.12.9) with ESMTP id i0UMCDqM015661
	for <commit-classpath@gnu.org>; Fri, 30 Jan 2004 23:12:14 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1Amgs1-00014Q-00
	for <commit-classpath@gnu.org>; Fri, 30 Jan 2004 23:12:13 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Fri, 30 Jan 2004 23:15:58 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_eetGASo9/kOwd+u"
Message-Id: <200401302315.58671.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: Fixes for make distcheck
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Jan 2004 22:36:09 -0000


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

Hi list,


I just commited some fixes to make "make distcheck" work again.


Michael


2004-01-30  Michael Koch  <konqueror@gmx.de>

	* java/util/logging/Makefile.am: Include logging.properties in dist
	tarball.
	* native/jni/Makefile.am: Reworked subdir handling.
	* native/Makefile.am: Likewise.
	* resource/java/security/Makefile.am: Simplified classpath.security
	handling.


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

Index: java/util/logging/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/Makefile.am,v
retrieving revision 1.3
diff -u -b -B -r1.3 Makefile.am
--- java/util/logging/Makefile.am	22 Jan 2004 10:48:49 -0000	1.3
+++ java/util/logging/Makefile.am	30 Jan 2004 22:08:19 -0000
@@ -1,9 +1,7 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = 
-
 propertiesdir = $(libdir)
-properties_DATA = logging.properties
+dist_properties_DATA = logging.properties
 
 EXTRA_DIST = \
 ConsoleHandler.java \
Index: native/jni/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/Makefile.am,v
retrieving revision 1.7
diff -u -b -B -r1.7 Makefile.am
--- native/jni/Makefile.am	2 Jul 2003 09:16:52 -0000	1.7
+++ native/jni/Makefile.am	30 Jan 2004 22:08:19 -0000
@@ -1,8 +1,9 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
 if CREATE_GTK_PEER_LIBRARIES
-SUBDIRS = classpath java-io java-lang java-net java-nio java-util gtk-peer
-else
-SUBDIRS = classpath java-io java-lang java-net java-nio java-util
+  GTKDIR = gtk-peer
 endif
+
+SUBDIRS = classpath java-io java-lang java-net java-nio java-util $(GTKDIR)
+DIST_SUBDIRS = classpath java-io java-lang java-net java-nio java-util gtk-peer
 
Index: native/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/Makefile.am,v
retrieving revision 1.22
diff -u -b -B -r1.22 Makefile.am
--- native/Makefile.am	14 Aug 2003 16:58:44 -0000	1.22
+++ native/Makefile.am	30 Jan 2004 22:08:19 -0000
@@ -1,16 +1,13 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-if CREATE_JNI_LIBRARIES
-
 if CREATE_CNI_LIBRARIES
-SUBDIRS = fdlibm cni jni target
-else
-SUBDIRS = fdlibm jni target
+  CNIDIR = cni
 endif
 
-else
-if CREATE_CNI_LIBRARIES
-SUBDIRS = fdlibm cni target
-endif
+if CREATE_JNI_LIBRARIES
+  JNIDIR = jni
 endif
+
+SUBDIRS = fdlibm $(CNIDIR) $(JNIDIR) target
+DIST_SUBDIRS = fdlibm cni jni target
 
Index: resource/java/security/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/resource/java/security/Makefile.am,v
retrieving revision 1.3
diff -u -b -B -r1.3 Makefile.am
--- resource/java/security/Makefile.am	24 Dec 2002 05:35:23 -0000	1.3
+++ resource/java/security/Makefile.am	30 Jan 2004 22:08:19 -0000
@@ -1,15 +1,8 @@
 ## used by automake to generate Makefile.in
 
-EXTRA_DIST = \
-classpath.security
-
 # this may be a broken way to install, this file must be in 
 # java.home/lib/security
 
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)/security
-	$(INSTALL_DATA) $(srcdir)/classpath.security $(DESTDIR)$(libdir)/security/classpath.security
-
-uninstall-local:
-	rm -f $(DESTDIR)$(libdir)/security/classpath.security
+securitydir = $(libdir)/security
+dist_security_DATA = classpath.security
 

--Boundary-00=_eetGASo9/kOwd+u--




From MAILER-DAEMON Fri Jan 30 18:31:37 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Ami6r-0001so-5T
	for mharc-commit-classpath@gnu.org; Fri, 30 Jan 2004 18:31:37 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Ami6i-0001rM-8B
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 18:31:28 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1Ami6A-0001es-70
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 18:31:25 -0500
Received: from [207.174.178.17] (helo=gash2.peakpeak.com)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Ami68-0001bs-VE
	for commit-classpath@gnu.org; Fri, 30 Jan 2004 18:30:53 -0500
Received: from fleche.redhat.com (tf0208.peakpeak.com [204.144.239.208])
	by gash2.peakpeak.com (8.9.3/8.9.3.1) with ESMTP id QAA07526;
	Fri, 30 Jan 2004 16:30:24 -0700
Received: by fleche.redhat.com (Postfix, from userid 1000)
	id 742A64F82AE; Fri, 30 Jan 2004 16:20:48 -0700 (MST)
To: Eric Blake <ebb9@byu.net>
References: <87r7y8c0kf.fsf@fleche.redhat.com> <400047DA.8010000@byu.net>
From: Tom Tromey <tromey@redhat.com>
X-Attribution: Tom
X-Zippy: I'm EMOTIONAL now because I have MERCHANDISING CLOUT!!
Date: 30 Jan 2004 16:20:48 -0700
In-Reply-To: <400047DA.8010000@byu.net>
Message-ID: <87znc5c9bj.fsf@fleche.redhat.com>
Lines: 76
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 <commit-classpath@gnu.org>
Subject: Re: Patch: FYI: more standards updates
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
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 Jan 2004 23:31:28 -0000

I'm checking in the appended.  This updates the hacking documentation
to take into account some things Eric pointed out.

Eric> Other ideas: Do we have a preferred order for declarations?  For
Eric> example, some classes list fields, constructors, methods, then nested
Eric> classes; and either sort alphabetically or follow the order they are
Eric> documented in Sun's API documentation.

I don't think we have an agreed-upon rule here.

Tom

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

	* doc/hacking.texinfo (Programming Standards): Added more
	guidelines.

Index: doc/hacking.texinfo
===================================================================
RCS file: /cvsroot/classpath/classpath/doc/hacking.texinfo,v
retrieving revision 1.15
diff -u -r1.15 hacking.texinfo
--- doc/hacking.texinfo 9 Jan 2004 20:55:58 -0000 1.15
+++ doc/hacking.texinfo 30 Jan 2004 23:27:00 -0000
@@ -386,15 +386,35 @@
 @end example
 
 @item
-Don't use redundant modifiers.  For instance, all members of an
-interface are implicitly @code{public}, so there is no need to
-explicitly declare them as @code{public}.
+Don't use redundant modifiers.  Here is some sample code that shows
+redundant modifiers in comments:
+
+@example
+/*abstract*/ interface I {
+   /*public abstract*/ void m();
+   /*public static final*/ int i = 1;
+   /*public static*/ class Inner {}
+}
+final class C {
+   /*final*/ void m() {}
+}
+@end example
+
+Note that Jikes will generate warnings for these if you use
+@code{+Predundant-modifiers} on the command line.
+
+@item
+Modifiers should be listed in the standard order recommended by the
+JLS.  Jikes will warn for this when given @code{+Pmodifier-order}.
 
 @item
 Because the output of different compilers differs, we have
 standardized on explicitly specifying @code{serialVersionUID} in
 @code{Serializable} classes in Classpath.  This field should be
-declared as @code{private static final}.
+declared as @code{private static final}.  Note that a class may be
+@code{Serializable} without being explicitly marked as such, due to
+inheritance.  For instance, all subclasses of @code{Throwable} need to
+have @code{serialVersionUID} declared.
 @c fixme index
 @c fixme link to the discussion
 
@@ -402,6 +422,10 @@
 Don't declare unchecked exceptions in the @code{throws} clause of a
 method.  However, if throwing an unchecked exception is part of the
 method's API, you should mention it in the Javadoc.
+
+@item
+When overriding @code{Object.equals}, remember that @code{instanceof}
+filters out @code{null}, so an explicit check is not needed.
 
 @end itemize
 



From MAILER-DAEMON Sat Jan 31 08:38:22 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1AmvKI-0001pK-2V
	for mharc-commit-classpath@gnu.org; Sat, 31 Jan 2004 08:38:22 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1AmvKC-0001mg-Ow
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 08:38:16 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmvHi-0001EQ-Ay
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 08:36:14 -0500
Received: from [62.108.28.95] (helo=nescio.wildebeest.org)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AmvBU-00008S-Uv
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 08:29:17 -0500
Received: from slauerhoff.wildebeest.org ([192.168.1.27] ident=mark)
	by nescio.wildebeest.org with esmtp (Exim 3.35 #1 (Debian))
	id 1AmvB1-0000aw-00
	for <commit-classpath@gnu.org>; Sat, 31 Jan 2004 14:28:47 +0100
From: Mark Wielaard <mark@klomp.org>
To: commit-classpath@gnu.org
In-Reply-To: <200401302315.58671.konqueror@gmx.de>
References: <200401302315.58671.konqueror@gmx.de>
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature";
	boundary="=-hg/MWUTpEgGmH6Aq6tbr"
Message-Id: <1075549998.893.19.camel@localhost>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.5 
Date: Sat, 31 Jan 2004 14:29:15 +0100
Subject: Re: FYI: Patch: Fixes for make distcheck
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jan 2004 13:38:19 -0000


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

Hi,

On Fri, 2004-01-30 at 23:15, Michael Koch wrote:
> I just commited some fixes to make "make distcheck" work again.

Thanks!

> diff -u -b -B -r1.3 Makefile.am
> --- resource/java/security/Makefile.am  24 Dec 2002 05:35:23
> -0000      1.3
> +++ resource/java/security/Makefile.am  30 Jan 2004 22:08:19 -0000
> @@ -1,15 +1,8 @@
>  ## used by automake to generate Makefile.in
> =20
> -EXTRA_DIST =3D \
> -classpath.security
> -
>  # this may be a broken way to install, this file must be in=20
>  # java.home/lib/security

So this comment is no longer correct?
It seems we do it in a non-broken way now that installs in the correct
directory now.
=20
> -install-data-local:
> -       $(mkinstalldirs) $(DESTDIR)$(libdir)/security
> -       $(INSTALL_DATA) $(srcdir)/classpath.security
> $(DESTDIR)$(libdir)/security/classpath.security
> -
> -uninstall-local:
> -       rm -f $(DESTDIR)$(libdir)/security/classpath.security
> +securitydir =3D $(libdir)/security
> +dist_security_DATA =3D classpath.security

Cheers,

Mark

--=-hg/MWUTpEgGmH6Aq6tbr
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)

iD8DBQBAG5cuxVhZCJWr9QwRAlWCAKCfgKjTghubSHyxr+ZaXvqbyhdUgwCfWIVN
o3LIk9pHvvFJrzreasX2xO8=
=RJ+c
-----END PGP SIGNATURE-----

--=-hg/MWUTpEgGmH6Aq6tbr--




From MAILER-DAEMON Sat Jan 31 10:20:18 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Amwuw-0003Nk-ME
	for mharc-commit-classpath@gnu.org; Sat, 31 Jan 2004 10:20:18 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Amwuu-0003Jg-5t
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 10:20:16 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmwuO-0002hn-CQ
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 10:20:15 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1AmwuN-0002hh-Uv
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 10:19:44 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-202.ewetel.net
	[80.228.95.202])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0VFJgVM010149
	for <commit-classpath@gnu.org>; Sat, 31 Jan 2004 16:19:42 +0100 (MET)
Received: from obelix.konqueror.de ([192.168.1.4])
	by majestix.konqueror.de with esmtp (Exim 3.35 #1 (Debian))
	id 1AmwuL-0003LM-00
	for <commit-classpath@gnu.org>; Sat, 31 Jan 2004 16:19:41 +0100
From: Michael Koch <konqueror@gmx.de>
To: commit-classpath@gnu.org
Date: Sat, 31 Jan 2004 16:23:27 +0100
User-Agent: KMail/1.5.4
MIME-Version: 1.0
Content-Type: Multipart/Mixed;
  boundary="Boundary-00=_vh8GA2aibDUtCkR"
Message-Id: <200401311623.29034.konqueror@gmx.de>
X-CheckCompat: OK
Subject: FYI: Patch: resource/java/security/Makefile.am
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jan 2004 15:20:17 -0000


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

Hi list,


I commited the attached patch to remove a comment which does not apply 
anymore.


Michael


2004-01-31  Michael Koch  <konqueror@gmx.de>

	* resource/java/security/Makefile.am: Removed comment that does not
	apply anymore.


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

Index: resource/java/security/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/resource/java/security/Makefile.am,v
retrieving revision 1.4
diff -u -b -B -r1.4 Makefile.am
--- resource/java/security/Makefile.am	30 Jan 2004 22:16:15 -0000	1.4
+++ resource/java/security/Makefile.am	31 Jan 2004 15:15:12 -0000
@@ -1,8 +1,5 @@
 ## used by automake to generate Makefile.in
 
-# this may be a broken way to install, this file must be in 
-# java.home/lib/security
-
 securitydir = $(libdir)/security
 dist_security_DATA = classpath.security
 

--Boundary-00=_vh8GA2aibDUtCkR--




From MAILER-DAEMON Sat Jan 31 10:22:18 2004
Received: from list by monty-python.gnu.org with archive (Exim 4.24)
	id 1Amww2-0004u3-SO
	for mharc-commit-classpath@gnu.org; Sat, 31 Jan 2004 10:21:26 -0500
Received: from list by monty-python.gnu.org with tmda-scanned (Exim 4.24)
	id 1Amwvp-0004Uu-QF
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 10:21:14 -0500
Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.24)
	id 1AmwvA-0003Vx-LE
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 10:21:05 -0500
Received: from [212.6.122.141] (helo=mail4.ewetel.de)
	by monty-python.gnu.org with esmtp (Exim 4.24) id 1Amwv9-0003TE-3V
	for commit-classpath@gnu.org; Sat, 31 Jan 2004 10:20:31 -0500
Received: from majestix.konqueror.de (dynadsl-080-228-95-202.ewetel.net
	[80.228.95.202])
	by mail4.ewetel.de (8.12.1/8.12.9) with ESMTP id i0VFKKVM010432;
	Sat, 31 Jan 2004 16:20:21 +0100 (MET)
Received: from mkoch by majestix.konqueror.de with local (Exim 3.35 #1
	(Debian)) id 1Amwuy-0003LU-00; Sat, 31 Jan 2004 16:20:20 +0100
Date: Sat, 31 Jan 2004 16:20:20 +0100
From: Michael Koch <konqueror@gmx.de>
To: Mark Wielaard <mark@klomp.org>
Message-ID: <20040131152020.GA12261@mail.konqueror.de>
References: <200401302315.58671.konqueror@gmx.de>
	<1075549998.893.19.camel@localhost>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1075549998.893.19.camel@localhost>
User-Agent: Mutt/1.3.28i
Sender: Michael Koch <mkoch@mail.konqueror.de>
X-CheckCompat: OK
Cc: commit-classpath@gnu.org
Subject: Re: FYI: Patch: Fixes for make distcheck
X-BeenThere: commit-classpath@gnu.org
X-Mailman-Version: 2.1.2
Precedence: list
List-Id: Automatic administrative message (CVS, bugs, regressions).
	<commit-classpath.gnu.org>
List-Unsubscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=unsubscribe>
List-Archive: <http://mail.gnu.org/pipermail/commit-classpath>
List-Post: <mailto:commit-classpath@gnu.org>
List-Help: <mailto:commit-classpath-request@gnu.org?subject=help>
List-Subscribe: <http://mail.gnu.org/mailman/listinfo/commit-classpath>,
	<mailto:commit-classpath-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Jan 2004 15:21:22 -0000

On Sat, Jan 31, 2004 at 02:29:15PM +0100, Mark Wielaard wrote:
> Hi,
> 
> On Fri, 2004-01-30 at 23:15, Michael Koch wrote:
> > I just commited some fixes to make "make distcheck" work again.
> 
> Thanks!
> 
> > diff -u -b -B -r1.3 Makefile.am
> > --- resource/java/security/Makefile.am  24 Dec 2002 05:35:23
> > -0000      1.3
> > +++ resource/java/security/Makefile.am  30 Jan 2004 22:08:19 -0000
> > @@ -1,15 +1,8 @@
> >  ## used by automake to generate Makefile.in
> >  
> > -EXTRA_DIST = \
> > -classpath.security
> > -
> >  # this may be a broken way to install, this file must be in 
> >  # java.home/lib/security
> 
> So this comment is no longer correct?
> It seems we do it in a non-broken way now that installs in the correct
> directory now.

You are obviously right. I just removed the comment.

> > -install-data-local:
> > -       $(mkinstalldirs) $(DESTDIR)$(libdir)/security
> > -       $(INSTALL_DATA) $(srcdir)/classpath.security
> > $(DESTDIR)$(libdir)/security/classpath.security
> > -
> > -uninstall-local:
> > -       rm -f $(DESTDIR)$(libdir)/security/classpath.security
> > +securitydir = $(libdir)/security
> > +dist_security_DATA = classpath.security

Michael



